From 5b155966963775682d3f817caeceabf9b8e89923 Mon Sep 17 00:00:00 2001 From: SamSys Date: Sun, 4 Jan 2026 15:35:06 +0330 Subject: [PATCH] SchemeList, Edit, Create, delete --- .../IClassificationSchemeRepository.cs | 18 ++++- .../CheckStatusToDeleteScheme.cs | 32 +++++++++ ...odel.cs => ClassificationSchemeListDto.cs} | 4 +- .../CreateClassificationScheme.cs | 6 +- .../CreateClassificationSchemeDto.cs | 46 ++++++++++++ .../EditClassificationSchemeDto.cs | 45 ++++++++++++ .../IClassificationSchemeApplication.cs | 29 ++++++-- .../ClassificationScheme/SchemeListDto.cs | 32 +++++++++ .../ClassificationSchemeApplication.cs | 71 ++++++++++++++++--- .../ClassificationSchemeRepository.cs | 57 ++++++++++----- .../ClassificationSchemeController.cs | 53 ++++++++++++-- .../Workshops/ClassificationScheme.cshtml.cs | 26 +++---- .../ClassificationSchemeTab.cshtml | 2 +- 13 files changed, 363 insertions(+), 58 deletions(-) create mode 100644 CompanyManagment.App.Contracts/ClassificationScheme/CheckStatusToDeleteScheme.cs rename CompanyManagment.App.Contracts/ClassificationScheme/{ClassificationSchemePartialModel.cs => ClassificationSchemeListDto.cs} (78%) create mode 100644 CompanyManagment.App.Contracts/ClassificationScheme/CreateClassificationSchemeDto.cs create mode 100644 CompanyManagment.App.Contracts/ClassificationScheme/EditClassificationSchemeDto.cs create mode 100644 CompanyManagment.App.Contracts/ClassificationScheme/SchemeListDto.cs diff --git a/Company.Domain/ClassificationSchemeAgg/IClassificationSchemeRepository.cs b/Company.Domain/ClassificationSchemeAgg/IClassificationSchemeRepository.cs index ad4b43e9..8d41ae41 100644 --- a/Company.Domain/ClassificationSchemeAgg/IClassificationSchemeRepository.cs +++ b/Company.Domain/ClassificationSchemeAgg/IClassificationSchemeRepository.cs @@ -15,7 +15,7 @@ public interface IClassificationSchemeRepository : IRepository /// /// - Task ClassificationSchemePartialModel(long workshopId); + Task GetClassificationSchemeList(long workshopId); /// @@ -23,9 +23,16 @@ public interface IClassificationSchemeRepository : IRepository /// /// - Task GetClassificationScheme(long id); + Task GetClassificationScheme(long id); + /// + /// دریافت اطلاعات طر برای محاسبات + /// + /// + /// + Task GetClassificationSchemeToCompute(long id); + /// /// متد محاسبه پایه سنوات برا افراد تک گروه /// @@ -39,4 +46,11 @@ public interface IClassificationSchemeRepository : IRepository Task BaseYearComputeOneGroup(DateTime schemeStart, DateTime? schemeEnd, DateTime contractStart, DateTime contractEnd, string groupNo, long employeeId, long workshopId); + + /// + /// حذف طرح + /// + /// + /// + Task DeleteClassificationScheme(long id); } \ No newline at end of file diff --git a/CompanyManagment.App.Contracts/ClassificationScheme/CheckStatusToDeleteScheme.cs b/CompanyManagment.App.Contracts/ClassificationScheme/CheckStatusToDeleteScheme.cs new file mode 100644 index 00000000..deac4a4d --- /dev/null +++ b/CompanyManagment.App.Contracts/ClassificationScheme/CheckStatusToDeleteScheme.cs @@ -0,0 +1,32 @@ +namespace CompanyManagment.App.Contracts.ClassificationScheme; + +public class CheckStatusToDeleteScheme +{ + /// + /// وضعیت طرح برای حذف + /// + public DeleteSchemeStatus DeleteSchemeStatus { get; set; } + + /// + /// پیام سیستم + /// + public string Message { get; set; } +} + +public enum DeleteSchemeStatus +{ + /// + /// مجاز + /// + Valid, + /// + /// مجاز باشرط تایید + /// + ConfirmationNeeded, + + /// + /// غیر مجاز + /// + NotValid, + +} \ No newline at end of file diff --git a/CompanyManagment.App.Contracts/ClassificationScheme/ClassificationSchemePartialModel.cs b/CompanyManagment.App.Contracts/ClassificationScheme/ClassificationSchemeListDto.cs similarity index 78% rename from CompanyManagment.App.Contracts/ClassificationScheme/ClassificationSchemePartialModel.cs rename to CompanyManagment.App.Contracts/ClassificationScheme/ClassificationSchemeListDto.cs index 18778e3a..aee59eb6 100644 --- a/CompanyManagment.App.Contracts/ClassificationScheme/ClassificationSchemePartialModel.cs +++ b/CompanyManagment.App.Contracts/ClassificationScheme/ClassificationSchemeListDto.cs @@ -5,7 +5,7 @@ namespace CompanyManagment.App.Contracts.ClassificationScheme; /// /// پارشیال صفحه ایجاد طرح /// -public class ClassificationSchemePartialModel +public class ClassificationSchemeListDto { /// /// آیا طرح دارد @@ -20,5 +20,5 @@ public class ClassificationSchemePartialModel /// /// لیست طرح /// - public List ClassificationSchemesList { get; set; } + public List ClassificationSchemesList { get; set; } } \ No newline at end of file diff --git a/CompanyManagment.App.Contracts/ClassificationScheme/CreateClassificationScheme.cs b/CompanyManagment.App.Contracts/ClassificationScheme/CreateClassificationScheme.cs index e740d97b..75f1812d 100644 --- a/CompanyManagment.App.Contracts/ClassificationScheme/CreateClassificationScheme.cs +++ b/CompanyManagment.App.Contracts/ClassificationScheme/CreateClassificationScheme.cs @@ -9,11 +9,7 @@ namespace CompanyManagment.App.Contracts.ClassificationScheme; /// public class CreateClassificationScheme { - /// - /// تاریخ شمول طرح - /// میلادی - /// - public DateTime IncludingDateGr { get; set; } + /// /// تاریخ شمول طرح diff --git a/CompanyManagment.App.Contracts/ClassificationScheme/CreateClassificationSchemeDto.cs b/CompanyManagment.App.Contracts/ClassificationScheme/CreateClassificationSchemeDto.cs new file mode 100644 index 00000000..130bfcb5 --- /dev/null +++ b/CompanyManagment.App.Contracts/ClassificationScheme/CreateClassificationSchemeDto.cs @@ -0,0 +1,46 @@ +using _0_Framework.Application.Enums; +using System; +using System.ComponentModel.DataAnnotations; + +namespace CompanyManagment.App.Contracts.ClassificationScheme; + +public class CreateClassificationSchemeDto +{ + + + /// + /// تاریخ شمول طرح + /// شمسی + /// + public string IncludingDateFa { get; set; } + + + /// + /// تاریخ اجرای طرح + /// شمسی + /// + public string ExecutionDateFa { get; set; } + + + /// + /// نام کامل طراح + /// + public string DesignerFullName { get; set; } + + /// + /// شماره همراه طراح + /// + [RegularExpression("^[0-9]*$", ErrorMessage = "لطفا فقط عدد وارد کنید")] + public string DesignerPhone { get; set; } + + /// + /// آی دی کارگاه + /// + public long WorkshopId { get; set; } + + + /// + /// نوع ضریب + /// + public TypeOfCoefficient TypeOfCoefficient { get; set; } +} \ No newline at end of file diff --git a/CompanyManagment.App.Contracts/ClassificationScheme/EditClassificationSchemeDto.cs b/CompanyManagment.App.Contracts/ClassificationScheme/EditClassificationSchemeDto.cs new file mode 100644 index 00000000..904acf5f --- /dev/null +++ b/CompanyManagment.App.Contracts/ClassificationScheme/EditClassificationSchemeDto.cs @@ -0,0 +1,45 @@ +using _0_Framework.Application.Enums; +using System.ComponentModel.DataAnnotations; + +namespace CompanyManagment.App.Contracts.ClassificationScheme; + +public class EditClassificationSchemeDto +{ + /// + /// آی دی طرح + /// + public long Id { get; set; } + + /// + /// تاریخ شمول طرح + /// شمسی + /// + public string IncludingDateFa { get; set; } + + + /// + /// تاریخ اجرای طرح + /// شمسی + /// + public string ExecutionDateFa { get; set; } + + + /// + /// نام کامل طراح + /// + public string DesignerFullName { get; set; } + + /// + /// شماره همراه طراح + /// + [RegularExpression("^[0-9]*$", ErrorMessage = "لطفا فقط عدد وارد کنید")] + public string DesignerPhone { get; set; } + + + + + /// + /// نوع ضریب + /// + public TypeOfCoefficient TypeOfCoefficient { get; set; } +} \ No newline at end of file diff --git a/CompanyManagment.App.Contracts/ClassificationScheme/IClassificationSchemeApplication.cs b/CompanyManagment.App.Contracts/ClassificationScheme/IClassificationSchemeApplication.cs index f7e1e3a3..d87424ba 100644 --- a/CompanyManagment.App.Contracts/ClassificationScheme/IClassificationSchemeApplication.cs +++ b/CompanyManagment.App.Contracts/ClassificationScheme/IClassificationSchemeApplication.cs @@ -17,28 +17,35 @@ public interface IClassificationSchemeApplication /// /// /// - Task ClassificationSchemePartialModel(long workshopId); + Task GetClassificationSchemeList(long workshopId); /// /// ایجاد طرح /// /// /// - Task CreateClassificationScheme(CreateClassificationScheme command); + Task CreateClassificationScheme(CreateClassificationSchemeDto command); /// /// دریافت اطلاعات طرح برای مودال ویرایش /// /// /// - Task GetClassificationScheme(long id); + Task GetClassificationScheme(long id); + + /// + /// دریافت اطلاعات طر برای محاسبات + /// + /// + /// + Task GetClassificationSchemeToCompute(long id); /// /// ویرایش طرح /// /// /// - Task EditClassificationScheme(EditClassificationScheme command); + Task EditClassificationScheme(EditClassificationSchemeDto command); @@ -178,4 +185,18 @@ public interface IClassificationSchemeApplication Task BaseYearComputeOneGroup(DateTime schemeStart, DateTime? schemeEnd, DateTime contractStart, DateTime contractEnd, string groupNo, long employeeId, long workshopId); + /// + /// چک کردن امکان حذف طرح + /// + /// + /// + Task CheckToDeleteScheme(long id); + + /// + /// حذف طرح + /// + /// + /// + Task DeleteScheme(long id); + } \ No newline at end of file diff --git a/CompanyManagment.App.Contracts/ClassificationScheme/SchemeListDto.cs b/CompanyManagment.App.Contracts/ClassificationScheme/SchemeListDto.cs new file mode 100644 index 00000000..f1e8133a --- /dev/null +++ b/CompanyManagment.App.Contracts/ClassificationScheme/SchemeListDto.cs @@ -0,0 +1,32 @@ +using System.ComponentModel.DataAnnotations; + +namespace CompanyManagment.App.Contracts.ClassificationScheme; + +public class SchemeListDto +{ + /// + /// آی دی طرح + /// + public long Id { get; set; } + + /// + /// تاریخ شمول طرح + /// شمسی + /// + public string IncludingDateFa { get; set; } + + + /// + /// تاریخ اجرای طرح + /// شمسی + /// + public string ExecutionDateFa { get; set; } + + + /// + /// نام کامل طراح + /// + public string DesignerFullName { get; set; } + + +} \ No newline at end of file diff --git a/CompanyManagment.Application/ClassificationSchemeApplication.cs b/CompanyManagment.Application/ClassificationSchemeApplication.cs index 2c34b5bd..fdc2f332 100644 --- a/CompanyManagment.Application/ClassificationSchemeApplication.cs +++ b/CompanyManagment.Application/ClassificationSchemeApplication.cs @@ -29,12 +29,12 @@ public class ClassificationSchemeApplication : IClassificationSchemeApplication _classificationEmployeeRepository = classificationEmployeeRepository; } - public Task ClassificationSchemePartialModel(long workshopId) + public Task GetClassificationSchemeList(long workshopId) { - return _classificationSchemeRepository.ClassificationSchemePartialModel(workshopId); + return _classificationSchemeRepository.GetClassificationSchemeList(workshopId); } - public async Task CreateClassificationScheme(CreateClassificationScheme command) + public async Task CreateClassificationScheme(CreateClassificationSchemeDto command) { var op = new OperationResult(); @@ -54,7 +54,7 @@ public class ClassificationSchemeApplication : IClassificationSchemeApplication #endregion //ایجاد طرح - var create = new ClassificationScheme(includingDateGr, executionDateGr, + var create = new Company.Domain.ClassificationSchemeAgg.ClassificationScheme(includingDateGr, executionDateGr, command.DesignerFullName, command.DesignerPhone, command.WorkshopId, command.TypeOfCoefficient); _classificationSchemeRepository.Create(create); await _classificationSchemeRepository.SaveChangesAsync(); @@ -90,12 +90,18 @@ public class ClassificationSchemeApplication : IClassificationSchemeApplication return op.Succcedded(); } - public Task GetClassificationScheme(long id) + public async Task GetClassificationScheme(long id) { - return _classificationSchemeRepository.GetClassificationScheme(id); + return await _classificationSchemeRepository.GetClassificationScheme(id); } - public async Task EditClassificationScheme(EditClassificationScheme command) + + public Task GetClassificationSchemeToCompute(long id) + { + return _classificationSchemeRepository.GetClassificationSchemeToCompute(id); + } + + public async Task EditClassificationScheme(EditClassificationSchemeDto command) { var op = new OperationResult(); @@ -349,7 +355,7 @@ public class ClassificationSchemeApplication : IClassificationSchemeApplication #endregion - var scheme = _classificationSchemeRepository.GetClassificationScheme(command.SchemeId).GetAwaiter().GetResult(); + var scheme = _classificationSchemeRepository.GetClassificationSchemeToCompute(command.SchemeId).GetAwaiter().GetResult(); var create = new ClassificationEmployee(scheme.WorkshopId, command.EmployeeId, command.SchemeId, @@ -388,7 +394,7 @@ public class ClassificationSchemeApplication : IClassificationSchemeApplication if (command.Count < 1) return op.Failed("هیچ انتقالی ایجاد نشده است"); var oldGroupsMemberize = await _classificationEmployeeRepository.GetEmployeeMemberizeData(command[0].EmployeeId); - var scheme = await _classificationSchemeRepository.GetClassificationScheme(oldGroupsMemberize[0].SchemeId); + var scheme = await _classificationSchemeRepository.GetClassificationSchemeToCompute(oldGroupsMemberize[0].SchemeId); var newStartDateList = new List(); foreach (var item in command) { @@ -473,7 +479,7 @@ public class ClassificationSchemeApplication : IClassificationSchemeApplication var op = new OperationResult(); var zeroItem = command.First(x => x.Id == 0); var oldGroupsMemberize = await _classificationEmployeeRepository.GetEmployeeMemberizeData(zeroItem.EmployeeId); - var scheme = await _classificationSchemeRepository.GetClassificationScheme(zeroItem.SchemeId); + var scheme = await _classificationSchemeRepository.GetClassificationSchemeToCompute(zeroItem.SchemeId); command = command.Where(x=>x.Id != 0).ToList(); var newStartDateList = new List(); foreach (var item in command) @@ -556,4 +562,49 @@ public class ClassificationSchemeApplication : IClassificationSchemeApplication return await _classificationSchemeRepository.BaseYearComputeOneGroup(schemeStart, schemeEnd, contractStart, contractEnd, groupNo, employeeId, workshopId); } + + public async Task CheckToDeleteScheme(long id) + { + var op = new CheckStatusToDeleteScheme(); + var scheme = _classificationSchemeRepository.Get(id); + if (scheme != null) + { + var employeeInfoList =await _classificationEmployeeRepository.GetEmployeeListData(id); + var anyHasGroup = employeeInfoList.Any(x => x.HasGroup); + if (employeeInfoList.Any() && anyHasGroup) + { + + op.DeleteSchemeStatus = DeleteSchemeStatus.ConfirmationNeeded; + op.Message = "برای این طرح پرسنل افزوده شده است، آیا از حذف طرح اطمینان دارید"; + return op; + + } + else + { + + op.DeleteSchemeStatus = DeleteSchemeStatus.Valid; + op.Message = "مجاز برای حذف"; + return op; + } + + } + + op.DeleteSchemeStatus = DeleteSchemeStatus.NotValid; + op.Message = "یافت نشد"; + return op; + } + + public async Task DeleteScheme(long id) + { + var op = new OperationResult(); + var scheme = _classificationSchemeRepository.Get(id); + + if (scheme != null) + { + await _classificationSchemeRepository.DeleteClassificationScheme(id); + return op.Succcedded(); + } + + return op.Failed("یافت نشد"); + } } \ No newline at end of file diff --git a/CompanyManagment.EFCore/Repository/ClassificationSchemeRepository.cs b/CompanyManagment.EFCore/Repository/ClassificationSchemeRepository.cs index 1935b6a9..1b425196 100644 --- a/CompanyManagment.EFCore/Repository/ClassificationSchemeRepository.cs +++ b/CompanyManagment.EFCore/Repository/ClassificationSchemeRepository.cs @@ -13,7 +13,7 @@ using PersianTools.Core; namespace CompanyManagment.EFCore.Repository; -public class ClassificationSchemeRepository :RepositoryBase, IClassificationSchemeRepository +public class ClassificationSchemeRepository :RepositoryBase, IClassificationSchemeRepository { private readonly CompanyContext _context; public ClassificationSchemeRepository(CompanyContext context) : base(context) @@ -21,37 +21,30 @@ public class ClassificationSchemeRepository :RepositoryBase ClassificationSchemePartialModel(long workshopId) + public async Task GetClassificationSchemeList(long workshopId) { var hasScheme =await _context.ClassificationSchemes.AnyAsync(x => x.WorkshopId == workshopId); if (!hasScheme) - return new ClassificationSchemePartialModel() + return new ClassificationSchemeListDto() { HasScheme = false, }; - var schemeList = _context.ClassificationSchemes.Where(x => x.WorkshopId == workshopId).Select(x => - new EditClassificationScheme() + var schemeList =await _context.ClassificationSchemes.Where(x => x.WorkshopId == workshopId).Select(x => + new SchemeListDto() { - Id = x.id, - WorkshopId = x.WorkshopId, - IncludingDateGr = x.IncludingDateGr, - ExecutionDateGr = x.ExecutionDateGr, - EndSchemeDateGr = x.EndSchemeDateGr, IncludingDateFa = x.IncludingDateGr.ToFarsi(), ExecutionDateFa = x.ExecutionDateGr.ToFarsi(), DesignerFullName = x.DesignerFullName, - DesignerPhone = x.DesignerPhone, - TypeOfCoefficient = x.TypeOfCoefficient }).ToListAsync(); - return new ClassificationSchemePartialModel() + return new ClassificationSchemeListDto() { HasScheme = true, WorkshopId = workshopId, - ClassificationSchemesList = schemeList.GetAwaiter().GetResult() + ClassificationSchemesList = schemeList }; } @@ -61,15 +54,37 @@ public class ClassificationSchemeRepository :RepositoryBase /// /// - public Task GetClassificationScheme(long id) + public Task GetClassificationScheme(long id) { return _context.ClassificationSchemes.Select(x => + new EditClassificationSchemeDto() + { + + Id = x.id, + IncludingDateFa = x.IncludingDateGr.ToFarsi(), + ExecutionDateFa = x.ExecutionDateGr.ToFarsi(), + DesignerFullName = x.DesignerFullName, + DesignerPhone = x.DesignerPhone, + TypeOfCoefficient = x.TypeOfCoefficient + + }).FirstOrDefaultAsync(x => x.Id == id); + } + + + + /// + /// دریافت اطلاعات طر برای محاسبات + /// + /// + /// + public Task GetClassificationSchemeToCompute(long id) + { + return _context.ClassificationSchemes.Select(x => new EditClassificationScheme() { Id = x.id, WorkshopId = x.WorkshopId, - IncludingDateGr = x.IncludingDateGr, ExecutionDateGr = x.ExecutionDateGr, EndSchemeDateGr = x.EndSchemeDateGr, IncludingDateFa = x.IncludingDateGr.ToFarsi(), @@ -527,6 +542,16 @@ public class ClassificationSchemeRepository :RepositoryBase /// متد کمکی پایه سنوات diff --git a/ServiceHost/Areas/Admin/Controllers/ClassificationSchemeController.cs b/ServiceHost/Areas/Admin/Controllers/ClassificationSchemeController.cs index 388e5bdc..a5a4e598 100644 --- a/ServiceHost/Areas/Admin/Controllers/ClassificationSchemeController.cs +++ b/ServiceHost/Areas/Admin/Controllers/ClassificationSchemeController.cs @@ -14,17 +14,24 @@ public class ClassificationSchemeController : AdminBaseController private readonly IClassificationSchemeApplication _classificationSchemeApplication; private readonly IAuthHelper _authHelper; + public ClassificationSchemeController(IClassificationSchemeApplication classificationSchemeApplication, IAuthHelper authHelper) { _classificationSchemeApplication = classificationSchemeApplication; _authHelper = authHelper; } + /// + /// لیست طرح + /// + /// + /// [HttpGet] - public async Task>> GetList() + public async Task> GetList(long workshopId) { - var scheme = _classificationSchemeApplication.ClassificationSchemePartialModel(workshopId).GetAwaiter().GetResult(); - scheme.WorkshopId = workshopId; + var result =await _classificationSchemeApplication.GetClassificationSchemeList(workshopId); + return result; + } /// @@ -33,21 +40,57 @@ public class ClassificationSchemeController : AdminBaseController /// /// [HttpPost("Scheme")] - public async Task> CreateScheme([FromBody] CreateClassificationScheme command) + public async Task> CreateScheme([FromBody] CreateClassificationSchemeDto command) { var result = await _classificationSchemeApplication.CreateClassificationScheme(command); return result; } + /// + /// دریافت اطلاعات طرح برای ویرایش + /// + /// + /// + [HttpGet("GetSchemeToEdit")] + public async Task GetSchemeToEdit(long id) + { + var result = await _classificationSchemeApplication.GetClassificationScheme(id); + return result; + } + /// /// ویرایش طرح /// /// /// [HttpPut("Scheme")] - public async Task> EditScheme([FromBody] EditClassificationScheme command) + public async Task> EditScheme([FromBody] EditClassificationSchemeDto command) { var result =await _classificationSchemeApplication.EditClassificationScheme(command); return result; } + + /// + /// چگ کردن شرایط حذف طرح + /// + /// + /// + [HttpGet("CheckToDeleteScheme")] + public async Task CheckToDeleteScheme(long id) + { + var result =await _classificationSchemeApplication.CheckToDeleteScheme(id); + return result; + } + + + /// + /// حذف طرح + /// + /// + [HttpDelete] + public async Task> DeleteScheme(long id) + { + var result = await _classificationSchemeApplication.DeleteScheme(id); + return result; + } } \ No newline at end of file diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/ClassificationScheme.cshtml.cs b/ServiceHost/Areas/Admin/Pages/Company/Workshops/ClassificationScheme.cshtml.cs index 964d04d4..5b38d580 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/ClassificationScheme.cshtml.cs +++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/ClassificationScheme.cshtml.cs @@ -50,7 +50,7 @@ public class ClassificationSchemeModel : PageModel { WorkshopId = workshopId; WorkshopName = workshopName; - var scheme = _classificationSchemeApplication.ClassificationSchemePartialModel(workshopId).GetAwaiter().GetResult(); + var scheme = _classificationSchemeApplication.GetClassificationSchemeList(workshopId).GetAwaiter().GetResult(); HasScheme = scheme.HasScheme; SchemeId = scheme.HasScheme ? scheme.ClassificationSchemesList.FirstOrDefault()!.Id : 0; } @@ -64,7 +64,7 @@ public class ClassificationSchemeModel : PageModel public IActionResult OnGetSchemeTab(long workshopId) { //دریافت طرح - var scheme = _classificationSchemeApplication.ClassificationSchemePartialModel(workshopId).GetAwaiter().GetResult(); + var scheme = _classificationSchemeApplication.GetClassificationSchemeList(workshopId).GetAwaiter().GetResult(); scheme.WorkshopId = workshopId; return Partial("_ClassificationPartials/ClassificationSchemeTab", scheme); @@ -85,11 +85,11 @@ public class ClassificationSchemeModel : PageModel /// ایجاد طرح /// /// - public async Task OnPostCreateScheme(CreateClassificationScheme command) - { - var result = await _classificationSchemeApplication.CreateClassificationScheme(command); - return new JsonResult(result); - } + //public async Task OnPostCreateScheme(CreateClassificationScheme command) + //{ + // var result = await _classificationSchemeApplication.CreateClassificationScheme(command); + // return new JsonResult(result); + //} /// /// لود مودال ویرایش طرح @@ -107,11 +107,11 @@ public class ClassificationSchemeModel : PageModel /// /// /// - public async Task OnPostEditScheme(EditClassificationScheme command) - { - var result = _classificationSchemeApplication.EditClassificationScheme(command).GetAwaiter().GetResult(); - return new JsonResult(result); - } + //public async Task OnPostEditScheme(EditClassificationScheme command) + //{ + // var result = _classificationSchemeApplication.EditClassificationScheme(command).GetAwaiter().GetResult(); + // return new JsonResult(result); + //} #endregion //تب تعیین مشاغل @@ -592,7 +592,7 @@ public class ClassificationSchemeModel : PageModel /// public IActionResult OnGetComputeTest(long schemeId, long employeeId, string year, string month) { - var scheme = _classificationSchemeApplication.GetClassificationScheme(schemeId).GetAwaiter().GetResult(); + var scheme = _classificationSchemeApplication.GetClassificationSchemeToCompute(schemeId).GetAwaiter().GetResult(); var typeOfCoefficient = scheme.TypeOfCoefficient; var startDate = $"{year}/{month}/01"; diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/_ClassificationPartials/ClassificationSchemeTab.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Workshops/_ClassificationPartials/ClassificationSchemeTab.cshtml index a50fa577..25e05cc6 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/_ClassificationPartials/ClassificationSchemeTab.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/_ClassificationPartials/ClassificationSchemeTab.cshtml @@ -1,4 +1,4 @@ -@model CompanyManagment.App.Contracts.ClassificationScheme.ClassificationSchemePartialModel +@model CompanyManagment.App.Contracts.ClassificationScheme.ClassificationSchemeListDto @{ int index = 1;