add client checkout list controller

Company.Domain/CheckoutAgg/ICheckoutRepository.cs

@@ -80,4 +80,6 @@ public interface ICheckoutRepository : IRepository<long, Checkout>
     #endregion
 
     Task<Checkout> GetByWorkshopIdEmployeeIdInDate(long workshopId, long employeeId, DateTime inDate);
+    Task<PagedResult<CheckoutListClientDto>> GetListForClient(long workshopId,
+        CheckoutListClientSearchModel searchModel);
 }

CompanyManagment.App.Contracts/Checkout/ICheckoutApplication.cs

@@ -62,4 +62,40 @@ public interface ICheckoutApplication
         long workshopId, DateTime start, DateTime end);
 
     #endregion
+
+    Task<PagedResult<CheckoutListClientDto>> GetListForClient(long workshopId,
+        CheckoutListClientSearchModel searchModel);
+}
+
+public class CheckoutListClientSearchModel:PaginationRequest
+{
+    public long? EmployeeId { get; set; }
+    public string Year { get; set; }
+    public string Month { get; set; }
+    public string StartDate { get; set; }
+    public string EndDate { get; set; }
+    public CheckoutClientListOrderType? OrderType { get; set; }
+}
+
+public class CheckoutListClientDto
+{
+    public long Id { get; set; }
+    public string Year { get; set; }
+    public string Month { get; set; }
+    public string EmployeeName { get; set; }
+    public string ContractNo { get; set; }
+    public string ContractStart { get; set; }
+    public string ContractEnd { get; set; }
+    public bool Signature { get; set; }
+}
+
+public enum CheckoutClientListOrderType
+{
+    ByCheckoutCreationDate,
+    BySignedCheckout,
+    ByUnSignedCheckout,
+    ByPersonnelCode,
+    ByPersonnelCodeDescending,
+    ByCheckoutStartDate,
+    ByCheckoutStartDateDescending
 }

CompanyManagment.Application/CheckoutApplication.cs

@@ -706,5 +706,10 @@ public class CheckoutApplication : ICheckoutApplication
 		return _checkoutRepository.GetLastCheckoutsByWorkshopIdForWorkFlow(workshopId, start, end);
 	}
 
+	public async Task<PagedResult<CheckoutListClientDto>> GetListForClient(long workshopId,CheckoutListClientSearchModel searchModel)
+	{
+		return await _checkoutRepository.GetListForClient(workshopId, searchModel);
+	}
+
 	#endregion
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Checkouts/Commands/CreateCheckout/CreateOrEditCheckoutCommandHandler.cs

@@ -209,22 +209,38 @@ public class CreateOrEditCheckoutCommandHandler : IBaseCommandHandler<CreateOrEd
             }
 
         }
-        //حقوق نهایی
+        ////حقوق نهایی
-        var monthlySalaryPay = (totalHoursWorked * monthlySalaryDefined) / mandatoryHours;
+        //var monthlySalaryPay = (totalHoursWorked * monthlySalaryDefined) / mandatoryHours;
-        // اگر اضافه کار داشت حقوق تعین شده به عنوان حقوق نهایی در نظر گرفته میشود
+        //// اگر اضافه کار داشت حقوق تعین شده به عنوان حقوق نهایی در نظر گرفته میشود
-        monthlySalaryPay = monthlySalaryPay > monthlySalaryDefined ? monthlySalaryDefined : monthlySalaryPay;
+        //monthlySalaryPay = monthlySalaryPay > monthlySalaryDefined ? monthlySalaryDefined : monthlySalaryPay;
 
-        //حقوق کسر شده
+        ////حقوق کسر شده
-        var deductionFromSalary = monthlySalaryDefined - monthlySalaryPay;
+        //var deductionFromSalary = monthlySalaryDefined - monthlySalaryPay;
+
+        //new chang salary compute
+        var monthlySalaryPay = totalHoursWorked * monthlySalaryDefined;
 
         //زمان باقی مانده
         var remainingTime = totalHoursWorked - mandatoryHours;
 
+
+        //تناسب به دقیقه
+        #region MyRegion
+
+        //var monthlySalaryDefinedTest = monthlySalaryDefined * mandatoryHours;
+        //var monthlySalaryPayTest = totalHoursWorked * monthlySalaryDefined;
+        ////// اگر اضافه کار داشت حقوق تعین شده به عنوان حقوق نهایی در نظر گرفته میشود
+        //monthlySalaryPayTest = monthlySalaryPayTest > monthlySalaryDefinedTest ? monthlySalaryDefinedTest : monthlySalaryPayTest;
+        //////حقوق کسر شده
+        //var deductionFromSalaryTest = monthlySalaryDefinedTest - monthlySalaryPayTest;
+
+        #endregion
+
         var computeResult = new ComputeResultDto
         {
             MandatoryHours = mandatoryHours,
             MonthlySalaryPay = monthlySalaryPay,
-            DeductionFromSalary = deductionFromSalary,
+            DeductionFromSalary = 0 /*deductionFromSalary*/,
             RemainingHours = remainingTime
         };
         Console.WriteLine(mandatoryHours);

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Checkouts/Queries/GetUserToGropCreate/GetUserToGroupCreatingQueryHandler.cs

@@ -1,10 +1,11 @@
-using GozareshgirProgramManager.Application._Common.Interfaces;
+using DNTPersianUtils.Core;
+using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Application.Modules.SalaryPaymentSettings.Queries.GetUserListWhoHaveSettings;
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.CheckoutAgg.Enums;
 using Microsoft.EntityFrameworkCore;
-using PersianTools.Core;
+using PersianDateTime = PersianTools.Core.PersianDateTime;
 
 namespace GozareshgirProgramManager.Application.Modules.Checkouts.Queries.GetUserToGropCreate;
 
@@ -45,8 +46,8 @@ public class GetUserToGroupCreatingQueryHandler : IBaseQueryHandler<GetUserToGro
                 "ایجاد فیش فقط برای ماه های گذشته امکان پذیر است");
 
 
-        var lastMonthStart = lastMonth; 
+        //var lastMonthStart = lastMonth; 
-        var lastMonthEnd = lastMonth;  
+        var lastMonthEnd = ((selectedDate.ToFarsi().FindeEndOfMonth())).ToGeorgianDateTime();  
 
         var query =
             await (from u in _context.Users
@@ -60,8 +61,8 @@ public class GetUserToGroupCreatingQueryHandler : IBaseQueryHandler<GetUserToGro
                     // LEFT JOIN 
                     //فیش
                     join ch in _context.Checkouts
-                            .Where(x => x.CheckoutStartDate < lastMonthStart
+                            .Where(x => x.CheckoutStartDate < lastMonthEnd
-                                        && x.CheckoutEndDate >= lastMonthStart)
+                                        && x.CheckoutEndDate > selectedDate)
                         on u.Id equals ch.UserId into chJoin
                     from ch in chJoin.DefaultIfEmpty()
 

ServiceHost/Areas/Client/Controllers/CheckoutController.cs

@@ -0,0 +1,25 @@
+using _0_Framework.Application;
+using CompanyManagment.App.Contracts.Checkout;
+using Microsoft.AspNetCore.Mvc;
+using ServiceHost.BaseControllers;
+
+namespace ServiceHost.Areas.Client.Controllers;
+
+public class CheckoutController:ClientBaseController
+{
+    private readonly ICheckoutApplication _checkoutApplication;
+    private readonly long _workshopId;
+
+    public CheckoutController(ICheckoutApplication checkoutApplication,IAuthHelper authHelper)
+    {
+        _checkoutApplication = checkoutApplication;
+        _workshopId = authHelper.GetWorkshopId();
+    }
+
+    [HttpGet]
+    public async Task<ActionResult<PagedResult<CheckoutListClientDto>>> GetList(CheckoutListClientSearchModel searchModel)
+    {
+        var res =await _checkoutApplication.GetListForClient(_workshopId, searchModel);
+        return res;
+    }
+}