From cdcf9d309c143e7dc62a96e51fe3e73e314bf5c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sedat=20=C3=96ZT=C3=9CRK?= <76204082+iamsedatozturk@users.noreply.github.com> Date: Fri, 31 Oct 2025 15:19:57 +0300 Subject: [PATCH] =?UTF-8?q?Employee=20Liste=20d=C3=BCzenlemesi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Seeds/ListFormSeeder.cs | 100 +++++++++++++----- ui/src/mocks/mockEmployees.ts | 2 +- 2 files changed, 74 insertions(+), 28 deletions(-) diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder.cs index 654b7cb0..cd80a4dd 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder.cs @@ -33651,7 +33651,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency UserId = null, CultureName = LanguageCodes.En, SourceDbType = DbType.String, - FieldName = "MaritalStatus", + FieldName = "Gender", Width = 100, ListOrderNo = 6, Visible = true, @@ -33696,7 +33696,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency UserId = null, CultureName = LanguageCodes.En, SourceDbType = DbType.String, - FieldName = "EmployeeStatus", + FieldName = "MaritalStatus", Width = 100, ListOrderNo = 7, Visible = true, @@ -33711,6 +33711,52 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency AllowReordering = true, }), LookupJson = JsonSerializer.Serialize(new LookupDto + { + DataSourceType = UiLookupDataSourceTypeEnum.StaticData, + DisplayExpr = "name", + ValueExpr = "key", + LookupQuery = JsonSerializer.Serialize(new LookupDataDto[] { + new () { Key= "Single", Name= "Single"}, + new () { Key= "Married", Name= "Married" }, + new () { Key= "Divorced", Name= "Divorced" }, + new () { Key= "Widowed", Name= "Widowed" }, + }), + }), + PermissionJson = JsonSerializer.Serialize(new ListFormFieldPermissionDto + { + C = AppCodes.Hr.Employee + ".Create", + R = AppCodes.Hr.Employee, + U = AppCodes.Hr.Employee + ".Update", + E = true, + I = true, + Deny = false + }), + PivotSettingsJson = JsonSerializer.Serialize(new ListFormFieldPivotSettingsDto + { + IsPivot = true + }) + }, + new() { + ListFormCode = listFormEmployee.ListFormCode, + RoleId = null, + UserId = null, + CultureName = LanguageCodes.En, + SourceDbType = DbType.String, + FieldName = "EmployeeStatus", + Width = 100, + ListOrderNo = 8, + Visible = true, + IsActive = true, + IsDeleted = false, + AllowSearch = true, + ValidationRuleJson = JsonSerializer.Serialize(new ValidationRuleDto[] { + new ValidationRuleDto() { Type = Enum.GetName(UiColumnValidationRuleTypeEnum.required) } + }), + ColumnCustomizationJson = JsonSerializer.Serialize(new ColumnCustomizationDto + { + AllowReordering = true, + }), + LookupJson = JsonSerializer.Serialize(new LookupDto { DataSourceType = UiLookupDataSourceTypeEnum.StaticData, DisplayExpr = "name", @@ -33745,7 +33791,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.Boolean, FieldName = "IsActive", Width = 100, - ListOrderNo = 8, + ListOrderNo = 9, Visible = true, IsActive = true, IsDeleted = false, @@ -33777,7 +33823,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.String, FieldName = "Address1", Width = 200, - ListOrderNo = 9, + ListOrderNo = 10, Visible = true, IsActive = true, IsDeleted = false, @@ -33808,7 +33854,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.String, FieldName = "Address2", Width = 200, - ListOrderNo = 10, + ListOrderNo = 11, Visible = true, IsActive = true, IsDeleted = false, @@ -33839,7 +33885,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.String, FieldName = "Country", Width = 100, - ListOrderNo = 11, + ListOrderNo = 12, Visible = true, IsActive = true, IsDeleted = false, @@ -33878,7 +33924,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.String, FieldName = "City", Width = 100, - ListOrderNo = 12, + ListOrderNo = 13, Visible = true, IsActive = true, IsDeleted = false, @@ -33920,7 +33966,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.String, FieldName = "District", Width = 100, - ListOrderNo = 13, + ListOrderNo = 14, Visible = true, IsActive = true, IsDeleted = false, @@ -33962,7 +34008,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.String, FieldName = "PostalCode", Width = 100, - ListOrderNo = 14, + ListOrderNo = 15, Visible = true, IsActive = true, IsDeleted = false, @@ -33993,7 +34039,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.String, FieldName = "Phone", Width = 100, - ListOrderNo = 15, + ListOrderNo = 16, Visible = true, IsActive = true, IsDeleted = false, @@ -34024,7 +34070,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.String, FieldName = "PersonalPhone", Width = 100, - ListOrderNo = 16, + ListOrderNo = 17, Visible = true, IsActive = true, IsDeleted = false, @@ -34055,7 +34101,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.String, FieldName = "Email", Width = 200, - ListOrderNo = 17, + ListOrderNo = 18, Visible = true, IsActive = true, IsDeleted = false, @@ -34091,7 +34137,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.String, FieldName = "EmergencyContactName", Width = 100, - ListOrderNo = 18, + ListOrderNo = 19, Visible = true, IsActive = true, IsDeleted = false, @@ -34122,7 +34168,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.String, FieldName = "EmergencyContactRelationship", Width = 100, - ListOrderNo = 19, + ListOrderNo = 20, Visible = true, IsActive = true, IsDeleted = false, @@ -34153,7 +34199,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.String, FieldName = "EmergencyContactPhone", Width = 150, - ListOrderNo = 20, + ListOrderNo = 21, Visible = true, IsActive = true, IsDeleted = false, @@ -34184,7 +34230,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.Date, FieldName = "HireDate", Width = 100, - ListOrderNo = 21, + ListOrderNo = 22, Visible = true, IsActive = true, IsDeleted = false, @@ -34215,7 +34261,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.Date, FieldName = "TerminationDate", Width = 100, - ListOrderNo = 22, + ListOrderNo = 23, Visible = true, IsActive = true, IsDeleted = false, @@ -34246,7 +34292,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.Guid, FieldName = "EmploymentTypeId", Width = 100, - ListOrderNo = 23, + ListOrderNo = 24, Visible = true, IsActive = true, IsDeleted = false, @@ -34284,7 +34330,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.Guid, FieldName = "JobPositionId", Width = 100, - ListOrderNo = 24, + ListOrderNo = 25, Visible = true, IsActive = true, IsDeleted = false, @@ -34322,7 +34368,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.Guid, FieldName = "DepartmentId", Width = 100, - ListOrderNo = 25, + ListOrderNo = 26, Visible = true, IsActive = true, IsDeleted = false, @@ -34360,7 +34406,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.String, FieldName = "WorkLocation", Width = 150, - ListOrderNo = 26, + ListOrderNo = 27, Visible = true, IsActive = true, IsDeleted = false, @@ -34391,7 +34437,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.Guid, FieldName = "ManagerId", Width = 100, - ListOrderNo = 27, + ListOrderNo = 28, Visible = true, IsActive = true, IsDeleted = false, @@ -34431,7 +34477,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency Format = "fixedPoint", Alignment = "right", Width = 100, - ListOrderNo = 28, + ListOrderNo = 29, Visible = true, IsActive = true, IsDeleted = false, @@ -34462,7 +34508,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.Guid, FieldName = "CurrencyId", Width = 100, - ListOrderNo = 29, + ListOrderNo = 30, Visible = true, IsActive = true, IsDeleted = false, @@ -34500,7 +34546,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.String, FieldName = "PayrollGroup", Width = 100, - ListOrderNo = 30, + ListOrderNo = 31, Visible = true, IsActive = true, IsDeleted = false, @@ -34542,7 +34588,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.Guid, FieldName = "BankAccountId", Width = 100, - ListOrderNo = 31, + ListOrderNo = 32, Visible = true, IsActive = true, IsDeleted = false, @@ -34580,7 +34626,7 @@ public class ListFormSeeder : IDataSeedContributor, ITransientDependency SourceDbType = DbType.Guid, FieldName = "BadgeId", Width = 100, - ListOrderNo = 32, + ListOrderNo = 33, Visible = true, IsActive = true, IsDeleted = false, diff --git a/ui/src/mocks/mockEmployees.ts b/ui/src/mocks/mockEmployees.ts index 4e7ce81b..f4622e79 100644 --- a/ui/src/mocks/mockEmployees.ts +++ b/ui/src/mocks/mockEmployees.ts @@ -1,5 +1,5 @@ +import { EmployeeDto } from "@/proxy/intranet/models"; import { - EmployeeDto, EmployeeStatusEnum, EmploymentTypeEnum, GenderEnum,