From 21284b652f456fa8adc62ef9b20da4c91a8aa560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sedat=20=C3=96ZT=C3=9CRK?= <76204082+iamsedatozturk@users.noreply.github.com> Date: Thu, 9 Oct 2025 12:44:28 +0300 Subject: [PATCH] =?UTF-8?q?format=20ve=20mask=20i=C5=9Flemleri=20i=C3=A7in?= =?UTF-8?q?=20g=C3=BCncellemeler?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Banks/BankDto.cs | 1 - .../DynamicApi/CreateUpdateTenantInput.cs | 8 +- .../Tenants/CustomTenantDto.cs | 8 +- .../Seeds/PlatformListFormsSeeder.cs | 429 ++++++++++-------- .../Entities/Tenant/Branch.cs | 6 +- .../Entities/Tenant/Public/Order.cs | 6 +- .../Extensions/AbpTenantExtensions.cs | 20 +- .../PlatformEfCoreEntityExtensionMappings.cs | 14 +- ....cs => 20251009092012_Initial.Designer.cs} | 39 +- ...9_Initial.cs => 20251009092012_Initial.cs} | 18 +- .../PlatformDbContextModelSnapshot.cs | 37 +- ui/src/shared/useListFormColumns.ts | 29 +- .../JsonRowOpDialogEditForm.tsx | 1 + ui/src/views/list/Grid.tsx | 39 +- 14 files changed, 375 insertions(+), 280 deletions(-) rename api/src/Kurs.Platform.EntityFrameworkCore/Migrations/{20251008192259_Initial.Designer.cs => 20251009092012_Initial.Designer.cs} (99%) rename api/src/Kurs.Platform.EntityFrameworkCore/Migrations/{20251008192259_Initial.cs => 20251009092012_Initial.cs} (99%) diff --git a/api/src/Kurs.Platform.Application.Contracts/Banks/BankDto.cs b/api/src/Kurs.Platform.Application.Contracts/Banks/BankDto.cs index 55b03e26..a073fa07 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Banks/BankDto.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Banks/BankDto.cs @@ -14,7 +14,6 @@ public class BankDto : AuditedEntityDto public string City { get; set; } public string PostalCode { get; set; } public string Country { get; set; } - public string Phone { get; set; } public string Email { get; set; } } \ No newline at end of file diff --git a/api/src/Kurs.Platform.Application.Contracts/ListForms/DynamicApi/CreateUpdateTenantInput.cs b/api/src/Kurs.Platform.Application.Contracts/ListForms/DynamicApi/CreateUpdateTenantInput.cs index c45ea23d..d96eb8c5 100644 --- a/api/src/Kurs.Platform.Application.Contracts/ListForms/DynamicApi/CreateUpdateTenantInput.cs +++ b/api/src/Kurs.Platform.Application.Contracts/ListForms/DynamicApi/CreateUpdateTenantInput.cs @@ -6,7 +6,7 @@ public class CreateUpdateTenantInput { public string Name { get; set; } public bool IsActive { get; set; } - + public Guid? Id { get; set; } public string AdminEmail { get; set; } public string AdminPassword { get; set; } @@ -22,9 +22,9 @@ public class CreateUpdateTenantInput public string Address { get; set; } public string Address2 { get; set; } public string PostalCode { get; set; } - public long Phone { get; set; } - public long Mobile { get; set; } - public long Fax { get; set; } + public string Phone { get; set; } + public string Mobile { get; set; } + public string Fax { get; set; } public string Email { get; set; } public string Website { get; set; } } diff --git a/api/src/Kurs.Platform.Application.Contracts/Tenants/CustomTenantDto.cs b/api/src/Kurs.Platform.Application.Contracts/Tenants/CustomTenantDto.cs index 259a2a89..2ed95c2f 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Tenants/CustomTenantDto.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Tenants/CustomTenantDto.cs @@ -6,7 +6,7 @@ public class CustomTenantDto { public string Name { get; set; } public bool IsActive { get; set; } - + public Guid? Id { get; set; } public string OrganizationName { get; set; } public string Founder { get; set; } @@ -19,9 +19,9 @@ public class CustomTenantDto public string Address { get; set; } public string Address2 { get; set; } public string PostalCode { get; set; } - public long Phone { get; set; } - public long Mobile { get; set; } - public long Fax { get; set; } + public string Phone { get; set; } + public string Mobile { get; set; } + public string Fax { get; set; } public string Email { get; set; } public string Website { get; set; } } diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/PlatformListFormsSeeder.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/PlatformListFormsSeeder.cs index 91a3538d..c93061be 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/PlatformListFormsSeeder.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/PlatformListFormsSeeder.cs @@ -169,8 +169,9 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc $"FROM \"{SelectCommandByTableName("InstallmentOption", Prefix.DbTableWeb)}\" " + $"ORDER BY \"{SelectCommandByTableName("InstallmentOption", Prefix.DbTableWeb)}\".\"Installment\";"; - 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 }"; + 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 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\" }"; #region Form @@ -886,8 +887,9 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc new EditingFormItemDto { Order = 8, DataField = "City", ColSpan = 1, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order = 9, DataField = "District", ColSpan = 1, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order = 10, DataField = "PostalCode", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 11, DataField = "Phone", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 12, DataField = "Email", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, ] + new EditingFormItemDto { Order = 11, DataField = "Phone", ColSpan = 1, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions }, + new EditingFormItemDto { Order = 12, DataField = "Email", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, + ] } }), InsertFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -1273,6 +1275,10 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc IsActive = true, IsDeleted = false, AllowSearch = true, + ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[] + { + new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.email) } + }), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { C = AppCodes.Definitions.Bank + ".Create", @@ -1407,9 +1413,9 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc new EditingFormItemDto { Order=3, DataField="Founder", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=4, DataField="VknTckn", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxNumberBox }, new EditingFormItemDto { Order=5, DataField="TaxOffice", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=6, DataField="Mobile", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order=7, DataField="Phone", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order=8, DataField="Fax", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, + new EditingFormItemDto { Order=6, DataField="Mobile", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions }, + new EditingFormItemDto { Order=7, DataField="Phone", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions }, + new EditingFormItemDto { Order=8, DataField="Fax", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions }, new EditingFormItemDto { Order=9, DataField="IsActive", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxCheckBox }, ] }, @@ -1417,8 +1423,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc [ new EditingFormItemDto { Order=1, DataField="Country", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order=2, DataField="City", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, - new EditingFormItemDto { Order=3, DataField="District", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, - new EditingFormItemDto { Order=4, DataField="Street", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, + new EditingFormItemDto { Order=3, DataField="District", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, + new EditingFormItemDto { Order=4, DataField="Street", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order=5, DataField="PostalCode", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order=6, DataField="Address", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=7, DataField="Address2", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, @@ -1880,6 +1886,10 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc IsActive = true, IsDeleted = false, AllowSearch = true, + ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[] + { + new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.email) } + }), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { C = TenantManagementPermissions.Tenants.Create, @@ -2100,9 +2110,9 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, - ColumnResizingMode = "widget", + AllowColumnResizing = true, + AllowColumnReordering = true, + ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto { @@ -2148,9 +2158,9 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc new EditingFormItemDto { Order=3, DataField="Founder", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=4, DataField="VknTckn", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxNumberBox }, new EditingFormItemDto { Order=5, DataField="TaxOffice", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=6, DataField="Mobile", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order=7, DataField="Phone", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order=8, DataField="Fax", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, + new EditingFormItemDto { Order=6, DataField="Mobile", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions }, + new EditingFormItemDto { Order=7, DataField="Phone", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions }, + new EditingFormItemDto { Order=8, DataField="Fax", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions }, new EditingFormItemDto { Order=9, DataField="IsActive", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxCheckBox }, ] }, @@ -2158,8 +2168,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc [ new EditingFormItemDto { Order=1, DataField="Country", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order=2, DataField="City", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, - new EditingFormItemDto { Order=3, DataField="District", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, - new EditingFormItemDto { Order=4, DataField="Street", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, + new EditingFormItemDto { Order=3, DataField="District", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, + new EditingFormItemDto { Order=4, DataField="Street", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order=5, DataField="PostalCode", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order=6, DataField="Address", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=7, DataField="Address2", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, @@ -2627,6 +2637,10 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc IsActive = true, IsDeleted = false, AllowSearch = true, + ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[] + { + new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.email) } + }), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { C = TenantManagementPermissions.Tenants.Create, @@ -2844,7 +2858,7 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, + AllowColumnResizing = true, AllowColumnReordering = true, ColumnResizingMode = "widget", }), @@ -2892,9 +2906,9 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc new EditingFormItemDto { Order=3, DataField="Name", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=4, DataField="VknTckn", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxNumberBox }, new EditingFormItemDto { Order=5, DataField="TaxOffice", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=6, DataField="Mobile", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order=7, DataField="Phone", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order=8, DataField="Fax", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, + new EditingFormItemDto { Order=6, DataField="Mobile", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions }, + new EditingFormItemDto { Order=7, DataField="Phone", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions }, + new EditingFormItemDto { Order=8, DataField="Fax", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions }, new EditingFormItemDto { Order=9, DataField="IsActive", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxCheckBox }, ] }, @@ -2902,8 +2916,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc [ new EditingFormItemDto { Order=1, DataField="Country", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order=2, DataField="City", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, - new EditingFormItemDto { Order=3, DataField="District", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, - new EditingFormItemDto { Order=4, DataField="Street", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, + new EditingFormItemDto { Order=3, DataField="District", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, + new EditingFormItemDto { Order=4, DataField="Street", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order=5, DataField="Address", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=6, DataField="Address2", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=7, DataField="PostalCode", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, @@ -3376,6 +3390,10 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc IsActive = true, IsDeleted = false, AllowSearch = true, + ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[] + { + new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.email) } + }), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { C = AppCodes.Branches + ".Create", @@ -3591,8 +3609,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -3820,11 +3838,11 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnOptionJson = JsonSerializer.Serialize(new { ColumnFixingEnabled = true, - ColumnAutoWidth = true, + ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, - ColumnResizingMode = "widget", + AllowColumnResizing = true, + AllowColumnReordering = true, + ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto { @@ -4177,11 +4195,11 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnOptionJson = JsonSerializer.Serialize(new { ColumnFixingEnabled = true, - ColumnAutoWidth = true, + ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, - ColumnResizingMode = "widget", + AllowColumnResizing = true, + AllowColumnReordering = true, + ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto { @@ -4402,11 +4420,11 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnOptionJson = JsonSerializer.Serialize(new { ColumnFixingEnabled = true, - ColumnAutoWidth = true, + ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, - ColumnResizingMode = "widget", + AllowColumnResizing = true, + AllowColumnReordering = true, + ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto { @@ -4530,8 +4548,10 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc IsActive = true, IsDeleted = false, AllowSearch = true, - ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[] { - new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.required)} + ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[] + { + new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.email) }, + new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.required) } }), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { @@ -4754,8 +4774,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -5118,8 +5138,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -5444,11 +5464,11 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnOptionJson = JsonSerializer.Serialize(new { ColumnFixingEnabled = true, - ColumnAutoWidth = true, + ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, - ColumnResizingMode = "widget", + AllowColumnResizing = true, + AllowColumnReordering = true, + ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto { @@ -5975,8 +5995,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), DeleteCommand = $"UPDATE \"{Prefix.DbTableDefault}ListForm\" SET \"DeleterId\"=@DeleterId, \"DeletionTime\"=CURRENT_TIMESTAMP, \"IsDeleted\"='true' WHERE \"Id\"=@Id", @@ -6870,8 +6890,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -7558,8 +7578,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -7829,8 +7849,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), CommandColumnJson = JsonSerializer.Serialize(new CommandColumnDto[] { @@ -8246,8 +8266,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -8679,8 +8699,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -9037,8 +9057,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -9310,8 +9330,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), CommandColumnJson = JsonSerializer.Serialize(new CommandColumnDto[] { @@ -9728,8 +9748,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -10020,8 +10040,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -10367,8 +10387,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -10749,8 +10769,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -11055,8 +11075,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -11296,8 +11316,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -11540,8 +11560,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -11861,8 +11881,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -12225,8 +12245,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -12451,8 +12471,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -12678,8 +12698,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -12737,27 +12757,25 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc }), EditingFormJson = JsonSerializer.Serialize(new List { - new() - { - Order = 1, - ColCount = 2, - ColSpan = 2, - ItemType = "group", - Items = + new() { Order=1, ColCount=1, ColSpan=1, ItemType="group", Items = [ new EditingFormItemDto { Order = 1, DataField = "OrganizationName", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 2, DataField = "Founder", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 3, DataField = "VknTckn", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, new EditingFormItemDto { Order = 4, DataField = "TaxOffice", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 5, DataField = "Address", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 6, DataField = "Address2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 7, DataField = "Country", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order = 8, DataField = "City", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order = 9, DataField = "District", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=showClearButton }, - new EditingFormItemDto { Order = 5, DataField = "Address", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 6, DataField = "Address2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 10, DataField = "PostalCode", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 11, DataField = "Phone", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 12, DataField = "Mobile", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 13, DataField = "Fax", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, + ] + }, + new() { Order=2, ColCount=1, ColSpan=1, ItemType="group", Items = + [ + new EditingFormItemDto { Order = 11, DataField = "Phone", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions }, + new EditingFormItemDto { Order = 12, DataField = "Mobile", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions }, + new EditingFormItemDto { Order = 13, DataField = "Fax", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions }, new EditingFormItemDto { Order = 14, DataField = "Email", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 15, DataField = "Website", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 16, DataField = "Subtotal", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, @@ -13060,7 +13078,7 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc { ListFormCode = listFormPurchaseOrder.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.Int64, + SourceDbType = DbType.String, FieldName = "Phone", Width = 100, ListOrderNo = 11, @@ -13319,8 +13337,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -13657,8 +13675,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -14168,8 +14186,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -14220,7 +14238,7 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc new EditingFormItemDto { Order = 1, DataField = "OrganizationName", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 2, DataField = "FullName", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 3, DataField = "Email", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 4, DataField = "Phone", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 4, DataField = "Phone", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions }, new EditingFormItemDto { Order = 5, DataField = "Address", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextArea }, new EditingFormItemDto { Order = 6, DataField = "NumberOfBranches", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, new EditingFormItemDto { Order = 7, DataField = "NumberOfUsers", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, @@ -14352,6 +14370,10 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc IsActive = true, IsDeleted = false, AllowSearch = true, + ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[] + { + new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.email) }, + }), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { C = AppCodes.Demos + ".Create", @@ -14524,8 +14546,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -14574,7 +14596,7 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc Items = [ new EditingFormItemDto { Order = 1, DataField = "Address", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, - new EditingFormItemDto { Order = 2, DataField = "Phone", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 2, DataField = "Phone", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox, EditorOptions=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 }, new EditingFormItemDto { Order = 5, DataField = "TaxNumber", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox }, @@ -14714,9 +14736,10 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc IsActive = true, IsDeleted = false, AllowSearch = true, - ValidationRuleJson = JsonSerializer.Serialize(new[] + ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[] { - new ValidationRuleDto { Type = "required" } + new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.required) }, + new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.email) }, }), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { @@ -14910,8 +14933,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -15144,8 +15167,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -15378,8 +15401,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -15703,8 +15726,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -15900,8 +15923,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -16261,8 +16284,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -16547,8 +16570,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -16899,8 +16922,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -17099,8 +17122,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -17317,8 +17340,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -17629,8 +17652,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -17863,8 +17886,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -18081,8 +18104,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -18422,8 +18445,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -18616,8 +18639,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -18809,8 +18832,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -19002,8 +19025,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -19223,8 +19246,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -19416,8 +19439,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -19609,8 +19632,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -19935,8 +19958,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -20159,8 +20182,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -20383,8 +20406,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -20623,8 +20646,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -20863,8 +20886,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -21104,8 +21127,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -21344,8 +21367,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -21538,8 +21561,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -21732,8 +21755,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -21972,8 +21995,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -22439,8 +22462,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -22914,8 +22937,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -22982,7 +23005,7 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc Items = [ new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "Phone", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 2, DataField = "Phone", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox, EditorOptions=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 }, @@ -23120,6 +23143,10 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc Visible = true, IsActive = true, IsDeleted = false, + ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[] + { + new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.email) } + }), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { C = AppCodes.Definitions.Psychologist + ".Create", @@ -23237,8 +23264,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -23428,6 +23455,10 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc Visible = true, IsActive = true, IsDeleted = false, + ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[] + { + new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.email) } + }), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { C = AppCodes.Definitions.Lawyer + ".Create", @@ -23750,8 +23781,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -24006,8 +24037,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -24295,8 +24326,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -24633,8 +24664,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -24922,8 +24953,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -25320,8 +25351,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -25707,8 +25738,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -26393,8 +26424,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -26722,8 +26753,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto @@ -26786,7 +26817,7 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc new EditingFormItemDto { Order = 8, DataField = "City", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order = 9, DataField = "District", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=showClearButton }, new EditingFormItemDto { Order = 10, DataField = "PostalCode", ColSpan = 2, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 11, DataField = "Phone", ColSpan = 2, EditorType2=EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 11, DataField = "Phone", ColSpan = 2, EditorType2=EditorTypes.dxTextBox, EditorOptions=phoneEditorOptions }, new EditingFormItemDto { Order = 12, DataField = "Email", ColSpan = 2, EditorType2=EditorTypes.dxTextBox }, ] } @@ -27184,6 +27215,10 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc IsActive = true, IsDeleted = false, AllowSearch = true, + ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[] + { + new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.email) } + }), PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto { C = AppCodes.Definitions.Bank + ".Create", @@ -27261,8 +27296,8 @@ public class PlatformListFormsSeeder : IDataSeedContributor, ITransientDependenc ColumnFixingEnabled = true, ColumnAutoWidth = true, ColumnChooserEnabled = true, - AllowColumnResizing = true, - AllowColumnReordering = true, + AllowColumnResizing = true, + AllowColumnReordering = true, ColumnResizingMode = "widget", }), PermissionJson = JsonSerializer.Serialize(new PermissionCrudDto diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/Branch.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Branch.cs index 697b9dc3..9e1c12e2 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Branch.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Branch.cs @@ -19,9 +19,9 @@ public class Branch : FullAuditedEntity public string Address { get; set; } public string Address2 { get; set; } public string PostalCode { get; set; } - public long? Phone { get; set; } - public long Mobile { get; set; } - public long? Fax { get; set; } + public string Phone { get; set; } + public string Mobile { get; set; } + public string Fax { get; set; } public string Email { get; set; } public string Website { get; set; } public bool? IsActive { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/Public/Order.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Public/Order.cs index 6c2a7ca0..a38ed767 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Public/Order.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Public/Order.cs @@ -19,9 +19,9 @@ public class Order : FullAuditedEntity, IMultiTenant public string Country { get; set; } public string City { get; set; } public string PostalCode { get; set; } - public long Phone { get; set; } - public long Mobile { get; set; } - public long Fax { get; set; } + public string Phone { get; set; } + public string Mobile { get; set; } + public string Fax { get; set; } public string Email { get; set; } public string Website { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Extensions/AbpTenantExtensions.cs b/api/src/Kurs.Platform.Domain/Extensions/AbpTenantExtensions.cs index d8bcb6c7..8f6da7ad 100644 --- a/api/src/Kurs.Platform.Domain/Extensions/AbpTenantExtensions.cs +++ b/api/src/Kurs.Platform.Domain/Extensions/AbpTenantExtensions.cs @@ -103,7 +103,7 @@ public static class AbpTenantExtensions { return tenant.GetProperty(PlatformConsts.Tenants.Address2); } - public static void SetPostalCode(this Tenant tenant, string postalCode) + public static void SetPostalCode(this Tenant tenant, string postalCode) { tenant.SetProperty(PlatformConsts.Tenants.PostalCode, postalCode); } @@ -112,31 +112,31 @@ public static class AbpTenantExtensions return tenant.GetProperty(PlatformConsts.Tenants.PostalCode); } - public static void SetPhone(this Tenant tenant, long phone) + public static void SetPhone(this Tenant tenant, string phone) { tenant.SetProperty(PlatformConsts.Tenants.Phone, phone); } - public static long GetPhone(this Tenant tenant) + public static string GetPhone(this Tenant tenant) { - return tenant.GetProperty(PlatformConsts.Tenants.Phone); + return tenant.GetProperty(PlatformConsts.Tenants.Phone); } - public static void SetMobile(this Tenant tenant, long mobile) + public static void SetMobile(this Tenant tenant, string mobile) { tenant.SetProperty(PlatformConsts.Tenants.Mobile, mobile); } - public static long GetMobile(this Tenant tenant) + public static string GetMobile(this Tenant tenant) { - return tenant.GetProperty(PlatformConsts.Tenants.Mobile); + return tenant.GetProperty(PlatformConsts.Tenants.Mobile); } - public static void SetFax(this Tenant tenant, long fax) + public static void SetFax(this Tenant tenant, string fax) { tenant.SetProperty(PlatformConsts.Tenants.Fax, fax); } - public static long GetFax(this Tenant tenant) + public static string GetFax(this Tenant tenant) { - return tenant.GetProperty(PlatformConsts.Tenants.Fax); + return tenant.GetProperty(PlatformConsts.Tenants.Fax); } public static void SetEmail(this Tenant tenant, string email) diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEfCoreEntityExtensionMappings.cs b/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEfCoreEntityExtensionMappings.cs index 6a4a464f..f0888029 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEfCoreEntityExtensionMappings.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEfCoreEntityExtensionMappings.cs @@ -126,7 +126,7 @@ public static class PlatformEfCoreEntityExtensionMappings propertyBuilder.HasMaxLength(128).HasDefaultValue(null); } ); - + ObjectExtensionManager.Instance .MapEfCoreProperty( PlatformConsts.Tenants.Address, @@ -155,29 +155,29 @@ public static class PlatformEfCoreEntityExtensionMappings ); ObjectExtensionManager.Instance - .MapEfCoreProperty( + .MapEfCoreProperty( PlatformConsts.Tenants.Phone, (entityBuilder, propertyBuilder) => { - propertyBuilder.HasDefaultValue(null); + propertyBuilder.HasMaxLength(20).HasDefaultValue(null); } ); ObjectExtensionManager.Instance - .MapEfCoreProperty( + .MapEfCoreProperty( PlatformConsts.Tenants.Mobile, (entityBuilder, propertyBuilder) => { - propertyBuilder.HasDefaultValue(null); + propertyBuilder.HasMaxLength(20).HasDefaultValue(null); } ); ObjectExtensionManager.Instance - .MapEfCoreProperty( + .MapEfCoreProperty( PlatformConsts.Tenants.Fax, (entityBuilder, propertyBuilder) => { - propertyBuilder.HasDefaultValue(null); + propertyBuilder.HasMaxLength(20).HasDefaultValue(null); } ); diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251008192259_Initial.Designer.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251009092012_Initial.Designer.cs similarity index 99% rename from api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251008192259_Initial.Designer.cs rename to api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251009092012_Initial.Designer.cs index 0c206c3c..77bd329b 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251008192259_Initial.Designer.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251009092012_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace Kurs.Platform.Migrations { [DbContext(typeof(PlatformDbContext))] - [Migration("20251008192259_Initial")] + [Migration("20251009092012_Initial")] partial class Initial { /// @@ -1288,9 +1288,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("Fax") + b.Property("Fax") .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); b.Property("IsActive") .ValueGeneratedOnAdd() @@ -1311,18 +1311,19 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("Mobile") + b.Property("Mobile") + .IsRequired() .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); b.Property("Name") .IsRequired() .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("Phone") + b.Property("Phone") .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); b.Property("PostalCode") .HasMaxLength(16) @@ -4621,8 +4622,8 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("Fax") - .HasColumnType("bigint"); + b.Property("Fax") + .HasColumnType("nvarchar(max)"); b.Property("Founder") .HasMaxLength(128) @@ -4645,8 +4646,8 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("Mobile") - .HasColumnType("bigint"); + b.Property("Mobile") + .HasColumnType("nvarchar(max)"); b.Property("OrganizationName") .HasMaxLength(128) @@ -4659,8 +4660,8 @@ namespace Kurs.Platform.Migrations b.Property("PaymentMethodId") .HasColumnType("uniqueidentifier"); - b.Property("Phone") - .HasColumnType("bigint"); + b.Property("Phone") + .HasColumnType("nvarchar(max)"); b.Property("PostalCode") .HasMaxLength(16) @@ -8434,8 +8435,8 @@ namespace Kurs.Platform.Migrations .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); - b.Property("Fax") - .HasColumnType("bigint"); + b.Property("Fax") + .HasColumnType("nvarchar(max)"); b.Property("Founder") .HasColumnType("nvarchar(max)"); @@ -8459,8 +8460,8 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("Mobile") - .HasColumnType("bigint"); + b.Property("Mobile") + .HasColumnType("nvarchar(max)"); b.Property("Name") .IsRequired() @@ -8476,8 +8477,8 @@ namespace Kurs.Platform.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("Phone") - .HasColumnType("bigint"); + b.Property("Phone") + .HasColumnType("nvarchar(max)"); b.Property("PostalCode") .HasMaxLength(10) diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251008192259_Initial.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251009092012_Initial.cs similarity index 99% rename from api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251008192259_Initial.cs rename to api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251009092012_Initial.cs index 288c93a0..cff89675 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251008192259_Initial.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251009092012_Initial.cs @@ -346,12 +346,12 @@ namespace Kurs.Platform.Migrations Country = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), District = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), Email = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true), - Fax = table.Column(type: "bigint", nullable: false), + Fax = table.Column(type: "nvarchar(max)", nullable: true), Founder = table.Column(type: "nvarchar(max)", nullable: true), IsActive = table.Column(type: "bit", nullable: false, defaultValue: true), - Mobile = table.Column(type: "bigint", nullable: false), + Mobile = table.Column(type: "nvarchar(max)", nullable: true), OrganizationName = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), - Phone = table.Column(type: "bigint", nullable: false), + Phone = table.Column(type: "nvarchar(max)", nullable: true), PostalCode = table.Column(type: "nvarchar(10)", maxLength: 10, nullable: true), Street = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), TaxOffice = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), @@ -1284,9 +1284,9 @@ namespace Kurs.Platform.Migrations Address = table.Column(type: "nvarchar(512)", maxLength: 512, nullable: true), Address2 = table.Column(type: "nvarchar(512)", maxLength: 512, nullable: true), PostalCode = table.Column(type: "nvarchar(16)", maxLength: 16, nullable: true), - Phone = table.Column(type: "bigint", maxLength: 20, nullable: true), - Mobile = table.Column(type: "bigint", maxLength: 20, nullable: false), - Fax = table.Column(type: "bigint", maxLength: 20, nullable: true), + Phone = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), + Mobile = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: false), + Fax = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), Email = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), Website = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), IsActive = table.Column(type: "bit", nullable: true, defaultValue: true), @@ -1925,9 +1925,9 @@ namespace Kurs.Platform.Migrations Country = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), City = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), PostalCode = table.Column(type: "nvarchar(16)", maxLength: 16, nullable: true), - Phone = table.Column(type: "bigint", nullable: false), - Mobile = table.Column(type: "bigint", nullable: false), - Fax = table.Column(type: "bigint", nullable: false), + Phone = table.Column(type: "nvarchar(max)", nullable: true), + Mobile = table.Column(type: "nvarchar(max)", nullable: true), + Fax = table.Column(type: "nvarchar(max)", nullable: true), Email = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), Website = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), Subtotal = table.Column(type: "decimal(18,2)", precision: 18, scale: 2, nullable: false), diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs index 11558f75..9c429bf7 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs @@ -1285,9 +1285,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("Fax") + b.Property("Fax") .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); b.Property("IsActive") .ValueGeneratedOnAdd() @@ -1308,18 +1308,19 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("Mobile") + b.Property("Mobile") + .IsRequired() .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); b.Property("Name") .IsRequired() .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("Phone") + b.Property("Phone") .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); b.Property("PostalCode") .HasMaxLength(16) @@ -4618,8 +4619,8 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("Fax") - .HasColumnType("bigint"); + b.Property("Fax") + .HasColumnType("nvarchar(max)"); b.Property("Founder") .HasMaxLength(128) @@ -4642,8 +4643,8 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("Mobile") - .HasColumnType("bigint"); + b.Property("Mobile") + .HasColumnType("nvarchar(max)"); b.Property("OrganizationName") .HasMaxLength(128) @@ -4656,8 +4657,8 @@ namespace Kurs.Platform.Migrations b.Property("PaymentMethodId") .HasColumnType("uniqueidentifier"); - b.Property("Phone") - .HasColumnType("bigint"); + b.Property("Phone") + .HasColumnType("nvarchar(max)"); b.Property("PostalCode") .HasMaxLength(16) @@ -8431,8 +8432,8 @@ namespace Kurs.Platform.Migrations .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); - b.Property("Fax") - .HasColumnType("bigint"); + b.Property("Fax") + .HasColumnType("nvarchar(max)"); b.Property("Founder") .HasColumnType("nvarchar(max)"); @@ -8456,8 +8457,8 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("Mobile") - .HasColumnType("bigint"); + b.Property("Mobile") + .HasColumnType("nvarchar(max)"); b.Property("Name") .IsRequired() @@ -8473,8 +8474,8 @@ namespace Kurs.Platform.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("Phone") - .HasColumnType("bigint"); + b.Property("Phone") + .HasColumnType("nvarchar(max)"); b.Property("PostalCode") .HasMaxLength(10) diff --git a/ui/src/shared/useListFormColumns.ts b/ui/src/shared/useListFormColumns.ts index 43d60c29..c73f44d8 100644 --- a/ui/src/shared/useListFormColumns.ts +++ b/ui/src/shared/useListFormColumns.ts @@ -17,7 +17,6 @@ import { UiCommandButtonPositionTypeEnum, UiLookupDataSourceTypeEnum, } from '../proxy/form/models' -import { css } from 'react-select/dist/declarations/src/components/Control' const cellTemplateMultiValue = ( cellElement: HTMLElement, @@ -376,7 +375,33 @@ const useListFormColumns = ({ column.alignment = colData.alignment column.format = colData.format - column.editorOptions = { ...(colData.editorOptions as IFormatProps) } + + // editorOptions + if (!colData.editorOptions) { + const allFormItems = gridDto.gridOptions.editingFormDto.flatMap((g) => g.items) + const formItem = allFormItems.find((f) => f?.dataField === colData.fieldName) + if (formItem?.editorOptions) { + colData.editorOptions = formItem.editorOptions + } + } + + if (colData.editorOptions) { + try { + column.editorOptions = + typeof colData.editorOptions === 'string' + ? JSON.parse(colData.editorOptions) + : colData.editorOptions + } catch (err) { + // Eğer JSON değilse, eval fallback + try { + // Örneğin { format: 'phoneGlobal', mask: '+90 (000)...' } gibi string geldiğinde + column.editorOptions = eval('(' + colData.editorOptions + ')') + } catch (e2) { + console.warn('Invalid editorOptions for', colData.fieldName, colData.editorOptions) + column.editorOptions = undefined + } + } + } // columnCustomizationDto column.fixed = colData.columnCustomizationDto?.fixed 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 3463a71d..dfccc008 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 @@ -306,6 +306,7 @@ function JsonRowOpDialogEditForm({
● Editor Options
{`• {"showClearButton":true }`}
+ 
{`• {"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" }`}
{`• {"height":200}`}
                               {`• {
diff --git a/ui/src/views/list/Grid.tsx b/ui/src/views/list/Grid.tsx
index 17fdefbf..5d302e8f 100644
--- a/ui/src/views/list/Grid.tsx
+++ b/ui/src/views/list/Grid.tsx
@@ -458,6 +458,42 @@ const Grid = (props: GridProps) => {
     const cols = getBandedColumns()
     setColumnData(cols)
 
+    cols?.forEach((col) => {
+      const eo = col.editorOptions
+
+      // Sadece phoneGlobal formatlı kolonlarda çalış
+      if (eo?.format === 'phoneGlobal') {
+        // DevExtreme bazen string tipinde formatter'ı çağırmaz
+        // Bu yüzden her durumda çalışması için customizeText ekleyeceğiz
+        col.dataType = 'string'
+
+        const formatter = (value: any) => {
+          if (!value) return ''
+
+          // string'e dönüştür ve sadece rakamları al
+          let digits = String(value).replace(/\D/g, '')
+
+          // +90, 0090, 0 gibi ülke kodu veya ön ekleri atla
+          if (digits.startsWith('90') && digits.length > 10) digits = digits.slice(-10)
+          if (digits.startsWith('0') && digits.length > 10) digits = digits.slice(-10)
+          if (digits.length > 10) digits = digits.slice(-10)
+
+          // 🔒 Eğer 10 haneli değilse geçersiz → boş göster
+          if (digits.length !== 10) return ''
+
+          // (XXX) XXX-XXXX formatında göster
+          const match = digits.match(/^(\d{3})(\d{3})(\d{4})$/)
+          return match ? `(${match[1]}) ${match[2]}-${match[3]}` : digits
+        }
+
+        // 1️⃣ Normal format nesnesi
+        col.format = { formatter }
+
+        // 2️⃣ CustomizeText fallback — bazı durumlarda zorunlu
+        col.customizeText = (cellInfo: any) => formatter(cellInfo?.value)
+      }
+    })
+
     const dataSource = createSelectDataSource(gridDto.gridOptions, listFormCode, searchParams, cols)
     setGridDataSource(dataSource)
   }, [gridDto, searchParams])
@@ -784,9 +820,6 @@ const Grid = (props: GridProps) => {
                           .find((i) => i.dataField === e.dataField)
                         if (formItem?.script) {
                           try {
-                            //setFormData({...formData, Path: e.value});
-                            //UiEvalService.ApiGenerateBackgroundWorkers();
-                            //setFormData({ ...formData, Path: (v => v === '1' ? '1-deneme' : v === '0' ? '0-deneme' : '')(e.value) })
                             eval(formItem.script)
                           } catch (err) {
                             console.error('Script exec error', err)