diff --git a/Company.Domain/SalaryAidAgg/ISalaryAidRepository.cs b/Company.Domain/SalaryAidAgg/ISalaryAidRepository.cs index 4acc1cec..c1a7cf87 100644 --- a/Company.Domain/SalaryAidAgg/ISalaryAidRepository.cs +++ b/Company.Domain/SalaryAidAgg/ISalaryAidRepository.cs @@ -15,12 +15,11 @@ public interface ISalaryAidRepository:IRepository void RemoveRange(IEnumerable salaryAids); #region Pooya - /// /// گروهبندی بر اساس ماه هنگام جستجو با انتخاب کارمند /// - SalaryAidsGroupedViewModel GetSearchListAsGrouped(SalaryAidSearchViewModel searchModel); + SalaryAidsGroupedViewModel GetSearchListAsGrouped(SalaryAidSearchViewModel searchModel); #endregion } \ No newline at end of file diff --git a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionTimeRequests/Commands/CreateTimeRequest/CreateTimeRequestCommand.cs b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionTimeRequests/Commands/CreateTimeRequest/CreateTimeRequestCommand.cs index 794a1442..465df578 100644 --- a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionTimeRequests/Commands/CreateTimeRequest/CreateTimeRequestCommand.cs +++ b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionTimeRequests/Commands/CreateTimeRequest/CreateTimeRequestCommand.cs @@ -35,7 +35,7 @@ public class CreateTimeRequestCommandHandler : IBaseCommandHandler { + public TaskSectionTimeRequest(long userId, string description, TimeSpan requestedTime, TaskSectionTimeRequestType requestType, Guid taskSectionId) @@ -14,6 +15,7 @@ public class TaskSectionTimeRequest:EntityBase RequestedTime = requestedTime; RequestType = requestType; TaskSectionId = taskSectionId; + RequestStatus = TaskSectionTimeRequestStatus.Pending; } public TaskSection TaskSection { get; set; } @@ -22,6 +24,6 @@ public class TaskSectionTimeRequest:EntityBase public string Description { get; private set; } public TimeSpan RequestedTime { get; private set; } public TaskSectionTimeRequestType RequestType { get; private set; } - + public TaskSectionTimeRequestStatus RequestStatus { get; private set; } } \ No newline at end of file diff --git a/ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Enums/TaskSectionTimeRequestStatus.cs b/ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Enums/TaskSectionTimeRequestStatus.cs new file mode 100644 index 00000000..6300b35e --- /dev/null +++ b/ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Enums/TaskSectionTimeRequestStatus.cs @@ -0,0 +1,8 @@ +namespace GozareshgirProgramManager.Domain.ProjectAgg.Enums; + +public enum TaskSectionTimeRequestStatus +{ + Pending, + Accepted, + Rejected +} \ No newline at end of file diff --git a/ServiceHost/Areas/Admin/Controllers/ProgramManager/TimeRequestController.cs b/ServiceHost/Areas/Admin/Controllers/ProgramManager/TimeRequestController.cs index 3e577b13..0c959e6a 100644 --- a/ServiceHost/Areas/Admin/Controllers/ProgramManager/TimeRequestController.cs +++ b/ServiceHost/Areas/Admin/Controllers/ProgramManager/TimeRequestController.cs @@ -1,3 +1,4 @@ +using System.Runtime.InteropServices; using GozareshgirProgramManager.Application._Common.Models; using GozareshgirProgramManager.Application.Modules.TaskSectionTimeRequests.Commands.CreateTimeRequest; using GozareshgirProgramManager.Domain.ProjectAgg.Enums; @@ -17,31 +18,31 @@ public class TimeRequestController:ProgramManagerBaseController } [HttpPost("Rejected")] - public async Task> CreateRejectedTimeRequest(CreateRejectedTimeRequest request) + public async Task> CreateRejectedTimeRequest(CreateTimeRequest request) { var command = new CreateTimeRequestCommand(request.Hours, request.Minutes, request.Description, - TaskSectionTimeRequestType.RejectedTime); + TaskSectionTimeRequestType.RejectedTime,request.TaskSectionId); var res = await _mediator.Send(command); return res; } [HttpPost("Initial")] - public async Task> CreateInitialTimeRequest(CreateRejectedTimeRequest request) + public async Task> CreateInitialTimeRequest(CreateTimeRequest request) { var command = new CreateTimeRequestCommand(request.Hours, request.Minutes, request.Description, - TaskSectionTimeRequestType.InitialTime); + TaskSectionTimeRequestType.InitialTime,request.TaskSectionId); var res = await _mediator.Send(command); return res; } [HttpPost("Additional")] - public async Task> CreateAdditionalTimeRequest(CreateRejectedTimeRequest request) + public async Task> CreateAdditionalTimeRequest(CreateTimeRequest request) { var command = new CreateTimeRequestCommand(request.Hours, request.Minutes, request.Description, - TaskSectionTimeRequestType.AdditionalTime); + TaskSectionTimeRequestType.AdditionalTime,request.TaskSectionId); var res = await _mediator.Send(command); return res; } } -public record CreateRejectedTimeRequest(int Hours, int Minutes, string Description); \ No newline at end of file +public record CreateTimeRequest(int Hours, int Minutes, string Description,Guid TaskSectionId); \ No newline at end of file