From 18327a4d21e7754b46895cf905226e24481540ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sedat=20=C3=96ZT=C3=9CRK?= <76204082+iamsedatozturk@users.noreply.github.com> Date: Tue, 11 Nov 2025 14:50:54 +0300 Subject: [PATCH] =?UTF-8?q?PhoneNumber=20string=20olarak=20de=C4=9Fi=C5=9F?= =?UTF-8?q?tirildi.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Banks/BankDto.cs | 2 +- .../Intranet/EmployeeDto.cs | 4 +- .../Intranet/VisitorDto.cs | 2 +- .../DynamicApi/CreateUpdateTenantInput.cs | 6 +- .../Public/ContactDto.cs | 2 +- .../Public/DemoDto.cs | 2 +- .../Tenants/CustomTenantDto.cs | 6 +- .../Seeds/ListFormSeeder_Hr.cs | 157 ++++++++++-------- .../Seeds/ListFormSeeder_Saas.cs | 6 +- .../PlatformConsts.cs | 2 +- .../Entities/Branch/Accounting/Bank.cs | 2 +- .../Entities/Tenant/Administration/Contact.cs | 2 +- .../Entities/Tenant/Administration/Demo.cs | 2 +- .../Entities/Tenant/Administration/Lawyer.cs | 6 +- .../Entities/Tenant/Administration/Order.cs | 6 +- .../Tenant/Administration/Psychologist.cs | 2 +- .../Entities/Tenant/Hr/Employee.cs | 4 +- .../Entities/Tenant/Intranet/Visitor.cs | 2 +- .../Entities/Tenant/Saas/Branch.cs | 6 +- .../Entities/Tenant/SupplyChain/Partner.cs | 6 +- .../Tenant/SupplyChain/PartnerContact.cs | 4 +- .../Extensions/AbpTenantExtensions.cs | 24 +-- .../EntityFrameworkCore/PlatformDbContext.cs | 21 ++- .../PlatformEfCoreEntityExtensionMappings.cs | 12 +- ....cs => 20251111112247_Initial.Designer.cs} | 125 +++++++------- ...5_Initial.cs => 20251111112247_Initial.cs} | 48 +++--- .../PlatformDbContextModelSnapshot.cs | 123 +++++++------- .../Tenants/TenantSeederDto.cs | 8 +- ui/src/mocks/mockBusinessParties.ts | 24 +-- ui/src/mocks/mockEmployees.ts | 46 ++--- ui/src/proxy/config/models.ts | 6 +- ui/src/proxy/intranet/models.ts | 2 +- ui/src/views/form/useFormData.tsx | 2 +- ui/src/views/form/useLookupDataSource.ts | 1 - ui/src/views/list/Card.tsx | 5 +- ui/src/views/list/CardItem.tsx | 2 +- ui/src/views/list/Chart.tsx | 1 - ui/src/views/list/Grid.tsx | 2 +- ui/src/views/list/Pivot.tsx | 2 +- ui/src/views/list/Tree.tsx | 2 +- .../views/list/useListFormCustomDataSource.ts | 2 +- 41 files changed, 366 insertions(+), 323 deletions(-) rename api/src/Kurs.Platform.EntityFrameworkCore/Migrations/{20251107212125_Initial.Designer.cs => 20251111112247_Initial.Designer.cs} (99%) rename api/src/Kurs.Platform.EntityFrameworkCore/Migrations/{20251107212125_Initial.cs => 20251111112247_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 c84f8e6c..2bc860fe 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Banks/BankDto.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Banks/BankDto.cs @@ -14,6 +14,6 @@ public class BankDto : AuditedEntityDto public string City { get; set; } public string PostalCode { get; set; } public string Country { get; set; } - public long PhoneNumber { get; set; } + public string PhoneNumber { get; set; } public string Email { get; set; } } \ No newline at end of file diff --git a/api/src/Kurs.Platform.Application.Contracts/Intranet/EmployeeDto.cs b/api/src/Kurs.Platform.Application.Contracts/Intranet/EmployeeDto.cs index 6676e944..4b54aa11 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Intranet/EmployeeDto.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Intranet/EmployeeDto.cs @@ -21,8 +21,8 @@ public class EmployeeDto : FullAuditedEntityDto public string District { get; set; } public string Street { get; set; } public string PostalCode { get; set; } - public long? PhoneNumber { get; set; } - public long? MobileNumber { get; set; } + public string PhoneNumber { get; set; } + public string MobileNumber { get; set; } public string Email { get; set; } public string Address1 { get; set; } public string Address2 { get; set; } diff --git a/api/src/Kurs.Platform.Application.Contracts/Intranet/VisitorDto.cs b/api/src/Kurs.Platform.Application.Contracts/Intranet/VisitorDto.cs index 255fa14c..ef3e200e 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Intranet/VisitorDto.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Intranet/VisitorDto.cs @@ -10,7 +10,7 @@ public class VisitorDto : FullAuditedEntityDto public string FullName { get; set; } public string CompanyName { get; set; } public string Email { get; set; } - public long PhoneNumber { get; set; } + public string PhoneNumber { get; set; } public string Purpose { get; set; } public DateTime VisitDate { get; set; } public DateTime? CheckIn { get; set; } 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 1a50ee32..b776f0ec 100644 --- a/api/src/Kurs.Platform.Application.Contracts/ListForms/DynamicApi/CreateUpdateTenantInput.cs +++ b/api/src/Kurs.Platform.Application.Contracts/ListForms/DynamicApi/CreateUpdateTenantInput.cs @@ -22,9 +22,9 @@ public class CreateUpdateTenantInput public string Address1 { get; set; } public string Address2 { get; set; } public string PostalCode { get; set; } - public long? PhoneNumber { get; set; } - public long? MobileNumber { get; set; } - public long? FaxNumber { get; set; } + public string PhoneNumber { get; set; } + public string MobileNumber { get; set; } + public string FaxNumber { get; set; } public string Email { get; set; } public string Website { get; set; } public string MenuGroup { get; set; } diff --git a/api/src/Kurs.Platform.Application.Contracts/Public/ContactDto.cs b/api/src/Kurs.Platform.Application.Contracts/Public/ContactDto.cs index 9df6685a..d4ed469e 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Public/ContactDto.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Public/ContactDto.cs @@ -8,7 +8,7 @@ namespace Kurs.Platform.Public; public class ContactDto : EntityDto { public string Address { get; set; } - public long PhoneNumber { get; set; } + public string PhoneNumber { get; set; } public string Email { get; set; } public string Location { get; set; } public string TaxNumber { get; set; } diff --git a/api/src/Kurs.Platform.Application.Contracts/Public/DemoDto.cs b/api/src/Kurs.Platform.Application.Contracts/Public/DemoDto.cs index 049326da..eea40206 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Public/DemoDto.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Public/DemoDto.cs @@ -9,7 +9,7 @@ public class DemoDto : FullAuditedEntityDto public string OrganizationName { get; set; } public string FullName { get; set; } public string Email { get; set; } - public long PhoneNumber { get; set; } + public string PhoneNumber { get; set; } public string Address { get; set; } public int NumberOfBranches { get; set; } public int NumberOfUsers { 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 7b5bf234..0d56cfdd 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Tenants/CustomTenantDto.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Tenants/CustomTenantDto.cs @@ -19,9 +19,9 @@ public class CustomTenantDto public string Address1 { get; set; } public string Address2 { get; set; } public string PostalCode { get; set; } - public long? MobileNumber { get; set; } - public long? PhoneNumber { get; set; } - public long? FaxNumber { get; set; } + public string MobileNumber { get; set; } + public string PhoneNumber { get; set; } + public string FaxNumber { get; set; } public string Email { get; set; } public string Website { get; set; } public string MenuGroup { get; set; } diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs index fb06519d..bd12eb98 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs @@ -1536,48 +1536,48 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency { new() { Order=1, Caption="General", ColCount=2, ColSpan=1, ItemType="group", Items =[ - new EditingFormItemDto { Order = 1, DataField="Code", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField="FullName", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField="NationalId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 4, DataField="BirthDate", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxDateBox }, - new EditingFormItemDto { Order = 5, DataField="Gender", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 6, DataField="MaritalStatus", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 7, DataField="EmployeeStatus", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 8, DataField="IsActive", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, + new EditingFormItemDto { Order = 1, DataField = "Code", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 2, DataField = "FullName", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 3, DataField = "NationalId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 4, DataField = "BirthDate", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxDateBox }, + new EditingFormItemDto { Order = 5, DataField = "Gender", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 6, DataField = "MaritalStatus", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 7, DataField = "EmployeeStatus", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 8, DataField = "IsActive", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, ]}, new() { Order=2, Caption="Contact", ColCount=2, ColSpan=1, ItemType="group", Items =[ - new EditingFormItemDto { Order = 1, DataField="Country", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 2, DataField="City", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 3, DataField="District", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 4, DataField="Street", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 5, DataField="PostalCode", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 6, DataField="PhoneNumber", ColSpan = 1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, - new EditingFormItemDto { Order = 7, DataField="MobileNumber", ColSpan = 1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, - new EditingFormItemDto { Order = 8, DataField="Email", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 9, DataField="Address1", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 10, DataField="Address2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 1, DataField = "Country", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 2, DataField = "City", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 3, DataField = "District", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 4, DataField = "Street", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 5, DataField = "PostalCode", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 6, DataField = "PhoneNumber", ColSpan = 1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 7, DataField = "MobileNumber", ColSpan = 1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 8, DataField = "Email", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 9, DataField = "Address1", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 10, DataField = "Address2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, ]}, new() { Order=3, Caption="Job", ColCount=2, ColSpan=1, ItemType="group", Items =[ - new EditingFormItemDto { Order = 1, DataField="HireDate", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxDateBox }, - new EditingFormItemDto { Order = 2, DataField="TerminationDate", ColSpan = 1, EditorType2 = EditorTypes.dxDateBox }, - new EditingFormItemDto { Order = 3, DataField="EmploymentTypeId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 4, DataField="JobPositionId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 5, DataField="DepartmentId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 6, DataField="WorkLocation", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 7, DataField="ManagerId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 8, DataField="BaseSalary", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox, EditorOptions = EditorOptionValues.NumberStandartFormat }, - new EditingFormItemDto { Order = 9, DataField="CurrencyId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 10, DataField="PayrollGroup", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 11, DataField="BankAccountId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 12, DataField="BadgeId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 1, DataField = "HireDate", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxDateBox }, + new EditingFormItemDto { Order = 2, DataField = "TerminationDate", ColSpan = 1, EditorType2 = EditorTypes.dxDateBox }, + new EditingFormItemDto { Order = 3, DataField = "EmploymentTypeId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 4, DataField = "JobPositionId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 5, DataField = "DepartmentId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 6, DataField = "WorkLocation", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 7, DataField = "ManagerId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 8, DataField = "BaseSalary", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox, EditorOptions = EditorOptionValues.NumberStandartFormat }, + new EditingFormItemDto { Order = 9, DataField = "CurrencyId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 10, DataField = "PayrollGroup", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 11, DataField = "BankAccountId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 12, DataField = "BadgeId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, ]}, new() { Order=4, Caption="Emergency", ColCount=1, ColSpan=1, ItemType="group", Items =[ - new EditingFormItemDto { Order = 1, DataField="EmergencyContactName", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField="EmergencyContactRelationship", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField="EmergencyContactPhoneNumber", ColSpan = 1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 1, DataField = "EmergencyContactName", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 2, DataField = "EmergencyContactRelationship", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 3, DataField = "EmergencyContactPhoneNumber", ColSpan = 1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, ]}, }), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -1874,13 +1874,38 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency ListFormCode = listFormEmployee.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.String, - FieldName = "PostalCode", + FieldName = "Street", Width = 100, ListOrderNo = 15, Visible = true, IsActive = true, IsDeleted = false, AllowSearch = true, + LookupJson = JsonSerializer.Serialize(new LookupDto + { + DataSourceType = UiLookupDataSourceTypeEnum.Query, + DisplayExpr = "Name", + ValueExpr = "Key", + LookupQuery = LookupQueryValues.StreetValues, + CascadeRelationField = "District", + CascadeFilterOperator="=", + CascadeParentFields = "Country,City,District", + }), + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(AppCodes.Hr.Employee), + PivotSettingsJson = DefaultPivotSettingsJson + }, + new() { + ListFormCode = listFormEmployee.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "PostalCode", + Width = 100, + ListOrderNo = 16, + Visible = true, + IsActive = true, + IsDeleted = false, + AllowSearch = true, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Hr.Employee), PivotSettingsJson = DefaultPivotSettingsJson @@ -1891,22 +1916,6 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency SourceDbType = DbType.String, FieldName = "PhoneNumber", Width = 100, - ListOrderNo = 16, - Visible = true, - IsActive = true, - IsDeleted = false, - AllowSearch = true, - EditorOptions = EditorOptionValues.PhoneEditorOptions, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(AppCodes.Hr.Employee), - PivotSettingsJson = DefaultPivotSettingsJson - }, - new() { - ListFormCode = listFormEmployee.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.String, - FieldName = "MobileNumber", - Width = 100, ListOrderNo = 17, Visible = true, IsActive = true, @@ -1917,13 +1926,29 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency PermissionJson = DefaultFieldPermissionJson(AppCodes.Hr.Employee), PivotSettingsJson = DefaultPivotSettingsJson }, + new() { + ListFormCode = listFormEmployee.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "MobileNumber", + Width = 100, + ListOrderNo = 18, + Visible = true, + IsActive = true, + IsDeleted = false, + AllowSearch = true, + EditorOptions = EditorOptionValues.PhoneEditorOptions, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(AppCodes.Hr.Employee), + PivotSettingsJson = DefaultPivotSettingsJson + }, new() { ListFormCode = listFormEmployee.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Email", Width = 200, - ListOrderNo = 18, + ListOrderNo = 19, Visible = true, IsActive = true, IsDeleted = false, @@ -1940,7 +1965,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency SourceDbType = DbType.String, FieldName = "EmergencyContactName", Width = 100, - ListOrderNo = 19, + ListOrderNo = 20, Visible = true, IsActive = true, IsDeleted = false, @@ -1955,7 +1980,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency SourceDbType = DbType.String, FieldName = "EmergencyContactRelationship", Width = 100, - ListOrderNo = 20, + ListOrderNo = 21, Visible = true, IsActive = true, IsDeleted = false, @@ -1970,7 +1995,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency SourceDbType = DbType.String, FieldName = "EmergencyContactPhoneNumber", Width = 150, - ListOrderNo = 21, + ListOrderNo = 22, Visible = true, IsActive = true, IsDeleted = false, @@ -1986,7 +2011,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency SourceDbType = DbType.Date, FieldName = "HireDate", Width = 100, - ListOrderNo = 22, + ListOrderNo = 23, Visible = true, IsActive = true, IsDeleted = false, @@ -2001,7 +2026,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency SourceDbType = DbType.Date, FieldName = "TerminationDate", Width = 100, - ListOrderNo = 23, + ListOrderNo = 24, Visible = true, IsActive = true, IsDeleted = false, @@ -2016,7 +2041,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency SourceDbType = DbType.Guid, FieldName = "EmploymentTypeId", Width = 200, - ListOrderNo = 24, + ListOrderNo = 25, Visible = true, IsActive = true, IsDeleted = false, @@ -2038,7 +2063,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency SourceDbType = DbType.Guid, FieldName = "JobPositionId", Width = 200, - ListOrderNo = 25, + ListOrderNo = 26, Visible = true, IsActive = true, IsDeleted = false, @@ -2060,7 +2085,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency SourceDbType = DbType.Guid, FieldName = "DepartmentId", Width = 100, - ListOrderNo = 26, + ListOrderNo = 27, Visible = true, IsActive = true, IsDeleted = false, @@ -2082,7 +2107,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency SourceDbType = DbType.String, FieldName = "WorkLocation", Width = 150, - ListOrderNo = 27, + ListOrderNo = 28, Visible = true, IsActive = true, IsDeleted = false, @@ -2097,7 +2122,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency SourceDbType = DbType.Guid, FieldName = "ManagerId", Width = 100, - ListOrderNo = 28, + ListOrderNo = 29, Visible = true, IsActive = true, IsDeleted = false, @@ -2121,7 +2146,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency Format = "fixedPoint", Alignment = "right", Width = 100, - ListOrderNo = 29, + ListOrderNo = 30, Visible = true, IsActive = true, IsDeleted = false, @@ -2136,7 +2161,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency SourceDbType = DbType.Guid, FieldName = "CurrencyId", Width = 100, - ListOrderNo = 30, + ListOrderNo = 31, Visible = true, IsActive = true, IsDeleted = false, @@ -2158,7 +2183,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency SourceDbType = DbType.String, FieldName = "PayrollGroup", Width = 100, - ListOrderNo = 31, + ListOrderNo = 32, Visible = true, IsActive = true, IsDeleted = false, @@ -2184,7 +2209,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency SourceDbType = DbType.Guid, FieldName = "BankAccountId", Width = 100, - ListOrderNo = 32, + ListOrderNo = 33, Visible = true, IsActive = true, IsDeleted = false, @@ -2206,7 +2231,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency SourceDbType = DbType.Guid, FieldName = "BadgeId", Width = 100, - ListOrderNo = 33, + ListOrderNo = 34, Visible = true, IsActive = true, IsDeleted = false, diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs index 5dc1da99..9be4bb44 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs @@ -92,7 +92,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ColumnOptionJson = DefaultColumnOptionJson, PermissionJson = DefaultPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, TenantManagementPermissions.Tenants.Delete, TenantManagementPermissions.Tenants.Default + ".Export", TenantManagementPermissions.Tenants.Default + ".Import", TenantManagementPermissions.Tenants.Default + ".Activity"), PagerOptionJson = DefaultPagerOptionJson, - EditingOptionJson = DefaultEditingOptionJson(TenantManagementPermissions.Tenants.Default, 800, 600, true, true, true, true, false), + EditingOptionJson = DefaultEditingOptionJson(TenantManagementPermissions.Tenants.Default, 800, 800, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List() { new() { Order=1, ColCount=2, ColSpan=1, ItemType="group", Items =[ @@ -690,7 +690,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ColumnOptionJson = DefaultColumnOptionJson, PermissionJson = DefaultPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, TenantManagementPermissions.Tenants.Delete, TenantManagementPermissions.Tenants.Default + ".Export", TenantManagementPermissions.Tenants.Default + ".Import", TenantManagementPermissions.Tenants.Default + ".Activity"), PagerOptionJson = DefaultPagerOptionJson, - EditingOptionJson = DefaultEditingOptionJson(TenantManagementPermissions.Tenants.Default, 800, 600, true, true, true, true, false), + EditingOptionJson = DefaultEditingOptionJson(TenantManagementPermissions.Tenants.Default, 800, 800, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List() { new() { Order=1, ColCount=1, ColSpan=1, ItemType="group", Items = @@ -1164,7 +1164,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ColumnOptionJson = DefaultColumnOptionJson, PermissionJson = DefaultPermissionJson(AppCodes.Branches), PagerOptionJson = DefaultPagerOptionJson, - EditingOptionJson = DefaultEditingOptionJson(AppCodes.Branches, 900, 450, true, true, true, true, false), + EditingOptionJson = DefaultEditingOptionJson(AppCodes.Branches, 900, 800, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List() { new() { Order=1, ColCount=1, ColSpan=1, ItemType="group", Items = diff --git a/api/src/Kurs.Platform.Domain.Shared/PlatformConsts.cs b/api/src/Kurs.Platform.Domain.Shared/PlatformConsts.cs index cf11c6bf..54b4043b 100644 --- a/api/src/Kurs.Platform.Domain.Shared/PlatformConsts.cs +++ b/api/src/Kurs.Platform.Domain.Shared/PlatformConsts.cs @@ -19,7 +19,7 @@ public static class PlatformConsts public static string Disabled = "{ \"disabled\" : true }"; 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 PhoneEditorOptions = "{\"format\": \"phoneGlobal\", \"mask\":\"(000) 000-0000\", \"maskInvalidMessage\":\"Lütfen geçerli bir telefon numarası girin\", \"useMaskedValue\":false, \"maskRules\": { \"X\": \"[0-9]\" }, \"placeholder\": \"(555) 123-4567\" }"; 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.##'%'\" }"; diff --git a/api/src/Kurs.Platform.Domain/Entities/Branch/Accounting/Bank.cs b/api/src/Kurs.Platform.Domain/Entities/Branch/Accounting/Bank.cs index f4844a81..ce6b2894 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Branch/Accounting/Bank.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Branch/Accounting/Bank.cs @@ -17,7 +17,7 @@ public class Bank : FullAuditedEntity, IMultiTenant public string City { get; set; } public string District { get; set; } public string PostalCode { get; set; } - public long? PhoneNumber { get; set; } + public string PhoneNumber { get; set; } public string Email { get; set; } Guid? IMultiTenant.TenantId => TenantId; diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Contact.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Contact.cs index d3b9f4bd..7ec70275 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Contact.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Contact.cs @@ -9,7 +9,7 @@ public class Contact : FullAuditedEntity, IMultiTenant public Guid? TenantId { get; set; } public string Address { get; set; } - public long PhoneNumber { get; set; } + public string PhoneNumber { get; set; } public string Email { get; set; } public string Location { get; set; } public string TaxNumber { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Demo.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Demo.cs index a97d5afc..ac691e71 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Demo.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Demo.cs @@ -11,7 +11,7 @@ public class Demo : FullAuditedEntity, IMultiTenant public string OrganizationName { get; set; } public string FullName { get; set; } public string Email { get; set; } - public long PhoneNumber { get; set; } + public string PhoneNumber { get; set; } public string Address { get; set; } public int NumberOfBranches { get; set; } public int NumberOfUsers { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Lawyer.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Lawyer.cs index 2825b1e7..071a66c8 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Lawyer.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Lawyer.cs @@ -14,9 +14,9 @@ public class Lawyer : FullAuditedEntity, IMultiTenant public string TaxOffice { get; set; } public string TaxNumber { get; set; } - public long MobileNumber { get; set; } - public long? PhoneNumber { get; set; } - public long? FaxNumber { get; set; } + public string MobileNumber { get; set; } + public string PhoneNumber { get; set; } + public string FaxNumber { get; set; } public string Description { get; set; } public string Status { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Order.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Order.cs index d725085e..7a7766b7 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Order.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Order.cs @@ -22,9 +22,9 @@ public class Order : FullAuditedEntity, IMultiTenant public string Country { get; set; } public string City { get; set; } public string PostalCode { get; set; } - public long? MobileNumber { get; set; } - public long? PhoneNumber { get; set; } - public long? FaxNumber { get; set; } + public string MobileNumber { get; set; } + public string PhoneNumber { get; set; } + public string FaxNumber { get; set; } public string Email { get; set; } public string Website { get; set; } public string MenuGroup { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Psychologist.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Psychologist.cs index 9f1b6b4b..29217cd9 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Psychologist.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Psychologist.cs @@ -9,7 +9,7 @@ public class Psychologist : FullAuditedEntity, IMultiTenant public Guid? TenantId { get; set; } public string Name { get; set; } // AdSoyad - public long PhoneNumber { get; set; } // Telefon + public string PhoneNumber { get; set; } // Telefon public string Email { get; set; } // Eposta public string Address { get; set; } // Adres public string Status { get; set; } // Durum diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/Hr/Employee.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Hr/Employee.cs index 20654b8f..7982a04c 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Hr/Employee.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Hr/Employee.cs @@ -23,8 +23,8 @@ public class Employee : FullAuditedEntity, IMultiTenant public string District { get; set; } public string Street { get; set; } public string PostalCode { get; set; } - public long MobileNumber { get; set; } - public long? PhoneNumber { get; set; } + public string MobileNumber { get; set; } + public string PhoneNumber { get; set; } public string Email { get; set; } public string Address1 { get; set; } public string Address2 { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/Intranet/Visitor.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Intranet/Visitor.cs index c16f045e..7dc182e1 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Intranet/Visitor.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Intranet/Visitor.cs @@ -11,7 +11,7 @@ public class Visitor : FullAuditedEntity, IMultiTenant public string FullName { get; set; } public string CompanyName { get; set; } public string Email { get; set; } - public long PhoneNumber { get; set; } + public string PhoneNumber { get; set; } public string Purpose { get; set; } public DateTime VisitDate { get; set; } public DateTime? CheckIn { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/Saas/Branch.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Saas/Branch.cs index 17775a7a..18c194bb 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Saas/Branch.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Saas/Branch.cs @@ -20,9 +20,9 @@ public class Branch : FullAuditedEntity public string Address1 { get; set; } public string Address2 { get; set; } public string PostalCode { get; set; } - public long MobileNumber { get; set; } - public long? PhoneNumber { get; set; } - public long? FaxNumber { get; set; } + public string MobileNumber { get; set; } + public string PhoneNumber { get; set; } + public string FaxNumber { 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/SupplyChain/Partner.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/SupplyChain/Partner.cs index 88e6cb5f..222edd49 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/SupplyChain/Partner.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/SupplyChain/Partner.cs @@ -29,9 +29,9 @@ public class Partner : FullAuditedEntity, IMultiTenant public string Address1 { get; set; } public string Address2 { get; set; } public string PostalCode { get; set; } - public long MobileNumber { get; set; } - public long? PhoneNumber { get; set; } - public long? FaxNumber { get; set; } + public string MobileNumber { get; set; } + public string PhoneNumber { get; set; } + public string FaxNumber { get; set; } public string Email { get; set; } public string Website { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/SupplyChain/PartnerContact.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/SupplyChain/PartnerContact.cs index 8ccc8c03..f84fbb2b 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/SupplyChain/PartnerContact.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/SupplyChain/PartnerContact.cs @@ -14,8 +14,8 @@ public class PartnerContact : FullAuditedEntity, IMultiTenant public string Title { get; set; } public string Department { get; set; } public string Email { get; set; } - public long MobileNumber { get; set; } - public long? PhoneNumber { get; set; } + public string MobileNumber { get; set; } + public string PhoneNumber { get; set; } public bool IsPrimary { get; set; } public bool IsActive { get; set; } } \ No newline at end of file diff --git a/api/src/Kurs.Platform.Domain/Extensions/AbpTenantExtensions.cs b/api/src/Kurs.Platform.Domain/Extensions/AbpTenantExtensions.cs index 60d9f7af..d5bcab26 100644 --- a/api/src/Kurs.Platform.Domain/Extensions/AbpTenantExtensions.cs +++ b/api/src/Kurs.Platform.Domain/Extensions/AbpTenantExtensions.cs @@ -112,31 +112,31 @@ public static class AbpTenantExtensions return tenant.GetProperty(PlatformConsts.Tenants.PostalCode); } - public static void SetPhoneNumber(this Tenant tenant, long? phoneNumber) + public static void SetPhoneNumber(this Tenant tenant, string phoneNumber) { - tenant.SetProperty(PlatformConsts.Tenants.PhoneNumber, phoneNumber.HasValue ? phoneNumber : null); + tenant.SetProperty(PlatformConsts.Tenants.PhoneNumber, phoneNumber); } - public static long? GetPhoneNumber(this Tenant tenant) + public static string GetPhoneNumber(this Tenant tenant) { - return tenant.GetProperty(PlatformConsts.Tenants.PhoneNumber); + return tenant.GetProperty(PlatformConsts.Tenants.PhoneNumber); } - public static void SetMobileNumber(this Tenant tenant, long? mobileNumber) + public static void SetMobileNumber(this Tenant tenant, string mobileNumber) { - tenant.SetProperty(PlatformConsts.Tenants.MobileNumber, mobileNumber.HasValue ? mobileNumber : null); + tenant.SetProperty(PlatformConsts.Tenants.MobileNumber, mobileNumber); } - public static long? GetMobileNumber(this Tenant tenant) + public static string GetMobileNumber(this Tenant tenant) { - return tenant.GetProperty(PlatformConsts.Tenants.MobileNumber); + return tenant.GetProperty(PlatformConsts.Tenants.MobileNumber); } - public static void SetFaxNumber(this Tenant tenant, long? faxNumber) + public static void SetFaxNumber(this Tenant tenant, string faxNumber) { - tenant.SetProperty(PlatformConsts.Tenants.FaxNumber, faxNumber.HasValue ? faxNumber : null); + tenant.SetProperty(PlatformConsts.Tenants.FaxNumber, faxNumber); } - public static long? GetFaxNumber(this Tenant tenant) + public static string GetFaxNumber(this Tenant tenant) { - return tenant.GetProperty(PlatformConsts.Tenants.FaxNumber); + return tenant.GetProperty(PlatformConsts.Tenants.FaxNumber); } public static void SetEmail(this Tenant tenant, string email) diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs b/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs index 3b79d9ee..e36e60d4 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs @@ -1461,6 +1461,9 @@ public class PlatformDbContext : b.Property(o => o.Country).HasMaxLength(128); b.Property(o => o.City).HasMaxLength(128); b.Property(o => o.PostalCode).HasMaxLength(16); + b.Property(o => o.MobileNumber).HasMaxLength(20); + b.Property(o => o.PhoneNumber).HasMaxLength(20); + b.Property(o => o.FaxNumber).HasMaxLength(20); b.Property(o => o.Email).HasMaxLength(128); b.Property(o => o.Website).HasMaxLength(128); b.Property(o => o.MenuGroup).HasMaxLength(64); @@ -1548,7 +1551,7 @@ public class PlatformDbContext : b.ConfigureByConvention(); b.Property(x => x.Address).HasMaxLength(500); - b.Property(x => x.PhoneNumber).HasMaxLength(50); + b.Property(x => x.PhoneNumber).HasMaxLength(20); b.Property(x => x.Email).HasMaxLength(150); b.Property(x => x.Location).HasMaxLength(150); b.Property(x => x.TaxNumber).HasMaxLength(50); @@ -1688,7 +1691,7 @@ public class PlatformDbContext : b.Property(x => x.City).HasMaxLength(128); b.Property(x => x.PostalCode).HasMaxLength(16); b.Property(x => x.Country).HasMaxLength(128); - b.Property(x => x.PhoneNumber).HasMaxLength(64); + b.Property(x => x.PhoneNumber).HasMaxLength(20); b.Property(x => x.Email).HasMaxLength(128); }); @@ -1814,8 +1817,8 @@ public class PlatformDbContext : b.Property(x => x.Code).IsRequired().HasMaxLength(50); b.Property(x => x.FullName).HasMaxLength(200); b.Property(x => x.Email).HasMaxLength(150); - b.Property(x => x.PhoneNumber).HasMaxLength(50); - b.Property(x => x.MobileNumber).HasMaxLength(50); + b.Property(x => x.PhoneNumber).HasMaxLength(20); + b.Property(x => x.MobileNumber).HasMaxLength(20); b.Property(x => x.Avatar).HasMaxLength(250); b.Property(x => x.NationalId).HasMaxLength(20); b.Property(x => x.PayrollGroup).HasMaxLength(50); @@ -2338,9 +2341,9 @@ public class PlatformDbContext : b.Property(p => p.Address1).HasMaxLength(256); b.Property(p => p.Address2).HasMaxLength(256); b.Property(p => p.PostalCode).HasMaxLength(16); - b.Property(p => p.PhoneNumber).HasMaxLength(32); - b.Property(p => p.MobileNumber).HasMaxLength(32); - b.Property(p => p.FaxNumber).HasMaxLength(32); + b.Property(p => p.PhoneNumber).HasMaxLength(20); + b.Property(p => p.MobileNumber).HasMaxLength(20); + b.Property(p => p.FaxNumber).HasMaxLength(20); b.Property(p => p.Email).HasMaxLength(128); b.Property(p => p.Website).HasMaxLength(128); b.Property(p => p.Status).IsRequired(); @@ -2432,8 +2435,8 @@ public class PlatformDbContext : b.Property(x => x.Title).HasMaxLength(64); b.Property(x => x.Department).HasMaxLength(64); b.Property(x => x.Email).HasMaxLength(128); - b.Property(x => x.PhoneNumber).HasMaxLength(32); - b.Property(x => x.MobileNumber).HasMaxLength(32); + b.Property(x => x.PhoneNumber).HasMaxLength(20); + b.Property(x => x.MobileNumber).HasMaxLength(20); b.Property(x => x.IsPrimary).HasDefaultValue(false); b.Property(x => x.IsActive).HasDefaultValue(true); diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEfCoreEntityExtensionMappings.cs b/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEfCoreEntityExtensionMappings.cs index dbad45af..0657481c 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEfCoreEntityExtensionMappings.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEfCoreEntityExtensionMappings.cs @@ -155,29 +155,29 @@ public static class PlatformEfCoreEntityExtensionMappings ); ObjectExtensionManager.Instance - .MapEfCoreProperty( + .MapEfCoreProperty( PlatformConsts.Tenants.PhoneNumber, (entityBuilder, propertyBuilder) => { - propertyBuilder.HasDefaultValue(null); + propertyBuilder.HasMaxLength(20).HasDefaultValue(null); } ); ObjectExtensionManager.Instance - .MapEfCoreProperty( + .MapEfCoreProperty( PlatformConsts.Tenants.MobileNumber, (entityBuilder, propertyBuilder) => { - propertyBuilder.HasDefaultValue(null); + propertyBuilder.HasMaxLength(20).HasDefaultValue(null); } ); ObjectExtensionManager.Instance - .MapEfCoreProperty( + .MapEfCoreProperty( PlatformConsts.Tenants.FaxNumber, (entityBuilder, propertyBuilder) => { - propertyBuilder.HasDefaultValue(null); + propertyBuilder.HasMaxLength(20).HasDefaultValue(null); } ); diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251107212125_Initial.Designer.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251111112247_Initial.Designer.cs similarity index 99% rename from api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251107212125_Initial.Designer.cs rename to api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251111112247_Initial.Designer.cs index da0cbb3a..602bcc70 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251107212125_Initial.Designer.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251111112247_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace Kurs.Platform.Migrations { [DbContext(typeof(PlatformDbContext))] - [Migration("20251107212125_Initial")] + [Migration("20251111112247_Initial")] partial class Initial { /// @@ -1036,9 +1036,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("PhoneNumber") - .HasMaxLength(64) - .HasColumnType("bigint"); + b.Property("PhoneNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("PostalCode") .HasMaxLength(16) @@ -1402,9 +1402,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("FaxNumber") + b.Property("FaxNumber") .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); b.Property("IsActive") .ValueGeneratedOnAdd() @@ -1425,18 +1425,19 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("MobileNumber") + b.Property("MobileNumber") + .IsRequired() .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); b.Property("Name") .IsRequired() .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("PhoneNumber") + b.Property("PhoneNumber") .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); b.Property("PostalCode") .HasMaxLength(16) @@ -2207,9 +2208,9 @@ namespace Kurs.Platform.Migrations b.Property("MapJson") .HasColumnType("text"); - b.Property("PhoneNumber") - .HasMaxLength(50) - .HasColumnType("bigint"); + b.Property("PhoneNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("TaxNumber") .HasMaxLength(50) @@ -3290,9 +3291,10 @@ namespace Kurs.Platform.Migrations .HasMaxLength(256) .HasColumnType("nvarchar(256)"); - b.Property("PhoneNumber") + b.Property("PhoneNumber") + .IsRequired() .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); b.Property("TenantId") .HasColumnType("uniqueidentifier") @@ -3827,9 +3829,9 @@ namespace Kurs.Platform.Migrations b.Property("MaritalStatus") .HasColumnType("nvarchar(max)"); - b.Property("MobileNumber") - .HasMaxLength(50) - .HasColumnType("bigint"); + b.Property("MobileNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("NationalId") .HasMaxLength(20) @@ -3839,9 +3841,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(50) .HasColumnType("nvarchar(50)"); - b.Property("PhoneNumber") - .HasMaxLength(50) - .HasColumnType("bigint"); + b.Property("PhoneNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("PostalCode") .HasColumnType("nvarchar(max)"); @@ -4651,9 +4653,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(100) .HasColumnType("nvarchar(100)"); - b.Property("FaxNumber") + b.Property("FaxNumber") .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); b.Property("FullName") .IsRequired() @@ -4674,13 +4676,13 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("MobileNumber") + b.Property("MobileNumber") .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); - b.Property("PhoneNumber") + b.Property("PhoneNumber") .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); b.Property("Status") .HasMaxLength(10) @@ -6317,8 +6319,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("FaxNumber") - .HasColumnType("bigint"); + b.Property("FaxNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("Founder") .HasMaxLength(128) @@ -6348,8 +6351,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("MobileNumber") - .HasColumnType("bigint"); + b.Property("MobileNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("Name") .HasMaxLength(64) @@ -6366,8 +6370,9 @@ namespace Kurs.Platform.Migrations b.Property("PaymentMethodId") .HasColumnType("uniqueidentifier"); - b.Property("PhoneNumber") - .HasColumnType("bigint"); + b.Property("PhoneNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("PostalCode") .HasMaxLength(16) @@ -6647,9 +6652,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("FaxNumber") - .HasMaxLength(32) - .HasColumnType("bigint"); + b.Property("FaxNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("IsDeleted") .ValueGeneratedOnAdd() @@ -6677,9 +6682,9 @@ namespace Kurs.Platform.Migrations b.Property("MaterialId") .HasColumnType("uniqueidentifier"); - b.Property("MobileNumber") - .HasMaxLength(32) - .HasColumnType("bigint"); + b.Property("MobileNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("Name") .IsRequired() @@ -6695,9 +6700,9 @@ namespace Kurs.Platform.Migrations b.Property("PerformanceMetricsJson") .HasColumnType("text"); - b.Property("PhoneNumber") - .HasMaxLength(32) - .HasColumnType("bigint"); + b.Property("PhoneNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("PostalCode") .HasMaxLength(16) @@ -7009,16 +7014,16 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("MobileNumber") - .HasMaxLength(32) - .HasColumnType("bigint"); + b.Property("MobileNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("PartnerId") .HasColumnType("uniqueidentifier"); - b.Property("PhoneNumber") - .HasMaxLength(32) - .HasColumnType("bigint"); + b.Property("PhoneNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("TenantId") .HasColumnType("uniqueidentifier") @@ -7556,9 +7561,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(100) .HasColumnType("nvarchar(100)"); - b.Property("PhoneNumber") + b.Property("PhoneNumber") .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); b.Property("Status") .HasMaxLength(10) @@ -10313,9 +10318,10 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("PhoneNumber") + b.Property("PhoneNumber") + .IsRequired() .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); b.Property("Photo") .HasColumnType("nvarchar(max)"); @@ -12504,8 +12510,9 @@ namespace Kurs.Platform.Migrations .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); - b.Property("FaxNumber") - .HasColumnType("bigint"); + b.Property("FaxNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("Founder") .HasColumnType("nvarchar(max)"); @@ -12533,8 +12540,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("MobileNumber") - .HasColumnType("bigint"); + b.Property("MobileNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("Name") .IsRequired() @@ -12550,8 +12558,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("PhoneNumber") - .HasColumnType("bigint"); + b.Property("PhoneNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("PostalCode") .HasMaxLength(10) diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251107212125_Initial.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251111112247_Initial.cs similarity index 99% rename from api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251107212125_Initial.cs rename to api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251111112247_Initial.cs index b2155ae8..7ffd3b7c 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251107212125_Initial.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251111112247_Initial.cs @@ -347,13 +347,13 @@ 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), - FaxNumber = table.Column(type: "bigint", nullable: true), + FaxNumber = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), Founder = table.Column(type: "nvarchar(max)", nullable: true), IsActive = table.Column(type: "bit", nullable: false, defaultValue: true), MenuGroup = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), - MobileNumber = table.Column(type: "bigint", nullable: true), + MobileNumber = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), OrganizationName = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), - PhoneNumber = table.Column(type: "bigint", nullable: true), + PhoneNumber = table.Column(type: "nvarchar(20)", maxLength: 20, 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), @@ -449,7 +449,7 @@ namespace Kurs.Platform.Migrations City = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), District = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), PostalCode = table.Column(type: "nvarchar(16)", maxLength: 16, nullable: true), - PhoneNumber = table.Column(type: "bigint", maxLength: 64, nullable: true), + PhoneNumber = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), Email = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), CreationTime = table.Column(type: "datetime2", nullable: false), CreatorId = table.Column(type: "uniqueidentifier", nullable: true), @@ -539,7 +539,7 @@ namespace Kurs.Platform.Migrations Id = table.Column(type: "uniqueidentifier", nullable: false), TenantId = table.Column(type: "uniqueidentifier", nullable: true), Address = table.Column(type: "nvarchar(500)", maxLength: 500, nullable: true), - PhoneNumber = table.Column(type: "bigint", maxLength: 50, nullable: false), + PhoneNumber = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), Email = table.Column(type: "nvarchar(150)", maxLength: 150, nullable: true), Location = table.Column(type: "nvarchar(150)", maxLength: 150, nullable: true), TaxNumber = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true), @@ -568,7 +568,7 @@ namespace Kurs.Platform.Migrations OrganizationName = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: false), FullName = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: false), Email = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: false), - PhoneNumber = table.Column(type: "bigint", maxLength: 20, nullable: false), + PhoneNumber = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: false), Address = table.Column(type: "nvarchar(512)", maxLength: 512, nullable: false), NumberOfBranches = table.Column(type: "int", nullable: false), NumberOfUsers = table.Column(type: "int", nullable: false), @@ -680,9 +680,9 @@ namespace Kurs.Platform.Migrations Address = table.Column(type: "nvarchar(250)", maxLength: 250, nullable: true), TaxOffice = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true), TaxNumber = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), - MobileNumber = table.Column(type: "bigint", maxLength: 20, nullable: false), - PhoneNumber = table.Column(type: "bigint", maxLength: 20, nullable: true), - FaxNumber = table.Column(type: "bigint", maxLength: 20, nullable: true), + MobileNumber = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), + PhoneNumber = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), + FaxNumber = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), Description = table.Column(type: "nvarchar(1000)", maxLength: 1000, nullable: true), Status = table.Column(type: "nvarchar(10)", maxLength: 10, nullable: true), CreationTime = table.Column(type: "datetime2", nullable: false), @@ -716,9 +716,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), - MobileNumber = table.Column(type: "bigint", nullable: true), - PhoneNumber = table.Column(type: "bigint", nullable: true), - FaxNumber = table.Column(type: "bigint", nullable: true), + MobileNumber = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), + PhoneNumber = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), + FaxNumber = 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), MenuGroup = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), @@ -797,7 +797,7 @@ namespace Kurs.Platform.Migrations Id = table.Column(type: "uniqueidentifier", nullable: false), TenantId = table.Column(type: "uniqueidentifier", nullable: true), Name = table.Column(type: "nvarchar(100)", maxLength: 100, nullable: false), - PhoneNumber = table.Column(type: "bigint", maxLength: 20, nullable: false), + PhoneNumber = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), Email = table.Column(type: "nvarchar(100)", maxLength: 100, nullable: true), Address = table.Column(type: "nvarchar(250)", maxLength: 250, nullable: true), Status = table.Column(type: "nvarchar(10)", maxLength: 10, nullable: true), @@ -2056,9 +2056,9 @@ namespace Kurs.Platform.Migrations Address1 = 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), - MobileNumber = table.Column(type: "bigint", maxLength: 20, nullable: false), - PhoneNumber = table.Column(type: "bigint", maxLength: 20, nullable: true), - FaxNumber = table.Column(type: "bigint", maxLength: 20, nullable: true), + MobileNumber = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: false), + PhoneNumber = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), + FaxNumber = 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), @@ -4101,9 +4101,9 @@ namespace Kurs.Platform.Migrations Address1 = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true), Address2 = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true), PostalCode = table.Column(type: "nvarchar(16)", maxLength: 16, nullable: true), - MobileNumber = table.Column(type: "bigint", maxLength: 32, nullable: false), - PhoneNumber = table.Column(type: "bigint", maxLength: 32, nullable: true), - FaxNumber = table.Column(type: "bigint", maxLength: 32, nullable: true), + MobileNumber = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), + PhoneNumber = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), + FaxNumber = 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), CurrencyId = table.Column(type: "uniqueidentifier", nullable: true), @@ -4264,8 +4264,8 @@ namespace Kurs.Platform.Migrations Title = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), Department = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), Email = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), - MobileNumber = table.Column(type: "bigint", maxLength: 32, nullable: false), - PhoneNumber = table.Column(type: "bigint", maxLength: 32, nullable: true), + MobileNumber = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), + PhoneNumber = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), IsPrimary = table.Column(type: "bit", nullable: false, defaultValue: false), IsActive = table.Column(type: "bit", nullable: false, defaultValue: true), CreationTime = table.Column(type: "datetime2", nullable: false), @@ -4578,8 +4578,8 @@ namespace Kurs.Platform.Migrations District = table.Column(type: "nvarchar(max)", nullable: true), Street = table.Column(type: "nvarchar(max)", nullable: true), PostalCode = table.Column(type: "nvarchar(max)", nullable: true), - MobileNumber = table.Column(type: "bigint", maxLength: 50, nullable: false), - PhoneNumber = table.Column(type: "bigint", maxLength: 50, nullable: true), + MobileNumber = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), + PhoneNumber = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), Email = table.Column(type: "nvarchar(150)", maxLength: 150, nullable: true), Address1 = table.Column(type: "nvarchar(max)", nullable: true), Address2 = table.Column(type: "nvarchar(max)", nullable: true), @@ -4989,7 +4989,7 @@ namespace Kurs.Platform.Migrations FullName = table.Column(type: "nvarchar(100)", maxLength: 100, nullable: false), CompanyName = table.Column(type: "nvarchar(150)", maxLength: 150, nullable: true), Email = table.Column(type: "nvarchar(150)", maxLength: 150, nullable: true), - PhoneNumber = table.Column(type: "bigint", maxLength: 20, nullable: false), + PhoneNumber = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: false), Purpose = table.Column(type: "nvarchar(250)", maxLength: 250, nullable: true), VisitDate = table.Column(type: "datetime2", nullable: false), CheckIn = table.Column(type: "datetime2", nullable: true), diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs index 28d20d18..12134457 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs @@ -1033,9 +1033,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("PhoneNumber") - .HasMaxLength(64) - .HasColumnType("bigint"); + b.Property("PhoneNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("PostalCode") .HasMaxLength(16) @@ -1399,9 +1399,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("FaxNumber") + b.Property("FaxNumber") .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); b.Property("IsActive") .ValueGeneratedOnAdd() @@ -1422,18 +1422,19 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("MobileNumber") + b.Property("MobileNumber") + .IsRequired() .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); b.Property("Name") .IsRequired() .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("PhoneNumber") + b.Property("PhoneNumber") .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); b.Property("PostalCode") .HasMaxLength(16) @@ -2204,9 +2205,9 @@ namespace Kurs.Platform.Migrations b.Property("MapJson") .HasColumnType("text"); - b.Property("PhoneNumber") - .HasMaxLength(50) - .HasColumnType("bigint"); + b.Property("PhoneNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("TaxNumber") .HasMaxLength(50) @@ -3287,9 +3288,10 @@ namespace Kurs.Platform.Migrations .HasMaxLength(256) .HasColumnType("nvarchar(256)"); - b.Property("PhoneNumber") + b.Property("PhoneNumber") + .IsRequired() .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); b.Property("TenantId") .HasColumnType("uniqueidentifier") @@ -3824,9 +3826,9 @@ namespace Kurs.Platform.Migrations b.Property("MaritalStatus") .HasColumnType("nvarchar(max)"); - b.Property("MobileNumber") - .HasMaxLength(50) - .HasColumnType("bigint"); + b.Property("MobileNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("NationalId") .HasMaxLength(20) @@ -3836,9 +3838,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(50) .HasColumnType("nvarchar(50)"); - b.Property("PhoneNumber") - .HasMaxLength(50) - .HasColumnType("bigint"); + b.Property("PhoneNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("PostalCode") .HasColumnType("nvarchar(max)"); @@ -4648,9 +4650,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(100) .HasColumnType("nvarchar(100)"); - b.Property("FaxNumber") + b.Property("FaxNumber") .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); b.Property("FullName") .IsRequired() @@ -4671,13 +4673,13 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("MobileNumber") + b.Property("MobileNumber") .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); - b.Property("PhoneNumber") + b.Property("PhoneNumber") .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); b.Property("Status") .HasMaxLength(10) @@ -6314,8 +6316,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("FaxNumber") - .HasColumnType("bigint"); + b.Property("FaxNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("Founder") .HasMaxLength(128) @@ -6345,8 +6348,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("MobileNumber") - .HasColumnType("bigint"); + b.Property("MobileNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("Name") .HasMaxLength(64) @@ -6363,8 +6367,9 @@ namespace Kurs.Platform.Migrations b.Property("PaymentMethodId") .HasColumnType("uniqueidentifier"); - b.Property("PhoneNumber") - .HasColumnType("bigint"); + b.Property("PhoneNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("PostalCode") .HasMaxLength(16) @@ -6644,9 +6649,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("FaxNumber") - .HasMaxLength(32) - .HasColumnType("bigint"); + b.Property("FaxNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("IsDeleted") .ValueGeneratedOnAdd() @@ -6674,9 +6679,9 @@ namespace Kurs.Platform.Migrations b.Property("MaterialId") .HasColumnType("uniqueidentifier"); - b.Property("MobileNumber") - .HasMaxLength(32) - .HasColumnType("bigint"); + b.Property("MobileNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("Name") .IsRequired() @@ -6692,9 +6697,9 @@ namespace Kurs.Platform.Migrations b.Property("PerformanceMetricsJson") .HasColumnType("text"); - b.Property("PhoneNumber") - .HasMaxLength(32) - .HasColumnType("bigint"); + b.Property("PhoneNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("PostalCode") .HasMaxLength(16) @@ -7006,16 +7011,16 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("MobileNumber") - .HasMaxLength(32) - .HasColumnType("bigint"); + b.Property("MobileNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("PartnerId") .HasColumnType("uniqueidentifier"); - b.Property("PhoneNumber") - .HasMaxLength(32) - .HasColumnType("bigint"); + b.Property("PhoneNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("TenantId") .HasColumnType("uniqueidentifier") @@ -7553,9 +7558,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(100) .HasColumnType("nvarchar(100)"); - b.Property("PhoneNumber") + b.Property("PhoneNumber") .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); b.Property("Status") .HasMaxLength(10) @@ -10310,9 +10315,10 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("PhoneNumber") + b.Property("PhoneNumber") + .IsRequired() .HasMaxLength(20) - .HasColumnType("bigint"); + .HasColumnType("nvarchar(20)"); b.Property("Photo") .HasColumnType("nvarchar(max)"); @@ -12501,8 +12507,9 @@ namespace Kurs.Platform.Migrations .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); - b.Property("FaxNumber") - .HasColumnType("bigint"); + b.Property("FaxNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("Founder") .HasColumnType("nvarchar(max)"); @@ -12530,8 +12537,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("MobileNumber") - .HasColumnType("bigint"); + b.Property("MobileNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("Name") .IsRequired() @@ -12547,8 +12555,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("PhoneNumber") - .HasColumnType("bigint"); + b.Property("PhoneNumber") + .HasMaxLength(20) + .HasColumnType("nvarchar(20)"); b.Property("PostalCode") .HasMaxLength(10) diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/TenantSeederDto.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/TenantSeederDto.cs index b6812458..59af4845 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/TenantSeederDto.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/TenantSeederDto.cs @@ -233,7 +233,7 @@ public class VisitorSeedDto public string FullName { get; set; } public string CompanyName { get; set; } public string Email { get; set; } - public long PhoneNumber { get; set; } + public string PhoneNumber { get; set; } public string Purpose { get; set; } public DateTime VisitDate { get; set; } public DateTime? CheckIn { get; set; } @@ -373,8 +373,8 @@ public class EmployeeSeedDto public string District { get; set; } public string Street { get; set; } public string PostalCode { get; set; } - public long MobileNumber { get; set; } - public long? PhoneNumber { get; set; } + public string MobileNumber { get; set; } + public string PhoneNumber { get; set; } public string Email { get; set; } public string Address1 { get; set; } public string Address2 { get; set; } @@ -624,7 +624,7 @@ public class AboutSeedDto public class ContactSeedDto { public string Address { get; set; } - public long PhoneNumber { get; set; } + public string PhoneNumber { get; set; } public string Email { get; set; } public string Location { get; set; } public string TaxNumber { get; set; } diff --git a/ui/src/mocks/mockBusinessParties.ts b/ui/src/mocks/mockBusinessParties.ts index 26a501ef..73e79f14 100644 --- a/ui/src/mocks/mockBusinessParties.ts +++ b/ui/src/mocks/mockBusinessParties.ts @@ -17,8 +17,8 @@ export const mockBusinessParties: BusinessParty[] = [ title: 'Genel Müdür', department: 'Yönetim', email: 'fatma.demir@uretim.com', - phoneNumber: '+90 312 555 0202', - mobileNumber: '+90 532 555 0202', + phoneNumber: '3125550202', + mobileNumber: '5325550202', isPrimary: true, isActive: true, creationTime: new Date(), @@ -109,8 +109,8 @@ export const mockBusinessParties: BusinessParty[] = [ title: 'Genel Müdür', department: 'Yönetim', email: 'fatma.demir@uretim.com', - phoneNumber: '+90 312 555 0202', - mobileNumber: '+90 532 555 0202', + phoneNumber: '3125550202', + mobileNumber: '5325550202', isPrimary: true, isActive: true, creationTime: new Date(), @@ -201,8 +201,8 @@ export const mockBusinessParties: BusinessParty[] = [ title: 'Genel Müdür', department: 'Yönetim', email: 'fatma.demir@uretim.com', - phoneNumber: '+90 312 555 0202', - mobileNumber: '+90 532 555 0202', + phoneNumber: '3125550202', + mobileNumber: '5325550202', isPrimary: true, isActive: true, creationTime: new Date(), @@ -293,8 +293,8 @@ export const mockBusinessParties: BusinessParty[] = [ title: 'Genel Müdür', department: 'Yönetim', email: 'fatma.demir@uretim.com', - phoneNumber: '+90 312 555 0202', - mobileNumber: '+90 532 555 0202', + phoneNumber: '3125550202', + mobileNumber: '5325550202', isPrimary: true, isActive: true, creationTime: new Date(), @@ -387,8 +387,8 @@ export const mockBusinessParties: BusinessParty[] = [ title: 'Genel Müdür', department: 'Yönetim', email: 'fatma.demir@uretim.com', - phoneNumber: '+90 312 555 0202', - mobileNumber: '+90 532 555 0202', + phoneNumber: '3125550202', + mobileNumber: '5325550202', isPrimary: true, isActive: true, creationTime: new Date(), @@ -438,8 +438,8 @@ export const mockBusinessParties: BusinessParty[] = [ title: 'Satınalma Müdürü', department: 'Satınalma', email: 'ali.yilmaz@teknoloji.com', - phoneNumber: '+90 212 555 0201', - mobileNumber: '+90 532 555 0201', + phoneNumber: '2125550201', + mobileNumber: '5325550201', isPrimary: true, isActive: true, creationTime: new Date(), diff --git a/ui/src/mocks/mockEmployees.ts b/ui/src/mocks/mockEmployees.ts index fa94abd3..eb81a68d 100644 --- a/ui/src/mocks/mockEmployees.ts +++ b/ui/src/mocks/mockEmployees.ts @@ -17,8 +17,8 @@ export const mockEmployees: EmployeeDto[] = [ lastName: "Öztürk", fullName: "Ali Öztürk", email: "ali.ozturk@company.com", - phoneNumber: "+90 212 555 0100", - mobileNumber: "+90 532 555 0101", + phoneNumber: "2125550100", + mobileNumber: "5325550101", avatar: "https://i.pravatar.cc/150?img=12", nationalId: "12345678901", birthDate: new Date("1988-10-20"), @@ -75,8 +75,8 @@ export const mockEmployees: EmployeeDto[] = [ lastName: "Kaya", fullName: "Ayşe Kaya", email: "ayse.kaya@company.com", - phoneNumber: "+90 212 555 0102", - mobileNumber: "+90 532 555 0103", + phoneNumber: "2125550102", + mobileNumber: "5325550103", avatar: "https://i.pravatar.cc/150?img=5", nationalId: "12345678902", birthDate: new Date("1990-08-22"), @@ -134,8 +134,8 @@ export const mockEmployees: EmployeeDto[] = [ lastName: "Yılmaz", fullName: "Mehmet Yılmaz", email: "mehmet.yilmaz@company.com", - phoneNumber: "+90 212 555 0105", - mobileNumber: "+90 532 555 0106", + phoneNumber: "2125550105", + mobileNumber: "5325550106", avatar: "https://i.pravatar.cc/150?img=8", nationalId: "12345678903", birthDate: new Date("1987-03-12"), @@ -193,8 +193,8 @@ export const mockEmployees: EmployeeDto[] = [ lastName: "Demir", fullName: "Selin Demir", email: "selin.demir@company.com", - phoneNumber: "+90 312 555 0108", - mobileNumber: "+90 542 555 0109", + phoneNumber: "3125550108", + mobileNumber: "5425550109", avatar: "https://i.pravatar.cc/150?img=9", nationalId: "12345678904", birthDate: new Date("1993-05-25"), @@ -210,7 +210,7 @@ export const mockEmployees: EmployeeDto[] = [ emergencyContact: { name: "Ali Demir", relationship: "Baba", - phoneNumber: "+90 532 555 0110", + phoneNumber: "532 555 0110", }, hireDate: new Date("2022-01-10"), employmentType: EmploymentTypeEnum.PartTime, @@ -252,8 +252,8 @@ export const mockEmployees: EmployeeDto[] = [ lastName: "Çelik", fullName: "Ahmet Çelik", email: "ahmet.celik@company.com", - phoneNumber: "+90 212 555 0111", - mobileNumber: "+90 532 555 0112", + phoneNumber: "2125550111", + mobileNumber: "5325550112", avatar: "https://i.pravatar.cc/150?img=33", nationalId: "12345678905", birthDate: new Date("1985-09-10"), @@ -269,7 +269,7 @@ export const mockEmployees: EmployeeDto[] = [ emergencyContact: { name: "Emine Çelik", relationship: "Eşi", - phoneNumber: "+90 532 555 0113", + phoneNumber: "532 555 0113", }, hireDate: new Date("2019-04-01"), employmentType: EmploymentTypeEnum.FullTime, @@ -311,8 +311,8 @@ export const mockEmployees: EmployeeDto[] = [ lastName: "Arslan", fullName: "Zeynep Arslan", email: "zeynep.arslan@company.com", - phoneNumber: "+90 216 555 0114", - mobileNumber: "+90 532 555 0115", + phoneNumber: "2165550114", + mobileNumber: "5325550115", avatar: "https://i.pravatar.cc/150?img=10", nationalId: "12345678906", birthDate: new Date("1995-01-30"), @@ -328,7 +328,7 @@ export const mockEmployees: EmployeeDto[] = [ emergencyContact: { name: "Hasan Arslan", relationship: "Baba", - phoneNumber: "+90 532 555 0116", + phoneNumber: "532 555 0116", }, hireDate: new Date("2023-03-20"), employmentType: EmploymentTypeEnum.Intern, @@ -370,8 +370,8 @@ export const mockEmployees: EmployeeDto[] = [ lastName: "Koç", fullName: "Burak Koç", email: "burak.koc@company.com", - phoneNumber: "+90 224 555 0117", - mobileNumber: "+90 532 555 0118", + phoneNumber: "2245550117", + mobileNumber: "5325550118", avatar: "https://i.pravatar.cc/150?img=14", nationalId: "12345678907", birthDate: new Date("1991-06-18"), @@ -429,8 +429,8 @@ export const mockEmployees: EmployeeDto[] = [ lastName: "Şahin", fullName: "Elif Şahin", email: "elif.sahin@company.com", - phoneNumber: "+90 232 555 0120", - mobileNumber: "+90 532 555 0121", + phoneNumber: "2325550120", + mobileNumber: "5325550121", avatar: "https://i.pravatar.cc/150?img=20", nationalId: "12345678908", birthDate: new Date("1989-11-05"), @@ -488,8 +488,8 @@ export const mockEmployees: EmployeeDto[] = [ lastName: "Öztürk", fullName: "Canan Öztürk", email: "canan.ozturk@company.com", - phoneNumber: "+90 312 555 0123", - mobileNumber: "+90 532 555 0124", + phoneNumber: "3125550123", + mobileNumber: "5325550124", avatar: "https://i.pravatar.cc/150?img=25", nationalId: "12345678909", birthDate: new Date("1992-04-14"), @@ -547,8 +547,8 @@ export const mockEmployees: EmployeeDto[] = [ lastName: "Aydın", fullName: "Murat Aydın", email: "murat.aydin@company.com", - phoneNumber: "+90 212 555 0126", - mobileNumber: "+90 532 555 0127", + phoneNumber: "2125550126", + mobileNumber: "5325550127", avatar: "https://i.pravatar.cc/150?img=30", nationalId: "12345678910", birthDate: new Date("1984-12-22"), diff --git a/ui/src/proxy/config/models.ts b/ui/src/proxy/config/models.ts index 479604b0..9429a7c1 100644 --- a/ui/src/proxy/config/models.ts +++ b/ui/src/proxy/config/models.ts @@ -37,9 +37,9 @@ export interface CustomTenantDto extends TenantDto { country: string city: string postalCode: string - phoneNumber: number - mobileNumber: number - faxNumber: number + phoneNumber: string + mobileNumber: string + faxNumber: string email: string website: string menuGroup?: string diff --git a/ui/src/proxy/intranet/models.ts b/ui/src/proxy/intranet/models.ts index 51ea1ba8..637eec65 100644 --- a/ui/src/proxy/intranet/models.ts +++ b/ui/src/proxy/intranet/models.ts @@ -69,7 +69,7 @@ export interface EmployeeDto { email: string phoneNumber?: string mobileNumber?: string - avatar?: string // Avatar URL + avatar?: string nationalId: string birthDate: Date gender: GenderEnum diff --git a/ui/src/views/form/useFormData.tsx b/ui/src/views/form/useFormData.tsx index fab38530..29cef6b6 100644 --- a/ui/src/views/form/useFormData.tsx +++ b/ui/src/views/form/useFormData.tsx @@ -204,8 +204,8 @@ const useGridData = (props: { gridDto.gridOptions, listFormCode, searchParams, - cols, layoutTypes.grid, + cols, ) setDataSource(dataSource) diff --git a/ui/src/views/form/useLookupDataSource.ts b/ui/src/views/form/useLookupDataSource.ts index ba3ad719..d1a6bcab 100644 --- a/ui/src/views/form/useLookupDataSource.ts +++ b/ui/src/views/form/useLookupDataSource.ts @@ -142,7 +142,6 @@ export const useLookupDataSource = ({ if (lookupDto.cascadeParentFields && !data) { return { store: [] } } - if (lookupDto.cascadeParentFields) { if (lookupDto.dataSourceType == UiLookupDataSourceTypeEnum.StaticData) { filters.push([ diff --git a/ui/src/views/list/Card.tsx b/ui/src/views/list/Card.tsx index c9db0121..70f290c0 100644 --- a/ui/src/views/list/Card.tsx +++ b/ui/src/views/list/Card.tsx @@ -117,8 +117,7 @@ const Card = (props: CardProps) => { gridDto.gridOptions, listFormCode, urlSearchParams, - [], - layoutTypes.card, + layoutTypes.card ) setGridDataSource(dataSource) @@ -189,7 +188,7 @@ const Card = (props: CardProps) => { -
+
diff --git a/ui/src/views/list/CardItem.tsx b/ui/src/views/list/CardItem.tsx index 05b02a23..11ccc35f 100644 --- a/ui/src/views/list/CardItem.tsx +++ b/ui/src/views/list/CardItem.tsx @@ -157,12 +157,12 @@ const CardItem = ({
diff --git a/ui/src/views/list/Chart.tsx b/ui/src/views/list/Chart.tsx index 220044fc..ae2b6193 100644 --- a/ui/src/views/list/Chart.tsx +++ b/ui/src/views/list/Chart.tsx @@ -99,7 +99,6 @@ const Chart = (props: ChartProps) => { gridOptions, listFormCode, urlSearchParams, - [], layoutTypes.chart, ) diff --git a/ui/src/views/list/Grid.tsx b/ui/src/views/list/Grid.tsx index e1c7cb23..468f3626 100644 --- a/ui/src/views/list/Grid.tsx +++ b/ui/src/views/list/Grid.tsx @@ -512,8 +512,8 @@ const Grid = (props: GridProps) => { gridDto.gridOptions, listFormCode, searchParams, - cols, layoutTypes.grid, + cols, ) setGridDataSource(dataSource) }, [gridDto, searchParams]) diff --git a/ui/src/views/list/Pivot.tsx b/ui/src/views/list/Pivot.tsx index 9c34b9c6..0b0c6ee5 100644 --- a/ui/src/views/list/Pivot.tsx +++ b/ui/src/views/list/Pivot.tsx @@ -232,8 +232,8 @@ const Pivot = (props: PivotProps) => { gridDto.gridOptions, listFormCode, searchParams, - cols, layoutTypes.pivot, + cols, ) setGridDataSource(dataSource) diff --git a/ui/src/views/list/Tree.tsx b/ui/src/views/list/Tree.tsx index 2c12c080..965e36a1 100644 --- a/ui/src/views/list/Tree.tsx +++ b/ui/src/views/list/Tree.tsx @@ -511,8 +511,8 @@ const Tree = (props: TreeProps) => { gridDto.gridOptions, listFormCode, searchParams, - cols, layoutTypes.tree, + cols, ) setTreeListDataSource(dataSource) }, [gridDto, searchParams]) diff --git a/ui/src/views/list/useListFormCustomDataSource.ts b/ui/src/views/list/useListFormCustomDataSource.ts index f2134f06..8a226454 100644 --- a/ui/src/views/list/useListFormCustomDataSource.ts +++ b/ui/src/views/list/useListFormCustomDataSource.ts @@ -25,8 +25,8 @@ const useListFormCustomDataSource = ({ gridOptions: GridOptionsDto, listFormCode: string, searchParams?: URLSearchParams, - cols?: GridColumnData[], layout?: ListViewLayoutType | string, + cols?: GridColumnData[], ) => { const store: any = new CustomStore({ key: