diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json b/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json index 1eae2748..4e83480a 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json +++ b/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json @@ -9615,13 +9615,13 @@ }, { "resourceName": "Platform", - "key": "App.Project.Task", - "tr": "Görev Tanımları", - "en": "Task Definitions" + "key": "App.Project.TaskType", + "tr": "Görev Türleri", + "en": "Task Types" }, { "resourceName": "Platform", - "key": "App.Project.Tasks", + "key": "App.Project.Task", "tr": "Görevler", "en": "Tasks" }, diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Project.cs b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Project.cs index 47c88b73..2157ded0 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Project.cs +++ b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Project.cs @@ -1287,8 +1287,8 @@ public class ListFormSeeder_Project : IDataSeedContributor, ITransientDependency } #endregion - #region Project Task - listFormName = AppCodes.Project.Task; + #region Project Task Type + listFormName = AppCodes.Project.TaskType; if (!await _listFormRepository.AnyAsync(a => a.ListFormCode == listFormName)) { var listForm = await _listFormRepository.InsertAsync( @@ -1308,7 +1308,7 @@ public class ListFormSeeder_Project : IDataSeedContributor, ITransientDependency IsOrganizationUnit = false, Description = listFormName, SelectCommandType = SelectCommandTypeEnum.Table, - SelectCommand = TableNameResolver.GetFullTableName(nameof(TableNameEnum.ProjectTask)), + SelectCommand = TableNameResolver.GetFullTableName(nameof(TableNameEnum.ProjectTaskType)), KeyFieldName = "Id", KeyFieldDbSourceType = DbType.Guid, DefaultFilter = DefaultFilterJson, @@ -1320,7 +1320,7 @@ public class ListFormSeeder_Project : IDataSeedContributor, ITransientDependency SelectionJson = DefaultSelectionSingleJson, ColumnOptionJson = DefaultColumnOptionJson, PermissionJson = DefaultPermissionJson(listFormName), - DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.ProjectTask)), + DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.ProjectTaskType)), DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson, PagerOptionJson = DefaultPagerOptionJson, EditingOptionJson = DefaultEditingOptionJson(listFormName, 500, 300, true, true, true, true, false), @@ -1340,7 +1340,7 @@ public class ListFormSeeder_Project : IDataSeedContributor, ITransientDependency } ); - #region Project Task Fields + #region Project Task Type Fields await _listFormFieldRepository.InsertManyAsync([ new() { ListFormCode = listForm.ListFormCode, diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/MenusData.json b/api/src/Erp.Platform.DbMigrator/Seeds/MenusData.json index 02d845d1..b944c663 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/MenusData.json +++ b/api/src/Erp.Platform.DbMigrator/Seeds/MenusData.json @@ -2590,7 +2590,7 @@ "DisplayName": "App.Project.Status", "Order": 2, "Url": "/admin/list/App.Project.Status", - "Icon": "FcTimeline", + "Icon": "FcApproval", "RequiredPermissionName": "App.Project.Status", "IsDisabled": false }, @@ -2600,7 +2600,7 @@ "DisplayName": "App.Project.Category", "Order": 3, "Url": "/admin/list/App.Project.Category", - "Icon": "FcTimeline", + "Icon": "FcGrid", "RequiredPermissionName": "App.Project.Category", "IsDisabled": false }, @@ -2616,12 +2616,12 @@ }, { "ParentCode": "App.Project", - "Code": "App.Project.Task", - "DisplayName": "App.Project.Task", + "Code": "App.Project.TaskType", + "DisplayName": "App.Project.TaskType", "Order": 5, - "Url": "/admin/list/App.Project.Task", + "Url": "/admin/list/App.Project.TaskType", "Icon": "FcPlanner", - "RequiredPermissionName": "App.Project.Task", + "RequiredPermissionName": "App.Project.TaskType", "IsDisabled": false }, { @@ -2640,18 +2640,18 @@ "DisplayName": "App.Project.Phase", "Order": 7, "Url": "/admin/list/App.Project.Phase", - "Icon": "FcParallelTasks", + "Icon": "FcProcess", "RequiredPermissionName": "App.Project.Phase", "IsDisabled": false }, { "ParentCode": "App.Project", - "Code": "App.Project.Tasks", - "DisplayName": "App.Project.Tasks", + "Code": "App.Project.Task", + "DisplayName": "App.Project.Task", "Order": 8, "Url": "/admin/projects/tasks", - "Icon": "FcBullish", - "RequiredPermissionName": "App.Project.Tasks", + "Icon": "FcInspection", + "RequiredPermissionName": "App.Project.Task", "IsDisabled": false }, { @@ -2660,7 +2660,7 @@ "DisplayName": "App.Project.Activity", "Order": 9, "Url": "/admin/projects/activities", - "Icon": "FcPlanner", + "Icon": "FcServices", "RequiredPermissionName": "App.Project.Activity", "IsDisabled": false }, @@ -2670,7 +2670,7 @@ "DisplayName": "App.Project.Workload", "Order": 10, "Url": "/admin/projects/workload", - "Icon": "FcFlowChart", + "Icon": "FcComboChart", "RequiredPermissionName": "App.Project.Workload", "IsDisabled": false }, diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/PermissionsData.json b/api/src/Erp.Platform.DbMigrator/Seeds/PermissionsData.json index 57f5edc2..839bf2f4 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/PermissionsData.json +++ b/api/src/Erp.Platform.DbMigrator/Seeds/PermissionsData.json @@ -8395,6 +8395,70 @@ "MultiTenancySide": 3, "MenuGroup": "Erp" }, + { + "GroupName": "App.Project", + "Name": "App.Project.TaskType", + "ParentName": null, + "DisplayName": "App.Project.TaskType", + "IsEnabled": true, + "MultiTenancySide": 3, + "MenuGroup": "Erp" + }, + { + "GroupName": "App.Project", + "Name": "App.Project.TaskType.Create", + "ParentName": "App.Project.TaskType", + "DisplayName": "Create", + "IsEnabled": true, + "MultiTenancySide": 3, + "MenuGroup": "Erp" + }, + { + "GroupName": "App.Project", + "Name": "App.Project.TaskType.Update", + "ParentName": "App.Project.TaskType", + "DisplayName": "Update", + "IsEnabled": true, + "MultiTenancySide": 3, + "MenuGroup": "Erp" + }, + { + "GroupName": "App.Project", + "Name": "App.Project.TaskType.Delete", + "ParentName": "App.Project.TaskType", + "DisplayName": "Delete", + "IsEnabled": true, + "MultiTenancySide": 3, + "MenuGroup": "Erp" + }, + { + "GroupName": "App.Project", + "Name": "App.Project.TaskType.Export", + "ParentName": "App.Project.TaskType", + "DisplayName": "Export", + "IsEnabled": true, + "MultiTenancySide": 3, + "MenuGroup": "Erp" + }, + { + "GroupName": "App.Project", + "Name": "App.Project.TaskType.Import", + "ParentName": "App.Project.TaskType", + "DisplayName": "Import", + "IsEnabled": true, + "MultiTenancySide": 3, + "MenuGroup": "Erp" + }, + { + "GroupName": "App.Project", + "Name": "App.Project.TaskType.Note", + "ParentName": "App.Project.TaskType", + "DisplayName": "Note", + "IsEnabled": true, + "MultiTenancySide": 3, + "MenuGroup": "Erp" + }, + { "GroupName": "App.Project", "Name": "App.Project.Task", @@ -8468,70 +8532,6 @@ "MenuGroup": "Erp" }, - { - "GroupName": "App.Project", - "Name": "App.Project.Tasks", - "ParentName": null, - "DisplayName": "App.Project.Tasks", - "IsEnabled": true, - "MultiTenancySide": 3, - "MenuGroup": "Erp" - }, - { - "GroupName": "App.Project", - "Name": "App.Project.Tasks.Create", - "ParentName": "App.Project.Tasks", - "DisplayName": "Create", - "IsEnabled": true, - "MultiTenancySide": 3, - "MenuGroup": "Erp" - }, - { - "GroupName": "App.Project", - "Name": "App.Project.Tasks.Update", - "ParentName": "App.Project.Tasks", - "DisplayName": "Update", - "IsEnabled": true, - "MultiTenancySide": 3, - "MenuGroup": "Erp" - }, - { - "GroupName": "App.Project", - "Name": "App.Project.Tasks.Delete", - "ParentName": "App.Project.Tasks", - "DisplayName": "Delete", - "IsEnabled": true, - "MultiTenancySide": 3, - "MenuGroup": "Erp" - }, - { - "GroupName": "App.Project", - "Name": "App.Project.Tasks.Export", - "ParentName": "App.Project.Tasks", - "DisplayName": "Export", - "IsEnabled": true, - "MultiTenancySide": 3, - "MenuGroup": "Erp" - }, - { - "GroupName": "App.Project", - "Name": "App.Project.Tasks.Import", - "ParentName": "App.Project.Tasks", - "DisplayName": "Import", - "IsEnabled": true, - "MultiTenancySide": 3, - "MenuGroup": "Erp" - }, - { - "GroupName": "App.Project", - "Name": "App.Project.Tasks.Note", - "ParentName": "App.Project.Tasks", - "DisplayName": "Note", - "IsEnabled": true, - "MultiTenancySide": 3, - "MenuGroup": "Erp" - }, - { "GroupName": "App.Project", "Name": "App.Project.Activity", diff --git a/api/src/Erp.Platform.Domain.Shared/Enums/TableNameEnum.cs b/api/src/Erp.Platform.Domain.Shared/Enums/TableNameEnum.cs index c5a30383..9ac8f518 100644 --- a/api/src/Erp.Platform.Domain.Shared/Enums/TableNameEnum.cs +++ b/api/src/Erp.Platform.Domain.Shared/Enums/TableNameEnum.cs @@ -194,5 +194,5 @@ public enum TableNameEnum ProjectRisk, ProjectPhase, ProjectCategory, - ProjectTask + ProjectTaskType } diff --git a/api/src/Erp.Platform.Domain.Shared/TableNameResolver.cs b/api/src/Erp.Platform.Domain.Shared/TableNameResolver.cs index 2116268d..e60b321c 100644 --- a/api/src/Erp.Platform.Domain.Shared/TableNameResolver.cs +++ b/api/src/Erp.Platform.Domain.Shared/TableNameResolver.cs @@ -233,7 +233,7 @@ public static class TableNameResolver { nameof(TableNameEnum.ProjectCategory), (TablePrefix.TenantByName, MenuPrefix.Project) }, { nameof(TableNameEnum.ProjectPhase), (TablePrefix.TenantByName, MenuPrefix.Project) }, { nameof(TableNameEnum.Projects), (TablePrefix.TenantByName, MenuPrefix.Project) }, - { nameof(TableNameEnum.ProjectTask), (TablePrefix.TenantByName, MenuPrefix.Project) }, + { nameof(TableNameEnum.ProjectTaskType), (TablePrefix.TenantByName, MenuPrefix.Project) }, }; public static string GetFullTableName(string tableName) diff --git a/api/src/Erp.Platform.Domain/Data/SeedConsts.cs b/api/src/Erp.Platform.Domain/Data/SeedConsts.cs index d7292ea2..168e57e9 100644 --- a/api/src/Erp.Platform.Domain/Data/SeedConsts.cs +++ b/api/src/Erp.Platform.Domain/Data/SeedConsts.cs @@ -568,7 +568,7 @@ public static class SeedConsts public const string Risk = Default + ".Risk"; public const string Category = Default + ".Category"; public const string Phase = Default + ".Phase"; - public const string Task = Default + ".Task"; + public const string TaskType = Default + ".TaskType"; } public static class Mrp diff --git a/api/src/Erp.Platform.Domain/Entities/Tenant/Project/ProjectTask.cs b/api/src/Erp.Platform.Domain/Entities/Tenant/Project/ProjectTaskType.cs similarity index 84% rename from api/src/Erp.Platform.Domain/Entities/Tenant/Project/ProjectTask.cs rename to api/src/Erp.Platform.Domain/Entities/Tenant/Project/ProjectTaskType.cs index 756bcce7..5d78a5da 100644 --- a/api/src/Erp.Platform.Domain/Entities/Tenant/Project/ProjectTask.cs +++ b/api/src/Erp.Platform.Domain/Entities/Tenant/Project/ProjectTaskType.cs @@ -5,7 +5,7 @@ using Volo.Abp.MultiTenancy; namespace Erp.Platform.Entities; -public class ProjectTask : FullAuditedEntity, IMultiTenant +public class ProjectTaskType : FullAuditedEntity, IMultiTenant { public Guid? TenantId { get; set; } diff --git a/api/src/Erp.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs b/api/src/Erp.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs index 2bd53eee..05c09ede 100644 --- a/api/src/Erp.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs +++ b/api/src/Erp.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs @@ -274,7 +274,7 @@ public class PlatformDbContext : public DbSet ProjectRisks { get; set; } public DbSet ProjectCategories { get; set; } public DbSet ProjectPhases { get; set; } - public DbSet ProjectTasks { get; set; } + public DbSet ProjectTasks { get; set; } #endregion public PlatformDbContext(DbContextOptions options) @@ -3309,9 +3309,9 @@ public class PlatformDbContext : b.Property(x => x.IsActive).HasDefaultValue(true); }); - builder.Entity(b => + builder.Entity(b => { - b.ToTable(TableNameResolver.GetFullTableName(nameof(TableNameEnum.ProjectTask)), Prefix.DbSchema); + b.ToTable(TableNameResolver.GetFullTableName(nameof(TableNameEnum.ProjectTaskType)), Prefix.DbSchema); b.ConfigureByConvention(); b.Property(x => x.Name).IsRequired().HasMaxLength(50); diff --git a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251127105051_Initial.Designer.cs b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251127112310_Initial.Designer.cs similarity index 99% rename from api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251127105051_Initial.Designer.cs rename to api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251127112310_Initial.Designer.cs index e65779a4..1d9e5223 100644 --- a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251127105051_Initial.Designer.cs +++ b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251127112310_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace Erp.Platform.Migrations { [DbContext(typeof(PlatformDbContext))] - [Migration("20251127105051_Initial")] + [Migration("20251127112310_Initial")] partial class Initial { /// @@ -9848,7 +9848,7 @@ namespace Erp.Platform.Migrations b.Property("ProjectPhaseId") .HasColumnType("uniqueidentifier"); - b.Property("ProjectTaskId") + b.Property("ProjectTaskTypeId") .HasColumnType("uniqueidentifier"); b.Property("ProjectTypeId") @@ -9872,7 +9872,7 @@ namespace Erp.Platform.Migrations b.HasIndex("ProjectPhaseId"); - b.HasIndex("ProjectTaskId"); + b.HasIndex("ProjectTaskTypeId"); b.HasIndex("ProjectTypeId"); @@ -10176,7 +10176,7 @@ namespace Erp.Platform.Migrations b.ToTable("Prj_T_ProjectStatus", (string)null); }); - modelBuilder.Entity("Erp.Platform.Entities.ProjectTask", b => + modelBuilder.Entity("Erp.Platform.Entities.ProjectTaskType", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -10231,7 +10231,7 @@ namespace Erp.Platform.Migrations b.HasKey("Id"); - b.ToTable("Prj_T_ProjectTask", (string)null); + b.ToTable("Prj_T_ProjectTaskType", (string)null); }); modelBuilder.Entity("Erp.Platform.Entities.ProjectType", b => @@ -17427,9 +17427,9 @@ namespace Erp.Platform.Migrations .WithMany("Projects") .HasForeignKey("ProjectPhaseId"); - b.HasOne("Erp.Platform.Entities.ProjectTask", null) + b.HasOne("Erp.Platform.Entities.ProjectTaskType", null) .WithMany("Projects") - .HasForeignKey("ProjectTaskId"); + .HasForeignKey("ProjectTaskTypeId"); b.HasOne("Erp.Platform.Entities.ProjectType", "ProjectType") .WithMany("Projects") @@ -18380,7 +18380,7 @@ namespace Erp.Platform.Migrations b.Navigation("Projects"); }); - modelBuilder.Entity("Erp.Platform.Entities.ProjectTask", b => + modelBuilder.Entity("Erp.Platform.Entities.ProjectTaskType", b => { b.Navigation("Projects"); }); diff --git a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251127105051_Initial.cs b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251127112310_Initial.cs similarity index 99% rename from api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251127105051_Initial.cs rename to api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251127112310_Initial.cs index b8257e60..8f7e2e94 100644 --- a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251127105051_Initial.cs +++ b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251127112310_Initial.cs @@ -1890,7 +1890,7 @@ namespace Erp.Platform.Migrations }); migrationBuilder.CreateTable( - name: "Prj_T_ProjectTask", + name: "Prj_T_ProjectTaskType", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), @@ -1908,7 +1908,7 @@ namespace Erp.Platform.Migrations }, constraints: table => { - table.PrimaryKey("PK_Prj_T_ProjectTask", x => x.Id); + table.PrimaryKey("PK_Prj_T_ProjectTaskType", x => x.Id); }); migrationBuilder.CreateTable( @@ -6840,7 +6840,7 @@ namespace Erp.Platform.Migrations Progress = table.Column(type: "int", nullable: false, defaultValue: 0), IsActive = table.Column(type: "bit", nullable: false, defaultValue: true), ProjectPhaseId = table.Column(type: "uniqueidentifier", nullable: true), - ProjectTaskId = table.Column(type: "uniqueidentifier", nullable: true), + ProjectTaskTypeId = table.Column(type: "uniqueidentifier", nullable: true), CreationTime = table.Column(type: "datetime2", nullable: false), CreatorId = table.Column(type: "uniqueidentifier", nullable: true), LastModificationTime = table.Column(type: "datetime2", nullable: true), @@ -6874,9 +6874,9 @@ namespace Erp.Platform.Migrations principalColumn: "Id", onDelete: ReferentialAction.Restrict); table.ForeignKey( - name: "FK_Prj_T_Projects_Prj_T_ProjectTask_ProjectTaskId", - column: x => x.ProjectTaskId, - principalTable: "Prj_T_ProjectTask", + name: "FK_Prj_T_Projects_Prj_T_ProjectTaskType_ProjectTaskTypeId", + column: x => x.ProjectTaskTypeId, + principalTable: "Prj_T_ProjectTaskType", principalColumn: "Id"); table.ForeignKey( name: "FK_Prj_T_Projects_Prj_T_ProjectType_ProjectTypeId", @@ -7831,9 +7831,9 @@ namespace Erp.Platform.Migrations column: "ProjectPhaseId"); migrationBuilder.CreateIndex( - name: "IX_Prj_T_Projects_ProjectTaskId", + name: "IX_Prj_T_Projects_ProjectTaskTypeId", table: "Prj_T_Projects", - column: "ProjectTaskId"); + column: "ProjectTaskTypeId"); migrationBuilder.CreateIndex( name: "IX_Prj_T_Projects_ProjectTypeId", @@ -8911,7 +8911,7 @@ namespace Erp.Platform.Migrations name: "Prj_T_ProjectPhase"); migrationBuilder.DropTable( - name: "Prj_T_ProjectTask"); + name: "Prj_T_ProjectTaskType"); migrationBuilder.DropTable( name: "Prj_T_ProjectType"); diff --git a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs index 66f1c0c5..c3964c7b 100644 --- a/api/src/Erp.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs +++ b/api/src/Erp.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs @@ -9845,7 +9845,7 @@ namespace Erp.Platform.Migrations b.Property("ProjectPhaseId") .HasColumnType("uniqueidentifier"); - b.Property("ProjectTaskId") + b.Property("ProjectTaskTypeId") .HasColumnType("uniqueidentifier"); b.Property("ProjectTypeId") @@ -9869,7 +9869,7 @@ namespace Erp.Platform.Migrations b.HasIndex("ProjectPhaseId"); - b.HasIndex("ProjectTaskId"); + b.HasIndex("ProjectTaskTypeId"); b.HasIndex("ProjectTypeId"); @@ -10173,7 +10173,7 @@ namespace Erp.Platform.Migrations b.ToTable("Prj_T_ProjectStatus", (string)null); }); - modelBuilder.Entity("Erp.Platform.Entities.ProjectTask", b => + modelBuilder.Entity("Erp.Platform.Entities.ProjectTaskType", b => { b.Property("Id") .HasColumnType("uniqueidentifier"); @@ -10228,7 +10228,7 @@ namespace Erp.Platform.Migrations b.HasKey("Id"); - b.ToTable("Prj_T_ProjectTask", (string)null); + b.ToTable("Prj_T_ProjectTaskType", (string)null); }); modelBuilder.Entity("Erp.Platform.Entities.ProjectType", b => @@ -17424,9 +17424,9 @@ namespace Erp.Platform.Migrations .WithMany("Projects") .HasForeignKey("ProjectPhaseId"); - b.HasOne("Erp.Platform.Entities.ProjectTask", null) + b.HasOne("Erp.Platform.Entities.ProjectTaskType", null) .WithMany("Projects") - .HasForeignKey("ProjectTaskId"); + .HasForeignKey("ProjectTaskTypeId"); b.HasOne("Erp.Platform.Entities.ProjectType", "ProjectType") .WithMany("Projects") @@ -18377,7 +18377,7 @@ namespace Erp.Platform.Migrations b.Navigation("Projects"); }); - modelBuilder.Entity("Erp.Platform.Entities.ProjectTask", b => + modelBuilder.Entity("Erp.Platform.Entities.ProjectTaskType", b => { b.Navigation("Projects"); }); diff --git a/api/src/Erp.Platform.EntityFrameworkCore/Tenants/Seeds/TenantData.json b/api/src/Erp.Platform.EntityFrameworkCore/Tenants/Seeds/TenantData.json index a7f58665..f9192753 100644 --- a/api/src/Erp.Platform.EntityFrameworkCore/Tenants/Seeds/TenantData.json +++ b/api/src/Erp.Platform.EntityFrameworkCore/Tenants/Seeds/TenantData.json @@ -6119,7 +6119,7 @@ "isActive": false } ], - "ProjectTasks": [ + "ProjectTaskTypes": [ { "name": "Geliştirme", "description": "Projenin planlama aşamasında olduğunu ifade eder", diff --git a/api/src/Erp.Platform.EntityFrameworkCore/Tenants/TenantDataSeeder.cs b/api/src/Erp.Platform.EntityFrameworkCore/Tenants/TenantDataSeeder.cs index ac92b10a..55ae9c9a 100644 --- a/api/src/Erp.Platform.EntityFrameworkCore/Tenants/TenantDataSeeder.cs +++ b/api/src/Erp.Platform.EntityFrameworkCore/Tenants/TenantDataSeeder.cs @@ -134,7 +134,7 @@ public class TenantDataSeeder : IDataSeedContributor, ITransientDependency private readonly IRepository _projectCategoryRepository; private readonly IRepository _projectRiskRepository; private readonly IRepository _projectPhaseRepository; - private readonly IRepository _projectTaskRepository; + private readonly IRepository _projectTaskRepository; public TenantDataSeeder( IClock clock, @@ -252,7 +252,7 @@ public class TenantDataSeeder : IDataSeedContributor, ITransientDependency IRepository projectRiskRepository, IRepository projectCategoryRepository, IRepository projectPhaseRepository, - IRepository projectTaskRepository + IRepository projectTaskRepository ) { _clock = clock; @@ -2588,13 +2588,13 @@ public class TenantDataSeeder : IDataSeedContributor, ITransientDependency }, autoSave: true); } - foreach (var item in items.ProjectTasks) + foreach (var item in items.ProjectTaskTypes) { var exists = await _projectTaskRepository.AnyAsync(x => x.Name == item.Name); if (exists) continue; - await _projectTaskRepository.InsertAsync(new ProjectTask + await _projectTaskRepository.InsertAsync(new ProjectTaskType { Name = item.Name, Description = item.Description, diff --git a/api/src/Erp.Platform.EntityFrameworkCore/Tenants/TenantSeederDto.cs b/api/src/Erp.Platform.EntityFrameworkCore/Tenants/TenantSeederDto.cs index 2e30c119..26449459 100644 --- a/api/src/Erp.Platform.EntityFrameworkCore/Tenants/TenantSeederDto.cs +++ b/api/src/Erp.Platform.EntityFrameworkCore/Tenants/TenantSeederDto.cs @@ -134,10 +134,10 @@ public class TenantSeederDto public List ProjectRisks { get; set; } public List ProjectCategories { get; set; } public List ProjectPhases { get; set; } - public List ProjectTasks { get; set; } + public List ProjectTaskTypes { get; set; } } -public class ProjectTaskSeedDto +public class ProjectTaskTypeSeedDto { public string Name { get; set; } public string Description { get; set; } diff --git a/ui/src/views/intranet/Dashboard.tsx b/ui/src/views/intranet/Dashboard.tsx index b36caf56..a3f041c4 100644 --- a/ui/src/views/intranet/Dashboard.tsx +++ b/ui/src/views/intranet/Dashboard.tsx @@ -127,7 +127,7 @@ const IntranetDashboard: React.FC = () => { permission: 'App.Intranet.Announcement.Widget', column: 'right', }, - { id: 'priority-tasks', permission: 'App.Project.Task.Widget', column: 'right' }, + { id: 'priority-tasks', permission: 'App.Project.TaskType.Widget', column: 'right' }, { id: 'meal-weekly-menu', permission: 'App.Intranet.Meal.Widget', column: 'right' }, { id: 'shuttle-route', permission: 'App.Intranet.ShuttleRoute.Widget', column: 'right' }, { id: 'leave-management', permission: 'App.Hr.Leave.Widget', column: 'right' },