diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs index 24ee2309..b713fa3a 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs @@ -429,7 +429,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep new EditingFormItemDto { Order=1, DataField="GroupName", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order=2, DataField="ParentName", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order=3, DataField="Name", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=4, DataField="DisplayName", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, + new EditingFormItemDto { Order=4, DataField="DisplayName", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order=5, DataField="IsEnabled", ColSpan=2, EditorType2=EditorTypes.dxCheckBox }, new EditingFormItemDto { Order=6, DataField="MultiTenancySide", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order=7, DataField="MenuGroup", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTagBox }, @@ -1212,7 +1212,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PagerOptionJson = DefaultPagerOptionJson, EditingOptionJson = JsonSerializer.Serialize(new GridEditingDto { - Popup = new GridEditingPopupDto() { Title = ListFormCodes.Lists.IpRestriction, Width = 500, Height = 300 }, + Popup = new GridEditingPopupDto() { Title = AppCodes.IdentityManagement.IpRestrictions, Width = 500, Height = 300 }, AllowDeleting = true, AllowAdding = true, AllowUpdating = true, @@ -2060,9 +2060,9 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ItemType = "group", Items = [ - new EditingFormItemDto { Order = 1, DataField = "Title", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, + new EditingFormItemDto { Order = 1, DataField = "Title", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 2, DataField = "Icon", ColSpan = 2, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "Description", ColSpan = 2, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, + new EditingFormItemDto { Order = 3, DataField = "Description", ColSpan = 2, EditorType2 = EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 4, DataField = "Type", ColSpan = 2, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 5, DataField = "Features", ColSpan = 2, EditorType2 = EditorTypes.dxTextArea }, ] @@ -2259,8 +2259,8 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ItemType = "group", Items = [ - new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 2, DataField = "Description", ColSpan = 2, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, + new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, + new EditingFormItemDto { Order = 2, DataField = "Description", ColSpan = 2, EditorType2 = EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 3, DataField = "Category", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 4, DataField = "Order", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, new EditingFormItemDto { Order = 5, DataField = "MonthlyPrice", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat }, @@ -3243,9 +3243,9 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ItemType = "group", Items = [ - new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, + new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 2, DataField = "Slug", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "Description", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, + new EditingFormItemDto { Order = 3, DataField = "Description", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 4, DataField = "Icon", ColSpan = 2, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 5, DataField = "DisplayOrder", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, new EditingFormItemDto { Order = 6, DataField = "IsActive", ColSpan = 2, EditorType2 = EditorTypes.dxCheckBox } @@ -3446,9 +3446,9 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ItemType = "group", Items = [ - new EditingFormItemDto { Order = 1, DataField = "Title", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, + new EditingFormItemDto { Order = 1, DataField = "Title", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 2, DataField = "Slug", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "Summary", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, + new EditingFormItemDto { Order = 3, DataField = "Summary", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 4, DataField = "CoverImage", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 5, DataField = "ReadTime", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 6, DataField = "CategoryId", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, @@ -4023,7 +4023,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ItemType = "group", Items = [ - new EditingFormItemDto { Order = 1, DataField = "Address", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, + new EditingFormItemDto { Order = 1, DataField = "Address", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 2, DataField = "PhoneNumber", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, new EditingFormItemDto { Order = 3, DataField = "Email", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 4, DataField = "Location", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox }, @@ -4242,7 +4242,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PagerOptionJson = DefaultPagerOptionJson, EditingOptionJson = JsonSerializer.Serialize(new GridEditingDto { - Popup = new GridEditingPopupDto() { Title = AppCodes.Definitions.WorkHour, Width = 600, Height = 500 }, + Popup = new GridEditingPopupDto() { Title = AppCodes.Definitions.WorkHour, Width = 600, Height = 300 }, AllowDeleting = true, AllowAdding = true, AllowUpdating = true, @@ -4253,8 +4253,8 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep Order = 1, ColCount = 2, ColSpan = 2, ItemType = "group", Items =[ new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 2, IsRequired = true, 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 = 2, DataField = "StartHour", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxDateBox, EditorOptions = EditorOptionValues.TimeSpanOptions }, + new EditingFormItemDto { Order = 3, DataField = "EndHour", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxDateBox, EditorOptions = EditorOptionValues.TimeSpanOptions }, 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 }, @@ -4321,30 +4321,32 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep new() { ListFormCode = listFormWorkHour.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Date, FieldName = "StartHour", - Width = 120, + Width = 150, ListOrderNo = 3, Visible = true, IsActive = true, IsDeleted = false, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.WorkHour), - PivotSettingsJson = DefaultPivotSettingsJson + PivotSettingsJson = DefaultPivotSettingsJson, + EditorOptions = EditorOptionValues.TimeSpanOptions }, new() { ListFormCode = listFormWorkHour.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Date, FieldName = "EndHour", - Width = 120, + Width = 150, ListOrderNo = 4, Visible = true, IsActive = true, IsDeleted = false, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.WorkHour), - PivotSettingsJson = DefaultPivotSettingsJson + PivotSettingsJson = DefaultPivotSettingsJson, + EditorOptions = EditorOptionValues.TimeSpanOptions }, // Günlük kolonlar new() @@ -4552,7 +4554,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", - Width = 150, + Width = 500, ListOrderNo = 2, Visible = true, IsActive = true, @@ -4667,7 +4669,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", - Width = 200, + Width = 500, ListOrderNo = 2, Visible = true, IsActive = true, @@ -4721,7 +4723,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PagerOptionJson = DefaultPagerOptionJson, EditingOptionJson = JsonSerializer.Serialize(new GridEditingDto { - Popup = new GridEditingPopupDto() { Title = ListFormCodes.Lists.SkillLevel, Width = 600, Height = 300 }, + Popup = new GridEditingPopupDto() { Title = AppCodes.Definitions.SkillLevel, Width = 600, Height = 300 }, AllowDeleting = true, AllowAdding = true, AllowUpdating = true, @@ -4731,7 +4733,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep new() { Order=1,ColCount=1,ColSpan=2,ItemType="group", Items= [ new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "Progress", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 2, DataField = "Progress", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSlider, EditorOptions=EditorOptionValues.SliderOptions }, new EditingFormItemDto { Order = 3, DataField = "IsDefault", ColSpan = 2, EditorType2=EditorTypes.dxCheckBox }, new EditingFormItemDto { Order = 4, DataField = "SkillTypeId", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, ] @@ -4771,7 +4773,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", - Width = 150, + Width = 250, ListOrderNo = 2, Visible = true, IsActive = true, @@ -4784,8 +4786,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.SkillLevel), PivotSettingsJson = DefaultPivotSettingsJson }, - new ListFormField - { + new() { ListFormCode = listFormSkillLevel.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, @@ -4800,8 +4801,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.SkillLevel), PivotSettingsJson = DefaultPivotSettingsJson }, - new ListFormField - { + new() { ListFormCode = listFormSkillLevel.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Boolean, @@ -4812,13 +4812,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep IsActive = true, IsDeleted = false, AllowSearch = true, - ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.SkillLevel), PivotSettingsJson = DefaultPivotSettingsJson }, - new ListFormField - { + new() { ListFormCode = listFormSkillLevel.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, @@ -4878,13 +4876,13 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PermissionJson = DefaultPermissionJson(AppCodes.Definitions.Skill), DeleteCommand = $"UPDATE \"{TableNameResolver.GetFullTableName(nameof(TableNameEnum.Skill))}\" SET \"DeleterId\"=@DeleterId, \"DeletionTime\"=CURRENT_TIMESTAMP, \"IsDeleted\"='true' WHERE \"Id\"=@Id", DeleteFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { - new FieldsDefaultValue() { FieldName = "DeleterId", FieldDbType = DbType.Guid, Value = "@USERID", CustomValueType = FieldCustomValueTypeEnum.CustomKey }, - new FieldsDefaultValue() { 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 = DefaultPagerOptionJson, EditingOptionJson = JsonSerializer.Serialize(new GridEditingDto { - Popup = new GridEditingPopupDto() { Title = AppCodes.Definitions.Skill, Width = 600, Height = 300 }, + Popup = new GridEditingPopupDto() { Title = AppCodes.Definitions.Skill, Width = 500, Height = 200 }, AllowDeleting = true, AllowAdding = true, AllowUpdating = true, @@ -4906,8 +4904,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep #region Skill Fields await _listFormFieldRepository.InsertManyAsync(new ListFormField[] { - new ListFormField - { + new() { ListFormCode = listFormSkill.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, @@ -4923,13 +4920,12 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.Skill), PivotSettingsJson = DefaultPivotSettingsJson }, - new ListFormField - { + new() { ListFormCode = listFormSkill.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", - Width = 150, + Width = 350, ListOrderNo = 2, Visible = true, IsActive = true, @@ -4942,8 +4938,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.Skill), PivotSettingsJson = DefaultPivotSettingsJson }, - new ListFormField - { + new() { ListFormCode = listFormSkill.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Guid, @@ -5067,7 +5062,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", - Width = 200, + Width = 500, ListOrderNo = 2, Visible = true, IsActive = true, @@ -5170,7 +5165,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", - Width = 150, + Width = 250, ListOrderNo = 2, Visible = true, IsActive = true, @@ -5189,7 +5184,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Type", - Width = 150, + Width = 200, ListOrderNo = 3, Visible = true, IsActive = true, @@ -5356,7 +5351,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", - Width = 250, + Width = 500, ListOrderNo = 2, Visible = true, IsActive = true, @@ -5455,7 +5450,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", - Width = 250, + Width = 500, ListOrderNo = 2, Visible = true, IsActive = true, @@ -5555,7 +5550,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", - Width = 250, + Width = 500, ListOrderNo = 2, Visible = true, IsActive = true, @@ -5622,7 +5617,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep new() { Order=1,ColCount=1,ColSpan=2,ItemType="group", Items= [ new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "Order", ColSpan = 2, EditorType2=EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 2, DataField = "Order", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxNumberBox }, ] } }), @@ -5656,7 +5651,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", - Width = 250, + Width = 500, ListOrderNo = 2, Visible = true, IsActive = true, @@ -5680,6 +5675,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep SortIndex = 1, SortDirection = GridColumnOptions.SortOrderAsc, AllowSearch = true, + ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.EducationStatus), PivotSettingsJson = DefaultPivotSettingsJson @@ -5770,7 +5766,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", - Width = 250, + Width = 500, ListOrderNo = 2, Visible = true, IsActive = true, @@ -5827,7 +5823,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PagerOptionJson = DefaultPagerOptionJson, EditingOptionJson = JsonSerializer.Serialize(new GridEditingDto { - Popup = new GridEditingPopupDto() { Title = AppCodes.Definitions.Vehicle, Width = 700, Height = 600 }, + Popup = new GridEditingPopupDto() { Title = AppCodes.Definitions.Vehicle, Width = 400, Height = 500 }, AllowDeleting = true, AllowAdding = true, AllowUpdating = true, @@ -5863,8 +5859,8 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ); #region Vehicle Fields - await _listFormFieldRepository.InsertManyAsync(new ListFormField[] - { + await _listFormFieldRepository.InsertManyAsync( + [ new() { ListFormCode = listFormVehicle.ListFormCode, CultureName = LanguageCodes.En, @@ -5885,7 +5881,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Plate", - Width = 150, + Width = 100, ListOrderNo = 2, Visible = true, IsActive = true, @@ -5946,7 +5942,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "DriverName", - Width = 200, + Width = 150, ListOrderNo = 6, Visible = true, IsActive = true, @@ -5960,7 +5956,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "DriverPhone1", - Width = 150, + Width = 100, ListOrderNo = 7, Visible = true, IsActive = true, @@ -5975,7 +5971,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "DriverPhone2", - Width = 150, + Width = 100, ListOrderNo = 8, Visible = true, IsActive = true, @@ -6006,7 +6002,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "AssistantDriverName", - Width = 200, + Width = 150, ListOrderNo = 10, Visible = true, IsActive = true, @@ -6020,7 +6016,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "AssistantDriverPhone1", - Width = 150, + Width = 100, ListOrderNo = 11, Visible = true, IsActive = true, @@ -6035,7 +6031,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "AssistantDriverPhone2", - Width = 150, + Width = 100, ListOrderNo = 12, Visible = true, IsActive = true, @@ -6050,7 +6046,8 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ListFormCode = listFormVehicle.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.String, - FieldName = "Status", Width = 120, + FieldName = "Status", + Width = 100, ListOrderNo = 13, Visible = true, IsActive = true, @@ -6067,8 +6064,8 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto{ C = AppCodes.Definitions.Vehicle + ".Create", R = AppCodes.Definitions.Vehicle, U = AppCodes.Definitions.Vehicle + ".Update", E = true, I = true, Deny = false}), PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto{ IsPivot = true}) - }, - }); + }, + ]); #endregion } #endregion @@ -6113,7 +6110,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PagerOptionJson = DefaultPagerOptionJson, EditingOptionJson = JsonSerializer.Serialize(new GridEditingDto { - Popup = new GridEditingPopupDto() { Title = AppCodes.Definitions.Psychologist, Width = 650, Height = 500 }, + Popup = new GridEditingPopupDto() { Title = AppCodes.Definitions.Psychologist, Width = 500, Height = 300 }, AllowDeleting = true, AllowAdding = true, AllowUpdating = true, @@ -6128,7 +6125,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ItemType = "group", Items =[ new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "PhoneNumber", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 2, DataField = "PhoneNumber", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, 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 = "Status", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, @@ -6173,7 +6170,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Name", - Width = 200, + Width = 250, ListOrderNo = 2, Visible = true, IsActive = true, @@ -6198,6 +6195,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep Visible = true, IsActive = true, IsDeleted = false, + ValidationRuleJson = DefaultValidationRuleRequiredJson, EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.Psychologist), @@ -6210,7 +6208,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Email", - Width = 200, + Width = 300, ListOrderNo = 4, Visible = true, IsActive = true, @@ -6227,7 +6225,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Address", - Width = 300, + Width = 500, ListOrderNo = 5, Visible = true, IsActive = true, @@ -6243,7 +6241,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Status", - Width = 150, + Width = 100, ListOrderNo = 6, Visible = true, IsActive = true, @@ -6306,7 +6304,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PagerOptionJson = DefaultPagerOptionJson, EditingOptionJson = JsonSerializer.Serialize(new GridEditingDto { - Popup = new GridEditingPopupDto() { Title = ListFormCodes.Lists.Lawyer, Width = 700, Height = 500 }, + Popup = new GridEditingPopupDto() { Title = AppCodes.Definitions.Lawyer, Width = 600, Height = 500 }, AllowDeleting = true, AllowAdding = true, AllowUpdating = true, @@ -6321,7 +6319,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ItemType = "group", Items =[ new EditingFormItemDto { Order = 1, DataField = "FullName", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "Email", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 2, DataField = "Email", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 3, DataField = "MobileNumber", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, new EditingFormItemDto { Order = 4, DataField = "PhoneNumber", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, new EditingFormItemDto { Order = 5, DataField = "FaxNumber", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, @@ -6371,7 +6369,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "FullName", - Width = 200, + Width = 150, ListOrderNo = 2, Visible = true, IsActive = true, @@ -6390,12 +6388,11 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Email", - Width = 200, + Width = 250, ListOrderNo = 3, Visible = true, IsActive = true, IsDeleted = false, - ValidationRuleJson = DefaultValidationRuleEmailJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.Lawyer), PivotSettingsJson = DefaultPivotSettingsJson @@ -6406,7 +6403,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "MobileNumber", - Width = 150, + Width = 100, ListOrderNo = 4, Visible = true, IsActive = true, @@ -6422,7 +6419,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "PhoneNumber", - Width = 150, + Width = 100, ListOrderNo = 5, Visible = true, IsActive = true, @@ -6438,7 +6435,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.Int64, FieldName = "FaxNumber", - Width = 150, + Width = 100, ListOrderNo = 6, Visible = true, IsActive = true, @@ -6500,7 +6497,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Description", - Width = 300, + Width = 250, ListOrderNo = 10, Visible = true, IsActive = true, @@ -6514,7 +6511,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Status", - Width = 120, + Width = 100, ListOrderNo = 11, Visible = true, IsActive = true, @@ -6532,7 +6529,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto{ C = AppCodes.Definitions.Lawyer + ".Create", R = AppCodes.Definitions.Lawyer, U = AppCodes.Definitions.Lawyer + ".Update", E = true, I = true, Deny = false }), PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto{ IsPivot = true }) - }, + }, }); #endregion } diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs index 2e776edf..66316f9f 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs @@ -2830,7 +2830,8 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Hr.Overtime), - PivotSettingsJson = DefaultPivotSettingsJson + PivotSettingsJson = DefaultPivotSettingsJson, + EditorOptions = EditorOptionValues.TimeSpanOptions }, new() { ListFormCode = listFormOvertime.ListFormCode, @@ -2846,7 +2847,8 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Hr.Overtime), - PivotSettingsJson = DefaultPivotSettingsJson + PivotSettingsJson = DefaultPivotSettingsJson, + EditorOptions = EditorOptionValues.TimeSpanOptions }, new() { ListFormCode = listFormOvertime.ListFormCode, diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Intranet.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Intranet.cs index 31027a63..18642ec5 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Intranet.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Intranet.cs @@ -1050,8 +1050,8 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc [ new EditingFormItemDto { Order = 1, DataField = "Name", IsRequired = true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 2, DataField = "Type", IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 3, DataField = "DepartureTime", IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions = EditorOptionValues.TimeSpanOptions }, - new EditingFormItemDto { Order = 4, DataField = "ArrivalTime", IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions = EditorOptionValues.TimeSpanOptions }, + new EditingFormItemDto { Order = 3, DataField = "DepartureTime", IsRequired = true, EditorType2 = EditorTypes.dxDateBox, EditorOptions = EditorOptionValues.TimeSpanOptions }, + new EditingFormItemDto { Order = 4, DataField = "ArrivalTime", IsRequired = true, EditorType2 = EditorTypes.dxDateBox, EditorOptions = EditorOptionValues.TimeSpanOptions }, new EditingFormItemDto { Order = 5, DataField = "Capacity", EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat }, new EditingFormItemDto { Order = 6, DataField = "Route", IsRequired = true, EditorType2 = EditorTypes.dxTagBox } ] @@ -1128,7 +1128,7 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc new() { ListFormCode = listFormShuttleRoute.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Date, FieldName = "DepartureTime", Width = 100, ListOrderNo = 4, @@ -1139,12 +1139,13 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Intranet.ShuttleRoute), - PivotSettingsJson = DefaultPivotSettingsJson + PivotSettingsJson = DefaultPivotSettingsJson, + EditorOptions = EditorOptionValues.TimeSpanOptions }, new() { ListFormCode = listFormShuttleRoute.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Date, FieldName = "ArrivalTime", Width = 100, ListOrderNo = 5, @@ -1155,7 +1156,8 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Intranet.ShuttleRoute), - PivotSettingsJson = DefaultPivotSettingsJson + PivotSettingsJson = DefaultPivotSettingsJson, + EditorOptions = EditorOptionValues.TimeSpanOptions }, new() { ListFormCode = listFormShuttleRoute.ListFormCode, diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs index 8bf710f3..d1e29832 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs @@ -1658,17 +1658,17 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency }), EditingFormJson = JsonSerializer.Serialize(new List() { new() { Order=1,ColCount=1,ColSpan=2,ItemType="group", Items= [ - new EditingFormItemDto { Order = 1, DataField = "MainGroupKey", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 2, DataField = "SubGroupKey", ColSpan = 2, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, + new EditingFormItemDto { Order = 1, DataField = "MainGroupKey", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, + new EditingFormItemDto { Order = 2, DataField = "SubGroupKey", ColSpan = 2, EditorType2=EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 3, DataField = "Code", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 4, DataField = "NameKey", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 5, DataField = "DescriptionKey", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, + new EditingFormItemDto { Order = 4, DataField = "NameKey", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, + new EditingFormItemDto { Order = 5, DataField = "DescriptionKey", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 6, DataField = "DefaultValue", ColSpan = 2, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 7, DataField = "IsVisibleToClients", ColSpan = 2, EditorType2=EditorTypes.dxCheckBox }, new EditingFormItemDto { Order = 8, DataField = "Providers", ColSpan = 2, EditorType2=EditorTypes.dxTagBox }, new EditingFormItemDto { Order = 9, DataField = "IsInherited", ColSpan = 2, EditorType2=EditorTypes.dxCheckBox }, new EditingFormItemDto { Order = 10, DataField = "IsEncrypted", ColSpan = 2, EditorType2=EditorTypes.dxCheckBox }, - new EditingFormItemDto { Order = 11, DataField = "RequiredPermissionName", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, + new EditingFormItemDto { Order = 11, DataField = "RequiredPermissionName", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 12, DataField = "DataType", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 13, DataField = "SelectOptions", ColSpan = 2, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 14, DataField = "Order", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxNumberBox }, @@ -2365,7 +2365,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency [ new EditingFormItemDto { Order = 1, DataField = "CultureName", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 2, DataField = "ResourceName", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 3, DataField = "Key", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, + new EditingFormItemDto { Order = 3, DataField = "Key", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 4, DataField = "Value", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox }, ] } @@ -2553,7 +2553,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency new EditingFormItemDto { Order = 2, DataField = "Path", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 3, DataField = "ComponentPath", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 4, DataField = "RouteType", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 5, DataField = "Authority", ColSpan = 2, EditorType2 = EditorTypes.dxSelectBox } + new EditingFormItemDto { Order = 5, DataField = "Authority", ColSpan = 2, EditorType2 = EditorTypes.dxAutocomplete } ] } }), @@ -2742,13 +2742,13 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency new() { Order=1,ColCount=1,ColSpan=2,ItemType="group", Items= [ new EditingFormItemDto { Order = 1, DataField = "Code", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "DisplayName", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, + new EditingFormItemDto { Order = 2, DataField = "DisplayName", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 3, DataField = "Order", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxNumberBox }, new EditingFormItemDto { Order = 4, DataField = "Url", ColSpan = 2, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 5, DataField = "Icon", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 6, DataField = "ParentCode", ColSpan = 2, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 7, DataField = "CssClass", ColSpan = 2, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 8, DataField = "RequiredPermissionName", ColSpan = 2, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, + new EditingFormItemDto { Order = 8, DataField = "RequiredPermissionName", ColSpan = 2, EditorType2=EditorTypes.dxAutocomplete, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 9, DataField = "Target", ColSpan = 2, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 10, DataField = "IsDisabled", ColSpan = 2, EditorType2=EditorTypes.dxCheckBox }, new EditingFormItemDto { Order = 11, DataField = "ElementId", ColSpan = 2, EditorType2=EditorTypes.dxTextBox }, diff --git a/api/src/Kurs.Platform.Domain.Shared/PlatformConsts.cs b/api/src/Kurs.Platform.Domain.Shared/PlatformConsts.cs index 90a45cac..3c8f4adc 100644 --- a/api/src/Kurs.Platform.Domain.Shared/PlatformConsts.cs +++ b/api/src/Kurs.Platform.Domain.Shared/PlatformConsts.cs @@ -23,11 +23,12 @@ public static class PlatformConsts public static string ShowClearButton = "{ \"showClearButton\" : true }"; public static string 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\"}]}}"; public static string PhoneEditorOptions = "{\"format\": \"phoneGlobal\", \"mask\":\"(000) 000-0000\", \"maskInvalidMessage\":\"Lütfen geçerli bir telefon numarası girin\", \"useMaskedValue\":false, \"maskRules\": { \"X\": \"[1-9]\" }, \"placeholder\": \"(555) 123-4567\" }"; - public static string TimeSpanOptions = "{\"type\":\"time\",\"pickerType\":\"list\",\"displayFormat\":\"HH:mm\",\"dateSerializationFormat\":\"yyyy-MM-ddTHH:mm:ss\",\"interval\":30,\"width\":\"100%\"}"; + public static string TimeSpanOptions = "{\"type\":\"time\",\"pickerType\":\"list\",\"displayFormat\":\"HH:mm\",\"dateSerializationFormat\":\"yyyy-MM-ddTHH:mm:ss\",\"interval\":5,\"width\":\"100%\"}"; public static string NumberStandartFormat = "{ \"format\": \"fixedPoint\", \"precision\": 2 }"; public static string NumberPercentFormat = "{ \"format\": \"#0.##'%'\" }"; public static string DateFormat = "{ \"format\": \"dd/MM/yyyy\", \"displayFormat\" : \"dd/MM/yyyy\" }"; public static string DateTimeFormat = "{ \"format\": \"dd/MM/yyyy HH:mm\", \"displayFormat\" : \"dd/MM/yyyy HH:mm\" }"; + public static string SliderOptions = "{\"tooltip\": { \"enabled\": true }}"; } public static class EditorScriptValues diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/WorkHour.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/WorkHour.cs index bb3bcb5a..c99b3742 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/WorkHour.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/WorkHour.cs @@ -9,8 +9,8 @@ public class WorkHour : FullAuditedEntity, IMultiTenant public Guid? TenantId { get; set; } public string Name { get; set; } - public string StartHour { get; set; } - public string EndHour { get; set; } + public DateTime StartHour { get; set; } + public DateTime EndHour { get; set; } public bool? Monday { get; set; } public bool? Tuesday { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/Intranet/ShuttleRoute.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Intranet/ShuttleRoute.cs index 48cbb7ca..0dfa91f5 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Intranet/ShuttleRoute.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Intranet/ShuttleRoute.cs @@ -11,8 +11,8 @@ public class ShuttleRoute : FullAuditedEntity, IMultiTenant public string Type { get; set; } public string Name { get; set; } - public string DepartureTime { get; set; } - public string ArrivalTime { get; set; } + public DateTime DepartureTime { get; set; } + public DateTime ArrivalTime { get; set; } public int Capacity { get; set; } public int Available { get; set; } public string Route { get; set; } diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251104124136_Initial.Designer.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251104135444_Initial.Designer.cs similarity index 99% rename from api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251104124136_Initial.Designer.cs rename to api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251104135444_Initial.Designer.cs index e5ba24e3..6cb60a31 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251104124136_Initial.Designer.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251104135444_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace Kurs.Platform.Migrations { [DbContext(typeof(PlatformDbContext))] - [Migration("20251104124136_Initial")] + [Migration("20251104135444_Initial")] partial class Initial { /// @@ -8441,9 +8441,9 @@ namespace Kurs.Platform.Migrations b.Property("Id") .HasColumnType("uniqueidentifier"); - b.Property("ArrivalTime") + b.Property("ArrivalTime") .HasMaxLength(10) - .HasColumnType("nvarchar(10)"); + .HasColumnType("datetime2"); b.Property("Available") .ValueGeneratedOnAdd() @@ -8471,9 +8471,9 @@ namespace Kurs.Platform.Migrations .HasColumnType("datetime2") .HasColumnName("DeletionTime"); - b.Property("DepartureTime") + b.Property("DepartureTime") .HasMaxLength(10) - .HasColumnType("nvarchar(10)"); + .HasColumnType("datetime2"); b.Property("IsDeleted") .ValueGeneratedOnAdd() @@ -10076,10 +10076,9 @@ namespace Kurs.Platform.Migrations .HasColumnType("datetime2") .HasColumnName("DeletionTime"); - b.Property("EndHour") - .IsRequired() + b.Property("EndHour") .HasMaxLength(8) - .HasColumnType("nvarchar(8)"); + .HasColumnType("datetime2"); b.Property("Friday") .HasColumnType("bit"); @@ -10109,10 +10108,9 @@ namespace Kurs.Platform.Migrations b.Property("Saturday") .HasColumnType("bit"); - b.Property("StartHour") - .IsRequired() + b.Property("StartHour") .HasMaxLength(8) - .HasColumnType("nvarchar(8)"); + .HasColumnType("datetime2"); b.Property("Sunday") .HasColumnType("bit"); diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251104124136_Initial.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251104135444_Initial.cs similarity index 99% rename from api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251104124136_Initial.cs rename to api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251104135444_Initial.cs index 867499aa..bb1532bc 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251104124136_Initial.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251104135444_Initial.cs @@ -936,8 +936,8 @@ namespace Kurs.Platform.Migrations Id = table.Column(type: "uniqueidentifier", nullable: false), TenantId = table.Column(type: "uniqueidentifier", nullable: true), Name = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: false), - StartHour = table.Column(type: "nvarchar(8)", maxLength: 8, nullable: false), - EndHour = table.Column(type: "nvarchar(8)", maxLength: 8, nullable: false), + StartHour = table.Column(type: "datetime2", maxLength: 8, nullable: false), + EndHour = table.Column(type: "datetime2", maxLength: 8, nullable: false), Monday = table.Column(type: "bit", nullable: true), Tuesday = table.Column(type: "bit", nullable: true), Wednesday = table.Column(type: "bit", nullable: true), @@ -1300,8 +1300,8 @@ namespace Kurs.Platform.Migrations TenantId = table.Column(type: "uniqueidentifier", nullable: true), Type = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), Name = table.Column(type: "nvarchar(150)", maxLength: 150, nullable: false), - DepartureTime = table.Column(type: "nvarchar(10)", maxLength: 10, nullable: true), - ArrivalTime = table.Column(type: "nvarchar(10)", maxLength: 10, nullable: true), + DepartureTime = table.Column(type: "datetime2", maxLength: 10, nullable: false), + ArrivalTime = table.Column(type: "datetime2", maxLength: 10, nullable: false), Capacity = table.Column(type: "int", nullable: false, defaultValue: 0), Available = table.Column(type: "int", nullable: false, defaultValue: 0), Route = table.Column(type: "nvarchar(max)", nullable: false), diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs index 9ad597da..9d8164d0 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs @@ -8438,9 +8438,9 @@ namespace Kurs.Platform.Migrations b.Property("Id") .HasColumnType("uniqueidentifier"); - b.Property("ArrivalTime") + b.Property("ArrivalTime") .HasMaxLength(10) - .HasColumnType("nvarchar(10)"); + .HasColumnType("datetime2"); b.Property("Available") .ValueGeneratedOnAdd() @@ -8468,9 +8468,9 @@ namespace Kurs.Platform.Migrations .HasColumnType("datetime2") .HasColumnName("DeletionTime"); - b.Property("DepartureTime") + b.Property("DepartureTime") .HasMaxLength(10) - .HasColumnType("nvarchar(10)"); + .HasColumnType("datetime2"); b.Property("IsDeleted") .ValueGeneratedOnAdd() @@ -10073,10 +10073,9 @@ namespace Kurs.Platform.Migrations .HasColumnType("datetime2") .HasColumnName("DeletionTime"); - b.Property("EndHour") - .IsRequired() + b.Property("EndHour") .HasMaxLength(8) - .HasColumnType("nvarchar(8)"); + .HasColumnType("datetime2"); b.Property("Friday") .HasColumnType("bit"); @@ -10106,10 +10105,9 @@ namespace Kurs.Platform.Migrations b.Property("Saturday") .HasColumnType("bit"); - b.Property("StartHour") - .IsRequired() + b.Property("StartHour") .HasMaxLength(8) - .HasColumnType("nvarchar(8)"); + .HasColumnType("datetime2"); b.Property("Sunday") .HasColumnType("bit"); diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/Seeds/TenantData.json b/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/Seeds/TenantData.json index 12ea4814..67051ef4 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/Seeds/TenantData.json +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/Seeds/TenantData.json @@ -2110,8 +2110,8 @@ "WorkHours": [ { "Name": "00:00-23:59", - "StartHour": "00:00:00", - "EndHour": "23:59:59", + "StartHour": "1970-01-01T00:00:00", + "EndHour": "1970-01-01T23:59:59", "IsFixed": false, "Monday": true, "Tuesday": true, @@ -3299,8 +3299,8 @@ { "employeeCode": "EMP-001", "date": "12-05-2024", - "startTime": "18:00", - "endTime": "21:00", + "startTime": "1970-01-01T18:00", + "endTime": "1970-01-01T21:00", "totalHours": 3, "reason": "Proje deadline'ı nedeniyle acil çalışma", "status": "Approved", @@ -3310,8 +3310,8 @@ { "employeeCode": "EMP-002", "date": "12-01-2024", - "startTime": "17:30", - "endTime": "20:00", + "startTime": "1970-01-01T17:30", + "endTime": "1970-01-01T20:00", "totalHours": 2.5, "reason": "Müşteri talep değişikliği nedeniyle ek çalışma", "status": "Pending", @@ -3321,8 +3321,8 @@ { "employeeCode": "EMP-003", "date": "12-01-2024", - "startTime": "19:00", - "endTime": "22:30", + "startTime": "1970-01-01T19:00", + "endTime": "1970-01-01T22:30", "totalHours": 3.5, "reason": "Sistem bakımı ve güncelleme çalışmaları", "status": "Approved", @@ -3332,8 +3332,8 @@ { "employeeCode": "EMP-004", "date": "12-12-2024", - "startTime": "17:00", - "endTime": "19:00", + "startTime": "1970-01-01T17:00", + "endTime": "1970-01-01T19:00", "totalHours": 2, "reason": "Rapor hazırlama ve sunum düzenleme", "status": "Rejected", @@ -3343,8 +3343,8 @@ { "employeeCode": "EMP-005", "date": "12-11-2024", - "startTime": "18:30", - "endTime": "21:00", + "startTime": "1970-01-01T18:30", + "endTime": "1970-01-01T21:00", "totalHours": 2.5, "reason": "Acil hata düzeltme ve test çalışmaları", "status": "Approved", @@ -3355,8 +3355,8 @@ { "employeeCode": "EMP-006", "date": "02-10-2024", - "startTime": "16:00", - "endTime": "20:00", + "startTime": "1970-01-01T16:00", + "endTime": "1970-01-01T20:00", "totalHours": 4, "reason": "Yeni müşteri onboarding süreci", "status": "Pending", @@ -3366,8 +3366,8 @@ { "employeeCode": "EMP-007", "date": "01-09-2024", - "startTime": "17:45", - "endTime": "21:15", + "startTime": "1970-01-01T17:45", + "endTime": "1970-01-01T21:15", "totalHours": 3.5, "reason": "Veri analizi ve raporlama çalışmaları", "status": "Approved", @@ -3378,8 +3378,8 @@ { "employeeCode": "EMP-008", "date": "09-08-2024", - "startTime": "18:00", - "endTime": "20:30", + "startTime": "1970-01-01T18:00", + "endTime": "1970-01-01T20:30", "totalHours": 2.5, "reason": "Eğitim materyali hazırlama", "status": "Pending", @@ -3389,8 +3389,8 @@ { "employeeCode": "EMP-009", "date": "01-07-2024", - "startTime": "19:30", - "endTime": "23:00", + "startTime": "1970-01-01T19:30", + "endTime": "1970-01-01T23:00", "totalHours": 3.5, "reason": "Kritik sistem güvenlik yaması uygulaması", "status": "Approved", @@ -3400,8 +3400,8 @@ { "employeeCode": "EMP-010", "date": "06-06-2024", - "startTime": "17:30", - "endTime": "20:00", + "startTime": "1970-01-01T17:30", + "endTime": "1970-01-01T20:00", "totalHours": 2.5, "reason": "Stratejik planlama toplantısı hazırlığı", "status": "Rejected", @@ -3661,8 +3661,8 @@ "Kozyatağı", "Ofis" ], - "departureTime": "07:30", - "arrivalTime": "08:45", + "departureTime": "1970-01-01T07:30", + "arrivalTime": "1970-01-01T08:45", "capacity": 25, "available": 3, "type": "morning" @@ -3676,8 +3676,8 @@ "Ümraniye", "Ofis" ], - "departureTime": "07:45", - "arrivalTime": "08:50", + "departureTime": "1970-01-01T07:45", + "arrivalTime": "1970-01-01T08:50", "capacity": 25, "available": 8, "type": "morning" @@ -3691,8 +3691,8 @@ "Bostancı", "Kadıköy İskele" ], - "departureTime": "18:00", - "arrivalTime": "19:15", + "departureTime": "1970-01-01T18:00", + "arrivalTime": "1970-01-01T19:15", "capacity": 25, "available": 5, "type": "evening" @@ -3706,8 +3706,8 @@ "Kısıklı", "Üsküdar Meydanı" ], - "departureTime": "18:15", - "arrivalTime": "19:20", + "departureTime": "1970-01-01T18:15", + "arrivalTime": "1970-01-01T19:20", "capacity": 25, "available": 12, "type": "evening" diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/TenantSeederDto.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/TenantSeederDto.cs index 28919a56..7f213f50 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/TenantSeederDto.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/TenantSeederDto.cs @@ -244,8 +244,8 @@ public class ShuttleRouteSeedDto { public string Name { get; set; } public List Route { get; set; } - public string DepartureTime { get; set; } - public string ArrivalTime { get; set; } + public DateTime DepartureTime { get; set; } + public DateTime ArrivalTime { get; set; } public int Capacity { get; set; } public int Available { get; set; } public string Type { get; set; } @@ -661,8 +661,8 @@ public class VaccineSeedDto public class WorkHourSeedDto { public string Name { get; set; } - public string StartHour { get; set; } - public string EndHour { get; set; } + public DateTime StartHour { get; set; } + public DateTime EndHour { get; set; } public bool? IsFixed { get; set; } public bool? Monday { get; set; } public bool? Tuesday { get; set; } diff --git a/ui/src/main.tsx b/ui/src/main.tsx index 98800b39..5fbf1a91 100644 --- a/ui/src/main.tsx +++ b/ui/src/main.tsx @@ -6,6 +6,7 @@ import { UiEvalService } from './services/UiEvalService' import 'devextreme-react/text-area' import 'devextreme-react/html-editor' import 'devextreme-react/autocomplete' +import 'devextreme-react/slider' // import config from 'devextreme/core/config' // import { licenseKey } from './devextreme-license' diff --git a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogEditForm.tsx b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogEditForm.tsx index fcd1af48..dd583bb9 100644 --- a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogEditForm.tsx +++ b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogEditForm.tsx @@ -311,6 +311,7 @@ function JsonRowOpDialogEditForm({ 
{`• {"showClearButton":true }`}
{`• {"format": "fixedPoint", "precision": 2}`}
{`• {"format": "phoneGlobal", "mask":"(000) 000-0000", "maskInvalidMessage":"Lütfen geçerli bir telefon numarası girin", "useMaskedValue":false, "maskRules": { "X": "[1-9]" }, "placeholder": "(555) 123-4567" }`}
+ 
{`• {"tooltip": { "enabled": true }}`}
{`• {"height":200}`}
                               {`• {