sozsoft/erp-platform
1
0
Fork 0
Code Issues 6 Pull requests Projects 3 Releases Packages Wiki Activity Actions

Bank ve Bank Account

Browse source 
- locale store dan kaldırıldı
- admin localstorage eklendi.
This commit is contained in:
Sedat ÖZTÜRK 2025-10-02 13:08:48 +03:00
parent d6a2d3e6d0
commit 3406bccb25
104 changed files with 1667 additions and 1027 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

826
api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs
View file

@ -12147,6 +12147,832 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency
} }
#endregion #endregion
#region Bank
if (!await _listFormRepository.AnyAsync(a => a.ListFormCode == ListFormCodes.Lists.Bank))
{
var listFormBank = await _listFormRepository.InsertAsync(
new ListForm()
{
ListFormType = ListFormTypeEnum.List,
IsSubForm = false,
LayoutJson = JsonSerializer.Serialize(new LayoutDto()
{
Grid = true,
Card = true,
Pivot = true,
Chart = true,
DefaultLayout = "grid",
CardLayoutColumn = 4
}),
CultureName = LanguageCodes.En,
ListFormCode = ListFormCodes.Lists.Bank,
Name = AppCodes.Definitions.Bank,
Title = AppCodes.Definitions.Bank,
DataSourceCode = SeedConsts.DataSources.DefaultCode,
IsTenant = false,
IsBranch = false,
IsOrganizationUnit = false,
Description = AppCodes.Definitions.Bank,
SelectCommandType = SelectCommandTypeEnum.Table,
SelectCommand = SelectCommandByTableName("Bank"),
KeyFieldName = "Id",
KeyFieldDbSourceType = DbType.Guid,
DefaultFilter = "\"IsDeleted\" = 'false'",
SortMode = GridOptions.SortModeSingle,
FilterRowJson = JsonSerializer.Serialize(new GridFilterRowDto
{
Visible = true
}),
HeaderFilterJson = JsonSerializer.Serialize(new
{
Visible = true
}),
SearchPanelJson = JsonSerializer.Serialize(new
{
Visible = true
}),
GroupPanelJson = JsonSerializer.Serialize(new
{
Visible = true
}),
SelectionJson = JsonSerializer.Serialize(new SelectionDto
{
Mode = GridOptions.SelectionModeSingle,
AllowSelectAll = false
}),
ColumnOptionJson = JsonSerializer.Serialize(new
{
ColumnFixingEnabled = true,
ColumnChooserEnabled = true
}),
PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto
{
C = AppCodes.Definitions.Bank + ".Create",
R = AppCodes.Definitions.Bank,
U = AppCodes.Definitions.Bank + ".Update",
D = AppCodes.Definitions.Bank + ".Delete",
E = AppCodes.Definitions.Bank + ".Export",
I = AppCodes.Definitions.Bank + ".Import",
}),
DeleteCommand = $"UPDATE \"{DbTablePrefix}Bank\" SET \"DeleterId\"=@DeleterId, \"DeletionTime\"=CURRENT_TIMESTAMP, \"IsDeleted\"='true' WHERE \"Id\"=@Id",
DeleteFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] {
new() {
FieldName = "DeleterId",
FieldDbType = DbType.Guid,
Value = "@USERID",
CustomValueType = FieldCustomValueTypeEnum.CustomKey },
new() {
FieldName = "Id",
FieldDbType = DbType.Guid,
Value = "@ID",
CustomValueType = FieldCustomValueTypeEnum.CustomKey }
}),
PagerOptionJson = JsonSerializer.Serialize(new GridPagerOptionDto
{
Visible = true,
AllowedPageSizes = "10,20,50,100",
ShowPageSizeSelector = true,
ShowNavigationButtons = true,
ShowInfo = false,
InfoText = "Page {0} of {1} ({2} items)",
DisplayMode = GridColumnOptions.PagerDisplayModeAdaptive,
ScrollingMode = GridColumnOptions.ScrollingModeStandard,
LoadPanelEnabled = "auto",
LoadPanelText = "Loading..."
}),
EditingOptionJson = JsonSerializer.Serialize(new GridEditingDto
{
Popup = new GridEditingPopupDto()
{
Title = "Bank Form",
Width = 600,
Height = 600
},
AllowDeleting = true,
AllowAdding = true,
AllowUpdating = true,
SendOnlyChangedFormValuesUpdate = false,
}),
EditingFormJson = JsonSerializer.Serialize(new List<EditingFormDto>() {
new() { Order=1,ColCount=1,ColSpan=2,ItemType="group", Items=
[
new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 2, DataField = "IdentifierCode", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox},
new EditingFormItemDto { Order = 3, DataField = "AddressLine1", ColSpan = 2, EditorType2=EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 4, DataField = "AddressLine2", ColSpan = 2, EditorType2=EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 5, DataField = "Country", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order = 6, DataField = "City", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order = 7, DataField = "District", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order = 8, DataField = "PostalCode", ColSpan = 2, EditorType2=EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 9, DataField = "Phone", ColSpan = 2, EditorType2=EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 10, DataField = "Email", ColSpan = 2, EditorType2=EditorTypes.dxTextBox },
]
}
}),
InsertFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] {
new() {
FieldName = "CreationTime",
FieldDbType = DbType.DateTime,
Value = "@NOW",
CustomValueType = FieldCustomValueTypeEnum.CustomKey },
new() {
FieldName = "CreatorId",
FieldDbType = DbType.Guid,
Value = "@USERID",
CustomValueType = FieldCustomValueTypeEnum.CustomKey },
new() {
FieldName = "IsDeleted",
FieldDbType = DbType.Boolean,
Value = "false",
CustomValueType = FieldCustomValueTypeEnum.Value }
}),
}
);
#region Bank Fields
await _listFormFieldRepository.InsertManyAsync(new ListFormField[] {
new() {
ListFormCode = listFormBank.ListFormCode,
RoleId = null,
UserId = null,
CultureName = LanguageCodes.En,
SourceDbType = DbType.Guid,
FieldName = "Id",
Width = 100,
ListOrderNo = 1,
Visible = false,
IsActive = true,
IsDeleted = false,
SortIndex = 0,
ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[] {
new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.required)}
}),
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{
C = AppCodes.Definitions.Bank + ".Create",
R = AppCodes.Definitions.Bank,
U = AppCodes.Definitions.Bank + ".Update",
E = true,
I = true,
Deny = false
}),
PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto
{
IsPivot = true
})
},
new() {
ListFormCode = listFormBank.ListFormCode,
RoleId = null,
UserId = null,
CultureName = LanguageCodes.En,
SourceDbType = DbType.String,
FieldName = "Name",
Width = 150,
ListOrderNo = 2,
Visible = true,
IsActive = true,
IsDeleted = false,
SortIndex = 1,
SortDirection = GridColumnOptions.SortOrderAsc,
AllowSearch = true,
ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[] {
new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.required)}
}),
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{
C = AppCodes.Definitions.Bank + ".Create",
R = AppCodes.Definitions.Bank,
U = AppCodes.Definitions.Bank + ".Update",
E = true,
I = true,
Deny = false
}),
PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto
{
IsPivot = true
})
},
new() {
ListFormCode = listFormBank.ListFormCode,
RoleId = null,
UserId = null,
CultureName = LanguageCodes.En,
SourceDbType = DbType.String,
FieldName = "IdentifierCode",
Width = 150,
ListOrderNo = 3,
Visible = true,
IsActive = true,
IsDeleted = false,
AllowSearch = true,
ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[] {
new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.required)}
}),
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{
C = AppCodes.Definitions.Bank + ".Create",
R = AppCodes.Definitions.Bank,
U = AppCodes.Definitions.Bank + ".Update",
E = true,
I = true,
Deny = false
}),
PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto
{
IsPivot = true
})
},
new() {
ListFormCode = listFormBank.ListFormCode,
RoleId = null,
UserId = null,
CultureName = LanguageCodes.En,
SourceDbType = DbType.String,
FieldName = "AddressLine1",
Width = 150,
ListOrderNo = 4,
Visible = true,
IsActive = true,
IsDeleted = false,
AllowSearch = true,
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{
C = AppCodes.Definitions.Bank + ".Create",
R = AppCodes.Definitions.Bank,
U = AppCodes.Definitions.Bank + ".Update",
E = true,
I = true,
Deny = false
}),
PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto
{
IsPivot = true
})
},
new() {
ListFormCode = listFormBank.ListFormCode,
RoleId = null,
UserId = null,
CultureName = LanguageCodes.En,
SourceDbType = DbType.String,
FieldName = "AddressLine2",
Width = 150,
ListOrderNo = 5,
Visible = true,
IsActive = true,
IsDeleted = false,
AllowSearch = true,
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{
C = AppCodes.Definitions.Bank + ".Create",
R = AppCodes.Definitions.Bank,
U = AppCodes.Definitions.Bank + ".Update",
E = true,
I = true,
Deny = false
}),
PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto
{
IsPivot = true
})
},
new() {
ListFormCode = listFormBank.ListFormCode,
RoleId = null,
UserId = null,
CultureName = LanguageCodes.En,
SourceDbType = DbType.String,
FieldName = "Country",
Width = 100,
ListOrderNo = 6,
Visible = true,
IsActive = true,
IsDeleted = false,
AllowSearch = true,
LookupJson = JsonSerializer.Serialize(new LookupDto
{
DataSourceType = UiLookupDataSourceTypeEnum.Query,
DisplayExpr = "Name",
ValueExpr = "Key",
LookupQuery = $"SELECT \"{DbTablePrefix}Country\".\"Code\" AS \"Key\", \"{DbTablePrefix}Country\".\"Name\" as \"Name\" FROM \"{DbTablePrefix}Country\" ORDER BY \"{DbTablePrefix}Country\".\"Name\"",
CascadeEmptyFields = "City,District,Street"
}),
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{
C = AppCodes.Definitions.Bank + ".Create",
R = AppCodes.Definitions.Bank,
U = AppCodes.Definitions.Bank + ".Update",
E = true,
I = true,
Deny = false
}),
PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto
{
IsPivot = true
})
},
new() {
ListFormCode = listFormBank.ListFormCode,
RoleId = null,
UserId = null,
CultureName = LanguageCodes.En,
SourceDbType = DbType.String,
FieldName = "City",
Width = 100,
ListOrderNo = 7,
Visible = true,
IsActive = true,
IsDeleted = false,
AllowSearch = true,
LookupJson = JsonSerializer.Serialize(new LookupDto
{
DataSourceType = UiLookupDataSourceTypeEnum.Query,
DisplayExpr = "Name",
ValueExpr = "Key",
LookupQuery = $"SELECT \"{DbTablePrefix}City\".\"Code\" AS \"Key\", \"{DbTablePrefix}City\".\"Name\" as \"Name\" FROM \"{DbTablePrefix}City\" WHERE \"PCity\".\"CountryCode\" = @param0 OR @param0 IS NULL ORDER BY \"{DbTablePrefix}City\".\"Name\"",
CascadeRelationField = "Country",
CascadeFilterOperator="=",
CascadeParentFields = "Country",
CascadeEmptyFields = "District,Street"
}),
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{
C = AppCodes.Definitions.Bank + ".Create",
R = AppCodes.Definitions.Bank,
U = AppCodes.Definitions.Bank + ".Update",
E = true,
I = true,
Deny = false
}),
PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto
{
IsPivot = true
})
},
new() {
ListFormCode = listFormBank.ListFormCode,
RoleId = null,
UserId = null,
CultureName = LanguageCodes.En,
SourceDbType = DbType.String,
FieldName = "District",
Width = 100,
ListOrderNo = 8,
Visible = true,
IsActive = true,
IsDeleted = false,
AllowSearch = true,
LookupJson = JsonSerializer.Serialize(new LookupDto
{
DataSourceType = UiLookupDataSourceTypeEnum.Query,
DisplayExpr = "Name",
ValueExpr = "Key",
LookupQuery = $"SELECT \"{DbTablePrefix}District\".\"Name\" AS \"Key\", \"{DbTablePrefix}District\".\"Name\" as \"Name\" FROM \"{DbTablePrefix}District\" WHERE (\"{DbTablePrefix}District\".\"CountryCode\" = @param0 OR @param0 IS NULL) AND (\"{DbTablePrefix}District\".\"CityCode\" = @param1 OR @param1 IS NULL) GROUP BY \"{DbTablePrefix}District\".\"Name\" ORDER BY \"{DbTablePrefix}District\".\"Name\"",
CascadeRelationField = "City",
CascadeFilterOperator="=",
CascadeParentFields = "Country,City",
CascadeEmptyFields = "Street",
}),
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{
C = AppCodes.Definitions.Bank + ".Create",
R = AppCodes.Definitions.Bank,
U = AppCodes.Definitions.Bank + ".Update",
E = true,
I = true,
Deny = false
}),
PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto
{
IsPivot = true
})
},
new() {
ListFormCode = listFormBank.ListFormCode,
RoleId = null,
UserId = null,
CultureName = LanguageCodes.En,
SourceDbType = DbType.String,
FieldName = "PostalCode",
Width = 150,
ListOrderNo = 9,
Visible = true,
IsActive = true,
IsDeleted = false,
AllowSearch = true,
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{
C = AppCodes.Definitions.Bank + ".Create",
R = AppCodes.Definitions.Bank,
U = AppCodes.Definitions.Bank + ".Update",
E = true,
I = true,
Deny = false
}),
PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto
{
IsPivot = true
})
},
new() {
ListFormCode = listFormBank.ListFormCode,
RoleId = null,
UserId = null,
CultureName = LanguageCodes.En,
SourceDbType = DbType.String,
FieldName = "Phone",
Width = 150,
ListOrderNo = 10,
Visible = true,
IsActive = true,
IsDeleted = false,
AllowSearch = true,
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{
C = AppCodes.Definitions.Bank + ".Create",
R = AppCodes.Definitions.Bank,
U = AppCodes.Definitions.Bank + ".Update",
E = true,
I = true,
Deny = false
}),
PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto
{
IsPivot = true
})
},
new() {
ListFormCode = listFormBank.ListFormCode,
RoleId = null,
UserId = null,
CultureName = LanguageCodes.En,
SourceDbType = DbType.String,
FieldName = "Email",
Width = 150,
ListOrderNo = 11,
Visible = true,
IsActive = true,
IsDeleted = false,
AllowSearch = true,
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{
C = AppCodes.Definitions.Bank + ".Create",
R = AppCodes.Definitions.Bank,
U = AppCodes.Definitions.Bank + ".Update",
E = true,
I = true,
Deny = false
}),
PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto
{
IsPivot = true
})
},
});
#endregion
}
#endregion
#region BankAccount
if (!await _listFormRepository.AnyAsync(a => a.ListFormCode == ListFormCodes.Lists.BankAccount))
{
var listFormBankAccount = await _listFormRepository.InsertAsync(
new ListForm()
{
ListFormType = ListFormTypeEnum.List,
IsSubForm = false,
LayoutJson = JsonSerializer.Serialize(new LayoutDto()
{
Grid = true,
Card = true,
Pivot = true,
Chart = true,
DefaultLayout = "grid",
CardLayoutColumn = 4
}),
CultureName = LanguageCodes.En,
ListFormCode = ListFormCodes.Lists.BankAccount,
Name = AppCodes.Definitions.BankAccount,
Title = AppCodes.Definitions.BankAccount,
DataSourceCode = SeedConsts.DataSources.DefaultCode,
IsTenant = false,
IsBranch = false,
IsOrganizationUnit = false,
Description = AppCodes.Definitions.BankAccount,
SelectCommandType = SelectCommandTypeEnum.Table,
SelectCommand = SelectCommandByTableName("BankAccount"),
KeyFieldName = "Id",
KeyFieldDbSourceType = DbType.Guid,
DefaultFilter = "\"IsDeleted\" = 'false'",
SortMode = GridOptions.SortModeSingle,
FilterRowJson = JsonSerializer.Serialize(new GridFilterRowDto
{
Visible = true
}),
HeaderFilterJson = JsonSerializer.Serialize(new
{
Visible = true
}),
SearchPanelJson = JsonSerializer.Serialize(new
{
Visible = true
}),
GroupPanelJson = JsonSerializer.Serialize(new
{
Visible = true
}),
SelectionJson = JsonSerializer.Serialize(new SelectionDto
{
Mode = GridOptions.SelectionModeSingle,
AllowSelectAll = false
}),
ColumnOptionJson = JsonSerializer.Serialize(new
{
ColumnFixingEnabled = true,
ColumnChooserEnabled = true
}),
PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto
{
C = AppCodes.Definitions.BankAccount + ".Create",
R = AppCodes.Definitions.BankAccount,
U = AppCodes.Definitions.BankAccount + ".Update",
D = AppCodes.Definitions.BankAccount + ".Delete",
E = AppCodes.Definitions.BankAccount + ".Export",
I = AppCodes.Definitions.BankAccount + ".Import",
}),
DeleteCommand = $"UPDATE \"{DbTablePrefix}BankAccount\" SET \"DeleterId\"=@DeleterId, \"DeletionTime\"=CURRENT_TIMESTAMP, \"IsDeleted\"='true' WHERE \"Id\"=@Id",
DeleteFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] {
new() {
FieldName = "DeleterId",
FieldDbType = DbType.Guid,
Value = "@USERID",
CustomValueType = FieldCustomValueTypeEnum.CustomKey },
new() {
FieldName = "Id",
FieldDbType = DbType.Guid,
Value = "@ID",
CustomValueType = FieldCustomValueTypeEnum.CustomKey }
}),
PagerOptionJson = JsonSerializer.Serialize(new GridPagerOptionDto
{
Visible = true,
AllowedPageSizes = "10,20,50,100",
ShowPageSizeSelector = true,
ShowNavigationButtons = true,
ShowInfo = false,
InfoText = "Page {0} of {1} ({2} items)",
DisplayMode = GridColumnOptions.PagerDisplayModeAdaptive,
ScrollingMode = GridColumnOptions.ScrollingModeStandard,
LoadPanelEnabled = "auto",
LoadPanelText = "Loading..."
}),
EditingOptionJson = JsonSerializer.Serialize(new GridEditingDto
{
Popup = new GridEditingPopupDto()
{
Title = "Bank Account Form",
Width = 600,
Height = 300
},
AllowDeleting = true,
AllowAdding = true,
AllowUpdating = true,
SendOnlyChangedFormValuesUpdate = false,
}),
EditingFormJson = JsonSerializer.Serialize(new List<EditingFormDto>() {
new() { Order=1,ColCount=1,ColSpan=2,ItemType="group", Items=
[
new EditingFormItemDto { Order = 1, DataField = "AccountNumber", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 2, DataField = "BankId", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order = 3, DataField = "AccountOwner", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 4, DataField = "CurrencyId", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton },
new EditingFormItemDto { Order = 5, DataField = "CanTransferMoney", ColSpan = 2, EditorType2=EditorTypes.dxCheckBox },
]
}
}),
InsertFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] {
new() {
FieldName = "CreationTime",
FieldDbType = DbType.DateTime,
Value = "@NOW",
CustomValueType = FieldCustomValueTypeEnum.CustomKey },
new() {
FieldName = "CreatorId",
FieldDbType = DbType.Guid,
Value = "@USERID",
CustomValueType = FieldCustomValueTypeEnum.CustomKey },
new() {
FieldName = "IsDeleted",
FieldDbType = DbType.Boolean,
Value = "false",
CustomValueType = FieldCustomValueTypeEnum.Value }
}),
FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] {
new() {
FieldName = "CanTransferMoney",
FieldDbType = DbType.Boolean,
Value = "false",
CustomValueType = FieldCustomValueTypeEnum.Value }
}),
}
);
#region Bank Account Fields
await _listFormFieldRepository.InsertManyAsync(new ListFormField[] {
new() {
ListFormCode = listFormBankAccount.ListFormCode,
RoleId = null,
UserId = null,
CultureName = LanguageCodes.En,
SourceDbType = DbType.Guid,
FieldName = "Id",
Width = 100,
ListOrderNo = 1,
Visible = false,
IsActive = true,
IsDeleted = false,
SortIndex = 0,
ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[] {
new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.required)}
}),
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{
C = AppCodes.Definitions.BankAccount + ".Create",
R = AppCodes.Definitions.BankAccount,
U = AppCodes.Definitions.BankAccount + ".Update",
E = true,
I = true,
Deny = false
}),
PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto
{
IsPivot = true
})
},
new() {
ListFormCode = listFormBankAccount.ListFormCode,
RoleId = null,
UserId = null,
CultureName = LanguageCodes.En,
SourceDbType = DbType.String,
FieldName = "AccountNumber",
Width = 150,
ListOrderNo = 2,
Visible = true,
IsActive = true,
IsDeleted = false,
SortIndex = 1,
SortDirection = GridColumnOptions.SortOrderAsc,
AllowSearch = true,
ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[] {
new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.required)}
}),
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{
C = AppCodes.Definitions.BankAccount + ".Create",
R = AppCodes.Definitions.BankAccount,
U = AppCodes.Definitions.BankAccount + ".Update",
E = true,
I = true,
Deny = false
}),
PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto
{
IsPivot = true
})
},
new() {
ListFormCode = listFormBankAccount.ListFormCode,
RoleId = null,
UserId = null,
CultureName = LanguageCodes.En,
SourceDbType = DbType.Guid,
FieldName = "BankId",
Width = 250,
ListOrderNo = 3,
Visible = true,
IsActive = true,
IsDeleted = false,
AllowSearch = true,
LookupJson = JsonSerializer.Serialize(new LookupDto
{
DataSourceType = UiLookupDataSourceTypeEnum.Query,
DisplayExpr = "Name",
ValueExpr = "Key",
LookupQuery = $"SELECT \"{DbTablePrefix}Bank\".\"Id\" AS \"Key\", \"{DbTablePrefix}Bank\".\"Name\" as \"Name\" FROM \"{DbTablePrefix}Bank\" ORDER BY \"{DbTablePrefix}Bank\".\"Name\"",
}),
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{
C = AppCodes.Definitions.BankAccount + ".Create",
R = AppCodes.Definitions.BankAccount,
U = AppCodes.Definitions.BankAccount + ".Update",
E = true,
I = true,
Deny = false
}),
PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto
{
IsPivot = true
})
},
new() {
ListFormCode = listFormBankAccount.ListFormCode,
RoleId = null,
UserId = null,
CultureName = LanguageCodes.En,
SourceDbType = DbType.String,
FieldName = "AccountOwner",
Width = 250,
ListOrderNo = 4,
Visible = true,
IsActive = true,
IsDeleted = false,
SortIndex = 1,
AllowSearch = true,
ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[] {
new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.required)}
}),
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{
C = AppCodes.Definitions.BankAccount + ".Create",
R = AppCodes.Definitions.BankAccount,
U = AppCodes.Definitions.BankAccount + ".Update",
E = true,
I = true,
Deny = false
}),
PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto
{
IsPivot = true
})
},
new() {
ListFormCode = listFormBankAccount.ListFormCode,
RoleId = null,
UserId = null,
CultureName = LanguageCodes.En,
SourceDbType = DbType.Guid,
FieldName = "CurrencyId",
Width = 150,
ListOrderNo = 5,
Visible = true,
IsActive = true,
IsDeleted = false,
AllowSearch = true,
LookupJson = JsonSerializer.Serialize(new LookupDto
{
DataSourceType = UiLookupDataSourceTypeEnum.Query,
DisplayExpr = "Name",
ValueExpr = "Key",
LookupQuery = $"SELECT \"{DbTablePrefix}Currency\".\"Id\" AS \"Key\", \"{DbTablePrefix}Currency\".\"Code\" as \"Name\" FROM \"{DbTablePrefix}Currency\" ORDER BY \"{DbTablePrefix}Currency\".\"Name\"",
}),
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{
C = AppCodes.Definitions.BankAccount + ".Create",
R = AppCodes.Definitions.BankAccount,
U = AppCodes.Definitions.BankAccount + ".Update",
E = true,
I = true,
Deny = false
}),
PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto
{
IsPivot = true
})
},
new() {
ListFormCode = listFormBankAccount.ListFormCode,
RoleId = null,
UserId = null,
CultureName = LanguageCodes.En,
SourceDbType = DbType.Boolean,
FieldName = "CanTransferMoney",
Width = 50,
ListOrderNo = 6,
Visible = true,
IsActive = true,
IsDeleted = false,
AllowSearch = true,
PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto
{
C = AppCodes.Definitions.BankAccount + ".Create",
R = AppCodes.Definitions.BankAccount,
U = AppCodes.Definitions.BankAccount + ".Update",
E = true,
I = true,
Deny = false
}),
PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto
{
IsPivot = true
})
},
});
#endregion
}
#endregion
#region Skill Level #region Skill Level
if (!await _listFormRepository.AnyAsync(a => a.ListFormCode == ListFormCodes.Lists.SkillLevel)) if (!await _listFormRepository.AnyAsync(a => a.ListFormCode == ListFormCodes.Lists.SkillLevel))
{ {

128
api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.json
View file

@ -2712,6 +2712,102 @@
"IsEnabled": true, "IsEnabled": true,
"MultiTenancySide": 3 "MultiTenancySide": 3
}, },
{
"GroupName": "App.Administration",
"Name": "App.Definitions.Bank",
"ParentName": null,
"DisplayName": "App.Definitions.Bank",
"IsEnabled": true,
"MultiTenancySide": 3
},
{
"GroupName": "App.Administration",
"Name": "App.Definitions.Bank.Create",
"ParentName": "App.Definitions.Bank",
"DisplayName": "Create",
"IsEnabled": true,
"MultiTenancySide": 3
},
{
"GroupName": "App.Administration",
"Name": "App.Definitions.Bank.Update",
"ParentName": "App.Definitions.Bank",
"DisplayName": "Update",
"IsEnabled": true,
"MultiTenancySide": 3
},
{
"GroupName": "App.Administration",
"Name": "App.Definitions.Bank.Delete",
"ParentName": "App.Definitions.Bank",
"DisplayName": "Delete",
"IsEnabled": true,
"MultiTenancySide": 3
},
{
"GroupName": "App.Administration",
"Name": "App.Definitions.Bank.Export",
"ParentName": "App.Definitions.Bank",
"DisplayName": "Export",
"IsEnabled": true,
"MultiTenancySide": 3
},
{
"GroupName": "App.Administration",
"Name": "App.Definitions.Bank.Import",
"ParentName": "App.Definitions.Bank",
"DisplayName": "Import",
"IsEnabled": true,
"MultiTenancySide": 3
},
{
"GroupName": "App.Administration",
"Name": "App.Definitions.BankAccount",
"ParentName": null,
"DisplayName": "App.Definitions.BankAccount",
"IsEnabled": true,
"MultiTenancySide": 3
},
{
"GroupName": "App.Administration",
"Name": "App.Definitions.BankAccount.Create",
"ParentName": "App.Definitions.BankAccount",
"DisplayName": "Create",
"IsEnabled": true,
"MultiTenancySide": 3
},
{
"GroupName": "App.Administration",
"Name": "App.Definitions.BankAccount.Update",
"ParentName": "App.Definitions.BankAccount",
"DisplayName": "Update",
"IsEnabled": true,
"MultiTenancySide": 3
},
{
"GroupName": "App.Administration",
"Name": "App.Definitions.BankAccount.Delete",
"ParentName": "App.Definitions.BankAccount",
"DisplayName": "Delete",
"IsEnabled": true,
"MultiTenancySide": 3
},
{
"GroupName": "App.Administration",
"Name": "App.Definitions.BankAccount.Export",
"ParentName": "App.Definitions.BankAccount",
"DisplayName": "Export",
"IsEnabled": true,
"MultiTenancySide": 3
},
{
"GroupName": "App.Administration",
"Name": "App.Definitions.BankAccount.Import",
"ParentName": "App.Definitions.BankAccount",
"DisplayName": "Import",
"IsEnabled": true,
"MultiTenancySide": 3
},
{ {
"GroupName": "App.Coordinator", "GroupName": "App.Coordinator",
@ -6495,6 +6591,26 @@
"RequiredPermissionName": "App.Definitions.UomCategory", "RequiredPermissionName": "App.Definitions.UomCategory",
"IsDisabled": false "IsDisabled": false
}, },
{
"ParentCode": "App.Definitions",
"Code": "App.Definitions.Bank",
"DisplayName": "App.Definitions.Bank",
"Order": 10,
"Url": "/admin/list/list-bank",
"Icon": "FaUniversity",
"RequiredPermissionName": "App.Definitions.Bank",
"IsDisabled": false
},
{
"ParentCode": "App.Definitions",
"Code": "App.Definitions.BankAccount",
"DisplayName": "App.Definitions.BankAccount",
"Order": 10,
"Url": "/admin/list/list-bankaccount",
"Icon": "FaMoneyCheckAlt",
"RequiredPermissionName": "App.Definitions.BankAccount",
"IsDisabled": false
},
{ {
"ParentCode": null, "ParentCode": null,
@ -14857,6 +14973,18 @@
"tr": "Ölçümler", "tr": "Ölçümler",
"en": "Measurements" "en": "Measurements"
}, },
{
"resourceName": "Platform",
"key": "App.Definitions.Bank",
"tr": "Bankalar",
"en": "Banks"
},
{
"resourceName": "Platform",
"key": "App.Definitions.BankAccount",
"tr": "Banka Hesapları",
"en": "Bank Accounts"
},
{ {
"resourceName": "Platform", "resourceName": "Platform",
"key": "App.Orders", "key": "App.Orders",

2
api/src/Kurs.Platform.Domain.Shared/PlatformConsts.cs
View file

@ -365,6 +365,8 @@ public static class PlatformConsts
public const string SkillLevel = "list-skilllevel"; public const string SkillLevel = "list-skilllevel";
public const string UomCategory = "list-uomcategory"; public const string UomCategory = "list-uomcategory";
public const string Uom = "list-uom"; public const string Uom = "list-uom";
public const string Bank = "list-bank";
public const string BankAccount = "list-bankaccount";
public const string BlogCategory = "list-blogcategory"; public const string BlogCategory = "list-blogcategory";
public const string BlogPost = "list-blogpost"; public const string BlogPost = "list-blogpost";
public const string Route = "list-route"; public const string Route = "list-route";

2
api/src/Kurs.Platform.Domain/Data/SeedConsts.cs
View file

@ -404,6 +404,8 @@ public static class SeedConsts
public const string Skill = Default + ".Skill"; public const string Skill = Default + ".Skill";
public const string UomCategory = Default + ".UomCategory"; public const string UomCategory = Default + ".UomCategory";
public const string Uom = Default + ".Uom"; public const string Uom = Default + ".Uom";
public const string Bank = Default + ".Bank";
public const string BankAccount = Default + ".BankAccount";
} }
} }

0
api/src/Kurs.Platform.Domain/Entities/City.cs → api/src/Kurs.Platform.Domain/Entities/Definitions/City.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/ContactTag.cs → api/src/Kurs.Platform.Domain/Entities/Definitions/ContactTag.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/ContactTitle.cs → api/src/Kurs.Platform.Domain/Entities/Definitions/ContactTitle.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/Country.cs → api/src/Kurs.Platform.Domain/Entities/Definitions/Country.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/Currency.cs → api/src/Kurs.Platform.Domain/Entities/Definitions/Currency.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/District.cs → api/src/Kurs.Platform.Domain/Entities/Definitions/District.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/Sector.cs → api/src/Kurs.Platform.Domain/Entities/Definitions/Sector.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/Skill.cs → api/src/Kurs.Platform.Domain/Entities/Definitions/Skill.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/SkillLevel.cs → api/src/Kurs.Platform.Domain/Entities/Definitions/SkillLevel.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/SkillType.cs → api/src/Kurs.Platform.Domain/Entities/Definitions/SkillType.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/Uom.cs → api/src/Kurs.Platform.Domain/Entities/Definitions/Uom.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/UomCategory.cs → api/src/Kurs.Platform.Domain/Entities/Definitions/UomCategory.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/ApiEndpoint.cs → api/src/Kurs.Platform.Domain/Entities/DeveloperKit/ApiEndpoint.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/ApiMigration.cs → api/src/Kurs.Platform.Domain/Entities/DeveloperKit/ApiMigration.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/CustomComponent.cs → api/src/Kurs.Platform.Domain/Entities/DeveloperKit/CustomComponent.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/CustomEndpoint.cs → api/src/Kurs.Platform.Domain/Entities/DeveloperKit/CustomEndpoint.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/CustomEntity.cs → api/src/Kurs.Platform.Domain/Entities/DeveloperKit/CustomEntity.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/ForumCategory.cs → api/src/Kurs.Platform.Domain/Entities/Forum/ForumCategory.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/ForumPost.cs → api/src/Kurs.Platform.Domain/Entities/Forum/ForumPost.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/ForumTopic.cs → api/src/Kurs.Platform.Domain/Entities/Forum/ForumTopic.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/ListForm.cs → api/src/Kurs.Platform.Domain/Entities/ListForm/ListForm.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/ListFormCustomization.cs → api/src/Kurs.Platform.Domain/Entities/ListForm/ListFormCustomization.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/ListFormField.cs → api/src/Kurs.Platform.Domain/Entities/ListForm/ListFormField.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/ListFormImport.cs → api/src/Kurs.Platform.Domain/Entities/ListForm/ListFormImport.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/ListFormImportExecute.cs → api/src/Kurs.Platform.Domain/Entities/ListForm/ListFormImportExecute.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/AiBot.cs → api/src/Kurs.Platform.Domain/Entities/Platform/AiBot.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/About.cs → api/src/Kurs.Platform.Domain/Entities/Public/About.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/BlogCategory.cs → api/src/Kurs.Platform.Domain/Entities/Public/BlogCategory.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/BlogPost.cs → api/src/Kurs.Platform.Domain/Entities/Public/BlogPost.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/Contact.cs → api/src/Kurs.Platform.Domain/Entities/Public/Contact.cs
View file

1
api/src/Kurs.Platform.Domain/Entities/Demo.cs → api/src/Kurs.Platform.Domain/Entities/Public/Demo.cs
View file

@ -1,5 +1,4 @@
using System; using System;
using System.ComponentModel.DataAnnotations;
using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.Domain.Entities.Auditing;
using Volo.Abp.MultiTenancy; using Volo.Abp.MultiTenancy;

0
api/src/Kurs.Platform.Domain/Entities/InstallmentOption.cs → api/src/Kurs.Platform.Domain/Entities/Public/InstallmentOption.cs
View file

2
api/src/Kurs.Platform.Domain/Orders/Order.cs → api/src/Kurs.Platform.Domain/Entities/Public/Order.cs
View file

@ -3,7 +3,7 @@ using System.Collections.Generic;
using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.Domain.Entities.Auditing;
using Volo.Abp.MultiTenancy; using Volo.Abp.MultiTenancy;
namespace Kurs.Platform.Orders; namespace Kurs.Platform.Entities;
public class Order : FullAuditedEntity<Guid>, IMultiTenant public class Order : FullAuditedEntity<Guid>, IMultiTenant
{ {

0
api/src/Kurs.Platform.Domain/Entities/PaymentMethod.cs → api/src/Kurs.Platform.Domain/Entities/Public/PaymentMethod.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/Product.cs → api/src/Kurs.Platform.Domain/Entities/Public/Product.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/Service.cs → api/src/Kurs.Platform.Domain/Entities/Public/Service.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/ReportCategory.cs → api/src/Kurs.Platform.Domain/Entities/Report/ReportCategory.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/ReportGenerated.cs → api/src/Kurs.Platform.Domain/Entities/Report/ReportGenerated.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/ReportParameter.cs → api/src/Kurs.Platform.Domain/Entities/Report/ReportParameter.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/ReportTemplate.cs → api/src/Kurs.Platform.Domain/Entities/Report/ReportTemplate.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/BackgroundWorker.cs → api/src/Kurs.Platform.Domain/Entities/Saas/BackgroundWorker.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/Branch.cs → api/src/Kurs.Platform.Domain/Entities/Saas/Branch.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/BranchUsers.cs → api/src/Kurs.Platform.Domain/Entities/Saas/BranchUsers.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/DataSource.cs → api/src/Kurs.Platform.Domain/Entities/Saas/DataSource.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/GlobalSearch.cs → api/src/Kurs.Platform.Domain/Entities/Saas/GlobalSearch.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/IpRestriction.cs → api/src/Kurs.Platform.Domain/Entities/Saas/IpRestriction.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/Menu.cs → api/src/Kurs.Platform.Domain/Entities/Saas/Menu.cs
View file

0
api/src/Kurs.Platform.Domain/Entities/Route.cs → api/src/Kurs.Platform.Domain/Entities/Saas/Route.cs
View file

38
api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs
View file

@ -22,7 +22,6 @@ using Kurs.Platform.Forum;
using Microsoft.EntityFrameworkCore.ChangeTracking; using Microsoft.EntityFrameworkCore.ChangeTracking;
using System; using System;
using System.Linq; using System.Linq;
using Kurs.Platform.Orders;
using System.Text.Json; using System.Text.Json;
namespace Kurs.Platform.EntityFrameworkCore; namespace Kurs.Platform.EntityFrameworkCore;
@ -40,6 +39,8 @@ public class PlatformDbContext :
public DbSet<ListForm> ListForms { get; set; } public DbSet<ListForm> ListForms { get; set; }
public DbSet<ListFormField> ListFormFields { get; set; } public DbSet<ListFormField> ListFormFields { get; set; }
public DbSet<ListFormCustomization> ListFormCustomization { get; set; } public DbSet<ListFormCustomization> ListFormCustomization { get; set; }
public DbSet<ListFormImport> ListFormImports { get; set; }
public DbSet<ListFormImportExecute> ListFormImportExecutes { get; set; }
public DbSet<Menu> Menus { get; set; } public DbSet<Menu> Menus { get; set; }
public DbSet<IpRestriction> IpRestrictions { get; set; } public DbSet<IpRestriction> IpRestrictions { get; set; }
public DbSet<DataSource> DataSources { get; set; } public DbSet<DataSource> DataSources { get; set; }
@ -75,26 +76,23 @@ public class PlatformDbContext :
public DbSet<ForumCategory> ForumCategories { get; set; } public DbSet<ForumCategory> ForumCategories { get; set; }
public DbSet<ForumTopic> ForumTopics { get; set; } public DbSet<ForumTopic> ForumTopics { get; set; }
public DbSet<ForumPost> ForumPosts { get; set; } public DbSet<ForumPost> ForumPosts { get; set; }
// Public Entities
public DbSet<Product> Products { get; set; } public DbSet<Product> Products { get; set; }
public DbSet<PaymentMethod> PaymentMethods { get; set; } public DbSet<PaymentMethod> PaymentMethods { get; set; }
public DbSet<InstallmentOption> InstallmentOptions { get; set; } public DbSet<InstallmentOption> InstallmentOptions { get; set; }
public DbSet<About> Abouts { get; set; } public DbSet<About> Abouts { get; set; }
public DbSet<Contact> Contacts { get; set; } public DbSet<Contact> Contacts { get; set; }
public DbSet<Order> Orders { get; set; } public DbSet<Order> Orders { get; set; }
public DbSet<OrderItem> OrderItems { get; set; } public DbSet<OrderItem> OrderItems { get; set; }
public DbSet<Demo> Demos { get; set; }
public DbSet<ListFormImport> ListFormImports { get; set; } public DbSet<Service> Services { get; set; }
public DbSet<ListFormImportExecute> ListFormImportExecutes { get; set; }
// Reports Entities // Reports Entities
public DbSet<ReportTemplate> ReportTemplates { get; set; } public DbSet<ReportTemplate> ReportTemplates { get; set; }
public DbSet<ReportParameter> ReportParameters { get; set; } public DbSet<ReportParameter> ReportParameters { get; set; }
public DbSet<ReportGenerated> ReportGenerated { get; set; } public DbSet<ReportGenerated> ReportGenerated { get; set; }
public DbSet<ReportCategory> ReportCategories { get; set; } public DbSet<ReportCategory> ReportCategories { get; set; }
public DbSet<Demo> Demos { get; set; }
public DbSet<Service> Services { get; set; }
public DbSet<Classroom> ClassSessions { get; set; } public DbSet<Classroom> ClassSessions { get; set; }
public DbSet<ClassroomParticipant> Participants { get; set; } public DbSet<ClassroomParticipant> Participants { get; set; }
@ -335,6 +333,30 @@ public class PlatformDbContext :
b.Property(x => x.LastUpdated); b.Property(x => x.LastUpdated);
}); });
builder.Entity<Bank>(b =>
{
b.ToTable(PlatformConsts.DbTablePrefix + nameof(Bank), PlatformConsts.DbSchema);
b.ConfigureByConvention();
b.Property(x => x.Name).IsRequired().HasMaxLength(8);
});
builder.Entity<BankAccount>(b =>
{
b.ToTable(PlatformConsts.DbTablePrefix + nameof(BankAccount), PlatformConsts.DbSchema);
b.ConfigureByConvention();
b.Property(x => x.AccountNumber).IsRequired().HasMaxLength(64);
b.Property(x => x.BankId).IsRequired();
b.Property(x => x.AccountOwner).IsRequired().HasMaxLength(256);
b.HasOne(x => x.Bank)
.WithMany()
.HasPrincipalKey(x => x.Id)
.HasForeignKey(x => x.BankId)
.OnDelete(DeleteBehavior.Restrict);
});
builder.Entity<CountryGroup>(b => builder.Entity<CountryGroup>(b =>
{ {
b.ToTable(PlatformConsts.DbTablePrefix + nameof(CountryGroup), PlatformConsts.DbSchema); b.ToTable(PlatformConsts.DbTablePrefix + nameof(CountryGroup), PlatformConsts.DbSchema);

545
api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20250926063427_Initial.Designer.cs → api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251002081543_Initial.Designer.cs generated
View file

@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore;
namespace Kurs.Platform.Migrations namespace Kurs.Platform.Migrations
{ {
[DbContext(typeof(PlatformDbContext))] [DbContext(typeof(PlatformDbContext))]
[Migration("20250926063427_Initial")] [Migration("20251002081543_Initial")]
partial class Initial partial class Initial
{ {
/// <inheritdoc /> /// <inheritdoc />
@ -988,8 +988,8 @@ namespace Kurs.Platform.Migrations
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired() .IsRequired()
.HasMaxLength(256) .HasMaxLength(8)
.HasColumnType("nvarchar(256)"); .HasColumnType("nvarchar(8)");
b.Property<string>("Phone") b.Property<string>("Phone")
.HasMaxLength(64) .HasMaxLength(64)
@ -1001,7 +1001,7 @@ namespace Kurs.Platform.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.ToTable("Banks"); b.ToTable("PBank", (string)null);
}); });
modelBuilder.Entity("Kurs.Platform.Entities.BankAccount", b => modelBuilder.Entity("Kurs.Platform.Entities.BankAccount", b =>
@ -1015,6 +1015,7 @@ namespace Kurs.Platform.Migrations
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
b.Property<string>("AccountOwner") b.Property<string>("AccountOwner")
.IsRequired()
.HasMaxLength(256) .HasMaxLength(256)
.HasColumnType("nvarchar(256)"); .HasColumnType("nvarchar(256)");
@ -1067,7 +1068,7 @@ namespace Kurs.Platform.Migrations
b.HasIndex("CurrencyId"); b.HasIndex("CurrencyId");
b.ToTable("BankAccounts"); b.ToTable("PBankAccount", (string)null);
}); });
modelBuilder.Entity("Kurs.Platform.Entities.BlogCategory", b => modelBuilder.Entity("Kurs.Platform.Entities.BlogCategory", b =>
@ -1359,144 +1360,6 @@ namespace Kurs.Platform.Migrations
b.ToTable("PBranchUsers", (string)null); b.ToTable("PBranchUsers", (string)null);
}); });
modelBuilder.Entity("Kurs.Platform.Entities.Chart", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier");
b.Property<string>("AdaptiveLayoutJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("AnimationJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("AnnotationsJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("ArgumentAxisJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("ChartCode")
.IsRequired()
.HasMaxLength(100)
.HasColumnType("nvarchar(100)");
b.Property<string>("CommonAnnotationsSettingsJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("CommonAxisSettingsJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("CommonJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("CommonPaneSettingsJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("CommonSeriesSettingsJson")
.HasColumnType("nvarchar(max)");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<string>("CrosshairJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("CultureName")
.IsRequired()
.ValueGeneratedOnAdd()
.HasColumnType("nvarchar(max)")
.HasDefaultValue("en");
b.Property<string>("DataSourceCode")
.HasColumnType("nvarchar(max)");
b.Property<string>("DataSourceJson")
.HasColumnType("nvarchar(max)");
b.Property<Guid?>("DeleterId")
.HasColumnType("uniqueidentifier")
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("datetime2")
.HasColumnName("DeletionTime");
b.Property<string>("ExportJson")
.HasColumnType("nvarchar(max)");
b.Property<bool>("IsBranch")
.HasColumnType("bit");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("bit")
.HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<bool>("IsOrganizationUnit")
.HasColumnType("bit");
b.Property<bool>("IsTenant")
.HasColumnType("bit");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime2")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId");
b.Property<string>("LegendJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("MarginJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("PanesJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("PermissionJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("RoleId")
.HasColumnType("nvarchar(max)");
b.Property<string>("ScrollBarJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("SeriesJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("SizeJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("TitleJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("TooltipJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("UserId")
.HasColumnType("nvarchar(max)");
b.Property<string>("ValueAxisJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("ZoomAndPanJson")
.HasColumnType("nvarchar(max)");
b.HasKey("Id");
b.ToTable("PChart", (string)null);
});
modelBuilder.Entity("Kurs.Platform.Entities.City", b => modelBuilder.Entity("Kurs.Platform.Entities.City", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
@ -3456,6 +3319,188 @@ namespace Kurs.Platform.Migrations
b.ToTable("PMenu", (string)null); b.ToTable("PMenu", (string)null);
}); });
modelBuilder.Entity("Kurs.Platform.Entities.Order", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier");
b.Property<string>("Address")
.HasColumnType("nvarchar(max)");
b.Property<string>("Address2")
.HasColumnType("nvarchar(max)");
b.Property<string>("City")
.HasColumnType("nvarchar(max)");
b.Property<decimal>("Commission")
.HasPrecision(18, 2)
.HasColumnType("decimal(18,2)");
b.Property<string>("Country")
.HasColumnType("nvarchar(max)");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<Guid?>("DeleterId")
.HasColumnType("uniqueidentifier")
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("datetime2")
.HasColumnName("DeletionTime");
b.Property<string>("District")
.HasColumnType("nvarchar(max)");
b.Property<string>("Email")
.HasColumnType("nvarchar(max)");
b.Property<long>("Fax")
.HasColumnType("bigint");
b.Property<string>("Founder")
.HasColumnType("nvarchar(max)");
b.Property<string>("InstallmentName")
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<int?>("Installments")
.HasColumnType("int");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("bit")
.HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime2")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId");
b.Property<long>("Mobile")
.HasColumnType("bigint");
b.Property<string>("OrganizationName")
.HasColumnType("nvarchar(max)");
b.Property<string>("PaymentDataJson")
.HasMaxLength(4000)
.HasColumnType("nvarchar(4000)");
b.Property<string>("PaymentMethod")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<long>("Phone")
.HasColumnType("bigint");
b.Property<string>("PostalCode")
.HasColumnType("nvarchar(max)");
b.Property<decimal>("Subtotal")
.HasPrecision(18, 2)
.HasColumnType("decimal(18,2)");
b.Property<string>("TaxOffice")
.HasColumnType("nvarchar(max)");
b.Property<Guid?>("TenantId")
.HasColumnType("uniqueidentifier")
.HasColumnName("TenantId");
b.Property<decimal>("Total")
.HasPrecision(18, 2)
.HasColumnType("decimal(18,2)");
b.Property<long>("VknTckn")
.HasColumnType("bigint");
b.Property<string>("Website")
.HasColumnType("nvarchar(max)");
b.HasKey("Id");
b.ToTable("POrder", (string)null);
});
modelBuilder.Entity("Kurs.Platform.Entities.OrderItem", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier");
b.Property<string>("BillingCycle")
.IsRequired()
.HasMaxLength(32)
.HasColumnType("nvarchar(32)");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<Guid?>("DeleterId")
.HasColumnType("uniqueidentifier")
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("datetime2")
.HasColumnName("DeletionTime");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("bit")
.HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime2")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId");
b.Property<Guid>("OrderId")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("ProductId")
.HasColumnType("uniqueidentifier");
b.Property<string>("ProductName")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<int>("Quantity")
.HasColumnType("int");
b.Property<decimal>("TotalPrice")
.HasPrecision(18, 2)
.HasColumnType("decimal(18,2)");
b.HasKey("Id");
b.HasIndex("OrderId");
b.ToTable("POrderItem", (string)null);
});
modelBuilder.Entity("Kurs.Platform.Entities.PaymentMethod", b => modelBuilder.Entity("Kurs.Platform.Entities.PaymentMethod", b =>
{ {
b.Property<string>("Id") b.Property<string>("Id")
@ -4498,188 +4543,6 @@ namespace Kurs.Platform.Migrations
b.ToTable("PForumTopic", (string)null); b.ToTable("PForumTopic", (string)null);
}); });
modelBuilder.Entity("Kurs.Platform.Orders.Order", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier");
b.Property<string>("Address")
.HasColumnType("nvarchar(max)");
b.Property<string>("Address2")
.HasColumnType("nvarchar(max)");
b.Property<string>("City")
.HasColumnType("nvarchar(max)");
b.Property<decimal>("Commission")
.HasPrecision(18, 2)
.HasColumnType("decimal(18,2)");
b.Property<string>("Country")
.HasColumnType("nvarchar(max)");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<Guid?>("DeleterId")
.HasColumnType("uniqueidentifier")
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("datetime2")
.HasColumnName("DeletionTime");
b.Property<string>("District")
.HasColumnType("nvarchar(max)");
b.Property<string>("Email")
.HasColumnType("nvarchar(max)");
b.Property<long>("Fax")
.HasColumnType("bigint");
b.Property<string>("Founder")
.HasColumnType("nvarchar(max)");
b.Property<string>("InstallmentName")
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<int?>("Installments")
.HasColumnType("int");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("bit")
.HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime2")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId");
b.Property<long>("Mobile")
.HasColumnType("bigint");
b.Property<string>("OrganizationName")
.HasColumnType("nvarchar(max)");
b.Property<string>("PaymentDataJson")
.HasMaxLength(4000)
.HasColumnType("nvarchar(4000)");
b.Property<string>("PaymentMethod")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<long>("Phone")
.HasColumnType("bigint");
b.Property<string>("PostalCode")
.HasColumnType("nvarchar(max)");
b.Property<decimal>("Subtotal")
.HasPrecision(18, 2)
.HasColumnType("decimal(18,2)");
b.Property<string>("TaxOffice")
.HasColumnType("nvarchar(max)");
b.Property<Guid?>("TenantId")
.HasColumnType("uniqueidentifier")
.HasColumnName("TenantId");
b.Property<decimal>("Total")
.HasPrecision(18, 2)
.HasColumnType("decimal(18,2)");
b.Property<long>("VknTckn")
.HasColumnType("bigint");
b.Property<string>("Website")
.HasColumnType("nvarchar(max)");
b.HasKey("Id");
b.ToTable("POrder", (string)null);
});
modelBuilder.Entity("Kurs.Platform.Orders.OrderItem", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier");
b.Property<string>("BillingCycle")
.IsRequired()
.HasMaxLength(32)
.HasColumnType("nvarchar(32)");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<Guid?>("DeleterId")
.HasColumnType("uniqueidentifier")
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("datetime2")
.HasColumnName("DeletionTime");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("bit")
.HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime2")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId");
b.Property<Guid>("OrderId")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("ProductId")
.HasColumnType("uniqueidentifier");
b.Property<string>("ProductName")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<int>("Quantity")
.HasColumnType("int");
b.Property<decimal>("TotalPrice")
.HasPrecision(18, 2)
.HasColumnType("decimal(18,2)");
b.HasKey("Id");
b.HasIndex("OrderId");
b.ToTable("POrderItem", (string)null);
});
modelBuilder.Entity("Kurs.Settings.Entities.SettingDefinition", b => modelBuilder.Entity("Kurs.Settings.Entities.SettingDefinition", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
@ -6625,7 +6488,7 @@ namespace Kurs.Platform.Migrations
b.HasOne("Kurs.Platform.Entities.Bank", "Bank") b.HasOne("Kurs.Platform.Entities.Bank", "Bank")
.WithMany() .WithMany()
.HasForeignKey("BankId") .HasForeignKey("BankId")
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Restrict)
.IsRequired(); .IsRequired();
b.HasOne("Kurs.Platform.Entities.Currency", "Currency") b.HasOne("Kurs.Platform.Entities.Currency", "Currency")
@ -6744,6 +6607,16 @@ namespace Kurs.Platform.Migrations
.IsRequired(); .IsRequired();
}); });
modelBuilder.Entity("Kurs.Platform.Entities.OrderItem", b =>
{
b.HasOne("Kurs.Platform.Entities.Order", "Order")
.WithMany("Items")
.HasForeignKey("OrderId")
.OnDelete(DeleteBehavior.Cascade);
b.Navigation("Order");
});
modelBuilder.Entity("Kurs.Platform.Entities.ReportGenerated", b => modelBuilder.Entity("Kurs.Platform.Entities.ReportGenerated", b =>
{ {
b.HasOne("Kurs.Platform.Entities.ReportTemplate", "Template") b.HasOne("Kurs.Platform.Entities.ReportTemplate", "Template")
@ -6838,16 +6711,6 @@ namespace Kurs.Platform.Migrations
b.Navigation("Category"); b.Navigation("Category");
}); });
modelBuilder.Entity("Kurs.Platform.Orders.OrderItem", b =>
{
b.HasOne("Kurs.Platform.Orders.Order", "Order")
.WithMany("Items")
.HasForeignKey("OrderId")
.OnDelete(DeleteBehavior.Cascade);
b.Navigation("Order");
});
modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
{ {
b.HasOne("Volo.Abp.AuditLogging.AuditLog", null) b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
@ -7024,6 +6887,11 @@ namespace Kurs.Platform.Migrations
b.Navigation("Fields"); b.Navigation("Fields");
}); });
modelBuilder.Entity("Kurs.Platform.Entities.Order", b =>
{
b.Navigation("Items");
});
modelBuilder.Entity("Kurs.Platform.Entities.ReportCategory", b => modelBuilder.Entity("Kurs.Platform.Entities.ReportCategory", b =>
{ {
b.Navigation("ReportTemplates"); b.Navigation("ReportTemplates");
@ -7061,11 +6929,6 @@ namespace Kurs.Platform.Migrations
b.Navigation("Posts"); b.Navigation("Posts");
}); });
modelBuilder.Entity("Kurs.Platform.Orders.Order", b =>
{
b.Navigation("Items");
});
modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
{ {
b.Navigation("Actions"); b.Navigation("Actions");

156
api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20250926063427_Initial.cs → api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251002081543_Initial.cs
View file

@ -432,34 +432,6 @@ namespace Kurs.Platform.Migrations
table.PrimaryKey("PK_AbpUsers", x => x.Id); table.PrimaryKey("PK_AbpUsers", x => x.Id);
}); });
migrationBuilder.CreateTable(
name: "Banks",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
Name = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
IdentifierCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
AddressLine1 = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
AddressLine2 = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
District = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
City = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
PostalCode = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: true),
Country = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
Phone = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
Email = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_Banks", x => x.Id);
});
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
name: "OpenIddictApplications", name: "OpenIddictApplications",
columns: table => new columns: table => new
@ -661,6 +633,34 @@ namespace Kurs.Platform.Migrations
table.PrimaryKey("PK_PBackgroundWorker_MailQueueTableFormat", x => x.Id); table.PrimaryKey("PK_PBackgroundWorker_MailQueueTableFormat", x => x.Id);
}); });
migrationBuilder.CreateTable(
name: "PBank",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
Name = table.Column<string>(type: "nvarchar(8)", maxLength: 8, nullable: false),
IdentifierCode = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
AddressLine1 = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
AddressLine2 = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
District = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
City = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
PostalCode = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: true),
Country = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
Phone = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
Email = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_PBank", x => x.Id);
});
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
name: "PBlogCategory", name: "PBlogCategory",
columns: table => new columns: table => new
@ -737,55 +737,6 @@ namespace Kurs.Platform.Migrations
table.PrimaryKey("PK_PBranchUsers", x => new { x.UserId, x.BranchId }); table.PrimaryKey("PK_PBranchUsers", x => new { x.UserId, x.BranchId });
}); });
migrationBuilder.CreateTable(
name: "PChart",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ChartCode = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: false),
DataSourceCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
UserId = table.Column<string>(type: "nvarchar(max)", nullable: true),
RoleId = table.Column<string>(type: "nvarchar(max)", nullable: true),
CultureName = table.Column<string>(type: "nvarchar(max)", nullable: false, defaultValue: "en"),
CommonJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
DataSourceJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
AdaptiveLayoutJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
AnimationJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
AnnotationsJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
ArgumentAxisJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
CommonAnnotationsSettingsJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
CommonAxisSettingsJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
CommonPaneSettingsJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
CommonSeriesSettingsJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
CrosshairJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
ExportJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
LegendJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
MarginJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
PanesJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
ScrollBarJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
SeriesJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
SizeJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
TitleJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
TooltipJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
ValueAxisJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
ZoomAndPanJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
PermissionJson = table.Column<string>(type: "nvarchar(max)", nullable: true),
IsTenant = table.Column<bool>(type: "bit", nullable: false),
IsBranch = table.Column<bool>(type: "bit", nullable: false),
IsOrganizationUnit = table.Column<bool>(type: "bit", nullable: false),
CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_PChart", x => x.Id);
});
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
name: "PClassroom", name: "PClassroom",
columns: table => new columns: table => new
@ -2081,13 +2032,13 @@ namespace Kurs.Platform.Migrations
}); });
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
name: "BankAccounts", name: "PBankAccount",
columns: table => new columns: table => new
{ {
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false), Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
AccountNumber = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false), AccountNumber = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
BankId = table.Column<Guid>(type: "uniqueidentifier", nullable: false), BankId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
AccountOwner = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true), AccountOwner = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: false),
CurrencyId = table.Column<Guid>(type: "uniqueidentifier", nullable: true), CurrencyId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CanTransferMoney = table.Column<bool>(type: "bit", nullable: false), CanTransferMoney = table.Column<bool>(type: "bit", nullable: false),
Company = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true), Company = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
@ -2101,15 +2052,15 @@ namespace Kurs.Platform.Migrations
}, },
constraints: table => constraints: table =>
{ {
table.PrimaryKey("PK_BankAccounts", x => x.Id); table.PrimaryKey("PK_PBankAccount", x => x.Id);
table.ForeignKey( table.ForeignKey(
name: "FK_BankAccounts_Banks_BankId", name: "FK_PBankAccount_PBank_BankId",
column: x => x.BankId, column: x => x.BankId,
principalTable: "Banks", principalTable: "PBank",
principalColumn: "Id", principalColumn: "Id",
onDelete: ReferentialAction.Cascade); onDelete: ReferentialAction.Restrict);
table.ForeignKey( table.ForeignKey(
name: "FK_BankAccounts_PCurrency_CurrencyId", name: "FK_PBankAccount_PCurrency_CurrencyId",
column: x => x.CurrencyId, column: x => x.CurrencyId,
principalTable: "PCurrency", principalTable: "PCurrency",
principalColumn: "Id"); principalColumn: "Id");
@ -2937,16 +2888,6 @@ namespace Kurs.Platform.Migrations
table: "AbpUsers", table: "AbpUsers",
column: "UserName"); column: "UserName");
migrationBuilder.CreateIndex(
name: "IX_BankAccounts_BankId",
table: "BankAccounts",
column: "BankId");
migrationBuilder.CreateIndex(
name: "IX_BankAccounts_CurrencyId",
table: "BankAccounts",
column: "CurrencyId");
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_OpenIddictApplications_ClientId", name: "IX_OpenIddictApplications_ClientId",
table: "OpenIddictApplications", table: "OpenIddictApplications",
@ -2993,6 +2934,16 @@ namespace Kurs.Platform.Migrations
columns: new[] { "TableName", "Order" }, columns: new[] { "TableName", "Order" },
unique: true); unique: true);
migrationBuilder.CreateIndex(
name: "IX_PBankAccount_BankId",
table: "PBankAccount",
column: "BankId");
migrationBuilder.CreateIndex(
name: "IX_PBankAccount_CurrencyId",
table: "PBankAccount",
column: "CurrencyId");
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_PBlogCategory_Slug", name: "IX_PBlogCategory_Slug",
table: "PBlogCategory", table: "PBlogCategory",
@ -3290,9 +3241,6 @@ namespace Kurs.Platform.Migrations
migrationBuilder.DropTable( migrationBuilder.DropTable(
name: "AbpUserTokens"); name: "AbpUserTokens");
migrationBuilder.DropTable(
name: "BankAccounts");
migrationBuilder.DropTable( migrationBuilder.DropTable(
name: "OpenIddictScopes"); name: "OpenIddictScopes");
@ -3323,6 +3271,9 @@ namespace Kurs.Platform.Migrations
migrationBuilder.DropTable( migrationBuilder.DropTable(
name: "PBackgroundWorker_MailQueueTableFormat"); name: "PBackgroundWorker_MailQueueTableFormat");
migrationBuilder.DropTable(
name: "PBankAccount");
migrationBuilder.DropTable( migrationBuilder.DropTable(
name: "PBlogPost"); name: "PBlogPost");
@ -3332,9 +3283,6 @@ namespace Kurs.Platform.Migrations
migrationBuilder.DropTable( migrationBuilder.DropTable(
name: "PBranchUsers"); name: "PBranchUsers");
migrationBuilder.DropTable(
name: "PChart");
migrationBuilder.DropTable( migrationBuilder.DropTable(
name: "PClassroomAttandance"); name: "PClassroomAttandance");
@ -3462,14 +3410,14 @@ namespace Kurs.Platform.Migrations
name: "AbpUsers"); name: "AbpUsers");
migrationBuilder.DropTable( migrationBuilder.DropTable(
name: "Banks"); name: "OpenIddictAuthorizations");
migrationBuilder.DropTable(
name: "PBank");
migrationBuilder.DropTable( migrationBuilder.DropTable(
name: "PCurrency"); name: "PCurrency");
migrationBuilder.DropTable(
name: "OpenIddictAuthorizations");
migrationBuilder.DropTable( migrationBuilder.DropTable(
name: "PBlogCategory"); name: "PBlogCategory");

543
api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs
View file

@ -985,8 +985,8 @@ namespace Kurs.Platform.Migrations
b.Property<string>("Name") b.Property<string>("Name")
.IsRequired() .IsRequired()
.HasMaxLength(256) .HasMaxLength(8)
.HasColumnType("nvarchar(256)"); .HasColumnType("nvarchar(8)");
b.Property<string>("Phone") b.Property<string>("Phone")
.HasMaxLength(64) .HasMaxLength(64)
@ -998,7 +998,7 @@ namespace Kurs.Platform.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.ToTable("Banks"); b.ToTable("PBank", (string)null);
}); });
modelBuilder.Entity("Kurs.Platform.Entities.BankAccount", b => modelBuilder.Entity("Kurs.Platform.Entities.BankAccount", b =>
@ -1012,6 +1012,7 @@ namespace Kurs.Platform.Migrations
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
b.Property<string>("AccountOwner") b.Property<string>("AccountOwner")
.IsRequired()
.HasMaxLength(256) .HasMaxLength(256)
.HasColumnType("nvarchar(256)"); .HasColumnType("nvarchar(256)");
@ -1064,7 +1065,7 @@ namespace Kurs.Platform.Migrations
b.HasIndex("CurrencyId"); b.HasIndex("CurrencyId");
b.ToTable("BankAccounts"); b.ToTable("PBankAccount", (string)null);
}); });
modelBuilder.Entity("Kurs.Platform.Entities.BlogCategory", b => modelBuilder.Entity("Kurs.Platform.Entities.BlogCategory", b =>
@ -1356,144 +1357,6 @@ namespace Kurs.Platform.Migrations
b.ToTable("PBranchUsers", (string)null); b.ToTable("PBranchUsers", (string)null);
}); });
modelBuilder.Entity("Kurs.Platform.Entities.Chart", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier");
b.Property<string>("AdaptiveLayoutJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("AnimationJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("AnnotationsJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("ArgumentAxisJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("ChartCode")
.IsRequired()
.HasMaxLength(100)
.HasColumnType("nvarchar(100)");
b.Property<string>("CommonAnnotationsSettingsJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("CommonAxisSettingsJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("CommonJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("CommonPaneSettingsJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("CommonSeriesSettingsJson")
.HasColumnType("nvarchar(max)");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<string>("CrosshairJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("CultureName")
.IsRequired()
.ValueGeneratedOnAdd()
.HasColumnType("nvarchar(max)")
.HasDefaultValue("en");
b.Property<string>("DataSourceCode")
.HasColumnType("nvarchar(max)");
b.Property<string>("DataSourceJson")
.HasColumnType("nvarchar(max)");
b.Property<Guid?>("DeleterId")
.HasColumnType("uniqueidentifier")
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("datetime2")
.HasColumnName("DeletionTime");
b.Property<string>("ExportJson")
.HasColumnType("nvarchar(max)");
b.Property<bool>("IsBranch")
.HasColumnType("bit");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("bit")
.HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<bool>("IsOrganizationUnit")
.HasColumnType("bit");
b.Property<bool>("IsTenant")
.HasColumnType("bit");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime2")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId");
b.Property<string>("LegendJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("MarginJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("PanesJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("PermissionJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("RoleId")
.HasColumnType("nvarchar(max)");
b.Property<string>("ScrollBarJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("SeriesJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("SizeJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("TitleJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("TooltipJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("UserId")
.HasColumnType("nvarchar(max)");
b.Property<string>("ValueAxisJson")
.HasColumnType("nvarchar(max)");
b.Property<string>("ZoomAndPanJson")
.HasColumnType("nvarchar(max)");
b.HasKey("Id");
b.ToTable("PChart", (string)null);
});
modelBuilder.Entity("Kurs.Platform.Entities.City", b => modelBuilder.Entity("Kurs.Platform.Entities.City", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
@ -3453,6 +3316,188 @@ namespace Kurs.Platform.Migrations
b.ToTable("PMenu", (string)null); b.ToTable("PMenu", (string)null);
}); });
modelBuilder.Entity("Kurs.Platform.Entities.Order", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier");
b.Property<string>("Address")
.HasColumnType("nvarchar(max)");
b.Property<string>("Address2")
.HasColumnType("nvarchar(max)");
b.Property<string>("City")
.HasColumnType("nvarchar(max)");
b.Property<decimal>("Commission")
.HasPrecision(18, 2)
.HasColumnType("decimal(18,2)");
b.Property<string>("Country")
.HasColumnType("nvarchar(max)");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<Guid?>("DeleterId")
.HasColumnType("uniqueidentifier")
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("datetime2")
.HasColumnName("DeletionTime");
b.Property<string>("District")
.HasColumnType("nvarchar(max)");
b.Property<string>("Email")
.HasColumnType("nvarchar(max)");
b.Property<long>("Fax")
.HasColumnType("bigint");
b.Property<string>("Founder")
.HasColumnType("nvarchar(max)");
b.Property<string>("InstallmentName")
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<int?>("Installments")
.HasColumnType("int");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("bit")
.HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime2")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId");
b.Property<long>("Mobile")
.HasColumnType("bigint");
b.Property<string>("OrganizationName")
.HasColumnType("nvarchar(max)");
b.Property<string>("PaymentDataJson")
.HasMaxLength(4000)
.HasColumnType("nvarchar(4000)");
b.Property<string>("PaymentMethod")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<long>("Phone")
.HasColumnType("bigint");
b.Property<string>("PostalCode")
.HasColumnType("nvarchar(max)");
b.Property<decimal>("Subtotal")
.HasPrecision(18, 2)
.HasColumnType("decimal(18,2)");
b.Property<string>("TaxOffice")
.HasColumnType("nvarchar(max)");
b.Property<Guid?>("TenantId")
.HasColumnType("uniqueidentifier")
.HasColumnName("TenantId");
b.Property<decimal>("Total")
.HasPrecision(18, 2)
.HasColumnType("decimal(18,2)");
b.Property<long>("VknTckn")
.HasColumnType("bigint");
b.Property<string>("Website")
.HasColumnType("nvarchar(max)");
b.HasKey("Id");
b.ToTable("POrder", (string)null);
});
modelBuilder.Entity("Kurs.Platform.Entities.OrderItem", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier");
b.Property<string>("BillingCycle")
.IsRequired()
.HasMaxLength(32)
.HasColumnType("nvarchar(32)");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<Guid?>("DeleterId")
.HasColumnType("uniqueidentifier")
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("datetime2")
.HasColumnName("DeletionTime");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("bit")
.HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime2")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId");
b.Property<Guid>("OrderId")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("ProductId")
.HasColumnType("uniqueidentifier");
b.Property<string>("ProductName")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<int>("Quantity")
.HasColumnType("int");
b.Property<decimal>("TotalPrice")
.HasPrecision(18, 2)
.HasColumnType("decimal(18,2)");
b.HasKey("Id");
b.HasIndex("OrderId");
b.ToTable("POrderItem", (string)null);
});
modelBuilder.Entity("Kurs.Platform.Entities.PaymentMethod", b => modelBuilder.Entity("Kurs.Platform.Entities.PaymentMethod", b =>
{ {
b.Property<string>("Id") b.Property<string>("Id")
@ -4495,188 +4540,6 @@ namespace Kurs.Platform.Migrations
b.ToTable("PForumTopic", (string)null); b.ToTable("PForumTopic", (string)null);
}); });
modelBuilder.Entity("Kurs.Platform.Orders.Order", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier");
b.Property<string>("Address")
.HasColumnType("nvarchar(max)");
b.Property<string>("Address2")
.HasColumnType("nvarchar(max)");
b.Property<string>("City")
.HasColumnType("nvarchar(max)");
b.Property<decimal>("Commission")
.HasPrecision(18, 2)
.HasColumnType("decimal(18,2)");
b.Property<string>("Country")
.HasColumnType("nvarchar(max)");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<Guid?>("DeleterId")
.HasColumnType("uniqueidentifier")
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("datetime2")
.HasColumnName("DeletionTime");
b.Property<string>("District")
.HasColumnType("nvarchar(max)");
b.Property<string>("Email")
.HasColumnType("nvarchar(max)");
b.Property<long>("Fax")
.HasColumnType("bigint");
b.Property<string>("Founder")
.HasColumnType("nvarchar(max)");
b.Property<string>("InstallmentName")
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<int?>("Installments")
.HasColumnType("int");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("bit")
.HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime2")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId");
b.Property<long>("Mobile")
.HasColumnType("bigint");
b.Property<string>("OrganizationName")
.HasColumnType("nvarchar(max)");
b.Property<string>("PaymentDataJson")
.HasMaxLength(4000)
.HasColumnType("nvarchar(4000)");
b.Property<string>("PaymentMethod")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<long>("Phone")
.HasColumnType("bigint");
b.Property<string>("PostalCode")
.HasColumnType("nvarchar(max)");
b.Property<decimal>("Subtotal")
.HasPrecision(18, 2)
.HasColumnType("decimal(18,2)");
b.Property<string>("TaxOffice")
.HasColumnType("nvarchar(max)");
b.Property<Guid?>("TenantId")
.HasColumnType("uniqueidentifier")
.HasColumnName("TenantId");
b.Property<decimal>("Total")
.HasPrecision(18, 2)
.HasColumnType("decimal(18,2)");
b.Property<long>("VknTckn")
.HasColumnType("bigint");
b.Property<string>("Website")
.HasColumnType("nvarchar(max)");
b.HasKey("Id");
b.ToTable("POrder", (string)null);
});
modelBuilder.Entity("Kurs.Platform.Orders.OrderItem", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier");
b.Property<string>("BillingCycle")
.IsRequired()
.HasMaxLength(32)
.HasColumnType("nvarchar(32)");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime2")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uniqueidentifier")
.HasColumnName("CreatorId");
b.Property<Guid?>("DeleterId")
.HasColumnType("uniqueidentifier")
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("datetime2")
.HasColumnName("DeletionTime");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("bit")
.HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime2")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("uniqueidentifier")
.HasColumnName("LastModifierId");
b.Property<Guid>("OrderId")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("ProductId")
.HasColumnType("uniqueidentifier");
b.Property<string>("ProductName")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<int>("Quantity")
.HasColumnType("int");
b.Property<decimal>("TotalPrice")
.HasPrecision(18, 2)
.HasColumnType("decimal(18,2)");
b.HasKey("Id");
b.HasIndex("OrderId");
b.ToTable("POrderItem", (string)null);
});
modelBuilder.Entity("Kurs.Settings.Entities.SettingDefinition", b => modelBuilder.Entity("Kurs.Settings.Entities.SettingDefinition", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
@ -6622,7 +6485,7 @@ namespace Kurs.Platform.Migrations
b.HasOne("Kurs.Platform.Entities.Bank", "Bank") b.HasOne("Kurs.Platform.Entities.Bank", "Bank")
.WithMany() .WithMany()
.HasForeignKey("BankId") .HasForeignKey("BankId")
.OnDelete(DeleteBehavior.Cascade) .OnDelete(DeleteBehavior.Restrict)
.IsRequired(); .IsRequired();
b.HasOne("Kurs.Platform.Entities.Currency", "Currency") b.HasOne("Kurs.Platform.Entities.Currency", "Currency")
@ -6741,6 +6604,16 @@ namespace Kurs.Platform.Migrations
.IsRequired(); .IsRequired();
}); });
modelBuilder.Entity("Kurs.Platform.Entities.OrderItem", b =>
{
b.HasOne("Kurs.Platform.Entities.Order", "Order")
.WithMany("Items")
.HasForeignKey("OrderId")
.OnDelete(DeleteBehavior.Cascade);
b.Navigation("Order");
});
modelBuilder.Entity("Kurs.Platform.Entities.ReportGenerated", b => modelBuilder.Entity("Kurs.Platform.Entities.ReportGenerated", b =>
{ {
b.HasOne("Kurs.Platform.Entities.ReportTemplate", "Template") b.HasOne("Kurs.Platform.Entities.ReportTemplate", "Template")
@ -6835,16 +6708,6 @@ namespace Kurs.Platform.Migrations
b.Navigation("Category"); b.Navigation("Category");
}); });
modelBuilder.Entity("Kurs.Platform.Orders.OrderItem", b =>
{
b.HasOne("Kurs.Platform.Orders.Order", "Order")
.WithMany("Items")
.HasForeignKey("OrderId")
.OnDelete(DeleteBehavior.Cascade);
b.Navigation("Order");
});
modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
{ {
b.HasOne("Volo.Abp.AuditLogging.AuditLog", null) b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
@ -7021,6 +6884,11 @@ namespace Kurs.Platform.Migrations
b.Navigation("Fields"); b.Navigation("Fields");
}); });
modelBuilder.Entity("Kurs.Platform.Entities.Order", b =>
{
b.Navigation("Items");
});
modelBuilder.Entity("Kurs.Platform.Entities.ReportCategory", b => modelBuilder.Entity("Kurs.Platform.Entities.ReportCategory", b =>
{ {
b.Navigation("ReportTemplates"); b.Navigation("ReportTemplates");
@ -7058,11 +6926,6 @@ namespace Kurs.Platform.Migrations
b.Navigation("Posts"); b.Navigation("Posts");
}); });
modelBuilder.Entity("Kurs.Platform.Orders.Order", b =>
{
b.Navigation("Items");
});
modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
{ {
b.Navigation("Actions"); b.Navigation("Actions");

6
ui/src/proxy/admin/list-form/models.ts
View file

@ -1,3 +1,4 @@
import { ListViewLayoutType } from '@/views/admin/listForm/edit/types'
import { import {
CommandColumnDto, CommandColumnDto,
EditingFormDto, EditingFormDto,
@ -52,3 +53,8 @@ export interface ListFormJsonRowDto {
itemChartValueAxis?: ChartValueAxisDto itemChartValueAxis?: ChartValueAxisDto
} }
export interface ListState {
listFormCode: string
layout: ListViewLayoutType
cardLayoutColumn?: number
}

82
ui/src/store/admin.model.ts
View file

@ -1,53 +1,65 @@
import type { Action, Thunk } from 'easy-peasy' import type { Action, Thunk } from 'easy-peasy'
import { action, thunk } from 'easy-peasy' import { action, thunk } from 'easy-peasy'
import { Injections } from './store' import { Injections } from './store'
import { FieldsDefaultValueDto, GridOptionsEditDto } from '../proxy/form/models' import { GridOptionsEditDto } from '../proxy/form/models'
import setNull from '../utils/setNull' import setNull from '../utils/setNull'
import { ListState } from '@/proxy/admin/list-form/models'
export interface AdminStoreModel { export interface AdminStoreModel {
listFormValues: GridOptionsEditDto | undefined lists: {
values: GridOptionsEditDto | undefined
states: ListState[]
}
} }
export interface AdminStoreActions { export interface AdminStoreActions {
setListFormValues: Action<AdminStoreModel, GridOptionsEditDto> lists: {
setJsonValue: Action< setListFormValues: Action<AdminStoreModel['lists'], GridOptionsEditDto>
AdminStoreModel, setJsonValue: Action<AdminStoreModel['lists'], { field: keyof GridOptionsEditDto; data: any[] }>
{ field: keyof GridOptionsEditDto; data: any[] } getListFormValues: Thunk<
> AdminStoreModel['lists'] & AdminStoreActions['lists'],
getListFormValues: Thunk<AdminStoreActions, string | undefined, Injections> string | undefined,
// onSetLang: ThunkOn<AdminModel, Injections, StoreModel> Injections
>
setStates: Action<AdminStoreModel['lists'], ListState>
}
} }
export type AdminModel = AdminStoreModel & AdminStoreActions export type AdminModel = AdminStoreModel & AdminStoreActions
const initialState: AdminStoreModel = { const initialState: AdminStoreModel = {
listFormValues: undefined, lists: {
values: undefined,
states: [],
},
} }
export const adminModel: AdminModel = { export const adminModel: AdminModel = {
...initialState, lists: {
setListFormValues: action((state, payload) => { ...initialState.lists,
state.listFormValues = { ...payload } setStates: action((state, payload) => {
}), const stateId = state.states.findIndex((s) => s.listFormCode === payload.listFormCode)
setJsonValue: action((state, payload) => { if (stateId !== -1) {
if (state.listFormValues) { state.states[stateId] = payload
state.listFormValues[payload.field] = payload.data } else {
} state.states = [...state.states, payload]
}), }
getListFormValues: thunk(async (actions, payload, helpers) => { }),
if (!payload) {
return setListFormValues: action((state, payload) => {
} state.values = { ...state.values, ...payload }
const service = helpers.injections.listFormService }),
const result = await service.getListFormByCode(payload) setJsonValue: action((state, payload) => {
setNull(result.data) if (state.values) {
actions.setListFormValues(result.data) state.values[payload.field] = payload.data
}), }
// onSetLang: thunkOn( }),
// (actions) => actions.setLang, getListFormValues: thunk(async (actions, payload, helpers) => {
// async (actions, target, helpers) => { if (!payload) return
// // Dil değiştiğince AppConfig ve Localizationları tekrar al const service = helpers.injections.listFormService
// helpers.getStoreActions().abpConfig.getConfig(false) const result = await service.getListFormByCode(payload)
// }, setNull(result.data)
// ), actions.setListFormValues(result.data)
}),
},
} }

27
ui/src/store/base.model.ts
View file

@ -1,4 +1,3 @@
import { ListViewLayoutType } from '@/views/admin/listForm/edit/types'
import type { Action } from 'easy-peasy' import type { Action } from 'easy-peasy'
import { action } from 'easy-peasy' import { action } from 'easy-peasy'
@ -28,12 +27,6 @@ export interface StoreError {
statusCode?: string statusCode?: string
} }
export interface ListState {
listFormCode: string
layout: ListViewLayoutType
cardLayoutColumn?: number
}
export interface BaseStoreModel { export interface BaseStoreModel {
common: { common: {
currentRouteKey: string currentRouteKey: string
@ -45,9 +38,6 @@ export interface BaseStoreModel {
warning: string[] warning: string[]
aiPosts: Message[] aiPosts: Message[]
} }
lists: {
states: ListState[]
}
} }
export interface BaseStoreActions { export interface BaseStoreActions {
@ -63,9 +53,6 @@ export interface BaseStoreActions {
addAiPost: Action<BaseStoreModel['messages'], Message> addAiPost: Action<BaseStoreModel['messages'], Message>
setAiPosts: Action<BaseStoreModel['messages'], Message[]> setAiPosts: Action<BaseStoreModel['messages'], Message[]>
} }
lists: {
setStates: Action<BaseStoreModel['lists'], ListState>
}
} }
export type BaseModel = BaseStoreModel & BaseStoreActions export type BaseModel = BaseStoreModel & BaseStoreActions
@ -78,9 +65,6 @@ const initialState: BaseStoreModel = {
warning: [], warning: [],
aiPosts: [], aiPosts: [],
}, },
lists: {
states: [],
},
} }
export const baseModel: BaseModel = { export const baseModel: BaseModel = {
@ -116,15 +100,4 @@ export const baseModel: BaseModel = {
state.aiPosts = payload state.aiPosts = payload
}), }),
}, },
lists: {
...initialState.lists,
setStates: action((state, payload) => {
const stateId = state.states.findIndex((s) => s.listFormCode === payload.listFormCode)
if (stateId !== -1) {
state.states[stateId] = payload
} else {
state.states = [...state.states, payload]
}
}),
},
} }

2
ui/src/store/store.ts
View file

@ -65,7 +65,7 @@ export const store = createStore<StoreModel>(
admin: adminModel, admin: adminModel,
}, },
{ {
allow: ['auth', 'theme', 'locale', 'base'], allow: ['auth', 'theme', 'locale', 'admin'],
storage: 'localStorage', storage: 'localStorage',
}, },
), ),

94
ui/src/views/admin/listForm/edit/ChartTabAnimation.tsx
View file

@ -13,7 +13,7 @@ const schema = object()
function ChartTabAnimation(props: FormEditProps) { function ChartTabAnimation(props: FormEditProps) {
const { translate } = useLocalization() const { translate } = useLocalization()
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }
@ -29,55 +29,55 @@ function ChartTabAnimation(props: FormEditProps) {
{({ touched, errors, resetForm, isSubmitting, values }) => ( {({ touched, errors, resetForm, isSubmitting, values }) => (
<Form> <Form>
<FormContainer size="sm"> <FormContainer size="sm">
<FormItem <FormItem
label="Enabled" label="Enabled"
invalid={!!(errors.animationDto?.enabled && touched.animationDto?.enabled)} invalid={!!(errors.animationDto?.enabled && touched.animationDto?.enabled)}
errorMessage={errors.animationDto?.enabled as string} errorMessage={errors.animationDto?.enabled as string}
> >
<Field name="animationDto.enabled" component={Checkbox} /> <Field name="animationDto.enabled" component={Checkbox} />
</FormItem> </FormItem>
<FormItem <FormItem
label="Easing" label="Easing"
invalid={!!(errors.animationDto?.easing && touched.animationDto?.easing)} invalid={!!(errors.animationDto?.easing && touched.animationDto?.easing)}
errorMessage={errors.animationDto?.easing} errorMessage={errors.animationDto?.easing}
> >
<Field type="text" name="animationDto.easing"> <Field type="text" name="animationDto.easing">
{({ field, form }: FieldProps<SelectBoxOption>) => ( {({ field, form }: FieldProps<SelectBoxOption>) => (
<Select <Select
field={field} field={field}
form={form} form={form}
options={chartEasingListOptions} options={chartEasingListOptions}
isClearable={true} isClearable={true}
value={chartEasingListOptions.filter( value={chartEasingListOptions.filter(
(option) => option.value === values.animationDto.easing, (option) => option.value === values.animationDto.easing,
)} )}
onChange={(option) => form.setFieldValue(field.name, option?.value)} onChange={(option) => form.setFieldValue(field.name, option?.value)}
/> />
)} )}
</Field> </Field>
</FormItem> </FormItem>
<FormItem <FormItem
label="Duration" label="Duration"
invalid={!!(errors.animationDto?.duration && touched.animationDto?.duration)} invalid={!!(errors.animationDto?.duration && touched.animationDto?.duration)}
errorMessage={errors.animationDto?.duration as string} errorMessage={errors.animationDto?.duration as string}
> >
<Field type="number" name="animationDto.duration" component={Input} /> <Field type="number" name="animationDto.duration" component={Input} />
</FormItem> </FormItem>
<FormItem <FormItem
label="Max Point Count Supported" label="Max Point Count Supported"
invalid={ invalid={
!!( !!(
errors.animationDto?.maxPointCountSupported && errors.animationDto?.maxPointCountSupported &&
touched.animationDto?.maxPointCountSupported touched.animationDto?.maxPointCountSupported
) )
} }
errorMessage={errors.animationDto?.maxPointCountSupported as string} errorMessage={errors.animationDto?.maxPointCountSupported as string}
> >
<Field type="number" name="animationDto.maxPointCountSupported" component={Input} /> <Field type="number" name="animationDto.maxPointCountSupported" component={Input} />
</FormItem> </FormItem>
<div className="mt-4"> <div className="mt-4">
<Button block variant="solid" loading={isSubmitting} type="submit"> <Button block variant="solid" loading={isSubmitting} type="submit">
{isSubmitting ? translate('::SavingWithThreeDot') : translate('::Save')} {isSubmitting ? translate('::SavingWithThreeDot') : translate('::Save')}

2
ui/src/views/admin/listForm/edit/ChartTabAnnotations.tsx
View file

@ -44,7 +44,7 @@ function ChartTabAnnotations(props: FormEditProps) {
const [jsonRowOpModalData, setJsonRowOpModalData] = useState<JsonRowDialogData>() const [jsonRowOpModalData, setJsonRowOpModalData] = useState<JsonRowDialogData>()
const { translate } = useLocalization() const { translate } = useLocalization()
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }

2
ui/src/views/admin/listForm/edit/ChartTabAxis.tsx
View file

@ -47,7 +47,7 @@ function ChartTabAxis(props: FormEditProps) {
const [jsonRowOpModalData, setJsonRowOpModalData] = useState<JsonRowDialogData>() const [jsonRowOpModalData, setJsonRowOpModalData] = useState<JsonRowDialogData>()
const { translate } = useLocalization() const { translate } = useLocalization()
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }

2
ui/src/views/admin/listForm/edit/ChartTabCommonSettings.tsx
View file

@ -37,7 +37,7 @@ const schema = object()
function ChartTabCommonSettings(props: FormEditProps) { function ChartTabCommonSettings(props: FormEditProps) {
const { translate } = useLocalization() const { translate } = useLocalization()
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }

2
ui/src/views/admin/listForm/edit/ChartTabCrosshair.tsx
View file

@ -14,7 +14,7 @@ const schema = object()
function ChartTabCrosshair(props: FormEditProps) { function ChartTabCrosshair(props: FormEditProps) {
const { translate } = useLocalization() const { translate } = useLocalization()
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }

62
ui/src/views/admin/listForm/edit/ChartTabExport.tsx
View file

@ -11,7 +11,7 @@ const schema = object()
function ChartTabExport(props: FormEditProps) { function ChartTabExport(props: FormEditProps) {
const { translate } = useLocalization() const { translate } = useLocalization()
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }
@ -27,41 +27,37 @@ function ChartTabExport(props: FormEditProps) {
{({ touched, errors, resetForm, isSubmitting, values }) => ( {({ touched, errors, resetForm, isSubmitting, values }) => (
<Form> <Form>
<FormContainer size="sm"> <FormContainer size="sm">
<FormItem <FormItem
label="Enabled" label="Enabled"
invalid={!!(errors.exportDto?.enabled && touched.exportDto?.enabled)} invalid={!!(errors.exportDto?.enabled && touched.exportDto?.enabled)}
errorMessage={errors.exportDto?.enabled as string} errorMessage={errors.exportDto?.enabled as string}
> >
<Field name="exportDto.enabled" component={Checkbox} /> <Field name="exportDto.enabled" component={Checkbox} />
</FormItem> </FormItem>
<FormItem <FormItem
label="Printing Enabled" label="Printing Enabled"
invalid={ invalid={!!(errors.exportDto?.printingEnabled && touched.exportDto?.printingEnabled)}
!!(errors.exportDto?.printingEnabled && touched.exportDto?.printingEnabled) errorMessage={errors.exportDto?.printingEnabled as string}
} >
errorMessage={errors.exportDto?.printingEnabled as string} <Field name="exportDto.printingEnabled" component={Checkbox} />
> </FormItem>
<Field name="exportDto.printingEnabled" component={Checkbox} />
</FormItem>
<FormItem <FormItem
label="Background Color" label="Background Color"
invalid={ invalid={!!(errors.exportDto?.backgroundColor && touched.exportDto?.backgroundColor)}
!!(errors.exportDto?.backgroundColor && touched.exportDto?.backgroundColor) errorMessage={errors.exportDto?.backgroundColor}
} >
errorMessage={errors.exportDto?.backgroundColor} <Field type="text" name="exportDto.backgroundColor" component={Input} />
> </FormItem>
<Field type="text" name="exportDto.backgroundColor" component={Input} />
</FormItem>
<FormItem <FormItem
label="Margin" label="Margin"
invalid={!!(errors.exportDto?.margin && touched.exportDto?.margin)} invalid={!!(errors.exportDto?.margin && touched.exportDto?.margin)}
errorMessage={errors.exportDto?.margin} errorMessage={errors.exportDto?.margin}
> >
<Field type="number" name="exportDto.margin" component={Input} /> <Field type="number" name="exportDto.margin" component={Input} />
</FormItem> </FormItem>
<div className="mt-4"> <div className="mt-4">
<Button block variant="solid" loading={isSubmitting} type="submit"> <Button block variant="solid" loading={isSubmitting} type="submit">
{isSubmitting ? translate('::SavingWithThreeDot') : translate('::Save')} {isSubmitting ? translate('::SavingWithThreeDot') : translate('::Save')}

2
ui/src/views/admin/listForm/edit/ChartTabLegend.tsx
View file

@ -29,7 +29,7 @@ const schema = object()
function ChartTabLegend(props: FormEditProps) { function ChartTabLegend(props: FormEditProps) {
const { translate } = useLocalization() const { translate } = useLocalization()
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }

2
ui/src/views/admin/listForm/edit/ChartTabPanes.tsx
View file

@ -26,7 +26,7 @@ function ChartTabPanes(props: FormEditProps) {
const [jsonRowOpModalData, setJsonRowOpModalData] = useState<JsonRowDialogData>() const [jsonRowOpModalData, setJsonRowOpModalData] = useState<JsonRowDialogData>()
const { translate } = useLocalization() const { translate } = useLocalization()
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }

2
ui/src/views/admin/listForm/edit/ChartTabSeries.tsx
View file

@ -51,7 +51,7 @@ function ChartTabSeries(props: FormEditProps & { listFormCode: string }) {
const { translate } = useLocalization() const { translate } = useLocalization()
const [fieldList, setFieldList] = useState<SelectBoxOption[]>([]) const [fieldList, setFieldList] = useState<SelectBoxOption[]>([])
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }

72
ui/src/views/admin/listForm/edit/ChartTabZoomAndPan.tsx
View file

@ -13,7 +13,7 @@ const schema = object()
const ChartTabZoomAndPan = (props: FormEditProps) => { const ChartTabZoomAndPan = (props: FormEditProps) => {
const { translate } = useLocalization() const { translate } = useLocalization()
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }
@ -32,42 +32,42 @@ const ChartTabZoomAndPan = (props: FormEditProps) => {
<div className="grid grid-cols-1 md:grid-cols-2 gap-3"> <div className="grid grid-cols-1 md:grid-cols-2 gap-3">
<Card className="my-2" header="General"> <Card className="my-2" header="General">
<div className="flex gap-5"> <div className="flex gap-5">
<FormItem <FormItem
label="Allow Mouse Wheel" label="Allow Mouse Wheel"
invalid={ invalid={
!!( !!(
errors.zoomAndPanDto?.allowMouseWheel && errors.zoomAndPanDto?.allowMouseWheel &&
touched.zoomAndPanDto?.allowMouseWheel touched.zoomAndPanDto?.allowMouseWheel
) )
} }
errorMessage={errors.zoomAndPanDto?.allowMouseWheel as string} errorMessage={errors.zoomAndPanDto?.allowMouseWheel as string}
> >
<Field name="zoomAndPanDto.allowMouseWheel" component={Checkbox} /> <Field name="zoomAndPanDto.allowMouseWheel" component={Checkbox} />
</FormItem> </FormItem>
<FormItem <FormItem
label="Allow Touch Gestures" label="Allow Touch Gestures"
invalid={ invalid={
!!( !!(
errors.zoomAndPanDto?.allowTouchGestures && errors.zoomAndPanDto?.allowTouchGestures &&
touched.zoomAndPanDto?.allowTouchGestures touched.zoomAndPanDto?.allowTouchGestures
) )
} }
errorMessage={errors.zoomAndPanDto?.allowTouchGestures as string} errorMessage={errors.zoomAndPanDto?.allowTouchGestures as string}
> >
<Field name="zoomAndPanDto.allowTouchGestures" component={Checkbox} /> <Field name="zoomAndPanDto.allowTouchGestures" component={Checkbox} />
</FormItem> </FormItem>
<FormItem <FormItem
label="Drag To Zoom" label="Drag To Zoom"
invalid={ invalid={
!!(errors.zoomAndPanDto?.dragToZoom && touched.zoomAndPanDto?.dragToZoom) !!(errors.zoomAndPanDto?.dragToZoom && touched.zoomAndPanDto?.dragToZoom)
} }
errorMessage={errors.zoomAndPanDto?.dragToZoom as string} errorMessage={errors.zoomAndPanDto?.dragToZoom as string}
> >
<Field name="zoomAndPanDto.dragToZoom" component={Checkbox} /> <Field name="zoomAndPanDto.dragToZoom" component={Checkbox} />
</FormItem> </FormItem>
</div> </div>
<FormItem <FormItem
label="Argument Axis" label="Argument Axis"
invalid={ invalid={
@ -165,7 +165,7 @@ const ChartTabZoomAndPan = (props: FormEditProps) => {
/> />
</FormItem> </FormItem>
</Card> </Card>
</div> </div>
<div className="mt-4"> <div className="mt-4">
<Button block variant="solid" loading={isSubmitting} type="submit"> <Button block variant="solid" loading={isSubmitting} type="submit">
{isSubmitting ? translate('::SavingWithThreeDot') : translate('::Save')} {isSubmitting ? translate('::SavingWithThreeDot') : translate('::Save')}

6
ui/src/views/admin/listForm/edit/FormEdit.tsx
View file

@ -69,8 +69,8 @@ const FormEdit = () => {
(state) => state.abpConfig.config?.localization.languages, (state) => state.abpConfig.config?.localization.languages,
) )
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
const { getListFormValues } = useStoreActions((a) => a.admin) const { getListFormValues } = useStoreActions((a) => a.admin.lists)
useEffect(() => { useEffect(() => {
if (languages) { if (languages) {
@ -289,7 +289,7 @@ const FormEdit = () => {
<TabNav value="legendSettings"> <TabNav value="legendSettings">
{translate('::ListForms.ListFormEdit.TabChartLegend')} {translate('::ListForms.ListFormEdit.TabChartLegend')}
</TabNav> </TabNav>
)} )}
{visibleTabs.includes('crosshairOptions') && ( {visibleTabs.includes('crosshairOptions') && (
<TabNav value="crosshairOptions"> <TabNav value="crosshairOptions">
{translate('::ListForms.ListFormEdit.TabChartCrosshair')} {translate('::ListForms.ListFormEdit.TabChartCrosshair')}

2
ui/src/views/admin/listForm/edit/FormTabColumns.tsx
View file

@ -23,7 +23,7 @@ const validationSchema = Yup.object().shape({})
function FormTabColumns(props: FormEditProps) { function FormTabColumns(props: FormEditProps) {
const { translate } = useLocalization() const { translate } = useLocalization()
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }

2
ui/src/views/admin/listForm/edit/FormTabCommands.tsx
View file

@ -19,7 +19,7 @@ function FormTabCommands() {
const [jsonRowOpModalData, setJsonRowOpModalData] = useState<JsonRowDialogData>() const [jsonRowOpModalData, setJsonRowOpModalData] = useState<JsonRowDialogData>()
const { translate } = useLocalization() const { translate } = useLocalization()
const initialValues = useStoreState((s) => s.admin.listFormValues) const initialValues = useStoreState((s) => s.admin.lists.values)
if (!initialValues) { if (!initialValues) {
return null return null
} }

2
ui/src/views/admin/listForm/edit/FormTabDatabaseDataSource.tsx
View file

@ -41,7 +41,7 @@ function FormTabDatabaseDataSource(props: FormEditProps) {
getDataSourceList() getDataSourceList()
}, []) }, [])
const initialValues = useStoreState((s) => s.admin.listFormValues) const initialValues = useStoreState((s) => s.admin.lists.values)
if (!initialValues) { if (!initialValues) {
return null return null
} }

4
ui/src/views/admin/listForm/edit/FormTabDatabaseDelete.tsx
View file

@ -10,7 +10,7 @@ import { useStoreState } from '@/store'
import { useLocalization } from '@/utils/hooks/useLocalization' import { useLocalization } from '@/utils/hooks/useLocalization'
import { Field, Form, Formik } from 'formik' import { Field, Form, Formik } from 'formik'
import { Dispatch, SetStateAction, useState } from 'react' import { Dispatch, SetStateAction, useState } from 'react'
import { FaEdit, FaFileMedical, FaTrash } from 'react-icons/fa'; import { FaEdit, FaFileMedical, FaTrash } from 'react-icons/fa'
import { object, string } from 'yup' import { object, string } from 'yup'
import { FormEditProps } from './FormEdit' import { FormEditProps } from './FormEdit'
import { JsonRowDialogData } from './json-row-operations/types' import { JsonRowDialogData } from './json-row-operations/types'
@ -34,7 +34,7 @@ function FormTabDatabaseDelete({
const [sqlQuery, setSqlQuery] = useState('') const [sqlQuery, setSqlQuery] = useState('')
const { translate } = useLocalization() const { translate } = useLocalization()
const initialValues = useStoreState((s) => s.admin.listFormValues) const initialValues = useStoreState((s) => s.admin.lists.values)
if (!initialValues) { if (!initialValues) {
return null return null
} }

4
ui/src/views/admin/listForm/edit/FormTabDatabaseInsert.tsx
View file

@ -10,7 +10,7 @@ import { useStoreState } from '@/store'
import { useLocalization } from '@/utils/hooks/useLocalization' import { useLocalization } from '@/utils/hooks/useLocalization'
import { Field, Form, Formik } from 'formik' import { Field, Form, Formik } from 'formik'
import { Dispatch, SetStateAction, useState } from 'react' import { Dispatch, SetStateAction, useState } from 'react'
import { FaEdit, FaFileMedical, FaTrash } from 'react-icons/fa'; import { FaEdit, FaFileMedical, FaTrash } from 'react-icons/fa'
import { object, string } from 'yup' import { object, string } from 'yup'
import { FormEditProps } from './FormEdit' import { FormEditProps } from './FormEdit'
import { JsonRowDialogData } from './json-row-operations/types' import { JsonRowDialogData } from './json-row-operations/types'
@ -34,7 +34,7 @@ function FormTabDatabaseInsert({
const [sqlQuery, setSqlQuery] = useState('') const [sqlQuery, setSqlQuery] = useState('')
const { translate } = useLocalization() const { translate } = useLocalization()
const initialValues = useStoreState((s) => s.admin.listFormValues) const initialValues = useStoreState((s) => s.admin.lists.values)
if (!initialValues) { if (!initialValues) {
return null return null
} }

4
ui/src/views/admin/listForm/edit/FormTabDatabaseSelect.tsx
View file

@ -10,7 +10,7 @@ import { useStoreState } from '@/store'
import { useLocalization } from '@/utils/hooks/useLocalization' import { useLocalization } from '@/utils/hooks/useLocalization'
import { Field, Form, Formik } from 'formik' import { Field, Form, Formik } from 'formik'
import { Dispatch, SetStateAction, useState } from 'react' import { Dispatch, SetStateAction, useState } from 'react'
import { FaEdit, FaFileMedical, FaTrash } from 'react-icons/fa'; import { FaEdit, FaFileMedical, FaTrash } from 'react-icons/fa'
import { object, string } from 'yup' import { object, string } from 'yup'
import { FormEditProps } from './FormEdit' import { FormEditProps } from './FormEdit'
import { JsonRowDialogData } from './json-row-operations/types' import { JsonRowDialogData } from './json-row-operations/types'
@ -34,7 +34,7 @@ function FormTabDatabaseSelect({
const [sqlQuery, setSqlQuery] = useState('') const [sqlQuery, setSqlQuery] = useState('')
const { translate } = useLocalization() const { translate } = useLocalization()
const initialValues = useStoreState((s) => s.admin.listFormValues) const initialValues = useStoreState((s) => s.admin.lists.values)
if (!initialValues) { if (!initialValues) {
return null return null
} }

4
ui/src/views/admin/listForm/edit/FormTabDatabaseUpdate.tsx
View file

@ -10,7 +10,7 @@ import { useStoreState } from '@/store'
import { useLocalization } from '@/utils/hooks/useLocalization' import { useLocalization } from '@/utils/hooks/useLocalization'
import { Field, Form, Formik } from 'formik' import { Field, Form, Formik } from 'formik'
import { Dispatch, SetStateAction, useState } from 'react' import { Dispatch, SetStateAction, useState } from 'react'
import { FaEdit, FaFileMedical, FaTrash } from 'react-icons/fa'; import { FaEdit, FaFileMedical, FaTrash } from 'react-icons/fa'
import { object, string } from 'yup' import { object, string } from 'yup'
import { FormEditProps } from './FormEdit' import { FormEditProps } from './FormEdit'
import { JsonRowDialogData } from './json-row-operations/types' import { JsonRowDialogData } from './json-row-operations/types'
@ -34,7 +34,7 @@ function FormTabDatabaseUpdate({
const [sqlQuery, setSqlQuery] = useState('') const [sqlQuery, setSqlQuery] = useState('')
const { translate } = useLocalization() const { translate } = useLocalization()
const initialValues = useStoreState((s) => s.admin.listFormValues) const initialValues = useStoreState((s) => s.admin.lists.values)
if (!initialValues) { if (!initialValues) {
return null return null
} }

2
ui/src/views/admin/listForm/edit/FormTabDetails.tsx
View file

@ -39,7 +39,7 @@ function FormTabDetails(
const { translate } = useLocalization() const { translate } = useLocalization()
const languages = useStoreState((state) => state.abpConfig.config?.localization.languages) const languages = useStoreState((state) => state.abpConfig.config?.localization.languages)
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }

2
ui/src/views/admin/listForm/edit/FormTabEdit.tsx
View file

@ -33,7 +33,7 @@ const schema = object()
function FormTabEdit(props: FormEditProps & { listFormCode: string }) { function FormTabEdit(props: FormEditProps & { listFormCode: string }) {
const { translate } = useLocalization() const { translate } = useLocalization()
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }

4
ui/src/views/admin/listForm/edit/FormTabEditForm.tsx
View file

@ -9,7 +9,7 @@ import { ListFormEditTabs } from '@/proxy/admin/list-form/options'
import { useStoreState } from '@/store' import { useStoreState } from '@/store'
import { useLocalization } from '@/utils/hooks/useLocalization' import { useLocalization } from '@/utils/hooks/useLocalization'
import { useState } from 'react' import { useState } from 'react'
import { FaEdit, FaFileMedical, FaTrash } from 'react-icons/fa'; import { FaEdit, FaFileMedical, FaTrash } from 'react-icons/fa'
import JsonRowOpDialogEditForm from './json-row-operations/JsonRowOpDialogEditForm' import JsonRowOpDialogEditForm from './json-row-operations/JsonRowOpDialogEditForm'
import { JsonRowDialogData } from './json-row-operations/types' import { JsonRowDialogData } from './json-row-operations/types'
@ -18,7 +18,7 @@ function FormTabEditForm(props: { listFormCode: string }) {
const [jsonRowOpModalData, setJsonRowOpModalData] = useState<JsonRowDialogData>() const [jsonRowOpModalData, setJsonRowOpModalData] = useState<JsonRowDialogData>()
const { translate } = useLocalization() const { translate } = useLocalization()
const initialValues = useStoreState((s) => s.admin.listFormValues) const initialValues = useStoreState((s) => s.admin.lists.values)
if (!initialValues) { if (!initialValues) {
return null return null
} }

2
ui/src/views/admin/listForm/edit/FormTabExtraFilters.tsx
View file

@ -18,7 +18,7 @@ function FormTabExtraFilters(props: { listFormCode: string }) {
const [jsonRowOpModalData, setJsonRowOpModalData] = useState<JsonRowDialogData>() const [jsonRowOpModalData, setJsonRowOpModalData] = useState<JsonRowDialogData>()
const { translate } = useLocalization() const { translate } = useLocalization()
const initialValues = useStoreState((s) => s.admin.listFormValues) const initialValues = useStoreState((s) => s.admin.lists.values)
if (!initialValues) { if (!initialValues) {
return null return null
} }

2
ui/src/views/admin/listForm/edit/FormTabFilters.tsx
View file

@ -27,7 +27,7 @@ const validationSchema = Yup.object().shape({})
function FormTabFilters(props: FormEditProps) { function FormTabFilters(props: FormEditProps) {
const { translate } = useLocalization() const { translate } = useLocalization()
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }

2
ui/src/views/admin/listForm/edit/FormTabGroup.tsx
View file

@ -12,7 +12,7 @@ const validationSchema = Yup.object().shape({})
function FormTabGroup(props: FormEditProps) { function FormTabGroup(props: FormEditProps) {
const { translate } = useLocalization() const { translate } = useLocalization()
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }

2
ui/src/views/admin/listForm/edit/FormTabPager.tsx
View file

@ -19,7 +19,7 @@ const validationSchema = Yup.object().shape({})
function FormTabPager(props: FormEditProps) { function FormTabPager(props: FormEditProps) {
const { translate } = useLocalization() const { translate } = useLocalization()
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }

2
ui/src/views/admin/listForm/edit/FormTabPermissions.tsx
View file

@ -23,7 +23,7 @@ function FormTabPermissions(props: FormEditProps) {
const [permissions, setPermissions] = useState<SelectBoxOption[]>([]) const [permissions, setPermissions] = useState<SelectBoxOption[]>([])
const { translate } = useLocalization() const { translate } = useLocalization()
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }

2
ui/src/views/admin/listForm/edit/FormTabPivots.tsx
View file

@ -14,7 +14,7 @@ const validationSchema = Yup.object().shape({})
function FormTabColumns(props: FormEditProps) { function FormTabColumns(props: FormEditProps) {
const { translate } = useLocalization() const { translate } = useLocalization()
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }

2
ui/src/views/admin/listForm/edit/FormTabSearch.tsx
View file

@ -12,7 +12,7 @@ const validationSchema = Yup.object().shape({})
function FormTabSearch(props: FormEditProps) { function FormTabSearch(props: FormEditProps) {
const { translate } = useLocalization() const { translate } = useLocalization()
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }

2
ui/src/views/admin/listForm/edit/FormTabSelect.tsx
View file

@ -19,7 +19,7 @@ const validationSchema = Yup.object().shape({})
function FormTabSelect(props: FormEditProps) { function FormTabSelect(props: FormEditProps) {
const { translate } = useLocalization() const { translate } = useLocalization()
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }

2
ui/src/views/admin/listForm/edit/FormTabState.tsx
View file

@ -14,7 +14,7 @@ const validationSchema = Yup.object().shape({})
function FormTabState(props: FormEditProps) { function FormTabState(props: FormEditProps) {
const { translate } = useLocalization() const { translate } = useLocalization()
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }

4
ui/src/views/admin/listForm/edit/FormTabSubForm.tsx
View file

@ -9,7 +9,7 @@ import { ListFormEditTabs } from '@/proxy/admin/list-form/options'
import { useStoreState } from '@/store' import { useStoreState } from '@/store'
import { useLocalization } from '@/utils/hooks/useLocalization' import { useLocalization } from '@/utils/hooks/useLocalization'
import { useState } from 'react' import { useState } from 'react'
import { FaEdit, FaFileMedical, FaTrash } from 'react-icons/fa'; import { FaEdit, FaFileMedical, FaTrash } from 'react-icons/fa'
import JsonRowOpDialogSubForm from './json-row-operations/JsonRowOpDialogSubForm' import JsonRowOpDialogSubForm from './json-row-operations/JsonRowOpDialogSubForm'
import { JsonRowDialogData } from './json-row-operations/types' import { JsonRowDialogData } from './json-row-operations/types'
@ -18,7 +18,7 @@ function FormTabSubForm() {
const [jsonRowOpModalData, setJsonRowOpModalData] = useState<JsonRowDialogData>() const [jsonRowOpModalData, setJsonRowOpModalData] = useState<JsonRowDialogData>()
const { translate } = useLocalization() const { translate } = useLocalization()
const initialValues = useStoreState((s) => s.admin.listFormValues) const initialValues = useStoreState((s) => s.admin.lists.values)
if (!initialValues) { if (!initialValues) {
return null return null
} }

2
ui/src/views/admin/listForm/edit/FormTabWidgets.tsx
View file

@ -18,7 +18,7 @@ function FormTabWidgets(props: { listFormCode: string }) {
const [jsonRowOpModalData, setJsonRowOpModalData] = useState<JsonRowDialogData>() const [jsonRowOpModalData, setJsonRowOpModalData] = useState<JsonRowDialogData>()
const { translate } = useLocalization() const { translate } = useLocalization()
const initialValues = useStoreState((s) => s.admin.listFormValues) const initialValues = useStoreState((s) => s.admin.lists.values)
if (!initialValues) { if (!initialValues) {
return null return null
} }

4
ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogAnnotation.tsx
View file

@ -52,9 +52,9 @@ function JsonRowOpDialogAnnotation({
setData: Dispatch<SetStateAction<JsonRowDialogData | undefined>> setData: Dispatch<SetStateAction<JsonRowDialogData | undefined>>
}) { }) {
const { translate } = useLocalization() const { translate } = useLocalization()
const { setJsonValue } = useStoreActions((a) => a.admin) const { setJsonValue } = useStoreActions((a) => a.admin.lists)
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }

2
ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogAxis.tsx
View file

@ -74,7 +74,7 @@ function JsonRowOpDialogAxis({
setData: Dispatch<SetStateAction<JsonRowDialogData | undefined>> setData: Dispatch<SetStateAction<JsonRowDialogData | undefined>>
}) { }) {
const { translate } = useLocalization() const { translate } = useLocalization()
const { setJsonValue } = useStoreActions((a) => a.admin) const { setJsonValue } = useStoreActions((a) => a.admin.lists)
const handleClose = async (e?: any) => { const handleClose = async (e?: any) => {
if (e) { if (e) {

2
ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogCommand.tsx
View file

@ -73,7 +73,7 @@ function JsonRowOpDialogCommand({
} }
}, [permissions]) }, [permissions])
const { setJsonValue } = useStoreActions((a) => a.admin) const { setJsonValue } = useStoreActions((a) => a.admin.lists)
const handleClose = async (e?: any) => { const handleClose = async (e?: any) => {
if (e) { if (e) {

2
ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogDatabase.tsx
View file

@ -44,7 +44,7 @@ function JsonRowOpDialogDatabase({
data: JsonRowDialogData | undefined data: JsonRowDialogData | undefined
setData: Dispatch<SetStateAction<JsonRowDialogData | undefined>> setData: Dispatch<SetStateAction<JsonRowDialogData | undefined>>
}) { }) {
const { setJsonValue } = useStoreActions((a) => a.admin) const { setJsonValue } = useStoreActions((a) => a.admin.lists)
const { translate } = useLocalization() const { translate } = useLocalization()
const handleClose = async (e?: any) => { const handleClose = async (e?: any) => {

2
ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogEditForm.tsx
View file

@ -72,7 +72,7 @@ function JsonRowOpDialogEditForm({
data: JsonRowDialogData | undefined data: JsonRowDialogData | undefined
setData: Dispatch<SetStateAction<JsonRowDialogData | undefined>> setData: Dispatch<SetStateAction<JsonRowDialogData | undefined>>
}) { }) {
const { setJsonValue } = useStoreActions((a) => a.admin) const { setJsonValue } = useStoreActions((a) => a.admin.lists)
const { translate } = useLocalization() const { translate } = useLocalization()
const [fieldList, setFieldList] = useState<SelectBoxOption[]>([]) const [fieldList, setFieldList] = useState<SelectBoxOption[]>([])

2
ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogExtraFilter.tsx
View file

@ -57,7 +57,7 @@ function JsonRowOpDialogExtraFilter({
const { translate } = useLocalization() const { translate } = useLocalization()
const [fieldList, setFieldList] = useState<SelectBoxOption[]>([]) const [fieldList, setFieldList] = useState<SelectBoxOption[]>([])
const { setJsonValue } = useStoreActions((a) => a.admin) const { setJsonValue } = useStoreActions((a) => a.admin.lists)
const handleClose = async (e?: any) => { const handleClose = async (e?: any) => {
if (e) { if (e) {

2
ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogPane.tsx
View file

@ -41,7 +41,7 @@ function JsonRowOpDialogPane({
setData: Dispatch<SetStateAction<JsonRowDialogData | undefined>> setData: Dispatch<SetStateAction<JsonRowDialogData | undefined>>
}) { }) {
const { translate } = useLocalization() const { translate } = useLocalization()
const { setJsonValue } = useStoreActions((a) => a.admin) const { setJsonValue } = useStoreActions((a) => a.admin.lists)
const handleClose = async (e?: any) => { const handleClose = async (e?: any) => {
if (e) { if (e) {

4
ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogSeries.tsx
View file

@ -81,7 +81,7 @@ function JsonRowOpDialogSeries({
fieldList?: SelectBoxOption[] fieldList?: SelectBoxOption[]
}) { }) {
const { translate } = useLocalization() const { translate } = useLocalization()
const { setJsonValue } = useStoreActions((a) => a.admin) const { setJsonValue } = useStoreActions((a) => a.admin.lists)
const handleClose = async (e?: any) => { const handleClose = async (e?: any) => {
if (e) { if (e) {
@ -97,7 +97,7 @@ function JsonRowOpDialogSeries({
setIsOpen(false) setIsOpen(false)
} }
const listFormValues = useStoreState((s) => s.admin.listFormValues) const listFormValues = useStoreState((s) => s.admin.lists.values)
if (!listFormValues) { if (!listFormValues) {
return null return null
} }

Some files were not shown because too many files have changed in this diff Show more