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 7198c4d4..a58806ed 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 string Phone { get; set; } - public string Mobile { get; set; } - public string Fax { get; set; } + public long Phone { get; set; } + public long Mobile { get; set; } + public long Fax { 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/CreateUpdateBlogPostDto.cs b/api/src/Kurs.Platform.Application.Contracts/Public/CreateUpdateBlogPostDto.cs index 19715e2b..3331626c 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Public/CreateUpdateBlogPostDto.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Public/CreateUpdateBlogPostDto.cs @@ -11,7 +11,7 @@ public class CreateUpdateBlogPostDto public string ContentTr { get; set; } public string ContentEn { get; set; } public string Summary { get; set; } - public string ReadTime { get; set; } + public DateTime ReadTime { get; set; } public string CoverImage { get; set; } public Guid CategoryId { get; set; } public List Tags { 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 a5e51e46..75fd15e1 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 string Phone { get; set; } - public string Mobile { get; set; } - public string Fax { get; set; } + public long Phone { get; set; } + public long Mobile { get; set; } + public long Fax { 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_Accounting.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Accounting.cs index 3be91fbe..3c70d057 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Accounting.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Accounting.cs @@ -326,7 +326,7 @@ public class ListFormSeeder_Accounting : IDataSeedContributor, ITransientDepende new() { ListFormCode = formBank.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Int64, FieldName = "Phone", Width = 150, ListOrderNo = 11, @@ -636,7 +636,7 @@ public class ListFormSeeder_Accounting : IDataSeedContributor, ITransientDepende new() { ListFormCode = listFormBank.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Int64, FieldName = "Phone", Width = 150, ListOrderNo = 11, diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs index c6a76e81..eaf67899 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs @@ -1124,7 +1124,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep RoleId = null, UserId = null, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Int64, FieldName = "PhoneNumber", Width = 150, ListOrderNo = 5, @@ -2978,7 +2978,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormCode = listFormPurchaseOrder.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Int64, FieldName = "Phone", Width = 100, ListOrderNo = 11, @@ -3517,7 +3517,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormCode = listFormBlogPosts.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.DateTime, FieldName = "ReadTime", Width = 80, ListOrderNo = 6, @@ -3629,7 +3629,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormCode = listFormBlogPosts.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.DateTime, + SourceDbType = DbType.String, FieldName = "ContentTr", Width = 120, ListOrderNo = 11, @@ -3644,7 +3644,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormCode = listFormBlogPosts.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.DateTime, + SourceDbType = DbType.String, FieldName = "ContentEn", Width = 120, ListOrderNo = 12, @@ -3804,7 +3804,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormCode = listFormDemo.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Int64, FieldName = "Phone", Width = 100, ListOrderNo = 5, @@ -3996,7 +3996,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormCode = listFormContact.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Int64, FieldName = "Phone", Width = 150, ListOrderNo = 3, @@ -6097,7 +6097,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormCode = listFormPsychologist.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Int64, FieldName = "Phone", Width = 150, ListOrderNo = 3, @@ -6373,7 +6373,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormCode = listFormLawyer.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Int64, FieldName = "Phone1", Width = 150, ListOrderNo = 8, @@ -6388,7 +6388,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormCode = listFormLawyer.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Int64, FieldName = "Phone2", Width = 150, ListOrderNo = 9, @@ -6403,7 +6403,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormCode = listFormLawyer.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Int64, FieldName = "Phone3", Width = 150, ListOrderNo = 10, @@ -6418,7 +6418,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormCode = listFormLawyer.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Int64, FieldName = "Phone4", Width = 150, ListOrderNo = 11, @@ -6433,7 +6433,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { ListFormCode = listFormLawyer.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Int64, FieldName = "Fax", Width = 150, ListOrderNo = 12, diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs index 297e09b2..2f039dab 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs @@ -1524,7 +1524,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency new() { ListFormCode = listFormCostCenter.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.Int32, + SourceDbType = DbType.Guid, FieldName = "CurrencyId", Width = 100, ListOrderNo = 11, @@ -1986,7 +1986,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency new() { ListFormCode = listFormEmployee.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Int64, FieldName = "Phone", Width = 100, ListOrderNo = 16, diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Intranet.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Intranet.cs index 7a8b8012..078a6504 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Intranet.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Intranet.cs @@ -1663,7 +1663,7 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc new() { ListFormCode = listFormVisitor.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.Int32, + SourceDbType = DbType.Int64, FieldName = "Phone", Width = 100, ListOrderNo = 5, diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs index f4450a9b..c2e076de 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs @@ -221,7 +221,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormCode = formTenant.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Int64, FieldName = "VknTckn", Width = 100, ListOrderNo = 5, @@ -457,7 +457,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormCode = formTenant.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Int64, FieldName = "Phone", Width = 100, ListOrderNo = 17, @@ -473,7 +473,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormCode = formTenant.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Int64, FieldName = "Fax", Width = 100, ListOrderNo = 18, @@ -844,7 +844,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormCode = listFormTenants.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Int64, FieldName = "VknTckn", Width = 100, ListOrderNo = 5, @@ -1077,7 +1077,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormCode = listFormTenants.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Int64, FieldName = "Phone", Width = 100, ListOrderNo = 17, @@ -1093,7 +1093,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormCode = listFormTenants.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Int64, FieldName = "Fax", Width = 100, ListOrderNo = 18, @@ -1321,7 +1321,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormCode = listFormBranches.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Int64, FieldName = "VknTckn", Width = 100, ListOrderNo = 4, @@ -1554,7 +1554,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormCode = listFormBranches.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Int64, FieldName = "Phone", Width = 100, ListOrderNo = 16, @@ -1570,7 +1570,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormCode = listFormBranches.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Int64, FieldName = "Fax", Width = 100, ListOrderNo = 17, @@ -5074,7 +5074,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency { ListFormCode = listFormCountry.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.String, + SourceDbType = DbType.Guid, FieldName = "CurrencyId", Width = 100, ListOrderNo = 5, diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/BlogPost.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/BlogPost.cs index e745373d..58ec671e 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/BlogPost.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/BlogPost.cs @@ -14,7 +14,7 @@ public class BlogPost : FullAuditedEntity, IMultiTenant public string ContentEn { get; set; } public string Summary { get; set; } public string CoverImage { get; set; } - public string ReadTime { get; set; } + public DateTime ReadTime { get; set; } public Guid CategoryId { get; set; } public virtual BlogCategory Category { 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 57197e38..84f63690 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Lawyer.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Lawyer.cs @@ -15,11 +15,11 @@ public class Lawyer : FullAuditedEntity, IMultiTenant public string TaxOffice { get; set; } public string TaxNumber { get; set; } - public string Phone1 { get; set; } - public string Phone2 { get; set; } - public string Phone3 { get; set; } - public string Phone4 { get; set; } - public string Fax { get; set; } + public long Phone1 { get; set; } + public long Phone2 { get; set; } + public long Phone3 { get; set; } + public long Phone4 { get; set; } + public long Fax { 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 adfb78e3..796617b2 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 string Phone { get; set; } - public string Mobile { get; set; } - public string Fax { get; set; } + public long Phone { get; set; } + public long Mobile { get; set; } + public long Fax { 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/Saas/Branch.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Saas/Branch.cs index a7fff1e9..7cbf14d1 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Saas/Branch.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Saas/Branch.cs @@ -18,9 +18,9 @@ public class Branch : FullAuditedEntity public string Address1 { get; set; } public string Address2 { get; set; } public string PostalCode { get; set; } - public string Phone { get; set; } - public string Mobile { get; set; } - public string Fax { get; set; } + public long Phone { get; set; } + public long Mobile { get; set; } + public long 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/Extensions/AbpTenantExtensions.cs b/api/src/Kurs.Platform.Domain/Extensions/AbpTenantExtensions.cs index c0c0b264..6c194161 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 SetPhone(this Tenant tenant, string phone) + public static void SetPhone(this Tenant tenant, long phone) { tenant.SetProperty(PlatformConsts.Tenants.Phone, phone); } - public static string GetPhone(this Tenant tenant) + public static long GetPhone(this Tenant tenant) { - return tenant.GetProperty(PlatformConsts.Tenants.Phone); + return tenant.GetProperty(PlatformConsts.Tenants.Phone); } - public static void SetMobile(this Tenant tenant, string mobile) + public static void SetMobile(this Tenant tenant, long mobile) { tenant.SetProperty(PlatformConsts.Tenants.Mobile, mobile); } - public static string GetMobile(this Tenant tenant) + public static long GetMobile(this Tenant tenant) { - return tenant.GetProperty(PlatformConsts.Tenants.Mobile); + return tenant.GetProperty(PlatformConsts.Tenants.Mobile); } - public static void SetFax(this Tenant tenant, string fax) + public static void SetFax(this Tenant tenant, long fax) { tenant.SetProperty(PlatformConsts.Tenants.Fax, fax); } - public static string GetFax(this Tenant tenant) + public static long 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/PlatformDbContext.cs b/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs index 233426de..a7875ab3 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs @@ -1465,7 +1465,6 @@ public class PlatformDbContext : b.Property(x => x.ContentTr).IsRequired(); b.Property(x => x.ContentEn).IsRequired(); b.Property(x => x.CoverImage).HasMaxLength(512); - b.Property(x => x.ReadTime).HasMaxLength(64); b.HasIndex(x => x.Slug); b.HasIndex(x => x.IsPublished); diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEfCoreEntityExtensionMappings.cs b/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEfCoreEntityExtensionMappings.cs index 6071bd76..531ad9a9 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEfCoreEntityExtensionMappings.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEfCoreEntityExtensionMappings.cs @@ -1,5 +1,4 @@ -using Kurs.Platform.Identity; -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; using System; using Volo.Abp.Identity; using Volo.Abp.ObjectExtending; @@ -156,29 +155,29 @@ public static class PlatformEfCoreEntityExtensionMappings ); ObjectExtensionManager.Instance - .MapEfCoreProperty( + .MapEfCoreProperty( PlatformConsts.Tenants.Phone, (entityBuilder, propertyBuilder) => { - propertyBuilder.HasMaxLength(20).HasDefaultValue(null); + propertyBuilder.HasDefaultValue(null); } ); ObjectExtensionManager.Instance - .MapEfCoreProperty( + .MapEfCoreProperty( PlatformConsts.Tenants.Mobile, (entityBuilder, propertyBuilder) => { - propertyBuilder.HasMaxLength(20).HasDefaultValue(null); + propertyBuilder.HasDefaultValue(null); } ); ObjectExtensionManager.Instance - .MapEfCoreProperty( + .MapEfCoreProperty( PlatformConsts.Tenants.Fax, (entityBuilder, propertyBuilder) => { - propertyBuilder.HasMaxLength(20).HasDefaultValue(null); + propertyBuilder.HasDefaultValue(null); } ); @@ -217,30 +216,6 @@ public static class PlatformEfCoreEntityExtensionMappings propertyBuilder.HasMaxLength(64).HasDefaultValue(null); } ); - - /* You can configure extra properties for the - * entities defined in the modules used by your application. - * - * This class can be used to map these extra properties to table fields in the database. - * - * USE THIS CLASS ONLY TO CONFIGURE EF CORE RELATED MAPPING. - * USE PlatformModuleExtensionConfigurator CLASS (in the Domain.Shared project) - * FOR A HIGH LEVEL API TO DEFINE EXTRA PROPERTIES TO ENTITIES OF THE USED MODULES - * - * Example: Map a property to a table field: - - ObjectExtensionManager.Instance - .MapEfCoreProperty( - "MyProperty", - (entityBuilder, propertyBuilder) => - { - propertyBuilder.HasMaxLength(128); - } - ); - - * See the documentation for more: - * https://docs.abp.io/en/abp/latest/Customizing-Application-Modules-Extending-Entities - */ }); } } diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103131643_Initial.Designer.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103145000_Initial.Designer.cs similarity index 99% rename from api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103131643_Initial.Designer.cs rename to api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103145000_Initial.Designer.cs index 9730c324..35a2eadf 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103131643_Initial.Designer.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103145000_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace Kurs.Platform.Migrations { [DbContext(typeof(PlatformDbContext))] - [Migration("20251103131643_Initial")] + [Migration("20251103145000_Initial")] partial class Initial { /// @@ -1449,9 +1449,8 @@ namespace Kurs.Platform.Migrations b.Property("PublishedAt") .HasColumnType("datetime2"); - b.Property("ReadTime") - .HasMaxLength(64) - .HasColumnType("nvarchar(64)"); + b.Property("ReadTime") + .HasColumnType("datetime2"); b.Property("Slug") .IsRequired() @@ -1538,9 +1537,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("Fax") + b.Property("Fax") .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + .HasColumnType("bigint"); b.Property("IsActive") .ValueGeneratedOnAdd() @@ -1561,19 +1560,18 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("Mobile") - .IsRequired() + b.Property("Mobile") .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + .HasColumnType("bigint"); b.Property("Name") .IsRequired() .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("Phone") + b.Property("Phone") .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + .HasColumnType("bigint"); b.Property("PostalCode") .HasMaxLength(16) @@ -4553,9 +4551,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(100) .HasColumnType("nvarchar(100)"); - b.Property("Fax") + b.Property("Fax") .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + .HasColumnType("bigint"); b.Property("IsDeleted") .ValueGeneratedOnAdd() @@ -4576,21 +4574,21 @@ namespace Kurs.Platform.Migrations .HasMaxLength(100) .HasColumnType("nvarchar(100)"); - b.Property("Phone1") + b.Property("Phone1") .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + .HasColumnType("bigint"); - b.Property("Phone2") + b.Property("Phone2") .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + .HasColumnType("bigint"); - b.Property("Phone3") + b.Property("Phone3") .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + .HasColumnType("bigint"); - b.Property("Phone4") + b.Property("Phone4") .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + .HasColumnType("bigint"); b.Property("Status") .HasMaxLength(10) @@ -6040,8 +6038,8 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("Fax") - .HasColumnType("nvarchar(max)"); + b.Property("Fax") + .HasColumnType("bigint"); b.Property("Founder") .HasMaxLength(128) @@ -6071,8 +6069,8 @@ namespace Kurs.Platform.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("Mobile") - .HasColumnType("nvarchar(max)"); + b.Property("Mobile") + .HasColumnType("bigint"); b.Property("Name") .HasMaxLength(64) @@ -6089,8 +6087,8 @@ namespace Kurs.Platform.Migrations b.Property("PaymentMethodId") .HasColumnType("uniqueidentifier"); - b.Property("Phone") - .HasColumnType("nvarchar(max)"); + b.Property("Phone") + .HasColumnType("bigint"); b.Property("PostalCode") .HasMaxLength(16) @@ -12214,9 +12212,8 @@ namespace Kurs.Platform.Migrations .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); - b.Property("Fax") - .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + b.Property("Fax") + .HasColumnType("bigint"); b.Property("Founder") .HasColumnType("nvarchar(max)"); @@ -12244,9 +12241,8 @@ namespace Kurs.Platform.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("Mobile") - .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + b.Property("Mobile") + .HasColumnType("bigint"); b.Property("Name") .IsRequired() @@ -12262,9 +12258,8 @@ namespace Kurs.Platform.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("Phone") - .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + b.Property("Phone") + .HasColumnType("bigint"); b.Property("PostalCode") .HasMaxLength(10) diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103131643_Initial.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103145000_Initial.cs similarity index 99% rename from api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103131643_Initial.cs rename to api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103145000_Initial.cs index 0801e401..ee48a5ab 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103131643_Initial.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103145000_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), - Fax = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), + Fax = table.Column(type: "bigint", nullable: false), 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), - Mobile = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), + Mobile = table.Column(type: "bigint", nullable: false), OrganizationName = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), - Phone = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), + Phone = table.Column(type: "bigint", nullable: false), 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), @@ -681,11 +681,11 @@ 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), - Phone1 = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), - Phone2 = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), - Phone3 = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), - Phone4 = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), - Fax = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), + Phone1 = table.Column(type: "bigint", maxLength: 20, nullable: false), + Phone2 = table.Column(type: "bigint", maxLength: 20, nullable: false), + Phone3 = table.Column(type: "bigint", maxLength: 20, nullable: false), + Phone4 = table.Column(type: "bigint", maxLength: 20, nullable: false), + Fax = table.Column(type: "bigint", maxLength: 20, nullable: false), 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), @@ -719,9 +719,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: "nvarchar(max)", nullable: true), - Mobile = table.Column(type: "nvarchar(max)", nullable: true), - Fax = table.Column(type: "nvarchar(max)", nullable: true), + Phone = table.Column(type: "bigint", nullable: false), + Mobile = table.Column(type: "bigint", nullable: false), + Fax = table.Column(type: "bigint", nullable: false), 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), @@ -2167,9 +2167,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), - 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), + Phone = table.Column(type: "bigint", maxLength: 20, nullable: false), + Mobile = table.Column(type: "bigint", maxLength: 20, nullable: false), + Fax = table.Column(type: "bigint", maxLength: 20, nullable: false), 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), @@ -2756,7 +2756,7 @@ namespace Kurs.Platform.Migrations ContentEn = table.Column(type: "nvarchar(max)", nullable: false), Summary = table.Column(type: "nvarchar(512)", maxLength: 512, nullable: false), CoverImage = table.Column(type: "nvarchar(512)", maxLength: 512, nullable: true), - ReadTime = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), + ReadTime = table.Column(type: "datetime2", nullable: false), CategoryId = table.Column(type: "uniqueidentifier", nullable: false), AuthorId = table.Column(type: "uniqueidentifier", nullable: false), ViewCount = table.Column(type: "int", nullable: true), diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs index 498cc42f..8309002b 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs @@ -1446,9 +1446,8 @@ namespace Kurs.Platform.Migrations b.Property("PublishedAt") .HasColumnType("datetime2"); - b.Property("ReadTime") - .HasMaxLength(64) - .HasColumnType("nvarchar(64)"); + b.Property("ReadTime") + .HasColumnType("datetime2"); b.Property("Slug") .IsRequired() @@ -1535,9 +1534,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("Fax") + b.Property("Fax") .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + .HasColumnType("bigint"); b.Property("IsActive") .ValueGeneratedOnAdd() @@ -1558,19 +1557,18 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("Mobile") - .IsRequired() + b.Property("Mobile") .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + .HasColumnType("bigint"); b.Property("Name") .IsRequired() .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("Phone") + b.Property("Phone") .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + .HasColumnType("bigint"); b.Property("PostalCode") .HasMaxLength(16) @@ -4550,9 +4548,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(100) .HasColumnType("nvarchar(100)"); - b.Property("Fax") + b.Property("Fax") .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + .HasColumnType("bigint"); b.Property("IsDeleted") .ValueGeneratedOnAdd() @@ -4573,21 +4571,21 @@ namespace Kurs.Platform.Migrations .HasMaxLength(100) .HasColumnType("nvarchar(100)"); - b.Property("Phone1") + b.Property("Phone1") .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + .HasColumnType("bigint"); - b.Property("Phone2") + b.Property("Phone2") .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + .HasColumnType("bigint"); - b.Property("Phone3") + b.Property("Phone3") .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + .HasColumnType("bigint"); - b.Property("Phone4") + b.Property("Phone4") .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + .HasColumnType("bigint"); b.Property("Status") .HasMaxLength(10) @@ -6037,8 +6035,8 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("Fax") - .HasColumnType("nvarchar(max)"); + b.Property("Fax") + .HasColumnType("bigint"); b.Property("Founder") .HasMaxLength(128) @@ -6068,8 +6066,8 @@ namespace Kurs.Platform.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("Mobile") - .HasColumnType("nvarchar(max)"); + b.Property("Mobile") + .HasColumnType("bigint"); b.Property("Name") .HasMaxLength(64) @@ -6086,8 +6084,8 @@ namespace Kurs.Platform.Migrations b.Property("PaymentMethodId") .HasColumnType("uniqueidentifier"); - b.Property("Phone") - .HasColumnType("nvarchar(max)"); + b.Property("Phone") + .HasColumnType("bigint"); b.Property("PostalCode") .HasMaxLength(16) @@ -12211,9 +12209,8 @@ namespace Kurs.Platform.Migrations .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); - b.Property("Fax") - .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + b.Property("Fax") + .HasColumnType("bigint"); b.Property("Founder") .HasColumnType("nvarchar(max)"); @@ -12241,9 +12238,8 @@ namespace Kurs.Platform.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("Mobile") - .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + b.Property("Mobile") + .HasColumnType("bigint"); b.Property("Name") .IsRequired() @@ -12259,9 +12255,8 @@ namespace Kurs.Platform.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("Phone") - .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + b.Property("Phone") + .HasColumnType("bigint"); 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 51d38133..fb483ac3 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/TenantSeederDto.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/TenantSeederDto.cs @@ -513,7 +513,7 @@ public class BlogPostSeedDto public string Slug { get; set; } public string ContentTr { get; set; } public string ContentEn { get; set; } - public string ReadTime { get; set; } + public DateTime ReadTime { get; set; } public string Summary { get; set; } public string CoverImage { get; set; } public string CategoryName { get; set; } diff --git a/ui/src/views/list/Grid.tsx b/ui/src/views/list/Grid.tsx index 7aa078b3..544afd38 100644 --- a/ui/src/views/list/Grid.tsx +++ b/ui/src/views/list/Grid.tsx @@ -807,7 +807,7 @@ const Grid = (props: GridProps) => { } startEditAction={gridDto.gridOptions.editingOptionDto?.startEditAction} popup={{ - title: gridDto.gridOptions.editingOptionDto?.popup?.title, + title: translate('::' + gridDto.gridOptions.editingOptionDto?.popup?.title), showTitle: gridDto.gridOptions.editingOptionDto?.popup?.showTitle, hideOnOutsideClick: gridDto.gridOptions.editingOptionDto?.popup?.hideOnOutsideClick,