From f84798663130314fe4aed5cded3207a9bdfbbd3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sedat=20=C3=96ZT=C3=9CRK?= <76204082+iamsedatozturk@users.noreply.github.com> Date: Mon, 6 Oct 2025 16:59:12 +0300 Subject: [PATCH] =?UTF-8?q?Yeni=20tan=C4=B1mlamalar=20i=C3=A7in=20g=C3=BCn?= =?UTF-8?q?cellemeler?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Seeds/ListFormsSeeder.cs | 1250 +++++++++-------- .../Seeds/PlatformDataSeeder.cs | 16 - .../Seeds/SeederData.json | 187 +-- .../PlatformConsts.cs | 6 +- .../Kurs.Platform.Domain/Data/SeedConsts.cs | 3 +- .../Entities/Administration/Information.cs | 14 - .../Entities/Administration/Lawyer.cs | 1 - .../Entities/Administration/Sector.cs | 7 +- .../Entities/Administration/Skill.cs | 10 +- .../Entities/Administration/SkillLevel.cs | 8 +- .../Entities/Administration/SkillType.cs | 7 +- .../Entities/Administration/Uom.cs | 11 +- .../Entities/Administration/UomCategory.cs | 7 +- .../EntityFrameworkCore/PlatformDbContext.cs | 10 - ....cs => 20251006121303_Initial.Designer.cs} | 75 +- ...1_Initial.cs => 20251006121303_Initial.cs} | 33 +- .../PlatformDbContextModelSnapshot.cs | 73 +- 17 files changed, 841 insertions(+), 877 deletions(-) delete mode 100644 api/src/Kurs.Platform.Domain/Entities/Administration/Information.cs rename api/src/Kurs.Platform.EntityFrameworkCore/Migrations/{20251006064241_Initial.Designer.cs => 20251006121303_Initial.Designer.cs} (99%) rename api/src/Kurs.Platform.EntityFrameworkCore/Migrations/{20251006064241_Initial.cs => 20251006121303_Initial.cs} (99%) diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs index c40cba89..17f074f4 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs @@ -55,6 +55,9 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency var lookupQueryTenantValues = $"SELECT \"AbpTenants\".\"Id\" AS \"Key\", \"AbpTenants\".\"Name\" as \"Name\" FROM \"AbpTenants\" ORDER BY \"AbpTenants\".\"Name\""; var lookupQueryBranchValues = $"SELECT \"{SelectCommandByTableName("Branch")}\".\"Id\" AS \"Key\", \"{SelectCommandByTableName("Branch")}\".\"Name\" as \"Name\" FROM \"{SelectCommandByTableName("Branch")}\" ORDER BY \"{SelectCommandByTableName("Branch")}\".\"Name\""; + var lookupQueryRegistrationTypeValues = $"SELECT \"{SelectCommandByTableName("RegistrationType", Prefix.DbTableDefinition)}\".\"Id\" AS \"Key\", \"{SelectCommandByTableName("RegistrationType", Prefix.DbTableDefinition)}\".\"Name\" as \"Name\" FROM \"{SelectCommandByTableName("RegistrationType", Prefix.DbTableDefinition)}\" ORDER BY \"{SelectCommandByTableName("RegistrationType", Prefix.DbTableDefinition)}\".\"Name\""; + var lookupQueryClassTypeValues = $"SELECT \"{SelectCommandByTableName("ClassType", Prefix.DbTableDefinition)}\".\"Id\" AS \"Key\", \"{SelectCommandByTableName("ClassType", Prefix.DbTableDefinition)}\".\"Name\" as \"Name\" FROM \"{SelectCommandByTableName("ClassType", Prefix.DbTableDefinition)}\" ORDER BY \"{SelectCommandByTableName("ClassType", Prefix.DbTableDefinition)}\".\"Name\""; + var htmlEditorOptions = "{\"toolbar\": {\"multiline\": true, \"items\": [{\"name\": \"undo\"},{\"name\": \"redo\"},{\"name\": \"separator\"},{\"name\": \"size\",\"acceptedValues\": [\"8pt\",\"10pt\",\"12pt\",\"14pt\",\"18pt\",\"24pt\",\"36pt\"],\"options\": {\"inputAttr\": {\"aria-label\": \"Font size\"}}},{\"name\": \"font\",\"acceptedValues\": [\"Arial\",\"Courier New\",\"Georgia\",\"Impact\",\"Lucida Console\",\"Tahoma\",\"Times New Roman\",\"Verdana\"],\"options\": {\"inputAttr\": {\"aria-label\": \"Font family\"}}},{\"name\": \"separator\"},{\"name\": \"bold\"},{\"name\": \"italic\"},{\"name\": \"strike\"},{\"name\": \"underline\"},{\"name\": \"separator\"},{\"name\": \"alignLeft\"},{\"name\": \"alignCenter\"},{\"name\": \"alignRight\"},{\"name\": \"alignJustify\"},{\"name\": \"separator\"},{\"name\": \"orderedList\"},{\"name\": \"bulletList\"},{\"name\": \"separator\"},{\"name\": \"header\",\"acceptedValues\": [false,1,2,3,4,5],\"options\": {\"inputAttr\": {\"aria-label\": \"Font family\"}}},{\"name\": \"separator\"},{\"name\": \"color\"},{\"name\": \"background\"},{\"name\": \"separator\"},{\"name\": \"link\"},{\"name\": \"image\"},{\"name\": \"separator\"},{\"name\": \"clear\"},{\"name\": \"codeBlock\"},{\"name\": \"blockquote\"},{\"name\": \"separator\"},{\"name\": \"insertTable\"},{\"name\": \"deleteTable\"},{\"name\": \"insertRowAbove\"},{\"name\": \"insertRowBelow\"},{\"name\": \"deleteRow\"},{\"name\": \"insertColumnLeft\"},{\"name\": \"insertColumnRight\"},{\"name\": \"deleteColumn\"}]}}"; var showClearButton = "{ \"showClearButton\" : true }"; @@ -13781,200 +13784,6 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency #endregion //Parameters - #region Sector - if (!await _listFormRepository.AnyAsync(a => a.ListFormCode == ListFormCodes.Lists.Sector)) - { - var listFormSector = 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.Sector, - Name = AppCodes.Parameters.Sector, - Title = AppCodes.Parameters.Sector, - DataSourceCode = SeedConsts.DataSources.DefaultCode, - IsTenant = false, - IsBranch = false, - IsOrganizationUnit = false, - Description = AppCodes.Parameters.Sector, - SelectCommandType = SelectCommandTypeEnum.Table, - SelectCommand = SelectCommandByTableName("Sector", Prefix.DbTableDefinition), - 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 = false }), - GroupPanelJson = JsonSerializer.Serialize(new { Visible = false }), - SelectionJson = JsonSerializer.Serialize(new SelectionDto - { - Mode = GridOptions.SelectionModeSingle, - AllowSelectAll = false - }), - ColumnOptionJson = JsonSerializer.Serialize(new - { - ColumnFixingEnabled = true, - }), - PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto - { - C = AppCodes.Parameters.Sector + ".Create", - R = AppCodes.Parameters.Sector, - U = AppCodes.Parameters.Sector + ".Update", - D = AppCodes.Parameters.Sector + ".Delete", - E = AppCodes.Parameters.Sector + ".Export", - I = AppCodes.Parameters.Sector + ".Import", - }), - DeleteCommand = $"UPDATE \"{SelectCommandByTableName("Sector", Prefix.DbTableDefinition)}\" 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 = "Sector Form", - Width = 400, - Height = 150 - }, - AllowDeleting = true, - AllowAdding = true, - AllowUpdating = true, - SendOnlyChangedFormValuesUpdate = false - }), - EditingFormJson = JsonSerializer.Serialize(new List - { - new() - { - Order = 1, - ColCount = 1, - ColSpan = 2, - ItemType = "group", - Items = - [ - new EditingFormItemDto - { - Order = 1, - DataField = "Name", - ColSpan = 2, - IsRequired = true, - 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 - } - }) - }); - - #region Sector Fields - await _listFormFieldRepository.InsertManyAsync([ - new() - { - ListFormCode = listFormSector.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.Guid, - FieldName = "Id", - Width = 100, - ListOrderNo = 1, - Visible = false, - IsActive = true, - IsDeleted = false, - PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto - { - C = AppCodes.Parameters.Sector + ".Create", - R = AppCodes.Parameters.Sector, - U = AppCodes.Parameters.Sector + ".Update", - E = true, - I = true, - Deny = false - }), - PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto { IsPivot = true }) - }, - new() - { - ListFormCode = listFormSector.ListFormCode, - 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() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.required) } - }), - PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto - { - C = AppCodes.Parameters.Sector + ".Create", - R = AppCodes.Parameters.Sector, - U = AppCodes.Parameters.Sector + ".Update", - E = true, - I = true, - Deny = false - }), - PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto { IsPivot = true }) - } - ]); - #endregion - } - #endregion - #region ContactTag if (!await _listFormRepository.AnyAsync(a => a.ListFormCode == ListFormCodes.Lists.ContactTag)) { @@ -15927,6 +15736,200 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency #endregion //Definitions + #region Sector + if (!await _listFormRepository.AnyAsync(a => a.ListFormCode == ListFormCodes.Lists.Sector)) + { + var listFormSector = 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.Sector, + Name = AppCodes.Definitions.Sector, + Title = AppCodes.Definitions.Sector, + DataSourceCode = SeedConsts.DataSources.DefaultCode, + IsTenant = true, + IsBranch = false, + IsOrganizationUnit = false, + Description = AppCodes.Definitions.Sector, + SelectCommandType = SelectCommandTypeEnum.Table, + SelectCommand = SelectCommandByTableName("Sector", Prefix.DbTableDefinition), + 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 = false }), + GroupPanelJson = JsonSerializer.Serialize(new { Visible = false }), + SelectionJson = JsonSerializer.Serialize(new SelectionDto + { + Mode = GridOptions.SelectionModeSingle, + AllowSelectAll = false + }), + ColumnOptionJson = JsonSerializer.Serialize(new + { + ColumnFixingEnabled = true, + }), + PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto + { + C = AppCodes.Definitions.Sector + ".Create", + R = AppCodes.Definitions.Sector, + U = AppCodes.Definitions.Sector + ".Update", + D = AppCodes.Definitions.Sector + ".Delete", + E = AppCodes.Definitions.Sector + ".Export", + I = AppCodes.Definitions.Sector + ".Import", + }), + DeleteCommand = $"UPDATE \"{SelectCommandByTableName("Sector", Prefix.DbTableDefinition)}\" 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 = "Sector Form", + Width = 400, + Height = 150 + }, + AllowDeleting = true, + AllowAdding = true, + AllowUpdating = true, + SendOnlyChangedFormValuesUpdate = false + }), + EditingFormJson = JsonSerializer.Serialize(new List + { + new() + { + Order = 1, + ColCount = 1, + ColSpan = 2, + ItemType = "group", + Items = + [ + new EditingFormItemDto + { + Order = 1, + DataField = "Name", + ColSpan = 2, + IsRequired = true, + 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 + } + }) + }); + + #region Sector Fields + await _listFormFieldRepository.InsertManyAsync([ + new() + { + ListFormCode = listFormSector.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.Guid, + FieldName = "Id", + Width = 100, + ListOrderNo = 1, + Visible = false, + IsActive = true, + IsDeleted = false, + PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto + { + C = AppCodes.Definitions.Sector + ".Create", + R = AppCodes.Definitions.Sector, + U = AppCodes.Definitions.Sector + ".Update", + E = true, + I = true, + Deny = false + }), + PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto { IsPivot = true }) + }, + new() + { + ListFormCode = listFormSector.ListFormCode, + 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() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.required) } + }), + PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto + { + C = AppCodes.Definitions.Sector + ".Create", + R = AppCodes.Definitions.Sector, + U = AppCodes.Definitions.Sector + ".Update", + E = true, + I = true, + Deny = false + }), + PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto { IsPivot = true }) + } + ]); + #endregion + } + #endregion + #region SkillType if (!await _listFormRepository.AnyAsync(a => a.ListFormCode == ListFormCodes.Lists.SkillType)) { @@ -15949,7 +15952,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Name = AppCodes.Definitions.SkillType, Title = AppCodes.Definitions.SkillType, DataSourceCode = SeedConsts.DataSources.DefaultCode, - IsTenant = false, + IsTenant = true, IsBranch = false, IsOrganizationUnit = false, Description = AppCodes.Definitions.SkillType, @@ -16150,7 +16153,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Name = AppCodes.Definitions.SkillLevel, Title = AppCodes.Definitions.SkillLevel, DataSourceCode = SeedConsts.DataSources.DefaultCode, - IsTenant = false, + IsTenant = true, IsBranch = false, IsOrganizationUnit = false, Description = AppCodes.Definitions.SkillLevel, @@ -16458,7 +16461,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Name = AppCodes.Definitions.Skill, Title = AppCodes.Definitions.Skill, DataSourceCode = SeedConsts.DataSources.DefaultCode, - IsTenant = false, + IsTenant = true, IsBranch = false, IsOrganizationUnit = false, Description = AppCodes.Definitions.Skill, @@ -16700,7 +16703,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Name = AppCodes.Definitions.UomCategory, Title = AppCodes.Definitions.UomCategory, DataSourceCode = SeedConsts.DataSources.DefaultCode, - IsTenant = false, + IsTenant = true, IsBranch = false, IsOrganizationUnit = false, Description = AppCodes.Definitions.UomCategory, @@ -16901,7 +16904,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Name = AppCodes.Definitions.Uom, Title = AppCodes.Definitions.Uom, DataSourceCode = SeedConsts.DataSources.DefaultCode, - IsTenant = false, + IsTenant = true, IsBranch = false, IsOrganizationUnit = false, Description = AppCodes.Definitions.Uom, @@ -17250,7 +17253,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Name = AppCodes.Definitions.Bank, Title = AppCodes.Definitions.Bank, DataSourceCode = SeedConsts.DataSources.DefaultCode, - IsTenant = false, + IsTenant = true, IsBranch = false, IsOrganizationUnit = false, Description = AppCodes.Definitions.Bank, @@ -17753,7 +17756,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Name = AppCodes.Definitions.BankAccount, Title = AppCodes.Definitions.BankAccount, DataSourceCode = SeedConsts.DataSources.DefaultCode, - IsTenant = false, + IsTenant = true, IsBranch = false, IsOrganizationUnit = false, Description = AppCodes.Definitions.BankAccount, @@ -19233,196 +19236,6 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency } #endregion - #region Information - if (!await _listFormRepository.AnyAsync(a => a.ListFormCode == ListFormCodes.Lists.Information)) - { - var listFormInformation = 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 = 3 - }), - CultureName = LanguageCodes.En, - ListFormCode = ListFormCodes.Lists.Information, - Name = AppCodes.Definitions.Information, - Title = AppCodes.Definitions.Information, - DataSourceCode = SeedConsts.DataSources.DefaultCode, - IsTenant = true, - IsBranch = false, - IsOrganizationUnit = false, - Description = AppCodes.Definitions.Information, - SelectCommandType = SelectCommandTypeEnum.Table, - SelectCommand = SelectCommandByTableName("Information", Prefix.DbTableDefinition), - 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.Information + ".Create", - R = AppCodes.Definitions.Information, - U = AppCodes.Definitions.Information + ".Update", - D = AppCodes.Definitions.Information + ".Delete", - E = AppCodes.Definitions.Information + ".Export", - I = AppCodes.Definitions.Information + ".Import", - }), - DeleteCommand = $"UPDATE \"{SelectCommandByTableName("Information", Prefix.DbTableDefinition)}\" 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 = "Information Form", - Width = 500, - Height = 250 - }, - AllowDeleting = true, - AllowAdding = true, - AllowUpdating = true, - SendOnlyChangedFormValuesUpdate = false, - }), - EditingFormJson = JsonSerializer.Serialize(new List() { - new() { Order=1,ColCount=1,ColSpan=2,ItemType="group", Items= - [ - new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 2, IsRequired = true, 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 Information Fields - await _listFormFieldRepository.InsertManyAsync(new ListFormField[] { - new() { - ListFormCode = listFormInformation.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.Information + ".Create", - R = AppCodes.Definitions.Information, - U = AppCodes.Definitions.Information + ".Update", - E = true, - I = true, - Deny = false - }), - PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto - { - IsPivot = true - }) - }, - new() { - ListFormCode = listFormInformation.ListFormCode, - RoleId = null, - UserId = null, - CultureName = LanguageCodes.En, - SourceDbType = DbType.String, - FieldName = "Name", - Width = 250, - 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.Information + ".Create", - R = AppCodes.Definitions.Information, - U = AppCodes.Definitions.Information + ".Update", - E = true, - I = true, - Deny = false - }), - PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto - { - IsPivot = true - }) - } - }); - #endregion - } - #endregion - #region MeetingMethod if (!await _listFormRepository.AnyAsync(a => a.ListFormCode == ListFormCodes.Lists.MeetingMethod)) { @@ -19982,6 +19795,13 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Value = "false", CustomValueType = FieldCustomValueTypeEnum.Value } }), + FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { + new() { + FieldName = "Status", + FieldDbType = DbType.String, + Value = "Aktif", + CustomValueType = FieldCustomValueTypeEnum.Value }, + }), } ); @@ -20211,6 +20031,13 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Value = "false", CustomValueType = FieldCustomValueTypeEnum.Value } }), + FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { + new() { + FieldName = "Status", + FieldDbType = DbType.String, + Value = "Aktif", + CustomValueType = FieldCustomValueTypeEnum.Value }, + }), } ); @@ -20440,6 +20267,13 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Value = "false", CustomValueType = FieldCustomValueTypeEnum.Value } }), + FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { + new() { + FieldName = "Status", + FieldDbType = DbType.String, + Value = "Aktif", + CustomValueType = FieldCustomValueTypeEnum.Value }, + }), } ); @@ -20670,6 +20504,13 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Value = "false", CustomValueType = FieldCustomValueTypeEnum.Value } }), + FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { + new() { + FieldName = "Status", + FieldDbType = DbType.String, + Value = "Aktif", + CustomValueType = FieldCustomValueTypeEnum.Value }, + }), } ); @@ -20899,6 +20740,13 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Value = "false", CustomValueType = FieldCustomValueTypeEnum.Value } }), + FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { + new() { + FieldName = "Status", + FieldDbType = DbType.String, + Value = "Aktif", + CustomValueType = FieldCustomValueTypeEnum.Value }, + }), } ); @@ -21489,8 +21337,8 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Items = [ new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "StartHour", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "EndHour", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 2, DataField = "StartHour", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 3, DataField = "EndHour", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 4, DataField = "Monday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, new EditingFormItemDto { Order = 5, DataField = "Tuesday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, new EditingFormItemDto { Order = 6, DataField = "Wednesday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, @@ -21518,6 +21366,43 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Value = "false", CustomValueType = FieldCustomValueTypeEnum.Value } }), + FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { + new() { + FieldName = "Monday", + FieldDbType = DbType.Boolean, + Value = "true", + CustomValueType = FieldCustomValueTypeEnum.Value }, + new() { + FieldName = "Tuesday", + FieldDbType = DbType.Boolean, + Value = "true", + CustomValueType = FieldCustomValueTypeEnum.Value }, + new() { + FieldName = "Wednesday", + FieldDbType = DbType.Boolean, + Value = "true", + CustomValueType = FieldCustomValueTypeEnum.Value }, + new() { + FieldName = "Thursday", + FieldDbType = DbType.Boolean, + Value = "true", + CustomValueType = FieldCustomValueTypeEnum.Value }, + new() { + FieldName = "Friday", + FieldDbType = DbType.Boolean, + Value = "true", + CustomValueType = FieldCustomValueTypeEnum.Value }, + new() { + FieldName = "Saturday", + FieldDbType = DbType.Boolean, + Value = "true", + CustomValueType = FieldCustomValueTypeEnum.Value }, + new() { + FieldName = "Sunday", + FieldDbType = DbType.Boolean, + Value = "true", + CustomValueType = FieldCustomValueTypeEnum.Value }, + }) } ); @@ -21872,17 +21757,17 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency }), DeleteCommand = $"UPDATE \"{SelectCommandByTableName("Vehicle", Prefix.DbTableDefinition)}\" 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 } - }), + 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, @@ -21910,41 +21795,48 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency SendOnlyChangedFormValuesUpdate = false, }), EditingFormJson = JsonSerializer.Serialize(new List() { - new() { - Order = 1, ColCount = 2, ColSpan = 2, ItemType = "group", - Items = - [ - new EditingFormItemDto { Order = 1, DataField = "Plate", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "Brand", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "ModelYear", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 4, DataField = "Status", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 5, DataField = "DriverNationalId", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 6, DataField = "DriverName", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 7, DataField = "DriverPhone1", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 8, DataField = "DriverPhone2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 9, DataField = "AssistantDriverNationalId", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 10, DataField = "AssistantDriverName", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 11, DataField = "AssistantDriverPhone1", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 12, DataField = "AssistantDriverPhone2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - ] - } + new() { + Order = 1, ColCount = 1, ColSpan = 2, ItemType = "group", + Items = + [ + new EditingFormItemDto { Order = 1, DataField = "Plate", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 2, DataField = "Brand", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 3, DataField = "ModelYear", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 4, DataField = "DriverNationalId", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 5, DataField = "DriverName", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 6, DataField = "DriverPhone1", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 7, DataField = "DriverPhone2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 8, DataField = "AssistantDriverNationalId", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 9, DataField = "AssistantDriverName", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 10, DataField = "AssistantDriverPhone1", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 11, DataField = "AssistantDriverPhone2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 12, DataField = "Status", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, + ] + } }), 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 } + 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 = "Status", + FieldDbType = DbType.String, + Value = "Aktif", + CustomValueType = FieldCustomValueTypeEnum.Value }, }), } ); @@ -22302,7 +22194,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Title = AppCodes.Definitions.Schedule, DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = true, - IsBranch = true, + IsBranch = false, IsOrganizationUnit = false, Description = AppCodes.Definitions.Schedule, SelectCommandType = SelectCommandTypeEnum.Table, @@ -22377,44 +22269,91 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency new() { Order = 1, ColCount = 2, ColSpan = 2, ItemType = "group", Items = - [ - new EditingFormItemDto { Order = 1, DataField = "BranchId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 2, DataField = "Name", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "Status", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 4, DataField = "StartTime", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 5, DataField = "EndTime", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 6, DataField = "LessonMinute", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 7, DataField = "LessonBreakMinute", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 8, DataField = "LessonCount", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 9, DataField = "LunchTime", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 10, DataField = "LunchMinute", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 11, DataField = "IncludeLunch", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 12, DataField = "Monday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 13, DataField = "Tuesday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 14, DataField = "Wednesday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 15, DataField = "Thursday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 16, DataField = "Friday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 17, DataField = "Saturday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 18, DataField = "Sunday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, - ] - } + [ + new EditingFormItemDto { Order = 1, DataField = "BranchId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 2, DataField = "Name", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 3, DataField = "StartTime", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 4, DataField = "EndTime", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 5, DataField = "LessonMinute", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 6, DataField = "LessonBreakMinute", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 7, DataField = "LessonCount", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 8, DataField = "IncludeLunch", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, + new EditingFormItemDto { Order = 9, DataField = "LunchTime", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 10, DataField = "LunchMinute", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 11, DataField = "Monday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, + new EditingFormItemDto { Order = 12, DataField = "Tuesday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, + new EditingFormItemDto { Order = 13, DataField = "Wednesday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, + new EditingFormItemDto { Order = 14, DataField = "Thursday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, + new EditingFormItemDto { Order = 15, DataField = "Friday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, + new EditingFormItemDto { Order = 16, DataField = "Saturday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, + new EditingFormItemDto { Order = 17, DataField = "Sunday", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, + new EditingFormItemDto { Order = 18, DataField = "Status", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, + ] + } }), 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 } + 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 = "IncludeLunch", + FieldDbType = DbType.Boolean, + Value = "false", + CustomValueType = FieldCustomValueTypeEnum.Value }, + new() { + FieldName = "Monday", + FieldDbType = DbType.Boolean, + Value = "true", + CustomValueType = FieldCustomValueTypeEnum.Value }, + new() { + FieldName = "Tuesday", + FieldDbType = DbType.Boolean, + Value = "true", + CustomValueType = FieldCustomValueTypeEnum.Value }, + new() { + FieldName = "Wednesday", + FieldDbType = DbType.Boolean, + Value = "true", + CustomValueType = FieldCustomValueTypeEnum.Value }, + new() { + FieldName = "Thursday", + FieldDbType = DbType.Boolean, + Value = "true", + CustomValueType = FieldCustomValueTypeEnum.Value }, + new() { + FieldName = "Friday", + FieldDbType = DbType.Boolean, + Value = "true", + CustomValueType = FieldCustomValueTypeEnum.Value }, + new() { + FieldName = "Saturday", + FieldDbType = DbType.Boolean, + Value = "true", + CustomValueType = FieldCustomValueTypeEnum.Value }, + new() { + FieldName = "Sunday", + FieldDbType = DbType.Boolean, + Value = "true", + CustomValueType = FieldCustomValueTypeEnum.Value }, + new() { + FieldName = "Status", + FieldDbType = DbType.String, + Value = "Aktif", + CustomValueType = FieldCustomValueTypeEnum.Value }, }), } ); @@ -22937,7 +22876,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Title = AppCodes.Definitions.Psychologist, DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = true, - IsBranch = true, + IsBranch = false, IsOrganizationUnit = false, Description = AppCodes.Definitions.Psychologist, SelectCommandType = SelectCommandTypeEnum.Table, @@ -23015,46 +22954,53 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency }), EditingFormJson = JsonSerializer.Serialize(new List() { - new() - { - Order = 1, - ColCount = 2, - ColSpan = 2, - ItemType = "group", - Items = - [ - new EditingFormItemDto { Order = 1, DataField = "BranchId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 2, DataField = "Name", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "Phone", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 4, DataField = "Email", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 5, DataField = "Address", ColSpan = 2, EditorType2 = EditorTypes.dxTextArea }, - new EditingFormItemDto { Order = 6, DataField = "Status", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, - ] - } + new() + { + Order = 1, + ColCount = 1, + ColSpan = 2, + ItemType = "group", + Items = + [ + new EditingFormItemDto { Order = 1, DataField = "BranchId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 2, DataField = "Name", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 3, DataField = "Phone", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 4, DataField = "Email", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 5, DataField = "Address", ColSpan = 2, EditorType2 = EditorTypes.dxTextArea }, + new EditingFormItemDto { Order = 6, DataField = "Status", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, + ] + } }), 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 - } + 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 = "Status", + FieldDbType = DbType.String, + Value = "Aktif", + CustomValueType = FieldCustomValueTypeEnum.Value }, }), } ); @@ -23279,7 +23225,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Title = AppCodes.Definitions.Meal, DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = true, - IsBranch = true, + IsBranch = false, IsOrganizationUnit = false, Description = AppCodes.Definitions.Meal, SelectCommandType = SelectCommandTypeEnum.Table, @@ -23314,20 +23260,20 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency DeleteCommand = $"UPDATE \"{SelectCommandByTableName("Meal", Prefix.DbTableDefinition)}\" 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 - } + 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 { @@ -23357,45 +23303,45 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency }), EditingFormJson = JsonSerializer.Serialize(new List() { - new() - { - Order = 1, - ColCount = 2, - ColSpan = 2, - ItemType = "group", - Items = - [ - new EditingFormItemDto { Order = 1, DataField = "BranchId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 2, DataField = "Date", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxDateBox }, - new EditingFormItemDto { Order = 3, DataField = "Breakfast", ColSpan = 2, EditorType2 = EditorTypes.dxTextArea }, - new EditingFormItemDto { Order = 4, DataField = "Lunch", ColSpan = 2, EditorType2 = EditorTypes.dxTextArea }, - new EditingFormItemDto { Order = 5, DataField = "Snack", ColSpan = 2, EditorType2 = EditorTypes.dxTextArea }, - ] - } + new() + { + Order = 1, + ColCount = 1, + ColSpan = 2, + ItemType = "group", + Items = + [ + new EditingFormItemDto { Order = 1, DataField = "BranchId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 2, DataField = "Date", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxDateBox }, + new EditingFormItemDto { Order = 3, DataField = "Breakfast", ColSpan = 2, EditorType2 = EditorTypes.dxTextArea }, + new EditingFormItemDto { Order = 4, DataField = "Lunch", ColSpan = 2, EditorType2 = EditorTypes.dxTextArea }, + new EditingFormItemDto { Order = 5, DataField = "Snack", ColSpan = 2, EditorType2 = EditorTypes.dxTextArea }, + ] + } }), 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 - } + 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 + } }), } ); @@ -23657,7 +23603,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency new() { Order = 1, - ColCount = 2, + ColCount = 1, ColSpan = 2, ItemType = "group", Items = @@ -23666,16 +23612,15 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency new EditingFormItemDto { Order = 2, DataField = "ContactPerson", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 3, DataField = "Email", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 4, DataField = "Address", ColSpan = 2, EditorType2 = EditorTypes.dxTextArea }, - new EditingFormItemDto { Order = 5, DataField = "City", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 6, DataField = "TaxOffice", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 7, DataField = "TaxNumber", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 8, DataField = "Phone1", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 9, DataField = "Phone2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 10, DataField = "Phone3", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 11, DataField = "Phone4", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 12, DataField = "Fax", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 13, DataField = "Description", ColSpan = 2, EditorType2 = EditorTypes.dxTextArea }, - new EditingFormItemDto { Order = 14, DataField = "Status", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 5, DataField = "TaxOffice", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 6, DataField = "TaxNumber", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 7, DataField = "Phone1", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 8, DataField = "Phone2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 9, DataField = "Phone3", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 10, DataField = "Phone4", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 11, DataField = "Fax", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 12, DataField = "Description", ColSpan = 1, EditorType2 = EditorTypes.dxTextArea }, + new EditingFormItemDto { Order = 13, DataField = "Status", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, ] } }), @@ -23685,6 +23630,13 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency 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 = "Status", + FieldDbType = DbType.String, + Value = "Aktif", + CustomValueType = FieldCustomValueTypeEnum.Value }, + }), } ); @@ -24180,7 +24132,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency new() { Order = 1, - ColCount = 2, + ColCount = 1, ColSpan = 2, ItemType = "group", Items = @@ -24200,6 +24152,13 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency 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 = "Status", + FieldDbType = DbType.String, + Value = "Aktif", + CustomValueType = FieldCustomValueTypeEnum.Value }, + }), } ); @@ -24248,8 +24207,10 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Visible = true, IsActive = true, IsDeleted = false, - SortIndex = 1, - ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[]{}), + ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[] + { + new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.required) } + }), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { C = AppCodes.Definitions.Event + ".Create", @@ -24273,8 +24234,10 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Visible = true, IsActive = true, IsDeleted = false, - SortIndex = 2, - ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[]{}), + ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[] + { + new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.required) } + }), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { C = AppCodes.Definitions.Event + ".Create", @@ -24298,7 +24261,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Visible = true, IsActive = true, IsDeleted = false, - SortIndex = 3, + SortIndex = 1, SortDirection = GridColumnOptions.SortOrderAsc, AllowSearch = true, ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[] @@ -24328,8 +24291,6 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Visible = true, IsActive = true, IsDeleted = false, - SortIndex = 4, - ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[]{}), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { C = AppCodes.Definitions.Event + ".Create", @@ -24353,8 +24314,6 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Visible = true, IsActive = true, IsDeleted = false, - SortIndex = 5, - ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[]{}), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { C = AppCodes.Definitions.Event + ".Create", @@ -24378,7 +24337,6 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Visible = true, IsActive = true, IsDeleted = false, - SortIndex = 6, LookupJson = JsonSerializer.Serialize(new LookupDto { DataSourceType = UiLookupDataSourceTypeEnum.StaticData, DisplayExpr = "name", @@ -24388,7 +24346,6 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency new () { Key="Pasif",Name="Pasif" }, }), }), - ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[]{}), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { C = AppCodes.Definitions.Event + ".Create", @@ -24428,7 +24385,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Title = AppCodes.Definitions.LessonPeriod, DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = true, - IsBranch = true, + IsBranch = false, IsOrganizationUnit = false, Description = AppCodes.Definitions.LessonPeriod, SelectCommandType = SelectCommandTypeEnum.Table, @@ -24660,8 +24617,8 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency DisplayExpr = "name", ValueExpr = "key", LookupQuery = JsonSerializer.Serialize(new LookupDataDto[] { - new () { Key="Ana",Name="Ana" }, - new () { Key="Ek",Name="Ek" }, + new () { Key="Ana",Name="Ana Öğretmen" }, + new () { Key="Ek",Name="Ek Öğretmen" }, }), }), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto @@ -24694,8 +24651,8 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency DisplayExpr = "name", ValueExpr = "key", LookupQuery = JsonSerializer.Serialize(new LookupDataDto[] { - new () { Key="Ana",Name="Ana" }, - new () { Key="Ek",Name="Ek" }, + new () { Key="Ana",Name="Ana Öğretmen" }, + new () { Key="Ek",Name="Ek Öğretmen" }, }), }), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto @@ -24728,8 +24685,8 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency DisplayExpr = "name", ValueExpr = "key", LookupQuery = JsonSerializer.Serialize(new LookupDataDto[] { - new () { Key="Ana",Name="Ana" }, - new () { Key="Ek",Name="Ek" }, + new () { Key="Ana",Name="Ana Öğretmen" }, + new () { Key="Ek",Name="Ek Öğretmen" }, }), }), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto @@ -24762,8 +24719,8 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency DisplayExpr = "name", ValueExpr = "key", LookupQuery = JsonSerializer.Serialize(new LookupDataDto[] { - new () { Key="Ana",Name="Ana" }, - new () { Key="Ek",Name="Ek" }, + new () { Key="Ana",Name="Ana Öğretmen" }, + new () { Key="Ek",Name="Ek Öğretmen" }, }), }), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto @@ -24808,7 +24765,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Title = AppCodes.Definitions.RegistrationType, DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = true, - IsBranch = true, + IsBranch = false, IsOrganizationUnit = false, Description = AppCodes.Definitions.RegistrationType, SelectCommandType = SelectCommandTypeEnum.Table, @@ -24877,14 +24834,14 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency new() { Order = 1, - ColCount = 2, + ColCount = 1, ColSpan = 2, ItemType = "group", Items = [ new EditingFormItemDto { Order = 1, DataField = "BranchId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, new EditingFormItemDto { Order = 2, DataField = "Name", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "Status", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 3, DataField = "Status", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, ] } }), @@ -24894,6 +24851,13 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency 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 = "Status", + FieldDbType = DbType.String, + Value = "Aktif", + CustomValueType = FieldCustomValueTypeEnum.Value }, + }), } ); @@ -25049,7 +25013,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Title = AppCodes.Definitions.RegistrationMethod, DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = true, - IsBranch = true, + IsBranch = false, IsOrganizationUnit = false, Description = AppCodes.Definitions.RegistrationMethod, SelectCommandType = SelectCommandTypeEnum.Table, @@ -25118,15 +25082,15 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency new() { Order = 1, - ColCount = 2, + ColCount = 1, ColSpan = 2, ItemType = "group", Items = [ new EditingFormItemDto { Order = 1, DataField = "BranchId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 2, DataField = "RegistrationTypeId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 2, DataField = "RegistrationTypeId", IsRequired = true, ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, new EditingFormItemDto { Order = 3, DataField = "Name", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 4, DataField = "Status", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 4, DataField = "Status", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, ] } }), @@ -25136,6 +25100,13 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency 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 = "Status", + FieldDbType = DbType.String, + Value = "Aktif", + CustomValueType = FieldCustomValueTypeEnum.Value }, + }), } ); @@ -25212,6 +25183,12 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Visible = true, IsActive = true, IsDeleted = false, + LookupJson = JsonSerializer.Serialize(new LookupDto { + DataSourceType = UiLookupDataSourceTypeEnum.Query, + DisplayExpr = "Name", + ValueExpr = "Key", + LookupQuery = lookupQueryRegistrationTypeValues, + }), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { C = AppCodes.Definitions.RegistrationMethod + ".Create", @@ -25313,7 +25290,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Title = AppCodes.Definitions.ClassType, DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = true, - IsBranch = true, + IsBranch = false, IsOrganizationUnit = false, Description = AppCodes.Definitions.ClassType, SelectCommandType = SelectCommandTypeEnum.Table, @@ -25382,17 +25359,17 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency new() { Order = 1, - ColCount = 2, + ColCount = 1, ColSpan = 2, ItemType = "group", Items = [ new EditingFormItemDto { Order = 1, DataField = "BranchId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 2, DataField = "RegistrationTypeId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 2, DataField = "RegistrationTypeId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, new EditingFormItemDto { Order = 3, DataField = "Name", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 4, DataField = "MinStudentCount", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 5, DataField = "MaxStudentCount", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 6, DataField = "Status", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 4, DataField = "MinStudentCount", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 5, DataField = "MaxStudentCount", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 6, DataField = "Status", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, ] } }), @@ -25402,6 +25379,13 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency 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 = "Status", + FieldDbType = DbType.String, + Value = "Aktif", + CustomValueType = FieldCustomValueTypeEnum.Value }, + }), } ); @@ -25479,6 +25463,12 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Visible = true, IsActive = true, IsDeleted = false, + LookupJson = JsonSerializer.Serialize(new LookupDto { + DataSourceType = UiLookupDataSourceTypeEnum.Query, + DisplayExpr = "Name", + ValueExpr = "Key", + LookupQuery = lookupQueryRegistrationTypeValues, + }), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { C = AppCodes.Definitions.ClassType + ".Create", @@ -25626,7 +25616,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Title = AppCodes.Definitions.Class, DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = true, - IsBranch = true, + IsBranch = false, IsOrganizationUnit = false, Description = AppCodes.Definitions.Class, SelectCommandType = SelectCommandTypeEnum.Table, @@ -25701,9 +25691,9 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Items = [ new EditingFormItemDto { Order = 1, DataField = "BranchId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 2, DataField = "ClassTypeId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 2, DataField = "ClassTypeId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, new EditingFormItemDto { Order = 3, DataField = "Name", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 4, DataField = "Status", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 4, DataField = "Status", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, ] } }), @@ -25713,6 +25703,13 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency 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 = "Status", + FieldDbType = DbType.String, + Value = "Aktif", + CustomValueType = FieldCustomValueTypeEnum.Value }, + }), } ); @@ -25789,6 +25786,12 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Visible = true, IsActive = true, IsDeleted = false, + LookupJson = JsonSerializer.Serialize(new LookupDto { + DataSourceType = UiLookupDataSourceTypeEnum.Query, + DisplayExpr = "Name", + ValueExpr = "Key", + LookupQuery = lookupQueryClassTypeValues, + }), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { C = AppCodes.Definitions.Class + ".Create", @@ -25890,7 +25893,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Title = AppCodes.Definitions.Level, DataSourceCode = SeedConsts.DataSources.DefaultCode, IsTenant = true, - IsBranch = true, + IsBranch = false, IsOrganizationUnit = false, Description = AppCodes.Definitions.Level, SelectCommandType = SelectCommandTypeEnum.Table, @@ -25959,19 +25962,19 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency new() { Order = 1, - ColCount = 2, + ColCount = 1, ColSpan = 2, ItemType = "group", Items = [ new EditingFormItemDto { Order = 1, DataField = "BranchId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 2, DataField = "ClassTypeId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 2, DataField = "ClassTypeId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, new EditingFormItemDto { Order = 3, DataField = "Name", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 4, DataField = "LevelType", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 5, DataField = "LessonCount", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 6, DataField = "LessonDuration", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 5, DataField = "LessonCount", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 6, DataField = "LessonDuration", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, new EditingFormItemDto { Order = 7, DataField = "MonthlyPaymentRate", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 8, DataField = "Status", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 8, DataField = "Status", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, ] } }), @@ -25981,6 +25984,13 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency 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 = "Status", + FieldDbType = DbType.String, + Value = "Aktif", + CustomValueType = FieldCustomValueTypeEnum.Value }, + }), } ); @@ -26057,6 +26067,12 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency Visible = true, IsActive = true, IsDeleted = false, + LookupJson = JsonSerializer.Serialize(new LookupDto { + DataSourceType = UiLookupDataSourceTypeEnum.Query, + DisplayExpr = "Name", + ValueExpr = "Key", + LookupQuery = lookupQueryClassTypeValues, + }), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { C = AppCodes.Definitions.Level + ".Create", diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/PlatformDataSeeder.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/PlatformDataSeeder.cs index 67274b35..09298ff3 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/PlatformDataSeeder.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/PlatformDataSeeder.cs @@ -77,7 +77,6 @@ public class PlatformDataSeeder : IDataSeedContributor, ITransientDependency private readonly IRepository _salesRejectionReasonRepository; private readonly IRepository _noteTypeRepository; private readonly IRepository _lessonPeriodRepository; - private readonly IRepository _informationRepository; private readonly IRepository _meetingMethodRepository; private readonly IRepository _meetingResultRepository; private readonly IRepository _classCancellationReasonRepository; @@ -144,7 +143,6 @@ public class PlatformDataSeeder : IDataSeedContributor, ITransientDependency IRepository salesRejectionReasonRepository, IRepository noteTypeRepository, IRepository lessonPeriodRepository, - IRepository informationRepository, IRepository meetingMethodRepository, IRepository meetingResultRepository, IRepository classCancellationReasonRepository, @@ -211,7 +209,6 @@ public class PlatformDataSeeder : IDataSeedContributor, ITransientDependency _salesRejectionReasonRepository = salesRejectionReasonRepository; _noteTypeRepository = noteTypeRepository; _lessonPeriodRepository = lessonPeriodRepository; - _informationRepository = informationRepository; _meetingMethodRepository = meetingMethodRepository; _meetingResultRepository = meetingResultRepository; _classCancellationReasonRepository = classCancellationReasonRepository; @@ -1247,19 +1244,6 @@ public class PlatformDataSeeder : IDataSeedContributor, ITransientDependency } } - foreach (var item in items.Informations) - { - var exists = await _informationRepository.AnyAsync(x => x.Name == item.Name); - - if (!exists) - { - await _informationRepository.InsertAsync(new() - { - Name = item.Name, - }); - } - } - foreach (var item in items.MeetingMethods) { var exists = await _meetingMethodRepository.AnyAsync(x => x.Name == item.Name); diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.json b/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.json index ac4f6a2c..2a413e7f 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.json +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.json @@ -1504,48 +1504,48 @@ }, { "GroupName": "App.Saas", - "Name": "App.Parameters.Sector", + "Name": "App.Definitions.Sector", "ParentName": null, - "DisplayName": "App.Parameters.Sector", + "DisplayName": "App.Definitions.Sector", "IsEnabled": true, "MultiTenancySide": 3 }, { "GroupName": "App.Saas", - "Name": "App.Parameters.Sector.Create", - "ParentName": "App.Parameters.Sector", + "Name": "App.Definitions.Sector.Create", + "ParentName": "App.Definitions.Sector", "DisplayName": "Create", "IsEnabled": true, "MultiTenancySide": 3 }, { "GroupName": "App.Saas", - "Name": "App.Parameters.Sector.Update", - "ParentName": "App.Parameters.Sector", + "Name": "App.Definitions.Sector.Update", + "ParentName": "App.Definitions.Sector", "DisplayName": "Update", "IsEnabled": true, "MultiTenancySide": 3 }, { "GroupName": "App.Saas", - "Name": "App.Parameters.Sector.Delete", - "ParentName": "App.Parameters.Sector", + "Name": "App.Definitions.Sector.Delete", + "ParentName": "App.Definitions.Sector", "DisplayName": "Delete", "IsEnabled": true, "MultiTenancySide": 3 }, { "GroupName": "App.Saas", - "Name": "App.Parameters.Sector.Export", - "ParentName": "App.Parameters.Sector", + "Name": "App.Definitions.Sector.Export", + "ParentName": "App.Definitions.Sector", "DisplayName": "Export", "IsEnabled": true, "MultiTenancySide": 3 }, { "GroupName": "App.Saas", - "Name": "App.Parameters.Sector.Import", - "ParentName": "App.Parameters.Sector", + "Name": "App.Definitions.Sector.Import", + "ParentName": "App.Definitions.Sector", "DisplayName": "Import", "IsEnabled": true, "MultiTenancySide": 3 @@ -3904,6 +3904,54 @@ "IsEnabled": true, "MultiTenancySide": 3 }, + { + "GroupName": "App.Administration", + "Name": "App.Definitions.LessonPeriod", + "ParentName": null, + "DisplayName": "App.Definitions.LessonPeriod", + "IsEnabled": true, + "MultiTenancySide": 3 + }, + { + "GroupName": "App.Administration", + "Name": "App.Definitions.LessonPeriod.Create", + "ParentName": "App.Definitions.LessonPeriod", + "DisplayName": "Create", + "IsEnabled": true, + "MultiTenancySide": 3 + }, + { + "GroupName": "App.Administration", + "Name": "App.Definitions.LessonPeriod.Update", + "ParentName": "App.Definitions.LessonPeriod", + "DisplayName": "Update", + "IsEnabled": true, + "MultiTenancySide": 3 + }, + { + "GroupName": "App.Administration", + "Name": "App.Definitions.LessonPeriod.Delete", + "ParentName": "App.Definitions.LessonPeriod", + "DisplayName": "Delete", + "IsEnabled": true, + "MultiTenancySide": 3 + }, + { + "GroupName": "App.Administration", + "Name": "App.Definitions.LessonPeriod.Export", + "ParentName": "App.Definitions.LessonPeriod", + "DisplayName": "Export", + "IsEnabled": true, + "MultiTenancySide": 3 + }, + { + "GroupName": "App.Administration", + "Name": "App.Definitions.LessonPeriod.Import", + "ParentName": "App.Definitions.LessonPeriod", + "DisplayName": "Import", + "IsEnabled": true, + "MultiTenancySide": 3 + }, { "GroupName": "App.Administration", "Name": "App.Definitions.Event", @@ -7748,16 +7796,6 @@ "RequiredPermissionName": null, "IsDisabled": false }, - { - "ParentCode": "App.Parameters", - "Code": "App.Parameters.Sector", - "DisplayName": "App.Parameters.Sector", - "Order": 1, - "Url": "/admin/list/list-sector", - "Icon": "FcBiomass", - "RequiredPermissionName": "App.Parameters.Sector", - "IsDisabled": false - }, { "ParentCode": "App.Parameters", "Code": "App.Parameters.ContactTag", @@ -7958,11 +7996,21 @@ "RequiredPermissionName": null, "IsDisabled": false }, + { + "ParentCode": "App.Definitions", + "Code": "App.Definitions.Sector", + "DisplayName": "App.Definitions.Sector", + "Order": 1, + "Url": "/admin/list/list-sector", + "Icon": "FcBiomass", + "RequiredPermissionName": "App.Definitions.Sector", + "IsDisabled": false + }, { "ParentCode": "App.Definitions", "Code": "App.Definitions.SkillType", "DisplayName": "App.Definitions.SkillType", - "Order": 1, + "Order": 2, "Url": "/admin/list/list-skillType", "Icon": "FcMindMap", "RequiredPermissionName": "App.Definitions.SkillType", @@ -7972,7 +8020,7 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.UomCategory", "DisplayName": "App.Definitions.UomCategory", - "Order": 2, + "Order": 3, "Url": "/admin/list/list-uomCategory", "Icon": "FcWorkflow", "RequiredPermissionName": "App.Definitions.UomCategory", @@ -7982,7 +8030,7 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.Bank", "DisplayName": "App.Definitions.Bank", - "Order": 3, + "Order": 4, "Url": "/admin/list/list-bank", "Icon": "FcMoneyTransfer", "RequiredPermissionName": "App.Definitions.Bank", @@ -7992,7 +8040,7 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.Behavior", "DisplayName": "App.Definitions.Behavior", - "Order": 4, + "Order": 5, "Url": "/admin/list/list-behavior", "Icon": "FcPuzzle", "RequiredPermissionName": "App.Definitions.Behavior", @@ -8002,7 +8050,7 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.Disease", "DisplayName": "App.Definitions.Disease", - "Order": 5, + "Order": 6, "Url": "/admin/list/list-disease", "Icon": "FcBiohazard", "RequiredPermissionName": "App.Definitions.Disease", @@ -8012,7 +8060,7 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.Document", "DisplayName": "App.Definitions.Document", - "Order": 6, + "Order": 7, "Url": "/admin/list/list-document", "Icon": "FcDocument", "RequiredPermissionName": "App.Definitions.Document", @@ -8022,7 +8070,7 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.EducationStatus", "DisplayName": "App.Definitions.EducationStatus", - "Order": 7, + "Order": 8, "Url": "/admin/list/list-educationstatus", "Icon": "FcGraduationCap", "RequiredPermissionName": "App.Definitions.EducationStatus", @@ -8032,9 +8080,9 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.EventType", "DisplayName": "App.Definitions.EventType", - "Order": 8, + "Order": 9, "Url": "/admin/list/list-eventtype", - "Icon": "FcCalendar", + "Icon": "FcPlanner", "RequiredPermissionName": "App.Definitions.EventType", "IsDisabled": false }, @@ -8042,7 +8090,7 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.EventCategory", "DisplayName": "App.Definitions.EventCategory", - "Order": 9, + "Order": 10, "Url": "/admin/list/list-eventcategory", "Icon": "FcTreeStructure", "RequiredPermissionName": "App.Definitions.EventCategory", @@ -8050,19 +8098,19 @@ }, { "ParentCode": "App.Definitions", - "Code": "App.Definitions.Information", - "DisplayName": "App.Definitions.Information", - "Order": 10, - "Url": "/admin/list/list-information", - "Icon": "FcInfo", - "RequiredPermissionName": "App.Definitions.Information", + "Code": "App.Definitions.Event", + "DisplayName": "App.Definitions.Event", + "Order": 11, + "Url": "/admin/list/list-event", + "Icon": "FcCalendar", + "RequiredPermissionName": "App.Definitions.Event", "IsDisabled": false }, { "ParentCode": "App.Definitions", "Code": "App.Definitions.MeetingMethod", "DisplayName": "App.Definitions.MeetingMethod", - "Order": 11, + "Order": 12, "Url": "/admin/list/list-meetingmethod", "Icon": "FcCollaboration", "RequiredPermissionName": "App.Definitions.MeetingMethod", @@ -8072,7 +8120,7 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.MeetingResult", "DisplayName": "App.Definitions.MeetingResult", - "Order": 12, + "Order": 13, "Url": "/admin/list/list-meetingresult", "Icon": "FcApproval", "RequiredPermissionName": "App.Definitions.MeetingResult", @@ -8082,7 +8130,7 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.Program", "DisplayName": "App.Definitions.Program", - "Order": 13, + "Order": 14, "Url": "/admin/list/list-program", "Icon": "FcFlowChart", "RequiredPermissionName": "App.Definitions.Program", @@ -8092,7 +8140,7 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.Interesting", "DisplayName": "App.Definitions.Interesting", - "Order": 14, + "Order": 15, "Url": "/admin/list/list-interesting", "Icon": "FcIdea", "RequiredPermissionName": "App.Definitions.Interesting", @@ -8102,7 +8150,7 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.SalesRejectionReason", "DisplayName": "App.Definitions.SalesRejectionReason", - "Order": 15, + "Order": 16, "Url": "/admin/list/list-salesrejectionreason", "Icon": "FcCancel", "RequiredPermissionName": "App.Definitions.SalesRejectionReason", @@ -8112,7 +8160,7 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.Source", "DisplayName": "App.Definitions.Source", - "Order": 16, + "Order": 17, "Url": "/admin/list/list-source", "Icon": "FcAdvertising", "RequiredPermissionName": "App.Definitions.Source", @@ -8122,7 +8170,7 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.Vaccine", "DisplayName": "App.Definitions.Vaccine", - "Order": 17, + "Order": 18, "Url": "/admin/list/list-vaccine", "Icon": "FcBiotech", "RequiredPermissionName": "App.Definitions.Vaccine", @@ -8132,7 +8180,7 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.NoteType", "DisplayName": "App.Definitions.NoteType", - "Order": 18, + "Order": 19, "Url": "/admin/list/list-notetype", "Icon": "FcTodoList", "RequiredPermissionName": "App.Definitions.NoteType", @@ -8142,7 +8190,7 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.ClassCancellationReason", "DisplayName": "App.Definitions.ClassCancellationReason", - "Order": 19, + "Order": 20, "Url": "/admin/list/list-classcancellationreason", "Icon": "FcDisapprove", "RequiredPermissionName": "App.Definitions.ClassCancellationReason", @@ -8152,7 +8200,7 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.WorkHour", "DisplayName": "App.Definitions.WorkHour", - "Order": 20, + "Order": 21, "Url": "/admin/list/list-workhour", "Icon": "FcClock", "RequiredPermissionName": "App.Definitions.WorkHour", @@ -8162,7 +8210,7 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.Vehicle", "DisplayName": "App.Definitions.Vehicle", - "Order": 21, + "Order": 22, "Url": "/admin/list/list-vehicle", "Icon": "FcAutomotive", "RequiredPermissionName": "App.Definitions.Vehicle", @@ -8172,7 +8220,7 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.Schedule", "DisplayName": "App.Definitions.Schedule", - "Order": 22, + "Order": 23, "Url": "/admin/list/list-schedule", "Icon": "FcPlanner", "RequiredPermissionName": "App.Definitions.Schedule", @@ -8182,7 +8230,7 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.Psychologist", "DisplayName": "App.Definitions.Psychologist", - "Order": 23, + "Order": 24, "Url": "/admin/list/list-psychologist", "Icon": "FcMindMap", "RequiredPermissionName": "App.Definitions.Psychologist", @@ -8192,7 +8240,7 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.Meal", "DisplayName": "App.Definitions.Meal", - "Order": 24, + "Order": 25, "Url": "/admin/list/list-meal", "Icon": "FcLike", "RequiredPermissionName": "App.Definitions.Meal", @@ -8202,22 +8250,12 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.Lawyer", "DisplayName": "App.Definitions.Lawyer", - "Order": 25, + "Order": 26, "Url": "/admin/list/list-lawyer", "Icon": "FcBusinessman", "RequiredPermissionName": "App.Definitions.Lawyer", "IsDisabled": false }, - { - "ParentCode": "App.Definitions", - "Code": "App.Definitions.Event", - "DisplayName": "App.Definitions.Event", - "Order": 26, - "Url": "/admin/list/list-event", - "Icon": "FcCalendar", - "RequiredPermissionName": "App.Definitions.Event", - "IsDisabled": false - }, { "ParentCode": "App.Definitions", "Code": "App.Definitions.LessonPeriod", @@ -8262,7 +8300,7 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.Class", "DisplayName": "App.Definitions.Class", - "Order": 31, + "Order": 32, "Url": "/admin/list/list-class", "Icon": "FcConferenceCall", "RequiredPermissionName": "App.Definitions.Class", @@ -8272,7 +8310,7 @@ "ParentCode": "App.Definitions", "Code": "App.Definitions.Level", "DisplayName": "App.Definitions.Level", - "Order": 32, + "Order": 33, "Url": "/admin/list/list-level", "Icon": "FcGraduationCap", "RequiredPermissionName": "App.Definitions.Level", @@ -16556,7 +16594,7 @@ }, { "resourceName": "Platform", - "key": "App.Parameters.Sector", + "key": "App.Definitions.Sector", "tr": "Sektörler", "en": "Sectors" }, @@ -25291,6 +25329,9 @@ }, { "Name": "Şikayet" + }, + { + "Name": "İzin" } ], "LessonPeriods": [ @@ -25463,20 +25504,6 @@ "Lesson4": "Ana" } ], - "Informations": [ - { - "Name": "Bilgi" - }, - { - "Name": "İzin" - }, - { - "Name": "Öneri" - }, - { - "Name": "Şikayet" - } - ], "MeetingMethods": [ { "Name": "EMAIL", diff --git a/api/src/Kurs.Platform.Domain.Shared/PlatformConsts.cs b/api/src/Kurs.Platform.Domain.Shared/PlatformConsts.cs index bb2eb144..2a72b037 100644 --- a/api/src/Kurs.Platform.Domain.Shared/PlatformConsts.cs +++ b/api/src/Kurs.Platform.Domain.Shared/PlatformConsts.cs @@ -305,7 +305,6 @@ public static class PlatformConsts public static class Parameters { public const string Default = Prefix.App + ".Parameters"; - public const string Sector = Default + ".Sector"; public const string ContactTag = Default + ".ContactTag"; public const string ContactTitle = Default + ".ContactTitle"; public const string Currency = Default + ".Currency"; @@ -328,6 +327,7 @@ public static class PlatformConsts public static class Definitions { public const string Default = Prefix.App + ".Definitions"; + public const string Sector = Default + ".Sector"; public const string SkillType = Default + ".SkillType"; public const string UomCategory = Default + ".UomCategory"; public const string Bank = Default + ".Bank"; @@ -337,7 +337,6 @@ public static class PlatformConsts public const string EducationStatus = Default + ".EducationStatus"; public const string EventType = Default + ".EventType"; public const string EventCategory = Default + ".EventCategory"; - public const string Information = Default + ".Information"; public const string MeetingMethod = Default + ".MeetingMethod"; public const string MeetingResult = Default + ".MeetingResult"; public const string Program = Default + ".Program"; @@ -402,7 +401,6 @@ public static class PlatformConsts public const string Demo = "list-demo"; public const string Contact = "list-contact"; - public const string Sector = "list-sector"; public const string ContactTag = "list-contacttag"; public const string ContactTitle = "list-contacttitle"; public const string Currency = "list-currency"; @@ -419,6 +417,7 @@ public static class PlatformConsts public const string IpRestriction = "list-iprestriction"; public const string AuditLog = "list-auditlog"; + public const string Sector = "list-sector"; public const string SkillType = "list-skilltype"; public const string Skill = "list-skill"; public const string SkillLevel = "list-skilllevel"; @@ -432,7 +431,6 @@ public static class PlatformConsts public const string EducationStatus = "list-educationstatus"; public const string EventType = "list-eventtype"; public const string EventCategory = "list-eventcategory"; - public const string Information = "list-information"; public const string MeetingMethod = "list-meetingmethod"; public const string MeetingResult = "list-meetingresult"; public const string Program = "list-program"; diff --git a/api/src/Kurs.Platform.Domain/Data/SeedConsts.cs b/api/src/Kurs.Platform.Domain/Data/SeedConsts.cs index b14c2dc8..01a5db02 100644 --- a/api/src/Kurs.Platform.Domain/Data/SeedConsts.cs +++ b/api/src/Kurs.Platform.Domain/Data/SeedConsts.cs @@ -380,7 +380,6 @@ public static class SeedConsts public static class Parameters { public const string Default = Prefix.App + ".Parameters"; - public const string Sector = Default + ".Sector"; public const string ContactTag = Default + ".ContactTag"; public const string ContactTitle = Default + ".ContactTitle"; public const string Currency = Default + ".Currency"; @@ -402,6 +401,7 @@ public static class SeedConsts public static class Definitions { public const string Default = Prefix.App + ".Definitions"; + public const string Sector = Default + ".Sector"; public const string SkillType = Default + ".SkillType"; public const string SkillLevel = Default + ".SkillLevel"; public const string Skill = Default + ".Skill"; @@ -415,7 +415,6 @@ public static class SeedConsts public const string EducationStatus = Default + ".EducationStatus"; public const string EventType = Default + ".EventType"; public const string EventCategory = Default + ".EventCategory"; - public const string Information = Default + ".Information"; public const string MeetingMethod = Default + ".MeetingMethod"; public const string MeetingResult = Default + ".MeetingResult"; public const string Program = Default + ".Program"; diff --git a/api/src/Kurs.Platform.Domain/Entities/Administration/Information.cs b/api/src/Kurs.Platform.Domain/Entities/Administration/Information.cs deleted file mode 100644 index e1580abc..00000000 --- a/api/src/Kurs.Platform.Domain/Entities/Administration/Information.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using Volo.Abp.Domain.Entities.Auditing; -using Volo.Abp.MultiTenancy; - -namespace Kurs.Platform.Entities; - -public class Information : FullAuditedEntity, IMultiTenant -{ - public Guid? TenantId { get; set; } - - public string Name { get; set; } - - Guid? IMultiTenant.TenantId => TenantId; -} diff --git a/api/src/Kurs.Platform.Domain/Entities/Administration/Lawyer.cs b/api/src/Kurs.Platform.Domain/Entities/Administration/Lawyer.cs index 1f4c73bc..57197e38 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Administration/Lawyer.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Administration/Lawyer.cs @@ -12,7 +12,6 @@ public class Lawyer : FullAuditedEntity, IMultiTenant public string ContactPerson { get; set; } public string Email { get; set; } public string Address { get; set; } - public string City { get; set; } public string TaxOffice { get; set; } public string TaxNumber { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/Administration/Sector.cs b/api/src/Kurs.Platform.Domain/Entities/Administration/Sector.cs index 13a9c15d..8a342fbb 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Administration/Sector.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Administration/Sector.cs @@ -1,10 +1,15 @@ using System; using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.MultiTenancy; namespace Kurs.Platform.Entities; -public class Sector : FullAuditedEntity +public class Sector : FullAuditedEntity, IMultiTenant { + public Guid? TenantId { get; set; } + public string Name { get; set; } public string FullName { get; set; } + + Guid? IMultiTenant.TenantId => TenantId; } \ No newline at end of file diff --git a/api/src/Kurs.Platform.Domain/Entities/Administration/Skill.cs b/api/src/Kurs.Platform.Domain/Entities/Administration/Skill.cs index aa25395d..76e24cce 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Administration/Skill.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Administration/Skill.cs @@ -1,11 +1,17 @@ using System; using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.MultiTenancy; namespace Kurs.Platform.Entities; -public class Skill : FullAuditedEntity +public class Skill : FullAuditedEntity, IMultiTenant { - public string Name { get; set; } + public Guid? TenantId { get; set; } public Guid SkillTypeId { get; set; } + + public string Name { get; set; } + + Guid? IMultiTenant.TenantId => TenantId; + public SkillType SkillType { get; set; } } \ No newline at end of file diff --git a/api/src/Kurs.Platform.Domain/Entities/Administration/SkillLevel.cs b/api/src/Kurs.Platform.Domain/Entities/Administration/SkillLevel.cs index 48b0a048..d704cfca 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Administration/SkillLevel.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Administration/SkillLevel.cs @@ -1,13 +1,19 @@ using System; using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.MultiTenancy; namespace Kurs.Platform.Entities; -public class SkillLevel : FullAuditedEntity +public class SkillLevel : FullAuditedEntity, IMultiTenant { + public Guid? TenantId { get; set; } + public string Name { get; set; } public int Progress { get; set; } public bool IsDefault { get; set; } + + Guid? IMultiTenant.TenantId => TenantId; + public Guid SkillTypeId { get; set; } public SkillType SkillType { get; set; } } \ No newline at end of file diff --git a/api/src/Kurs.Platform.Domain/Entities/Administration/SkillType.cs b/api/src/Kurs.Platform.Domain/Entities/Administration/SkillType.cs index 3ebd6570..c9638060 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Administration/SkillType.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Administration/SkillType.cs @@ -1,13 +1,18 @@ using System; using System.Collections.Generic; using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.MultiTenancy; namespace Kurs.Platform.Entities; -public class SkillType : FullAuditedEntity +public class SkillType : FullAuditedEntity, IMultiTenant { + public Guid? TenantId { get; set; } + public string Name { get; set; } + Guid? IMultiTenant.TenantId => TenantId; + public ICollection Skills { get; set; } public ICollection Levels { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/Administration/Uom.cs b/api/src/Kurs.Platform.Domain/Entities/Administration/Uom.cs index 70d0854e..f87a5725 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Administration/Uom.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Administration/Uom.cs @@ -1,16 +1,21 @@ using System; using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.MultiTenancy; namespace Kurs.Platform.Entities; -public class Uom : FullAuditedEntity +public class Uom : FullAuditedEntity, IMultiTenant { + public Guid? TenantId { get; set; } + public Guid UomCategoryId { get; set; } + public string Name { get; set; } - public string Type { get; set; } // Referans birime göre durumu + public string Type { get; set; } public decimal Ratio { get; set; } public bool IsActive { get; set; } public decimal Rounding { get; set; } - public Guid UomCategoryId { get; set; } + + Guid? IMultiTenant.TenantId => TenantId; public UomCategory UomCategory { get; set; } } diff --git a/api/src/Kurs.Platform.Domain/Entities/Administration/UomCategory.cs b/api/src/Kurs.Platform.Domain/Entities/Administration/UomCategory.cs index 2a1d3620..06026dad 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Administration/UomCategory.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Administration/UomCategory.cs @@ -1,15 +1,20 @@ using System; using System.Collections.Generic; using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.MultiTenancy; namespace Kurs.Platform.Entities; -public class UomCategory : FullAuditedEntity +public class UomCategory : FullAuditedEntity, IMultiTenant { + public Guid? TenantId { get; set; } + public string Name { get; set; } public ICollection Uoms { get; set; } + Guid? IMultiTenant.TenantId => TenantId; + protected UomCategory() { } public UomCategory(Guid id, string name) : base(id) diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs b/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs index 5120f949..4291b163 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs @@ -91,7 +91,6 @@ public class PlatformDbContext : public DbSet Events { get; set; } public DbSet EventCategories { get; set; } public DbSet EventTypes { get; set; } - public DbSet Informations { get; set; } public DbSet LessonPeriods { get; set; } public DbSet Lawyers { get; set; } public DbSet Meals { get; set; } @@ -1173,14 +1172,6 @@ public class PlatformDbContext : b.Property(x => x.Status).HasMaxLength(10); }); - builder.Entity(b => - { - b.ToTable(Prefix.DbTableDefinition + nameof(Information), Prefix.DbSchema); - b.ConfigureByConvention(); - - b.Property(x => x.Name).HasMaxLength(50).IsRequired(); - }); - builder.Entity(b => { b.ToTable(Prefix.DbTableDefinition + nameof(LessonPeriod), Prefix.DbSchema); @@ -1250,7 +1241,6 @@ public class PlatformDbContext : b.Property(x => x.ContactPerson).HasMaxLength(50); b.Property(x => x.Email).HasMaxLength(100); b.Property(x => x.Address).HasMaxLength(250); - b.Property(x => x.City).HasMaxLength(50); b.Property(x => x.TaxOffice).HasMaxLength(50); b.Property(x => x.TaxNumber).HasMaxLength(20); diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251006064241_Initial.Designer.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251006121303_Initial.Designer.cs similarity index 99% rename from api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251006064241_Initial.Designer.cs rename to api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251006121303_Initial.Designer.cs index de80ccab..0ea58856 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251006064241_Initial.Designer.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251006121303_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace Kurs.Platform.Migrations { [DbContext(typeof(PlatformDbContext))] - [Migration("20251006064241_Initial")] + [Migration("20251006121303_Initial")] partial class Initial { /// @@ -3169,55 +3169,6 @@ namespace Kurs.Platform.Migrations b.ToTable("PGlobalSearch", (string)null); }); - modelBuilder.Entity("Kurs.Platform.Entities.Information", b => - { - b.Property("Id") - .HasColumnType("uniqueidentifier"); - - b.Property("CreationTime") - .HasColumnType("datetime2") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnType("uniqueidentifier") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnType("uniqueidentifier") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnType("datetime2") - .HasColumnName("DeletionTime"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnType("bit") - .HasDefaultValue(false) - .HasColumnName("IsDeleted"); - - b.Property("LastModificationTime") - .HasColumnType("datetime2") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnType("uniqueidentifier") - .HasColumnName("LastModifierId"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(50) - .HasColumnType("nvarchar(50)"); - - b.Property("TenantId") - .HasColumnType("uniqueidentifier") - .HasColumnName("TenantId"); - - b.HasKey("Id"); - - b.ToTable("DInformation", (string)null); - }); - modelBuilder.Entity("Kurs.Platform.Entities.InstallmentOption", b => { b.Property("Id") @@ -5673,6 +5624,10 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + b.HasKey("Id"); b.ToTable("DSector", (string)null); @@ -5784,6 +5739,10 @@ namespace Kurs.Platform.Migrations b.Property("SkillTypeId") .HasColumnType("uniqueidentifier"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + b.HasKey("Id"); b.HasIndex("SkillTypeId"); @@ -5844,6 +5803,10 @@ namespace Kurs.Platform.Migrations b.Property("SkillTypeId") .HasColumnType("uniqueidentifier"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + b.HasKey("Id"); b.HasIndex("SkillTypeId"); @@ -5891,6 +5854,10 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + b.HasKey("Id"); b.HasIndex("Name") @@ -6003,6 +5970,10 @@ namespace Kurs.Platform.Migrations .HasPrecision(18, 6) .HasColumnType("decimal(18,6)"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + b.Property("Type") .IsRequired() .HasMaxLength(32) @@ -6058,6 +6029,10 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + b.HasKey("Id"); b.HasIndex("Name") diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251006064241_Initial.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251006121303_Initial.cs similarity index 99% rename from api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251006064241_Initial.cs rename to api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251006121303_Initial.cs index 050eaa84..61525f60 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251006064241_Initial.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251006121303_Initial.cs @@ -688,26 +688,6 @@ namespace Kurs.Platform.Migrations table.PrimaryKey("PK_DEventType", x => x.Id); }); - migrationBuilder.CreateTable( - name: "DInformation", - columns: table => new - { - Id = table.Column(type: "uniqueidentifier", nullable: false), - TenantId = table.Column(type: "uniqueidentifier", nullable: true), - Name = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: false), - CreationTime = table.Column(type: "datetime2", nullable: false), - CreatorId = table.Column(type: "uniqueidentifier", nullable: true), - LastModificationTime = table.Column(type: "datetime2", nullable: true), - LastModifierId = table.Column(type: "uniqueidentifier", nullable: true), - IsDeleted = table.Column(type: "bit", nullable: false, defaultValue: false), - DeleterId = table.Column(type: "uniqueidentifier", nullable: true), - DeletionTime = table.Column(type: "datetime2", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_DInformation", x => x.Id); - }); - migrationBuilder.CreateTable( name: "DInteresting", columns: table => new @@ -1005,6 +985,7 @@ namespace Kurs.Platform.Migrations columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), + TenantId = table.Column(type: "uniqueidentifier", nullable: true), Name = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: false), FullName = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true), CreationTime = table.Column(type: "datetime2", nullable: false), @@ -1025,6 +1006,7 @@ namespace Kurs.Platform.Migrations columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), + TenantId = table.Column(type: "uniqueidentifier", nullable: true), Name = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), CreatorId = table.Column(type: "uniqueidentifier", nullable: true), @@ -1065,6 +1047,7 @@ namespace Kurs.Platform.Migrations columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), + TenantId = table.Column(type: "uniqueidentifier", nullable: true), Name = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), CreatorId = table.Column(type: "uniqueidentifier", nullable: true), @@ -2459,8 +2442,9 @@ namespace Kurs.Platform.Migrations columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), - Name = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: false), + TenantId = table.Column(type: "uniqueidentifier", nullable: true), SkillTypeId = table.Column(type: "uniqueidentifier", nullable: false), + Name = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), CreatorId = table.Column(type: "uniqueidentifier", nullable: true), LastModificationTime = table.Column(type: "datetime2", nullable: true), @@ -2485,6 +2469,7 @@ namespace Kurs.Platform.Migrations columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), + TenantId = table.Column(type: "uniqueidentifier", nullable: true), Name = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: false), Progress = table.Column(type: "int", nullable: false, defaultValue: 0), IsDefault = table.Column(type: "bit", nullable: false, defaultValue: false), @@ -2513,12 +2498,13 @@ namespace Kurs.Platform.Migrations columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), + TenantId = table.Column(type: "uniqueidentifier", nullable: true), + UomCategoryId = table.Column(type: "uniqueidentifier", nullable: false), Name = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: false), Type = table.Column(type: "nvarchar(32)", maxLength: 32, nullable: false), Ratio = table.Column(type: "decimal(18,6)", precision: 18, scale: 6, nullable: false), IsActive = table.Column(type: "bit", nullable: false), Rounding = table.Column(type: "decimal(18,6)", precision: 18, scale: 6, nullable: false), - UomCategoryId = table.Column(type: "uniqueidentifier", nullable: false), CreationTime = table.Column(type: "datetime2", nullable: false), CreatorId = table.Column(type: "uniqueidentifier", nullable: true), LastModificationTime = table.Column(type: "datetime2", nullable: true), @@ -4158,9 +4144,6 @@ namespace Kurs.Platform.Migrations migrationBuilder.DropTable( name: "DEvent"); - migrationBuilder.DropTable( - name: "DInformation"); - migrationBuilder.DropTable( name: "DInteresting"); diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs index 9e0a6fc8..8c3b0f37 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs @@ -3166,55 +3166,6 @@ namespace Kurs.Platform.Migrations b.ToTable("PGlobalSearch", (string)null); }); - modelBuilder.Entity("Kurs.Platform.Entities.Information", b => - { - b.Property("Id") - .HasColumnType("uniqueidentifier"); - - b.Property("CreationTime") - .HasColumnType("datetime2") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnType("uniqueidentifier") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnType("uniqueidentifier") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnType("datetime2") - .HasColumnName("DeletionTime"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnType("bit") - .HasDefaultValue(false) - .HasColumnName("IsDeleted"); - - b.Property("LastModificationTime") - .HasColumnType("datetime2") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnType("uniqueidentifier") - .HasColumnName("LastModifierId"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(50) - .HasColumnType("nvarchar(50)"); - - b.Property("TenantId") - .HasColumnType("uniqueidentifier") - .HasColumnName("TenantId"); - - b.HasKey("Id"); - - b.ToTable("DInformation", (string)null); - }); - modelBuilder.Entity("Kurs.Platform.Entities.InstallmentOption", b => { b.Property("Id") @@ -5670,6 +5621,10 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + b.HasKey("Id"); b.ToTable("DSector", (string)null); @@ -5781,6 +5736,10 @@ namespace Kurs.Platform.Migrations b.Property("SkillTypeId") .HasColumnType("uniqueidentifier"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + b.HasKey("Id"); b.HasIndex("SkillTypeId"); @@ -5841,6 +5800,10 @@ namespace Kurs.Platform.Migrations b.Property("SkillTypeId") .HasColumnType("uniqueidentifier"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + b.HasKey("Id"); b.HasIndex("SkillTypeId"); @@ -5888,6 +5851,10 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + b.HasKey("Id"); b.HasIndex("Name") @@ -6000,6 +5967,10 @@ namespace Kurs.Platform.Migrations .HasPrecision(18, 6) .HasColumnType("decimal(18,6)"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + b.Property("Type") .IsRequired() .HasMaxLength(32) @@ -6055,6 +6026,10 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + b.HasKey("Id"); b.HasIndex("Name")