build tailwind

This reverts commit da738054df.

0_Framework/Application/IsActive.cs

@@ -4,5 +4,5 @@ public enum IsActive
 {
 	False,
 	True,
-   
+    None
 }

0_Framework/Application/OperationResult.cs

@@ -51,4 +51,11 @@ public class OperationResult<T>
         Message = message;
         return this;
     }
+    public OperationResult<T> Failed(string message, T data)
+    {
+        IsSuccedded = false;
+        Message = message;
+        Data = data;
+        return this;
+    }
 }

0_Framework/Application/Tools.cs

@@ -41,6 +41,23 @@ public static class Tools
         return Regex.IsMatch(mobileNo, "^((09))(\\d{9})$");
     }
 
+    /// <summary>
+    /// تاریخ شروع و تعداد ماه را میگیرد و تاریخ پایان قراردا را بر میگرداند
+    /// </summary>
+    /// <param name="startDate"></param>
+    /// <param name="monthPlus"></param>
+    /// <returns></returns>
+    public static (DateTime endDateGr, string endDateFa) FindEndOfContract(string startDate, string monthPlus)
+    {
+
+        int startYear = Convert.ToInt32(startDate.Substring(0, 4));
+        int startMonth = Convert.ToInt32(startDate.Substring(5, 2));
+        int startDay = Convert.ToInt32(startDate.Substring(8, 2));
+        var start = new PersianDateTime(startYear, startMonth, startDay);
+        var end = (start.AddMonths(Convert.ToInt32(monthPlus))).AddDays(-1);
+        return ($"{end}".ToGeorgianDateTime(), $"{end}");
+
+    }
 
     /// <summary>
     /// دریافت روزهای کارکرد پرسنل در لیست بیمه ماه مشخص شده
@@ -458,25 +475,30 @@ public static class Tools
     public static double MoneyToDouble(this string myMoney)
     {
         string bb = string.Empty;
+        bool isNegative = false;
 
         for (int x = 0; x < myMoney.Length; x++)
         {
             if (char.IsDigit(myMoney[x]))
+            {
                 bb += myMoney[x];
+            }
+            else if (myMoney[x] == '-' && bb.Length == 0)
+            {
+                // اگر علامت منفی قبل از اولین عدد آمد، در نظر بگیر
+                isNegative = true;
+            }
         }
 
         if (bb.Length > 0)
         {
             double res = double.Parse(bb);
-            return res;
+            return isNegative ? -res : res;
         }
         else
         {
             return 0;
         }
-
-
-
     }
     public static string ToFileName(this DateTime date)
     {
@@ -884,30 +906,39 @@ public static class Tools
         string result = "";
         switch (value)
         {
+            case "1":
             case "01":
                 result = "فروردین";
                 break;
+            case "2":
             case "02":
                 result = "اردیبهشت";
                 break;
+            case "3":
             case "03":
                 result = "خرداد";
                 break;
+            case "4":
             case "04":
                 result = "تیر";
                 break;
+            case "5":
             case "05":
                 result = "مرداد";
                 break;
+            case "6":
             case "06":
                 result = "شهریور";
                 break;
+            case "7":
             case "07":
                 result = "مهر";
                 break;
+            case "8":
             case "08":
                 result = "آبان";
                 break;
+            case "9":
             case "09":
                 result = "آذر";
                 break;
@@ -1403,6 +1434,8 @@ public static class Tools
 
             if (@char == char.Parse("ي"))
                 res += "ی";
+            else if (@char == char.Parse("ك"))
+                res += "ک";
             else
                 res += @char;
         }

AccountManagement.Application.Contracts/Account/AccountSelectListViewModel.cs

@@ -0,0 +1,7 @@
+namespace AccountManagement.Application.Contracts.Account;
+
+public class AccountSelectListViewModel
+{
+    public long Id { get; set; }
+    public string Name { get; set; }
+}

AccountManagement.Application.Contracts/Account/IAccountApplication.cs

@@ -41,6 +41,8 @@ public interface IAccountApplication
     List<AccountViewModel> GetAccountsByPositionId(long positionId);
 
     List<AccountViewModel> GetAccountEqualToLowerPositionValue();
+    Task<List<AccountSelectListViewModel>> GetAdminSelectList();
+
     OperationResult ReLogin();
 
     #endregion

AccountManagement.Application.Contracts/Task/EditTask.cs

@@ -21,4 +21,5 @@ public class EditTask:CreateTask
     public List<AccountViewModel> AssignsLists { get; set; }
     public bool  HasTicket { get; set; }
     public long TaskScheduleId { get; set; }
+    public bool HasRequest { get; set; }
 }

AccountManagement.Application.Contracts/Task/TaskViewModel.cs

@@ -48,6 +48,7 @@ public class TaskViewModel
     public bool CanDelete { get; set; }
     public bool CanAssign { get; set; }
     public bool CanCheckRequests { get; set; }
+    public bool HasRequest { get; set; }
     public AssignViewModel AssignedReceiverViewModel { get; set; }
 
     public TaskScheduleType ScheduleType { get; set; }

AccountManagement.Application.Contracts/TaskSchedule/TaskScheduleDetailsViewModel.cs

@@ -15,6 +15,8 @@ public class TaskScheduleDetailsViewModel
     public string ContractingPartyName { get; set; }
     public string Title { get; set; }
     public string Description { get; set; }
+    public string Count { get; set; }
+    public string FirstEndTaskDate { get; set; }
     public List<MediaViewModel> Medias { get; set; }
 
 }

AccountManagement.Application/AccountApplication.cs

@@ -627,7 +627,10 @@ public class AccountApplication : IAccountApplication
 
     }
 
-
+    public async Task<List<AccountSelectListViewModel>> GetAdminSelectList()
+    {
+        return await _accountRepository.GetAdminSelectList();
+    }
 
     #endregion
     #region Pooya

AccountManagement.Domain/AccountAgg/IAccountRepository.cs

@@ -27,6 +27,8 @@ namespace AccountManagement.Domain.AccountAgg
         List<AccountViewModel> GetAccountEqualToLowerPositionValue();
         AccountViewModel GetAccountViewModel(long id);
         List<AccountViewModel> GetAccountsDeactivePositionValue(long Positionid);
+        Task<List<AccountSelectListViewModel>> GetAdminSelectList();
+
         #endregion
 
         List<AccountViewModel> GetAdminAccountsNew();

AccountMangement.Infrastructure.EFCore/Repository/AccountRepository.cs

@@ -312,6 +312,16 @@ public class AccountRepository : RepositoryBase<long, Account>, IAccountReposito
                 IsActiveString = x.IsActive ? "true" : "false",
             }).ToList();
     }
+
+    public async Task<List<AccountSelectListViewModel>> GetAdminSelectList()
+    {
+        return await _context.Accounts.Where(x => x.AdminAreaPermission == "true").Select(x => new AccountSelectListViewModel()
+        {
+            Id = x.id,
+            Name = x.Fullname
+        }).ToListAsync();
+    }
+
     //public List<AccountViewModel> GetAdminAccounts()
     //{
     // return _context.Accounts.Where(x=>x.AdminAreaPermission == "true" && x.IsActiveString == "true").Select(x => new AccountViewModel()

AccountMangement.Infrastructure.EFCore/Repository/TaskRepository.cs

@@ -106,14 +106,16 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         {
             res.EndTaskDate = _accountContext.Assigns.First(a => a.TaskId == res.Id && a.AssignedId == userId)
                 .EndTaskDate.ToFarsi();
-
+            var userAssign = res.AssignViewModels.First(x => x.AssignedId == userId);
 
             res.AssignViewModels = res.AssignViewModels.Where(x => x.AssignedId == userId).ToList();
-            res.IsDone = res.AssignViewModels.First(x => x.AssignedId == userId).IsDone;
-            res.IsCancel = res.AssignViewModels.First(x => x.AssignedId == userId).IsCancel;
+            res.IsDone = userAssign.IsDone;
+            res.IsCancel = userAssign.IsCancel;
+            res.HasRequest = userAssign.IsCanceledRequest || userAssign.TimeRequest ||
+                             userAssign.IsDoneRequest;
         }
 
-        if (res.TaskScheduleId>0)
+        if (res.TaskScheduleId > 0)
         {
             var taskSchedule = _accountContext.TaskSchedules.FirstOrDefault(x => x.id == res.TaskScheduleId);
 
@@ -121,7 +123,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             res.ScheduleType = taskSchedule.Type;
             res.ScheduleCount = taskSchedule.Count;
             res.ScheduleUnitNumber = taskSchedule.UnitNumber;
-		}
+        }
 
 
         //_accountContext.Tasks.Where(x => x.id == TaskId).Select(x => new EditTask()
@@ -160,8 +162,6 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         Remove(task);
     }
 
-
-
     public List<TaskViewModel> GetRequestedTasks(TaskSearchModel searchModel)
     {
         var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value);
@@ -900,7 +900,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             AcceptedTimeRequest = x.AcceptedTimeRequest,
             IsCancelRequest = x.IsCancelRequest,
             ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -1229,7 +1229,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             AcceptedTimeRequest = x.AcceptedTimeRequest,
             IsCancelRequest = x.IsCancelRequest,
             ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -1788,7 +1788,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             AcceptedTimeRequest = x.AcceptedTimeRequest,
             IsCancelRequest = x.IsCancelRequest,
             ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -2056,7 +2056,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             TaskScheduleId = x.TaskScheduleId
 
 
-		}).ToList();
+        }).ToList();
 
 
         final = final.Select(x => new TaskViewModel()
@@ -2082,7 +2082,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             AcceptedTimeRequest = x.AcceptedTimeRequest,
             IsCancelRequest = x.IsCancelRequest,
             ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -2095,7 +2095,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             ScheduleUnitType = x.ScheduleUnitType,
             TaskScheduleId = x.TaskScheduleId
 
-		}).ToList();
+        }).ToList();
 
         final = final.Select(x => new TaskViewModel()
         {
@@ -2149,12 +2149,15 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             ScheduleUnitType = x.ScheduleUnitType,
             TaskScheduleId = x.TaskScheduleId
 
-		}).ToList();
+        }).ToList();
         return final;
     }
 
-    public string SetTasksColors(DateTime date, bool isCancel)
+    public string SetTasksColors(DateTime date, bool isCancel, bool hasRequest)
     {
+        if (hasRequest)
+            return "red";
+
         if (isCancel)
         {
             //return "brown";
@@ -2390,7 +2393,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
 
     public List<Tasks> GetTasksByTaskScheduleId(long taskScheduleId)
     {
-        return _accountContext.Tasks.Include(x=>x.Assigns).Where(x => x.TaskScheduleId != null && x.TaskScheduleId == taskScheduleId).ToList();
+        return _accountContext.Tasks.Include(x => x.Assigns).Where(x => x.TaskScheduleId != null && x.TaskScheduleId == taskScheduleId).ToList();
     }
 
 
@@ -2658,7 +2661,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             AcceptedTimeRequest = x.AcceptedTimeRequest,
             IsCancelRequest = x.IsCancelRequest,
             ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -2722,6 +2725,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
     {
         var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value);
         var positionValue = int.Parse(_contextAccessor.HttpContext.User.FindFirst("PositionValue").Value);
+        var today = DateTime.Today;
         var emptyAcc = new AccountViewModel()
         {
             Fullname = "-",
@@ -2731,7 +2735,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         var raw = _accountContext.Assigns.Include(x => x.Task).ThenInclude(x => x.TaskMedias)
             .ThenInclude(x => x.Media)
             .Where(x =>
-                x.Task.IsActiveString == "true" && x.AssignedId == accountId && (!x.IsCanceledRequest && !x.TimeRequest && !x.IsDoneRequest) && x.Task.TicketId == null);
+                x.Task.IsActiveString == "true" && x.AssignedId == accountId && x.Task.TicketId == null);
         if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch))
         {
             raw = raw.Where(x =>
@@ -2764,6 +2768,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
                 MediaCount = _accountContext.TaskMedias.Count(m => m.TaskId == x.Task.id),
                 Description = x.Task.Description,
                 IsDoneRequest = x.IsDoneRequest,
+
             });
         if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch))
         {
@@ -2802,7 +2807,8 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             ContractingPartyName = x.ContractingPartyName,
             MediaCount = x.MediaCount,
             Description = x.Description,
-            IsDoneRequest = x.IsDoneRequest
+            IsDoneRequest = x.IsDoneRequest,
+            HasRequest = x.IsCancelRequest || x.RequestTime || x.IsDoneRequest
         });
         if (!string.IsNullOrWhiteSpace(searchModel.StartDate) && !string.IsNullOrWhiteSpace(searchModel.EndDate))
         {
@@ -2871,8 +2877,10 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
         }
 
 
-        var orderResult = result.OrderByDescending(x => x.IsCancel ? 0 : 1).ThenBy(x => x.IsDone ? 1 : 0)
-            .ThenBy(x => x.EndTaskDateGE);
+        var orderResult = result.OrderBy(x => x.IsDone || x.IsCancel)
+            .ThenByDescending(x => x.EndTaskDateGE <= today.AddDays(1) && !x.HasRequest)
+            .ThenByDescending(x => x.HasRequest)
+            .ThenBy(x => x.EndTaskDateGE); // مرتب‌سازی داخلی بر اساس تاریخ
 
 
         var final = orderResult.Skip(searchModel.PageIndex).Take(30).ToList();
@@ -2906,7 +2914,8 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             MediaCount = x.MediaCount,
             SelfName = x.SelfName,
             Description = x.Description,
-            IsDoneRequest = x.IsDoneRequest
+            IsDoneRequest = x.IsDoneRequest,
+            HasRequest = x.IsDoneRequest || x.RequestTime || x.IsCancelRequest
 
         }).ToList();
 
@@ -2934,7 +2943,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
             AcceptedTimeRequest = x.AcceptedTimeRequest,
             IsCancelRequest = x.IsCancelRequest,
             ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, x.HasRequest),
             MediaCount = x.MediaCount,
             HasAttachment = x.MediaCount > 0,
             SelfName = x.SelfName,
@@ -2993,6 +3002,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
                     AssignedName = "-",
                     AssignedPositionValue = 0
                 },
+            HasRequest = x.IsCancelRequest || x.RequestTime || x.IsDoneRequest
         }).ToList();
         return final;
     }

AccountMangement.Infrastructure.EFCore/Repository/TaskScheduleRepository.cs

@@ -3,25 +3,26 @@ using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.InfraStructure;
 using AccountManagement.Application.Contracts.Media;
+using AccountManagement.Application.Contracts.Task;
 using AccountManagement.Application.Contracts.TaskSchedule;
 using AccountManagement.Domain.TaskScheduleAgg;
 using Microsoft.EntityFrameworkCore;
 
 namespace AccountMangement.Infrastructure.EFCore.Repository;
 
-public class TaskScheduleRepository: RepositoryBase<long, TaskSchedule>, ITaskScheduleRepository
+public class TaskScheduleRepository : RepositoryBase<long, TaskSchedule>, ITaskScheduleRepository
 {
     private readonly AccountContext _accountContext;
 
-    public TaskScheduleRepository(AccountContext accountContext):base(accountContext)
+    public TaskScheduleRepository(AccountContext accountContext) : base(accountContext)
     {
         _accountContext = accountContext;
     }
 
     public async Task<TaskScheduleDetailsViewModel> GetDetails(long id)
     {
-        var taskSchedule=await _accountContext.TaskSchedules.Include(x=>x.TasksList).ThenInclude(x=>x.Assigns)
-            .Include(x=>x.TasksList).ThenInclude(x=>x.TaskMedias).ThenInclude(x=>x.Media).FirstOrDefaultAsync(x => x.id == id);
+        var taskSchedule = await _accountContext.TaskSchedules.Include(x => x.TasksList).ThenInclude(x => x.Assigns)
+            .Include(x => x.TasksList).ThenInclude(x => x.TaskMedias).ThenInclude(x => x.Media).FirstOrDefaultAsync(x => x.id == id);
         if (taskSchedule == null)
         {
             return null;
@@ -29,7 +30,7 @@ public class TaskScheduleRepository: RepositoryBase<long, TaskSchedule>, ITaskSc
 
         var firstTaskDetails = taskSchedule.TasksList.First();
 
-        var firstTimeAssigns = firstTaskDetails.Assigns.Where(x=>x.FirstTimeCreation).ToList();
+        var firstTimeAssigns = firstTaskDetails.Assigns.Where(x => x.FirstTimeCreation).ToList();
 
         var assignedIds = firstTimeAssigns.Select(x => x.AssignedId).ToList();
 
@@ -46,13 +47,15 @@ public class TaskScheduleRepository: RepositoryBase<long, TaskSchedule>, ITaskSc
             Title = firstTaskDetails.Title,
             Description = firstTaskDetails.Description,
             ContractingPartyName = firstTaskDetails.ContractingPartyName,
-            AssignedName = assignedAccounts.Select(x=>x.Fullname).ToList(),
+            AssignedName = assignedAccounts.Select(x => x.Fullname).ToList(),
             CreationDateFa = firstTaskDetails.CreationDate.ToFarsi(),
             SenderName = sender.Fullname,
             TaskScheduleType = taskSchedule.Type,
             TaskScheduleUnitType = taskSchedule.UnitType,
             UnitNumber = taskSchedule.UnitNumber,
-            Medias = firstTaskDetails.TaskMedias.Select(x=> new MediaViewModel()
+            Count = taskSchedule.Type == TaskScheduleType.Limited ? taskSchedule.Count : "نامحدود",
+            FirstEndTaskDate = firstTaskDetails.Assigns.FirstOrDefault()?.EndTaskDate.ToFarsi() ?? "",
+            Medias = firstTaskDetails.TaskMedias.Select(x => new MediaViewModel()
             {
                 Category = x.Media.Category,
                 Id = x.MediaId,

Company.Domain/AdminMonthlyOverviewAgg/AdminMonthlyOverview.cs

@@ -0,0 +1,55 @@
+using System;
+using System.IO;
+using System.Linq;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.AdminMonthlyOverview;
+using Microsoft.AspNetCore.JsonPatch.Operations;
+
+namespace Company.Domain.AdminMonthlyOverviewAgg;
+
+public class AdminMonthlyOverview:EntityBase
+{
+    public AdminMonthlyOverview(long workshopId, int month, int year, AdminMonthlyOverviewStatus status)
+    {
+        WorkshopId = workshopId;
+        Month = month;
+        Year = year;
+        Status = status;
+    }
+
+    public long WorkshopId { get; set; }
+    public int Month { get; set; }
+    public int Year { get; set; }
+    public AdminMonthlyOverviewStatus Status { get; set; }
+
+    public void Next()
+    {
+        var maxValue = Enum.GetValues(typeof(AdminMonthlyOverviewStatus))
+            .Cast<AdminMonthlyOverviewStatus>()
+            .Max();
+
+        if (Status >= maxValue)
+        {
+            throw new InvalidDataException("تغییر وضعیت وارد شده نامعتبر است");
+        }
+        Status += 1;
+    }
+
+    public void Back()
+    {
+        var minValue = Enum.GetValues(typeof(AdminMonthlyOverviewStatus))
+            .Cast<AdminMonthlyOverviewStatus>()
+            .Min();
+
+        if (Status <= minValue)
+        {
+            throw new InvalidDataException("تغییر وضعیت وارد شده نامعتبر است");
+        }
+        Status -= 1;
+    }
+
+    public void SetStatus(AdminMonthlyOverviewStatus status)
+    {
+        Status = status;
+    }
+}

Company.Domain/AdminMonthlyOverviewAgg/IAdminMonthlyOverviewRepository.cs

@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.AdminMonthlyOverview;
+
+namespace Company.Domain.AdminMonthlyOverviewAgg;
+
+public interface IAdminMonthlyOverviewRepository:IRepository<long, AdminMonthlyOverview>
+{
+    Task<List<AdminMonthlyOverviewListViewModel>> GetWorkshopStatus(AdminMonthlyOverviewSearchModel searchModel);
+    Task<AdminMonthlyOverViewCounterVm> GetCounter(int year, int month, long accountId);
+}

Company.Domain/CheckoutAgg/Checkout.cs

@@ -1,6 +1,10 @@
 using System;
+using System.Collections;
+using System.Collections.Generic;
 using _0_Framework.Application;
 using _0_Framework.Domain;
+using Company.Domain.CheckoutAgg.ValueObjects;
+using Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 using Company.Domain.WorkshopAgg;
 
 namespace Company.Domain.CheckoutAgg;
@@ -21,7 +25,11 @@ public class Checkout : EntityBase
         double salaryAidDeduction, double absenceDeduction, string sumOfWorkingDays
         , string archiveCode, string personnelCode, 
         string totalClaims, string totalDeductions, double totalPayment, string signature, double marriedAllowance, bool leaveCheckout,
-        double creditLeaves, double absencePeriod, double averageHoursPerDay, bool hasRollCall, string overTimeWorkvalue, string overNightWorkValue, string fridayWorkValue, string rotatingShifValue, string absenceValue, string totalDayOfLeaveCompute, string totalDayOfYearsCompute, string totalDayOfBunosesCompute)
+        double creditLeaves, double absencePeriod, double averageHoursPerDay, bool hasRollCall, string overTimeWorkvalue,
+        string overNightWorkValue, string fridayWorkValue, string rotatingShifValue, string absenceValue,
+        string totalDayOfLeaveCompute, string totalDayOfYearsCompute, string totalDayOfBunosesCompute,
+        ICollection<CheckoutLoanInstallment> loanInstallments,
+        ICollection<CheckoutSalaryAid> salaryAids)
     {
         EmployeeFullName = employeeFullName;
         FathersName = fathersName;
@@ -78,6 +86,8 @@ public class Checkout : EntityBase
         TotalDayOfLeaveCompute = totalDayOfLeaveCompute;
         TotalDayOfYearsCompute = totalDayOfYearsCompute;
         TotalDayOfBunosesCompute = totalDayOfBunosesCompute;
+        LoanInstallments = loanInstallments;
+        SalaryAids = salaryAids;
     }
 
     public string EmployeeFullName { get; private set; }
@@ -181,7 +191,15 @@ public class Checkout : EntityBase
    /// </summary>
    public string TotalDayOfBunosesCompute { get; private set; }
 
-	public Workshop Workshop { get; set; }
+
+   #region valueObjects
+
+   public ICollection<CheckoutLoanInstallment> LoanInstallments { get; set; } = [];
+   public ICollection<CheckoutSalaryAid> SalaryAids { get; set; } = [];
+   #endregion
+
+
+    public Workshop Workshop { get; set; }
     //public WorkingHours WorkingHours { get; set; }
 
     public void Edit(string employeeFullName, string fathersName, string nationalCode, string dateOfBirth,
@@ -278,4 +296,16 @@ public class Checkout : EntityBase
         this.TotalDeductions = totalDeductions;
         this.TotalPayment = totalPayment;
     }
+
+
+    public void SetSalaryAid(ICollection<CheckoutSalaryAid> salaryAids,double salaryAidAmount)
+    {
+        SalaryAids = salaryAids;
+        SalaryAidDeduction = salaryAidAmount;
+    }
+    public void SetLoanInstallment(ICollection<CheckoutLoanInstallment> lonaInstallments, double installmentsAmount)
+    {
+        LoanInstallments = lonaInstallments;
+        InstallmentDeduction = installmentsAmount;
+    }
 }

Company.Domain/CheckoutAgg/ICheckoutRepository.cs

@@ -10,9 +10,19 @@ namespace Company.Domain.CheckoutAgg;
 
 public interface ICheckoutRepository : IRepository<long, Checkout>
 {
+    /// <summary>
+    /// چک میکند که آیا پرسنل در سال و ماه درخواستی در این کارگاه فیش حقوقی دارد یا خیر
+    /// </summary>
+    /// <param name="workshopId"></param>
+    /// <param name="employeId"></param>
+    /// <param name="سال به صورت رشته عددی"></param>
+    /// <param name="ماه بصورت رشته عددی"></param>
+    /// <returns></returns>
+    (bool hasChekout, double FamilyAlloance, double OverTimePay) HasCheckout(long workshopId, long employeId,
+        string year, string month);
     EditCheckout GetDetails(long id);
 
-    void CreateCkeckout(Checkout command);
+    Task CreateCkeckout(Checkout command);
 
     Task<List<CheckoutViewModel>> Search(CheckoutSearchModel searchModel);
 

Company.Domain/CheckoutAgg/ValueObjects/CheckoutLoanInstallment.cs

@@ -0,0 +1,25 @@
+using _0_Framework.Application;
+
+namespace Company.Domain.CheckoutAgg.ValueObjects;
+
+public class CheckoutLoanInstallment
+{
+    public CheckoutLoanInstallment(string amountForMonth, string month, string year, IsActive isActive, string loanRemaining, string loanAmount, long entityId)
+    {
+        AmountForMonth = amountForMonth;
+        Month = month;
+        Year = year;
+        IsActive = isActive;
+        LoanRemaining = loanRemaining;
+        LoanAmount = loanAmount;
+        EntityId = entityId;
+    }
+
+    public string AmountForMonth { get; private set; }
+    public string Month { get; private set; }
+    public string Year { get; private set; }
+    public string LoanRemaining { get; set; }
+    public IsActive IsActive { get; private set; }
+    public string LoanAmount { get; set; }
+    public long EntityId { get; set; }
+}

Company.Domain/CheckoutAgg/ValueObjects/CheckoutSalaryAid.cs

@@ -0,0 +1,24 @@
+using System;
+using AccountManagement.Domain.AccountAgg;
+
+namespace Company.Domain.CheckoutAgg.ValueObjects;
+
+public class CheckoutSalaryAid
+{
+    public CheckoutSalaryAid(string amount, DateTime salaryAidDateTime, string salaryAidDateTimeFa, DateTime calculationDateTime, string calculationDateTimeFa, long entityId)
+    {
+        Amount = amount;
+        SalaryAidDateTime = salaryAidDateTime;
+        SalaryAidDateTimeFa = salaryAidDateTimeFa;
+        CalculationDateTime = calculationDateTime;
+        CalculationDateTimeFa = calculationDateTimeFa;
+        EntityId = entityId;
+    }
+    public string Amount { get; private set; }
+    public DateTime SalaryAidDateTime { get; private set; }
+    public string SalaryAidDateTimeFa { get; private set; }
+
+    public DateTime CalculationDateTime { get; private set; }
+    public string CalculationDateTimeFa { get; private set; }
+    public long EntityId { get; set; }
+}

Company.Domain/Company.Domain.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -14,4 +14,8 @@
     <ProjectReference Include="..\CompanyManagment.App.Contracts\CompanyManagment.App.Contracts.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="CheckoutAgg\ValueObjects\" />
+  </ItemGroup>
+
 </Project>

Company.Domain/ContactUsAgg/ContactUs.cs

@@ -0,0 +1,26 @@
+using _0_Framework.Domain;
+
+namespace Company.Domain.ContactUsAgg;
+
+public class ContactUs:EntityBase
+{
+    public ContactUs(string firstName, string lastName, string email, string phoneNumber, string title, string message)
+    {
+        FirstName = firstName.Trim();
+        LastName = lastName.Trim();
+        Email = email;
+        PhoneNumber = phoneNumber;
+        Title = title;
+        Message = message;
+        FullName = FirstName + " " + LastName;
+    }
+
+    public string FirstName { get; private set; }
+    public string LastName { get; private set; }
+    public string Email { get; private set; }
+    public string PhoneNumber { get; private set; }
+    public string Title { get; private set; }   
+    public string Message { get; private set; }
+    public string FullName { get; private set; }
+    
+}

Company.Domain/ContactUsAgg/IContactUsRepository.cs

@@ -0,0 +1,8 @@
+using _0_Framework.Domain;
+
+namespace Company.Domain.ContactUsAgg;
+
+public interface IContactUsRepository : IRepository<long, ContactUs>
+{
+
+}

Company.Domain/CustomizeCheckoutAgg/CustomizeCheckout.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
@@ -18,20 +19,20 @@ public class CustomizeCheckout : EntityBase
     private CustomizeCheckout()
     { }
     public CustomizeCheckout(DateTime contractStart, DateTime contractEnd, long employeeId, string employeeFName,
-	    string employeeLName, DateTime employeeDateOfBirth,
-	    string employeeNationalCode, string workshopFullName, long workshopId, long? contractId,
-	    double monthlySalary, double fridayPay, double overTimePay, double baseYearsPay, double bonusesPay,
-	    double nightWorkPay,
-	    double marriedAllowance, double shiftPay, double familyAllowance, double leavePay, double insuranceDeduction,
-	    double fineAbsenceDeduction,
-	    double lateToWorkDeduction, double earlyExitDeduction, double rewardPay, double salaryAidDeduction,
-	    double installmentDeduction,
-	    double fineDeduction, double taxDeduction, string sumOfWorkingDays, string totalClaims, string totalDeductions,
-	    double totalPayment, string contractNo, ICollection<CustomizeCheckoutFine> checkoutFines,
-	    ICollection<CustomizeCheckoutLoanInstallments> customizeCheckoutLoanInstallments,
-	    ICollection<CustomizeCheckoutSalaryAid> customizeCheckoutSalaryAids,
-	    ICollection<CustomizeCheckoutReward> customizeCheckoutRewards, TimeSpan lateToWorkValue, double settingSalary,
-	    double dailyWage, WorkshopShiftStatus shiftStatus, IrregularShift irregularShift,
+        string employeeLName, DateTime employeeDateOfBirth,
+        string employeeNationalCode, string workshopFullName, long workshopId, long? contractId,
+        double monthlySalary, double fridayPay, double overTimePay, double baseYearsPay, double bonusesPay,
+        double nightWorkPay,
+        double marriedAllowance, double shiftPay, double familyAllowance, double leavePay, double insuranceDeduction,
+        double fineAbsenceDeduction,
+        double lateToWorkDeduction, double earlyExitDeduction, double rewardPay, double salaryAidDeduction,
+        double installmentDeduction,
+        double fineDeduction, double taxDeduction, string sumOfWorkingDays, string totalClaims, string totalDeductions,
+        double totalPayment, string contractNo, ICollection<CustomizeCheckoutFine> checkoutFines,
+        ICollection<CustomizeCheckoutLoanInstallments> customizeCheckoutLoanInstallments,
+        ICollection<CustomizeCheckoutSalaryAid> customizeCheckoutSalaryAids,
+        ICollection<CustomizeCheckoutReward> customizeCheckoutRewards, TimeSpan lateToWorkValue, double settingSalary,
+        double dailyWage, WorkshopShiftStatus shiftStatus, IrregularShift irregularShift,
         ICollection<CustomizeRotatingShift> customizeRotatingShifts, ICollection<CustomizeCheckoutRegularShift> employeeSettingsShifts)
     {
         YearInt = Convert.ToInt32(contractStart.ToFarsi().Substring(0, 4));
@@ -77,8 +78,8 @@ public class CustomizeCheckout : EntityBase
 
         LateToWorkValue = lateToWorkValue;
         SettingSalary = settingSalary;
-		DailyWage = dailyWage;
-		ShiftStatus = shiftStatus;
+        DailyWage = dailyWage;
+        ShiftStatus = shiftStatus;
         IrregularShift = irregularShift;
         CustomizeRotatingShifts = customizeRotatingShifts;
         RegularShifts = employeeSettingsShifts;
@@ -257,17 +258,17 @@ public class CustomizeCheckout : EntityBase
     /// </summary>
     public double TotalPayment { get; private set; }
 
-	/// <summary>
-	/// مزد روزانه
-	/// </summary>
-	public double DailyWage { get; private set; }
+    /// <summary>
+    /// مزد روزانه
+    /// </summary>
+    public double DailyWage { get; private set; }
 
-	/// <summary>
-	/// حقوق تعیین شده
-	/// </summary>
-	public double SettingSalary { get; private set; }
+    /// <summary>
+    /// حقوق تعیین شده
+    /// </summary>
+    public double SettingSalary { get; private set; }
 
-	public WorkshopShiftStatus ShiftStatus { get; set; }
+    public WorkshopShiftStatus ShiftStatus { get; set; }
 
 
     #region Values
@@ -301,4 +302,78 @@ public class CustomizeCheckout : EntityBase
 
     #endregion
 
+    public void SetValueObjects(ICollection<CustomizeCheckoutFine> checkoutFines,
+        ICollection<CustomizeCheckoutLoanInstallments> customizeCheckoutLoanInstallments,
+        ICollection<CustomizeCheckoutSalaryAid> customizeCheckoutSalaryAids,
+        ICollection<CustomizeCheckoutReward> customizeCheckoutRewards)
+    {
+        CheckoutFines = checkoutFines;
+        CustomizeCheckoutLoanInstallments = customizeCheckoutLoanInstallments;
+        CustomizeCheckoutSalaryAids = customizeCheckoutSalaryAids;
+        CustomizeCheckoutRewards = customizeCheckoutRewards;
+    }
+
+    public void SetRewards(ICollection<CustomizeCheckoutReward> rewards)
+    {
+        var previousTotalAmount = CustomizeCheckoutRewards.Sum(x => x.Amount.MoneyToDouble());
+        var newTotalAmount = rewards.Sum(x => x.Amount.MoneyToDouble());
+        RewardPay = newTotalAmount;
+        IncreaseTotalPayment(previousTotalAmount, newTotalAmount);
+        RecalculateTotalClaims(previousTotalAmount, newTotalAmount);
+        CustomizeCheckoutRewards = rewards;
+    }
+
+    public void SetSalaryAids(ICollection<CustomizeCheckoutSalaryAid> salaryAids)
+    {
+        var previousTotalAmount = CustomizeCheckoutSalaryAids.Sum(x => x.Amount.MoneyToDouble());
+        var newTotalAmount = salaryAids.Sum(x => x.Amount.MoneyToDouble());
+        SalaryAidDeduction = newTotalAmount;
+        ReduceTotalPayment(previousTotalAmount, newTotalAmount);
+        RecalculateTotalDeduction(previousTotalAmount, newTotalAmount);
+        CustomizeCheckoutSalaryAids = salaryAids;
+    }
+
+    public void SetFines(ICollection<CustomizeCheckoutFine> fines)
+    {
+        var previousTotalAmount = CheckoutFines.Sum(x => x.Amount.MoneyToDouble());
+        var newTotalAmount = fines.Sum(x => x.Amount.MoneyToDouble());
+        FineDeduction = newTotalAmount;
+        ReduceTotalPayment(previousTotalAmount, newTotalAmount);
+        RecalculateTotalDeduction(previousTotalAmount, newTotalAmount);
+        CheckoutFines = fines;
+    }
+
+    public void SetLoanInstallment(ICollection<CustomizeCheckoutLoanInstallments> installments)
+    {
+        var previousTotalAmount = CustomizeCheckoutLoanInstallments.Sum(x => x.AmountForMonth.MoneyToDouble());
+        var newTotalAmount = installments.Sum(x => x.AmountForMonth.MoneyToDouble());
+        InstallmentDeduction = newTotalAmount;
+        ReduceTotalPayment(previousTotalAmount, newTotalAmount);
+        RecalculateTotalDeduction(previousTotalAmount, newTotalAmount);
+        CustomizeCheckoutLoanInstallments = installments;
+    }
+
+
+    private void RecalculateTotalClaims(double previousTotalAmount, double newTotalAmount)
+    {
+        TotalClaims = (TotalClaims.MoneyToDouble() - previousTotalAmount + newTotalAmount).ToMoney();
+    }
+
+
+    private void RecalculateTotalDeduction(double previousTotalAmount, double newTotalAmount)
+    {
+        TotalDeductions = (TotalDeductions.MoneyToDouble() - previousTotalAmount + newTotalAmount).ToMoney();
+    }
+
+    private void ReduceTotalPayment(double previousAmount, double newAmount)
+    {
+        TotalPayment = TotalPayment + previousAmount - newAmount;
+    }
+    private void IncreaseTotalPayment(double previousAmount, double newAmount)
+    {
+        TotalPayment = TotalPayment - previousAmount + newAmount;
+    }
+
+
+
 }

Company.Domain/CustomizeCheckoutAgg/ICustomizeCheckoutRepository.cs

@@ -3,7 +3,7 @@ using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.CustomizeCheckout;
 using System;
 using System.Collections.Generic;
-using _0_Framework.Application;
+using System.Threading.Tasks;
 
 namespace Company.Domain.CustomizeCheckoutAgg
 {
@@ -15,5 +15,12 @@ namespace Company.Domain.CustomizeCheckoutAgg
         void RemoveEmployeeCustomizeCheckoutInDates(long workshopId, long employeeId, DateTime startOfMonth, DateTime endOfMonth);
         IEnumerable<CustomizeCheckout> GetRange(long workshopId, List<long> ids);
         void RemoveRange(IEnumerable<CustomizeCheckout> entities);
+        List<CustomizeCheckout> GetByWorkshopIdEmployeeIdInDates(long workshopId, long employeeId, DateTime startDate, DateTime endDate);
+
+        Task<CustomizeCheckout> GetByWorkshopIdEmployeeIdMonthYear(long workshopId, long employeeId, int year,
+            int month);
+
+        (bool Checkout, bool CustomizeCheckout, bool CustomizeCheckoutTemp) ValidateExistsCheckouts(
+            DateTime startDate, DateTime endDate, long workshopId, List<long> employeeId);
     }
 }

Company.Domain/CustomizeCheckoutAgg/ValueObjects/CustomizeCheckoutFine.cs

@@ -5,7 +5,7 @@ namespace Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 
 public record CustomizeCheckoutFine
 {
-    public CustomizeCheckoutFine(string title, string amount, string fineDateFa, DateTime fineDateGr, IsActive isActive, DateTime creationDate)
+    public CustomizeCheckoutFine(string title, string amount, string fineDateFa, DateTime fineDateGr, IsActive isActive, DateTime creationDate, long entityId)
     {
         Title = title;
         Amount = amount;
@@ -13,6 +13,7 @@ public record CustomizeCheckoutFine
         FineDateGr = fineDateGr;
         IsActive = isActive;
         CreationDate = creationDate;
+        EntityId = entityId;
     }
 
     public string Title { get; private set; }
@@ -21,4 +22,5 @@ public record CustomizeCheckoutFine
     public DateTime FineDateGr { get; private set; }
     public IsActive IsActive { get; private set; }
     public DateTime CreationDate { get; private set; }
+    public long EntityId { get; set; }
 }

Company.Domain/CustomizeCheckoutAgg/ValueObjects/CustomizeCheckoutLoanInstallments.cs

@@ -5,7 +5,7 @@ namespace Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 
 public class CustomizeCheckoutLoanInstallments
 {
-    public CustomizeCheckoutLoanInstallments(string amountForMonth, string month, string year, IsActive isActive, string loanRemaining, string loanAmount)
+    public CustomizeCheckoutLoanInstallments(string amountForMonth, string month, string year, IsActive isActive, string loanRemaining, string loanAmount, long entityId)
     {
         AmountForMonth = amountForMonth;
         Month = month;
@@ -13,6 +13,7 @@ public class CustomizeCheckoutLoanInstallments
         IsActive = isActive;
         LoanRemaining = loanRemaining;
         LoanAmount = loanAmount;
+        EntityId = entityId;
     }
 
     public string AmountForMonth { get; private set; }
@@ -21,5 +22,7 @@ public class CustomizeCheckoutLoanInstallments
     public string LoanRemaining { get; set; }
     public IsActive IsActive { get; private set; }
     public string LoanAmount { get; set; }
+    public long EntityId { get; set; }
+
 
 }

Company.Domain/CustomizeCheckoutAgg/ValueObjects/CustomizeCheckoutReward.cs

@@ -5,7 +5,7 @@ namespace Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 
 public class CustomizeCheckoutReward
 {
-    public CustomizeCheckoutReward(string amount, string description, DateTime grantDate, string grantDateFa, IsActive isActive, string title)
+    public CustomizeCheckoutReward(string amount, string description, DateTime grantDate, string grantDateFa, IsActive isActive, string title, long entityId)
     {
         Amount = amount;
         Description = description;
@@ -13,6 +13,7 @@ public class CustomizeCheckoutReward
         GrantDateFa = grantDateFa;
         IsActive = isActive;
         Title = title;
+        EntityId = entityId;
     }
 
     /// <summary>
@@ -39,5 +40,7 @@ public class CustomizeCheckoutReward
 
 
     public IsActive IsActive { get; private set; }
+    public long EntityId { get; set; }
+
 
 }

Company.Domain/CustomizeCheckoutAgg/ValueObjects/CustomizeCheckoutSalaryAid.cs

@@ -4,14 +4,23 @@ namespace Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 
 public class CustomizeCheckoutSalaryAid
 {
-    public CustomizeCheckoutSalaryAid(string amount, DateTime salaryAidDateTime, string salaryAidDateTimeFa)
+    public CustomizeCheckoutSalaryAid(string amount, DateTime salaryAidDateTime, string salaryAidDateTimeFa,DateTime calculationDateTime,string calculationDateTimeFa, long entityId)
     {
         Amount = amount;
         SalaryAidDateTime = salaryAidDateTime;
         SalaryAidDateTimeFa = salaryAidDateTimeFa;
+        CalculationDateTime = calculationDateTime;
+        CalculationDateTimeFa = calculationDateTimeFa;
+        EntityId = entityId;
     }
 
     public string Amount { get; private set; }
     public DateTime SalaryAidDateTime { get; private set; }
     public string SalaryAidDateTimeFa { get; private set; }
+
+    public DateTime CalculationDateTime { get; private set; }
+    public string CalculationDateTimeFa { get; private set; }
+
+    public long EntityId { get; set; }
+
 }

Company.Domain/CustomizeCheckoutTempAgg/CustomizeCheckoutTemp.cs

@@ -8,6 +8,7 @@ using System.Collections.Generic;
 using Company.Domain.CustomizeCheckoutTempAgg.ValueObjects;
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects;
+using System.Linq;
 
 
 namespace Company.Domain.CustomizeCheckoutTempAgg;
@@ -303,6 +304,77 @@ public class CustomizeCheckoutTemp : EntityBase
     public Workshop Workshop { get; set; }
 	public Employee Employee { get; set; }
 
-	#endregion
+    #endregion
 
+    public void SetValueObjects(ICollection<CustomizeCheckoutTempFine> checkoutFines,
+        ICollection<CustomizeCheckoutTempLoanInstallments> customizeCheckoutLoanInstallments,
+        ICollection<CustomizeCheckoutTempSalaryAid> customizeCheckoutSalaryAids,
+        ICollection<CustomizeCheckoutTempReward> customizeCheckoutRewards)
+    {
+        CheckoutFines = checkoutFines;
+        CustomizeCheckoutLoanInstallments = customizeCheckoutLoanInstallments;
+        CustomizeCheckoutSalaryAids = customizeCheckoutSalaryAids;
+        CustomizeCheckoutRewards = customizeCheckoutRewards;
+    }
+
+    public void SetRewards(ICollection<CustomizeCheckoutTempReward> rewards)
+    {
+        var previousTotalAmount = CustomizeCheckoutRewards.Sum(x => x.Amount.MoneyToDouble());
+        var newTotalAmount = rewards.Sum(x => x.Amount.MoneyToDouble());
+        RewardPay = newTotalAmount;
+        IncreaseTotalPayment(previousTotalAmount,newTotalAmount);
+       RecalculateTotalClaims(previousTotalAmount, newTotalAmount);
+        CustomizeCheckoutRewards = rewards;
+    }
+
+    public void SetSalaryAids(ICollection<CustomizeCheckoutTempSalaryAid> salaryAids)
+    {
+        var previousTotalAmount = CustomizeCheckoutSalaryAids.Sum(x => x.Amount.MoneyToDouble());
+        var newTotalAmount = salaryAids.Sum(x => x.Amount.MoneyToDouble());
+        SalaryAidDeduction = newTotalAmount;
+        ReduceTotalPayment(previousTotalAmount,newTotalAmount);
+        RecalculateTotalDeduction(previousTotalAmount, newTotalAmount);
+        CustomizeCheckoutSalaryAids = salaryAids;
+    }
+
+    public void SetFines(ICollection<CustomizeCheckoutTempFine> fines)
+    {
+        var previousTotalAmount = CheckoutFines.Sum(x => x.Amount.MoneyToDouble());
+        var newTotalAmount = fines.Sum(x => x.Amount.MoneyToDouble());
+        FineDeduction = newTotalAmount;
+        ReduceTotalPayment(previousTotalAmount,newTotalAmount);
+        RecalculateTotalDeduction(previousTotalAmount, newTotalAmount);
+        CheckoutFines = fines;
+    }
+
+    public void SetLoanInstallment(ICollection<CustomizeCheckoutTempLoanInstallments> installments)
+    {
+        var previousTotalAmount = CustomizeCheckoutLoanInstallments.Sum(x => x.AmountForMonth.MoneyToDouble());
+        var newTotalAmount = installments.Sum(x => x.AmountForMonth.MoneyToDouble());
+        InstallmentDeduction = newTotalAmount;
+        ReduceTotalPayment(previousTotalAmount,newTotalAmount);
+        RecalculateTotalDeduction(previousTotalAmount, newTotalAmount);
+        CustomizeCheckoutLoanInstallments = installments;
+    }
+
+
+    private void RecalculateTotalClaims(double previousTotalAmount, double newTotalAmount)
+    {
+        TotalClaims = (TotalClaims.MoneyToDouble() - previousTotalAmount + newTotalAmount).ToMoney();
+    }
+
+
+    private void RecalculateTotalDeduction(double previousTotalAmount, double newTotalAmount)
+    {
+        TotalDeductions = (TotalDeductions.MoneyToDouble() - previousTotalAmount + newTotalAmount).ToMoney();
+    }
+
+    private void ReduceTotalPayment(double previousAmount, double newAmount)
+    {
+        TotalPayment = TotalPayment + previousAmount - newAmount;
+    }
+	private void IncreaseTotalPayment(double previousAmount, double newAmount)
+    {
+        TotalPayment = TotalPayment - previousAmount + newAmount;
+    }
 }

Company.Domain/CustomizeCheckoutTempAgg/ICustomizeCheckoutTempRepository.cs

@@ -4,6 +4,7 @@ using Company.Domain.CustomizeCheckoutAgg;
 using CompanyManagment.App.Contracts.CustomizeCheckout;
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Company.Domain.CustomizeCheckoutTempAgg
 {
@@ -19,5 +20,7 @@ namespace Company.Domain.CustomizeCheckoutTempAgg
 
         IEnumerable<CustomizeCheckoutTemp> GetRange(long workshopId, List<long> ids);
         void RemoveRange(IEnumerable<CustomizeCheckoutTemp> entities);
+        List<CustomizeCheckoutTemp> GetByWorkshopIdEmployeeIdInDates(long workshopId, long employeeId, DateTime startDate, DateTime endDate);
+        Task<CustomizeCheckoutTemp> GetByWorkshopIdEmployeeIdInDate(long workshopId, long employeeId, DateTime inDate);
     }
 }

Company.Domain/CustomizeCheckoutTempAgg/ValueObjects/CustomizeCheckoutSalaryAid.cs

@@ -4,14 +4,23 @@ namespace Company.Domain.CustomizeCheckoutTempAgg.ValueObjects;
 
 public class CustomizeCheckoutTempSalaryAid
 {
-    public CustomizeCheckoutTempSalaryAid(string amount, DateTime salaryAidDateTime, string salaryAidDateTimeFa)
+    public CustomizeCheckoutTempSalaryAid(string amount, DateTime salaryAidDateTime, string salaryAidDateTimeFa,
+        DateTime calculationDateTime, string calculationDateTimeFa, long entityId)
     {
         Amount = amount;
         SalaryAidDateTime = salaryAidDateTime;
         SalaryAidDateTimeFa = salaryAidDateTimeFa;
+        CalculationDateTime = calculationDateTime;
+        CalculationDateTimeFa = calculationDateTimeFa;
+        EntityId = entityId;
     }
 
     public string Amount { get; private set; }
     public DateTime SalaryAidDateTime { get; private set; }
     public string SalaryAidDateTimeFa { get; private set; }
+
+    public DateTime CalculationDateTime { get; private set; }
+    public string CalculationDateTimeFa { get; private set; }
+    public long EntityId { get; set; }
+
 }

Company.Domain/CustomizeCheckoutTempAgg/ValueObjects/CustomizeCheckoutTempFine.cs

@@ -6,7 +6,7 @@ namespace Company.Domain.CustomizeCheckoutTempAgg.ValueObjects;
 
 public record CustomizeCheckoutTempFine
 {
-    public CustomizeCheckoutTempFine(string title, string amount, string fineDateFa, DateTime fineDateGr, IsActive isActive, DateTime creationDate)
+    public CustomizeCheckoutTempFine(string title, string amount, string fineDateFa, DateTime fineDateGr, IsActive isActive, DateTime creationDate, long entityId)
     {
         Title = title;
         Amount = amount;
@@ -14,7 +14,7 @@ public record CustomizeCheckoutTempFine
         FineDateGr = fineDateGr;
         IsActive = isActive;
         CreationDate = creationDate;
-
+        EntityId = entityId;
     }
     public string Title { get; private set; }
     public string Amount { get; private set; }
@@ -22,4 +22,6 @@ public record CustomizeCheckoutTempFine
     public DateTime FineDateGr { get; private set; }
     public IsActive IsActive { get; private set; }
     public DateTime CreationDate { get; private set; }
+    public long EntityId { get; set; }
+
 }

Company.Domain/CustomizeCheckoutTempAgg/ValueObjects/CustomizeCheckoutTempLoanInstallments.cs

@@ -4,7 +4,7 @@ namespace Company.Domain.CustomizeCheckoutTempAgg.ValueObjects;
 
 public class CustomizeCheckoutTempLoanInstallments
 {
-    public CustomizeCheckoutTempLoanInstallments(string amountForMonth, string month, string year, IsActive isActive, string loanRemaining, string loanAmount)
+    public CustomizeCheckoutTempLoanInstallments(string amountForMonth, string month, string year, IsActive isActive, string loanRemaining, string loanAmount, long entityId)
     {
         AmountForMonth = amountForMonth;
         Month = month;
@@ -12,6 +12,7 @@ public class CustomizeCheckoutTempLoanInstallments
         IsActive = isActive;
         LoanRemaining = loanRemaining;
         LoanAmount = loanAmount;
+        EntityId = entityId;
     }
 
     public string AmountForMonth { get; private set; }
@@ -20,5 +21,7 @@ public class CustomizeCheckoutTempLoanInstallments
     public IsActive IsActive { get; private set; }
     public string LoanRemaining { get; set; }
     public string LoanAmount { get; set; }
+    public long EntityId { get; set; }
+
 
 }

Company.Domain/CustomizeCheckoutTempAgg/ValueObjects/CustomizeCheckoutTempReward.cs

@@ -5,7 +5,7 @@ namespace Company.Domain.CustomizeCheckoutTempAgg.ValueObjects;
 
 public class CustomizeCheckoutTempReward
 {
-    public CustomizeCheckoutTempReward(string amount, string description, DateTime grantDate, string grantDateFa, IsActive isActive, string title)
+    public CustomizeCheckoutTempReward(string amount, string description, DateTime grantDate, string grantDateFa, IsActive isActive, string title, long entityId)
     {
         Amount = amount;
         Description = description;
@@ -13,6 +13,7 @@ public class CustomizeCheckoutTempReward
         GrantDateFa = grantDateFa;
         IsActive = isActive;
         Title = title;
+        EntityId = entityId;
     }
 
     /// <summary>
@@ -37,4 +38,6 @@ public class CustomizeCheckoutTempReward
 
     public IsActive IsActive { get; private set; }
     public string Title { get; set; }
+    public long EntityId { get; set; }
+
 }

Company.Domain/CustomizeWorkshopEmployeeSettingsAgg/Entities/CustomizeWorkshopEmployeeSettings.cs

@@ -214,5 +214,66 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
                 .ToList(), earlyExit.Value);
     }
 
+    public void UpdateIsShiftChange()
+    {
+        var groupSetting = CustomizeWorkshopGroupSettings;
+        if (groupSetting == null)
+            return;
+        bool isShiftChange;
 
+
+        if (WorkshopShiftStatus == WorkshopShiftStatus.Regular)
+        {
+
+
+
+            if (CustomizeWorkshopEmployeeSettingsShifts.All(x => groupSetting.CustomizeWorkshopGroupSettingsShifts.Any(y => x.Equals(y)))
+                && WorkshopShiftStatus == groupSetting.WorkshopShiftStatus && FridayWork == groupSetting.FridayWork &&
+                HolidayWork == groupSetting.HolidayWork && BreakTime == groupSetting.BreakTime)
+            {
+                isShiftChange = false;
+            }
+
+            else
+            {
+                isShiftChange = true;
+            }
+        }
+        else if (WorkshopShiftStatus == WorkshopShiftStatus.Irregular)
+        {
+            if (WorkshopShiftStatus == groupSetting.WorkshopShiftStatus && BreakTime == groupSetting.BreakTime &&
+                IrregularShift == groupSetting.IrregularShift && FridayWork == groupSetting.FridayWork &&
+                HolidayWork == groupSetting.HolidayWork)
+            {
+                isShiftChange = false;
+            }
+            else
+            {
+                isShiftChange = true;
+            }
+        }
+        else
+        {
+            if (CustomizeRotatingShifts.All(x => groupSetting.CustomizeRotatingShifts.Any(y => x.Equals(y)))
+                && WorkshopShiftStatus == groupSetting.WorkshopShiftStatus && FridayWork == groupSetting.FridayWork &&
+                HolidayWork == groupSetting.HolidayWork && BreakTime == groupSetting.BreakTime)
+            {
+                isShiftChange = false;
+            }
+
+            else
+            {
+                isShiftChange = true;
+            }
+
+        }
+
+        IsShiftChanged = isShiftChange;
+    }
+
+
+    public void SetSalary(double salary)
+    {
+        Salary = salary;
+    }
 }

Company.Domain/CustomizeWorkshopGroupSettingsAgg/Entities/CustomizeWorkshopGroupSettings.cs

@@ -219,7 +219,7 @@ public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
 
         }
 
-        var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.id));
+        var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.EmployeeId));
 
         foreach (var item in permittedToOverWrite)
         {

Company.Domain/EmployeeInsurancListDataAgg/EmployeeInsurancListData.cs

@@ -12,7 +12,7 @@ public class EmployeeInsurancListData : EntityBase
 {
     public EmployeeInsurancListData(long insuranceListId, long employeeId, int workingDays, double dailyWage, double monthlySalary,
         double monthlyBenefits, double monthlyBenefitsIncluded, double benefitsIncludedContinuous, double benefitsIncludedNonContinuous,
-        double insuranceShare, DateTime startWorkDate, DateTime? leftWorkDate, long jobId,bool includeStatus, double baseYears, double marriedAllowance)
+        double insuranceShare, DateTime startWorkDate, DateTime? leftWorkDate, long jobId,bool includeStatus, double baseYears, double marriedAllowance, double overTimePay, double familyAllowance)
     {
         InsuranceListId = insuranceListId;
         EmployeeId = employeeId;
@@ -30,6 +30,8 @@ public class EmployeeInsurancListData : EntityBase
         IncludeStatus = includeStatus;
         BaseYears = baseYears;
         MarriedAllowance = marriedAllowance;
+        OverTimePay = overTimePay;
+        FamilyAllowance = familyAllowance;
         DailyWagePlusBaseYears = dailyWage + baseYears;
     }
 
@@ -110,10 +112,20 @@ public class EmployeeInsurancListData : EntityBase
     /// </summary>
     public double MarriedAllowance { get; private set; }
 
+    /// <summary>
+    /// اضافه کار فیش حقوقی
+    /// </summary>
+    public double OverTimePay { get; private set; }
+
+    /// <summary>
+    /// حق اولاد فیش حقوقی
+    /// </summary>
+    public double FamilyAllowance { get; private set; }
+
 
     public void Edit(int workingDays, double dailyWage, double monthlySalary, double monthlyBenefits, double monthlyBenefitsIncluded, 
         double benefitsIncludedContinuous, double benefitsIncludedNonContinuous, double insuranceShare, DateTime startWorkDate,
-        DateTime? leftWorkDate, long jobId, bool includeStatus, double baseYears, double marriedAllowance)
+        DateTime? leftWorkDate, long jobId, bool includeStatus, double baseYears, double marriedAllowance, double overTimePay, double familyAllowance)
     {
             
         WorkingDays = workingDays;
@@ -130,6 +142,8 @@ public class EmployeeInsurancListData : EntityBase
         IncludeStatus= includeStatus;
         BaseYears = baseYears;
         MarriedAllowance = marriedAllowance;
+        OverTimePay = overTimePay;
+        FamilyAllowance = familyAllowance;
         DailyWagePlusBaseYears = dailyWage + baseYears;
     }
 

Company.Domain/InsurancJobAgg/IInsuranceJobRepositpry.cs

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.InsuranceJob;
+using CompanyManagment.App.Contracts.InsuranceJobItem;
 
 namespace Company.Domain.InsurancJobAgg;
 
@@ -13,10 +14,16 @@ public interface IInsuranceJobRepositpry:IRepository<long, InsuranceJob>
 {
     //OperationResult Create(CreateInsurancJob command);
     // OperationResult Edit(EditInsurancJob command);
-    EditInsuranceJob GetDetails(long id);
+    EditInsuranceJob GetDetails(long id, string year, string month);
     List<InsuranceJobViewModel> GetInsurancJob();
     List<InsuranceJobViewModel> Search(InsuranceJobSearchModel searchModel);
     OperationResult CreateInsuranceJob(CreateInsuranceJob command);
+    List<(long id, string date)> GetOldYersInsuranceItemIds();
+    OperationResult CopyFromLastYear(CopyFromLastYearViewModel command);
+    OperationResult RecoveryOldData1403();
     OperationResult Remove(long id);
     OperationResult EditInsuranceJob(EditInsuranceJob command);
-}
+
+
+}
+

Company.Domain/InsuranceJobItemAgg/IInsuranceJobItemRepositpry.cs

@@ -14,8 +14,11 @@ public interface IInsuranceJobItemRepositpry : IRepository<long, InsuranceJobIte
 {
     void CreateInsuranceJobItem(InsuranceJobItemViewModel model);
     DetailsInsuranceJobItem GetDetails(long id);
-    List<InsuranceJobItemViewModel> GetInsuranceJobItemByInsuranceJobId(long Id);
+    List<InsuranceJobItemViewModel> GetInsuranceJobItemByInsuranceJobId(long Id, string year, string month);
     List<InsuranceJobItemViewModel> Search(InsuranceJobItemSearchModel searchModel);
-    InsuranceJobItemViewModel GetInsuranceJobItemByInsuranceJobIdForFixedSalary(long insuranceJobId, long jobId); 
+    InsuranceJobItemViewModel GetInsuranceJobItemByInsuranceJobIdForFixedSalary(long insuranceJobId, long jobId,
+        string year, string month);
+
+    (List<string> workshopList, bool hasAnyWorkshop) GetWorkshopUsedThisInsuranceJob(long insuranceJobId);
 
 }

Company.Domain/InsuranceJobItemAgg/InsuranceJobItem.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using _0_Framework.Domain;
 using Company.Domain.InsuranceJobAndJobsAgg;
 using Company.Domain.InsurancJobAgg;
@@ -8,13 +9,15 @@ namespace Company.Domain.InsuranceJobItemAgg;
 
 public class InsuranceJobItem : EntityBase
 {
-    public InsuranceJobItem(double percentageLessThan, double salaeyLessThan, double percentageMoreThan, double salaryMoreThan, long insuranceJobId)
+    public InsuranceJobItem(double percentageLessThan, double salaeyLessThan, double percentageMoreThan, double salaryMoreThan, long insuranceJobId, DateTime? startDate, DateTime? endDate)
     {
         PercentageLessThan = percentageLessThan;
         SalaeyLessThan = salaeyLessThan;
         PercentageMoreThan = percentageMoreThan;
         SalaryMoreThan = salaryMoreThan;
         InsuranceJobId = insuranceJobId;
+        StartDate = startDate;
+        EndDate = endDate;
     }
 
     public double PercentageLessThan { get; private set; }
@@ -22,6 +25,9 @@ public class InsuranceJobItem : EntityBase
     public double PercentageMoreThan { get; private set; }
     public double SalaryMoreThan { get; private set; }
 
+    public DateTime? StartDate { get; private set; }
+    public DateTime? EndDate { get; private set; }
+
     public long InsuranceJobId { get; private set; }
     public InsuranceJob InsuranceJob { get; set; }
     public List<InsuranceJobAndJobs> InsuranceJobAndJobs { get; set; }
@@ -31,12 +37,14 @@ public class InsuranceJobItem : EntityBase
         InsuranceJobAndJobs = new List<InsuranceJobAndJobs>();
     }
 
-    public void Edit(double percentageLessThan, double salaeyLessThan, double percentageMoreThan, double salaryMoreThan, long insuranceJobId)
+    public void Edit(double percentageLessThan, double salaeyLessThan, double percentageMoreThan, double salaryMoreThan, long insuranceJobId, DateTime? startDate, DateTime? endDate)
     {
         PercentageLessThan = percentageLessThan;
         SalaeyLessThan = salaeyLessThan;
         PercentageMoreThan = percentageMoreThan;
         SalaryMoreThan = salaryMoreThan;
         InsuranceJobId = insuranceJobId;
+        StartDate = startDate;
+        EndDate = endDate;
     }
 }

Company.Domain/LeftWorkAgg/ILeftWorkRepository.cs

@@ -45,4 +45,5 @@ public interface ILeftWorkRepository : IRepository<long, LeftWork>
     #endregion
 
     Task<LeftWork> GetLastLeftWork(long employeeId, long workshopId);
+    List<LeftWorkViewModel> SearchCreateContract(LeftWorkSearchModel searchModel);
 }

Company.Domain/LeftWorkInsuranceAgg/ILeftWorkInsuranceRepository.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.InsuranceList;
+using CompanyManagment.App.Contracts.LeftWork;
 using CompanyManagment.App.Contracts.LeftWorkInsurance;
 using CompanyManagment.App.Contracts.PersonnleCode;
 
@@ -40,5 +41,16 @@ public interface ILeftWorkInsuranceRepository : IRepository<long, LeftWorkInsura
     /// <returns></returns>
 	List<EmployeeDetailsForInsuranceListViewModel> GetEmployeeInsuranceLeftWorksAndInformation(long workshopId, DateTime startDate, DateTime endDate);
 
-	#endregion
+    #endregion
+
+    #region Mahan
+
+    /// <summary>
+    /// پرسنل هایی که در قرارداد ترک کار دارند ولی در بیمه ترک کاری برایشان نخورده
+    /// </summary>
+    /// <param name="workshopId"></param>
+    /// <returns></returns>
+    List<LeftWorkViewModel> GetEmployeesWithContractExitOnly(long workshopId);
+
+    #endregion
 }

Company.Domain/RollCallAgg/DomainService/IRollCallDomainService.cs

@@ -31,6 +31,10 @@ public interface IRollCallDomainService
     void CalculateTimeDifferences(RollCall rollCall);
 
     (DateTime start, DateTime end) FindRotatingShift(DateTime startRollCall, DateTime endRollCall, ICollection<CustomizeRotatingShift> rotatingShifts);
+    (DateTime start, DateTime end) FindRotatingShift(List<(DateTime StartDate, DateTime EndDate)> rollcalls, ICollection<CustomizeRotatingShift> rotatingShifts);
+
+    BreakTime GetBreakTime(long employeeId, long workshopId);
+
 }
 
 public class RollCallDomainService : IRollCallDomainService
@@ -257,7 +261,7 @@ public class RollCallDomainService : IRollCallDomainService
                     var earlyEntryRollCall = rollCallsInShift.OrderBy(x => x.StartDate).FirstOrDefault(x => x.StartDate < employeeShift.start);
 
                     var lateEntryRollCall = rollCallsInShift.OrderBy(x => x.StartDate).FirstOrDefault(x => x.StartDate > employeeShift.start);
-        
+
 
 
 
@@ -354,7 +358,9 @@ public class RollCallDomainService : IRollCallDomainService
 
                 var rotatingShifts = shiftDetails.rotatingShifts;
 
-                var shift = FindRotatingShift(starDateTime, endDateTime, rotatingShifts);
+                var rollCallStartEnds = rollCalls.Select(x => (x.StartDate.Value, x.EndDate.Value)).ToList();
+
+                var shift = FindRotatingShift(rollCallStartEnds, rotatingShifts);
 
                 var rotatingShiftStart = shift.start;
                 var rotatingShiftEnd = shift.end;
@@ -374,8 +380,8 @@ public class RollCallDomainService : IRollCallDomainService
                 var earlyEntryRollCallRotating = rollCallsInRotatingShift.OrderBy(x => x.StartDate).FirstOrDefault(x => x.StartDate < shift.start);
 
                 var lateEntryRollCallRotating = rollCallsInRotatingShift.OrderBy(x => x.StartDate).FirstOrDefault(x => x.StartDate > shift.start);
-                earlyEntryRollCallRotating?.ClearTimeDiff();
-                lateEntryRollCallRotating?.ClearTimeDiff();
+                //برای خالی کردن اولیه حضور غیاب انتخاب شده
+                earlyEntryRollCallRotating?.SetEarlyEnter(TimeSpan.Zero);
 
                 if (earlyEntryRollCallRotating != null)
                 {
@@ -404,8 +410,8 @@ public class RollCallDomainService : IRollCallDomainService
                 var earlyExitRollCallRotating = rollCallsInRotatingShift.OrderByDescending(x => x.EndDate).FirstOrDefault(x => x.EndDate < shift.end);
 
                 var lateExitRollCallRotating = rollCallsInRotatingShift.OrderBy(x => x.EndDate).FirstOrDefault(x => x.EndDate > shift.end);
-                earlyExitRollCallRotating?.ClearTimeDiff();
-                lateExitRollCallRotating?.ClearTimeDiff();
+                //برای خالی کردن اولیه حضور غیاب انتخاب شده
+                earlyExitRollCallRotating?.SetEarlyExit(TimeSpan.Zero);
 
 
 
@@ -450,17 +456,6 @@ public class RollCallDomainService : IRollCallDomainService
         DateTime startDate = startRollCall.Date;
         DateTime endDate = endRollCall.Date;
 
-
-
-        DateTime startEntryWithDate = startDate.Add(startRollCall.TimeOfDay);
-        DateTime endEntryWithDate = endDate.Add(endRollCall.TimeOfDay);
-
-        DateTime twoHourBeforeStart = startEntryWithDate.AddHours(-2);
-        DateTime twoHourAfterStart = startEntryWithDate.AddHours(2);
-        DateTime twoHourBeforeEnd = endEntryWithDate.AddHours(-2);
-        DateTime twoHourAfterEnd = endEntryWithDate.AddHours(2);
-
-
         var shiftDateTimes = rotatingShifts.SelectMany(shift =>
         {
             var shifts = new List<(DateTime Start, DateTime End)>();
@@ -538,7 +533,8 @@ public class RollCallDomainService : IRollCallDomainService
             .ThenByDescending(s => s.Overlap)               // 2. بیشترین Overlap
             .ThenBy(s => s.TotalDistance)
             .ThenBy(s => s.StartDistance)
-            .ThenBy(x => x.EndDistance);                      // 3. اگر برابر بود، Start نزدیک‌تر
+            .ThenBy(x => x.EndDistance);                      // 3. اگر برابر بود، 
+
 
         var overlapChosenShift = overlapShifts.First();
         var end = overlapChosenShift.Shift.End;
@@ -551,6 +547,145 @@ public class RollCallDomainService : IRollCallDomainService
         #endregion
     }
 
+    public (DateTime start, DateTime end) FindRotatingShift(List<(DateTime StartDate, DateTime EndDate)> rollCalls, ICollection<CustomizeRotatingShift> rotatingShifts)
+    {
+
+        DateTime startDate = rollCalls.MinBy(x => x.StartDate).StartDate.Date;
+        DateTime endDate = rollCalls.MaxBy(x => x.EndDate).EndDate.Date;
+
+        var shiftDateTimes = rotatingShifts.SelectMany(shift =>
+        {
+            var shifts = new List<(DateTime Start, DateTime End)>();
+            for (int i = -1; i <= 1; i++)
+            {
+                var shiftStart = startDate.AddDays(i).Date;
+                shiftStart = shiftStart.Add(shift.StartTime.ToTimeSpan());
+                var shiftEnd = shift.StartTime < shift.EndTime
+                    ? startDate.AddDays(i).Date.Add(shift.EndTime.ToTimeSpan())
+                    : startDate.AddDays(i + 1).Date.Add(shift.EndTime.ToTimeSpan());
+                shifts.Add((shiftStart, shiftEnd));
+            }
+
+            return shifts;
+        }).ToList();
+
+        //var shiftScores = shiftDateTimes
+        //    .Select(shift =>
+        //    {
+        //        var totalOverlap = TimeSpan.Zero;
+
+        //        var firstRollCall = rollCalls.MinBy(x => x.StartDate);
+        //        var lastRollCall = rollCalls.MaxBy(x => x.EndDate);
+
+        //        long totalStartDistance = Math.Abs((shift.Start - firstRollCall.StartDate).Ticks);
+        //        long totalEndDistance = Math.Abs((shift.End - lastRollCall.EndDate).Ticks);
+
+
+        //        foreach (var rollCall in rollCalls)
+        //        {
+        //            var start = rollCall.StartDate;
+        //            var end = rollCall.EndDate;
+
+        //            var overlapTicks = Math.Max(0,
+        //                Math.Min(shift.End.Ticks, end.Ticks) -
+        //                Math.Max(shift.Start.Ticks, start.Ticks));
+
+        //            totalOverlap += new TimeSpan(overlapTicks);
+        //            //totalStartDistance += Math.Abs((shift.Start - start).Ticks);
+        //            //totalEndDistance += Math.Abs((shift.End - end).Ticks);
+        //        }
+
+        //        return new
+        //        {
+        //            Shift = shift,
+        //            TotalOverlap = totalOverlap,
+        //            TotalDistance = totalStartDistance + totalEndDistance,
+        //            StartDistance = totalStartDistance,
+        //            EndDistance = totalEndDistance
+        //        };
+        //    })
+        //    .OrderBy(s => s.StartDistance)
+        //    .ThenBy(s => s.TotalDistance)
+        //    .ThenByDescending(s => s.TotalOverlap)
+        //    .ThenBy(s => s.EndDistance);
+
+
+        // مرحله 1: گروه‌بندی بر اساس نزدیکی زمان شروع به اولین حضور و غیاب
+        var groupedByStart = shiftDateTimes
+            .GroupBy(shift =>
+            {
+                var firstRollCallStart = rollCalls.Min(x => x.StartDate);
+                var ticksDiff = Math.Abs((shift.Start - firstRollCallStart).Ticks);
+                return Math.Round(TimeSpan.FromTicks(ticksDiff).TotalMinutes / 30); // گروه‌بندی هر 30 دقیقه
+            })
+            .OrderBy(g => g.Key)
+            .First(); // نزدیک‌ترین گروه به شروع
+
+        // مرحله 2 (جایگزین مرحله ۴): گروه‌بندی بر اساس نزدیکی پایان شیفت به آخرین حضور و غیاب
+        var filteredByEnd = groupedByStart
+            .Select(shift =>
+            {
+                var lastRollCallEnd = rollCalls.Max(x => x.EndDate);
+                var endDistance = Math.Abs((shift.End - lastRollCallEnd).Ticks);
+                return new { Shift = shift, EndDistance = endDistance };
+            })
+            .GroupBy(x => x.EndDistance / TimeSpan.FromMinutes(30).Ticks) // گروه‌بندی هر 30 دقیقه
+            .OrderBy(g => g.Key)
+            .First() // نزدیک‌ترین پایان
+            .ToList();
+
+        // مرحله 3: فیلتر بر اساس بیشترین همپوشانی با حضور و غیاب‌ها
+        var filteredByOverlap = filteredByEnd
+            .Select(shift =>
+            {
+                var totalOverlap = TimeSpan.Zero;
+                foreach (var rollCall in rollCalls)
+                {
+                    var overlapTicks = Math.Max(0,
+                        Math.Min(shift.Shift.End.Ticks, rollCall.EndDate.Ticks) -
+                        Math.Max(shift.Shift.Start.Ticks, rollCall.StartDate.Ticks));
+                    totalOverlap += new TimeSpan(overlapTicks);
+                }
+                return new { Shift = shift.Shift, TotalOverlap = totalOverlap };
+            })
+            .GroupBy(x => Math.Round(x.TotalOverlap.TotalMinutes /5)) // گروه‌بندی همپوشانی
+            .OrderByDescending(g => g.Key) // بیشترین همپوشانی اول
+            .First()
+            .ToList();
+
+        // مرحله 4 (جایگزین مرحله ۲): فیلتر نهایی بر اساس کمترین مجموع فاصله (TotalDistance)
+        var bestShift = filteredByOverlap
+            .Select(shift =>
+            {
+                var firstRollCall = rollCalls.MinBy(x => x.StartDate);
+                var lastRollCall = rollCalls.MaxBy(x => x.EndDate);
+                var totalDistance =
+                    Math.Abs((shift.Shift.Start - firstRollCall.StartDate).Ticks) +
+                    Math.Abs((shift.Shift.End - lastRollCall.EndDate).Ticks);
+                return new { Shift = shift.Shift, TotalDistance = totalDistance };
+            })
+            .OrderBy(x => x.TotalDistance) // کمترین فاصله کلی
+            .First(); // بهترین شیفت نهایی
+        var overlapChosenShift = bestShift;
+        var end = overlapChosenShift.Shift.End;
+        if (overlapChosenShift.Shift.End < overlapChosenShift.Shift.Start)
+            end = overlapChosenShift.Shift.End.AddDays(1);
+
+
+        return (overlapChosenShift.Shift.Start, end);
+    }
+
+    public BreakTime GetBreakTime(long employeeId, long workshopId)
+    {
+        var employeeSettings = _customizeWorkshopEmployeeSettingsRepository.GetByEmployeeIdAndWorkshopIdIncludeGroupSettings(workshopId,
+            employeeId);
+        if (employeeSettings == null)
+        {
+            return new BreakTime(false, TimeOnly.MinValue);
+        }
+
+        return employeeSettings.BreakTime;
+    }
     private DateTime CalculateRegularShiftDate(DateTime startDate, TimeOnly offset)
     {
         DateTime nextOffSetDateTime;

Company.Domain/RollCallAgg/IRollCallMandatoryRepository.cs

@@ -6,24 +6,41 @@ using Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities;
 using CompanyManagment.App.Contracts.Contract;
 using CompanyManagment.App.Contracts.CustomizeCheckout;
 using CompanyManagment.App.Contracts.Leave;
+using CompanyManagment.App.Contracts.Loan;
 using CompanyManagment.App.Contracts.RollCall;
+using CompanyManagment.App.Contracts.SalaryAid;
 using CompanyManagment.App.Contracts.WorkingHoursTemp;
 
 namespace Company.Domain.RollCallAgg;
 
 public interface IRollCallMandatoryRepository : IRepository<long, RollCall>
 {
-	ComputingViewModel MandatoryCompute(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd, CreateWorkingHoursTemp command, bool holidayWorking);
+	ComputingViewModel MandatoryCompute(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd, CreateWorkingHoursTemp command, bool holidayWorking, bool isStaticCheckout);
 	TimeSpan AfterSubtract(CreateWorkingHoursTemp command, TimeSpan sumOneDaySpan, DateTime creationDate);
 
 	List<RotatingShiftViewModel> RotatingShiftCheck(List<GroupedRollCalls> rollCallList);
 
-
+    List<RollCallViewModel> ConvertStaticHoursToRollCall(CreateWorkingHoursTemp command, bool workshopHolidyWorking);
     CustomizeCheckoutMandatoryViewModel CustomizeCheckoutMandatoryCompute(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd);
 
     List<LateToWorkEarlyExistSpannig> LateToWorkEarlyExit(List<GroupedRollCalls> groupedRollCall,
         ICollection<CustomizeWorkshopEmployeeSettingsShift> shiftSettings, List<LeaveViewModel> leavList);
 
+    List<LoanInstallmentViewModel> LoanInstallmentForCheckout(long employeeId, long workshopId, DateTime contractStart,
+        DateTime contractEnd);
+
+    List<SalaryAidViewModel> SalaryAidsForCheckout(long employeeId, long workshopId, DateTime checkoutStart,
+        DateTime checkoutEnd);
+
+    /// <summary>
+    /// گزارش نوبت کاری حضور غیاب
+    /// </summary>
+    /// <param name="workshopId"></param>
+    /// <param name="employeeId"></param>
+    /// <param name="contractStart"></param>
+    /// <param name="contractEnd"></param>
+    /// <param name="shiftwork"></param>
+    /// <returns></returns>
     Task<ComputingViewModel> RotatingShiftReport(long workshopId, long employeeId, DateTime contractStart,
-        DateTime contractEnd, string shiftwork);
+        DateTime contractEnd, string shiftwork, bool hasRollCall, CreateWorkingHoursTemp command,bool holidayWorking);
 }

Company.Domain/RollCallAgg/RollCall.cs

@@ -4,6 +4,8 @@ using System;
 using Company.Domain.RollCallAgg.DomainService;
 using System.Linq;
 using _0_Framework.Exceptions;
+using Company.Domain.EmployeeAgg;
+using Company.Domain.WorkshopAgg;
 
 namespace Company.Domain.RollCallAgg
 {
@@ -34,10 +36,10 @@ namespace Company.Domain.RollCallAgg
             {
                 throw new NotFoundException("اطلاعات گروهبندی شخص نامعتبر است");
             }
-
+            SetBreakTime(service, employeeId, workshopId);
             //if (endDate.HasValue)
             //{
-	           // Edit(StartDate.Value,endDate.Value,service);
+            // Edit(StartDate.Value,endDate.Value,service);
             //}
 
         }
@@ -198,30 +200,7 @@ namespace Company.Domain.RollCallAgg
 
 
 
-        /// <summary>
-        /// Truncates the TimeSpan to only include days, hours, and minutes.
-        /// Removes seconds, milliseconds, and smaller units.
-        /// </summary>
-        /// <param name="time">The original TimeSpan value.</param>
-        /// <returns>A truncated TimeSpan with only days, hours, and minutes.</returns>
-        private TimeSpan TruncateTimeSpan(TimeSpan time)
-        {
-            return new TimeSpan(time.Days, time.Hours, time.Minutes, 0);
-        }
-
-        /// <summary>
-        /// Truncates the DateTime to only include Years,Month,days,Hours and Minutes.
-        /// Removes seconds, milliseconds, and smaller units.
-        /// </summary>
-        /// <param name="dateTime">The original DateTime value.</param>
-        /// <returns>A truncated DateTime with only days, hours, and minutes.</returns>
-        private DateTime TruncateDateTime(DateTime dateTime)
-        {
-            return new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, dateTime.Hour,
-                dateTime.Minute, 0);
-        }
-
-
+        
 
         public void SetEndDateTime(DateTime endDate, IRollCallDomainService service)
         {
@@ -238,7 +217,7 @@ namespace Company.Domain.RollCallAgg
             ////محاسبه اختلاف زمانی(تاخیر و تعجیل)ء
             service.CalculateTimeDifferences(this);
 
-
+            SetBreakTime(service, EmployeeId, WorkshopId);
         }
 
 
@@ -259,6 +238,8 @@ namespace Company.Domain.RollCallAgg
             //محاسبه اختلاف زمانی(تاخیر و تعجیل)ء
             service.CalculateTimeDifferences(this);
 
+            SetBreakTime(service, EmployeeId, WorkshopId);
+
         }
 
 
@@ -331,6 +312,40 @@ namespace Company.Domain.RollCallAgg
             }
         }
 
+
+
+        private void SetBreakTime(IRollCallDomainService rollCallDomainService, long employeeId, long workshopId)
+        {
+            var breakTime = rollCallDomainService.GetBreakTime(employeeId, workshopId);
+
+            if (breakTime.BreakTimeType == BreakTimeType.WithTime)
+                BreakTimeSpan = breakTime.BreakTimeValue.ToTimeSpan();
+
+
+        }
+
+        /// <summary>
+        /// Truncates the TimeSpan to only include days, hours, and minutes.
+        /// Removes seconds, milliseconds, and smaller units.
+        /// </summary>
+        /// <param name="time">The original TimeSpan value.</param>
+        /// <returns>A truncated TimeSpan with only days, hours, and minutes.</returns>
+        private TimeSpan TruncateTimeSpan(TimeSpan time)
+        {
+            return new TimeSpan(time.Days, time.Hours, time.Minutes, 0);
+        }
+
+        /// <summary>
+        /// Truncates the DateTime to only include Years,Month,days,Hours and Minutes.
+        /// Removes seconds, milliseconds, and smaller units.
+        /// </summary>
+        /// <param name="dateTime">The original DateTime value.</param>
+        /// <returns>A truncated DateTime with only days, hours, and minutes.</returns>
+        private DateTime TruncateDateTime(DateTime dateTime)
+        {
+            return new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, dateTime.Hour,
+                dateTime.Minute, 0);
+        }
         //private static (DateTime start, DateTime end) FindRotatingShift(DateTime startRollCall, DateTime endRollCall, ICollection<CustomizeRotatingShift> rotatingShifts)
         //{
 

Company.Domain/SalaryAidAgg/SalaryAid.cs

@@ -5,13 +5,13 @@ using Hangfire.Annotations;
 
 namespace Company.Domain.SalaryAidAgg;
 
-public class SalaryAid:EntityBase
+public class SalaryAid : EntityBase
 {
     private SalaryAid()
     {
-	    
+
     }
-    public SalaryAid(long employeeId, long workshopId, double amount, DateTime salaryAidDateTime, long createdByAccountId, UserType createdByUserType)
+    public SalaryAid(long employeeId, long workshopId, double amount, DateTime salaryAidDateTime, long createdByAccountId, UserType createdByUserType, int calculationMonth, int calculationYear)
     {
         EmployeeId = employeeId;
         WorkshopId = workshopId;
@@ -19,12 +19,25 @@ public class SalaryAid:EntityBase
         SalaryAidDateTime = salaryAidDateTime;
         CreatedByUserType = createdByUserType;
         CreatedByAccountId = createdByAccountId;
+        CalculationDate = $"{calculationYear:0000}/{calculationMonth:00}/01".ToGeorgianDateTime();
+        CalculationMonth = calculationMonth;
+        CalculationYear = calculationYear;
     }
-
     public long EmployeeId { get; private set; }
     public long WorkshopId { get; private set; }
     public double Amount { get; private set; }
+    /// <summary>
+    /// تاریخ پرداخت
+    /// </summary>
     public DateTime SalaryAidDateTime { get; private set; }
+    /// <summary>
+    /// تاریخ محاسبه
+    /// </summary>
+    public DateTime CalculationDate { get; private set; }
+
+    public int CalculationMonth { get; set; }
+    public int CalculationYear { get; set; }
+
 
 
     public long CreatedByAccountId { get; private set; }
@@ -36,11 +49,14 @@ public class SalaryAid:EntityBase
     public UserType LastModifiedByUserType { get; private set; }
 
 
-	public void Edit(double amount, DateTime salaryAidTime, long modifiedByAccountId, UserType modifiedByUserType)
+    public void Edit(double amount, DateTime salaryAidTime, long modifiedByAccountId, UserType modifiedByUserType, int calculationMonth, int calculationYear)
     {
         Amount = amount;
         SalaryAidDateTime = salaryAidTime;
         LastModifiedByAccountId = modifiedByAccountId;
         LastModifiedByUserType = modifiedByUserType;
+        CalculationDate = $"{calculationYear:0000}/{calculationMonth:00}/01".ToGeorgianDateTime();
+        CalculationMonth = calculationMonth;
+        CalculationYear = calculationYear;
     }
 }

Company.Domain/TemporaryClientRegistrationAgg/IWorkshopTempRepository.cs

@@ -14,5 +14,7 @@ public interface IWorkshopTempRepository : IRepository<long, WorkshopTemp>
     /// <returns></returns>
     Task<List<WorkshopTempViewModel>> GetWorkshopTemp(long contractingPartyTemp);
 
+    System.Threading.Tasks.Task RemoveWorkshopTemps(List<long> workshopTempIds);
+
 
 }

Company.Domain/TemporaryClientRegistrationAgg/InstitutionContractTemp.cs

@@ -34,12 +34,14 @@ public class InstitutionContractTemp : EntityBase
     /// بصورت یکجا
     /// -
     /// بصئورت ماهیانه
+    /// OneTime
     /// </summary>
     public string PaymentModel { get; private set; }
 
     /// <summary>
     /// مدت قرارداد
     /// چند ماهه؟
+    /// "12"
     /// </summary>
     public string PeriodModel { get; private set; }
 

Company.Domain/WorkshopAgg/IWorkshopRepository.cs

@@ -69,6 +69,8 @@ public interface IWorkshopRepository : IRepository<long, Workshop>
     Task<int> GetWorkshopsForEmployeeStartWorkCount(long accountId);
     Task<List<WorkshopWithLeftWorkTempEmployeesDto>> GetWorkshopsForLeftWorkTemp(long accountId);
     Task<int> GetWorkshopsForLeftWorkTempCount(long accountId);
+    Task<List<WorkshopSelectListViewModel>> GetSelectList(string search);
+
 
     #endregion
 

Company.Domain/WorkshopAgg/Workshop.cs

@@ -90,7 +90,9 @@ public class Workshop : EntityBase
     //}
     public Workshop(string workshopName,string workshopSureName, string insuranceCode, string typeOfOwnership, string archiveCode, string agentName, string agentPhone, 
         string state, string city, string address, string typeOfInsuranceSend, string typeOfContract, string contractTerm,
-        string agreementNumber, bool fixedSalary, string population,long? insuranceJobId, string zoneName, bool addBonusesPay, bool addYearsPay, bool addLeavePay, bool totalPaymentHide, bool isClassified, string computeOptions, string bonusesOptions, string yearsOptions, string hasRollCallFreeVip, bool workshopHolidayWorking)
+        string agreementNumber, bool fixedSalary, string population,long? insuranceJobId, string zoneName, bool addBonusesPay, bool addYearsPay, bool addLeavePay, bool totalPaymentHide,
+        bool isClassified, string computeOptions, string bonusesOptions, string yearsOptions, string hasRollCallFreeVip, bool workshopHolidayWorking,
+        bool insuranceCheckoutOvertime, bool insuranceCheckoutFamilyAllowance)
     {
         WorkshopName = workshopName;
         WorkshopSureName = workshopSureName;
@@ -132,6 +134,8 @@ public class Workshop : EntityBase
         YearsOptions = yearsOptions;
         HasRollCallFreeVip = hasRollCallFreeVip;
         WorkshopHolidayWorking = workshopHolidayWorking;
+        InsuranceCheckoutOvertime = insuranceCheckoutOvertime;
+        InsuranceCheckoutFamilyAllowance = insuranceCheckoutFamilyAllowance;
     }
 
 
@@ -198,6 +202,14 @@ public class Workshop : EntityBase
     //کارگاه هایی که در تعطیلات رسمی باز هستند
     public bool WorkshopHolidayWorking { get; private set; }
 
+    /// <summary>
+    /// محاسبه اضافه کار فیش حقوقی در لیست بیمه
+    /// </summary>
+    public bool InsuranceCheckoutOvertime { get; private set; }
+    /// <summary>
+    /// محاسبه حق اولاد در لیست بیمه
+    /// </summary>
+    public bool InsuranceCheckoutFamilyAllowance { get; private set; }
 	//public Employer Employer { get; private set; }
 
 	public Workshop()
@@ -229,7 +241,9 @@ public class Workshop : EntityBase
 
     public void Edit(string workshopName, string workshopSureName, string insuranceCode,string typeOfOwnership, string archiveCode, string agentName, string agentPhone,
         string state, string city, string address, string typeOfInsuranceSend, string typeOfContract, string contractTerm,
-        string agreementNumber, bool fixedSalary, string population, long? insuranceJobId, string zoneName, bool addBonusesPay, bool addYearsPay, bool addLeavePay,bool totalPaymentHide, bool isClassified, string computeOptions, string bonusesOptions, string yearsOptions, string hasRollCallFreeVip, bool workshopHolidayWorking)
+        string agreementNumber, bool fixedSalary, string population, long? insuranceJobId, string zoneName, bool addBonusesPay, bool addYearsPay, bool addLeavePay,
+        bool totalPaymentHide, bool isClassified, string computeOptions, string bonusesOptions, string yearsOptions, string hasRollCallFreeVip, bool workshopHolidayWorking,
+        bool insuranceCheckoutOvertime, bool insuranceCheckoutFamilyAllowance)
     {
         WorkshopName = workshopName;
         WorkshopSureName = workshopSureName;
@@ -268,7 +282,9 @@ public class Workshop : EntityBase
         YearsOptions = yearsOptions;
         HasRollCallFreeVip = hasRollCallFreeVip;
         WorkshopHolidayWorking = workshopHolidayWorking;
-	}
+        InsuranceCheckoutOvertime = insuranceCheckoutOvertime;
+        InsuranceCheckoutFamilyAllowance = insuranceCheckoutFamilyAllowance;
+    }
 
 
     public void Active(string archiveCode)

Company.Domain/YearlySalaryAgg/IYearlySalaryRepository.cs

@@ -17,7 +17,7 @@ public interface IYearlySalaryRepository : IRepository<long, YearlySalary>
     void TestDayliFeeCompute();
     List<string> GetYears();
     List<YearlySalaryViewModel> GetYearlySalary();
-    MontlywageBunosYearsViewModel GetMontlyBunosYears(TimeSpan weeklyTime, DateTime contractStart,DateTime contractEnd, double daylyWage, string weeklyWorkingTime, int officialholiday, int friday, string totalHoursH, string totalHorsM, string basic, int fridayStartToEnd, double dayliFeeComplete, bool hasRollCall, bool holidaysWorking);
+    MontlywageBunosYearsViewModel GetMontlyBunosYears(TimeSpan weeklyTime, DateTime contractStart,DateTime contractEnd, double daylyWage, string weeklyWorkingTime, int officialholiday, int friday, string totalHoursH, string totalHorsM, string basic, int fridayStartToEnd, double dayliFeeComplete, bool hasRollCall, bool holidaysWorking,string shiftWork);
     double GetLeavePay(DateTime contractStart, DateTime contractEnd, double daylyWage, double consumableItem, double housingAllowance, double familyAllowance , string weeklyWorkingTime, int officialholiday, int friday, string totalHoursH, string totalHorsM);
     double GetOverTimeWorking(double dayliWage, string overTimeWorkH, string overTimeWorkM);
     double GetOverNightWorking(double dayliWage, string overNightWorkH, string overNightWorkM, string weeklyWorkingTime, int officialholiday, int friday, DateTime contractStart, DateTime contractEnd, string totalHoursH, string totalHorsM);

Company.Domain/empolyerAgg/IEmployerRepository.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.Checkout;
@@ -33,6 +34,9 @@ public interface IEmployerRepository : IRepository<long, Employer>
 
     List<EmployerViewModel> GetEmployersHasWorkshop();
 
+    Task<List<EmployerSelectListViewModel>> GetSelectList(string search);
+
+
     #endregion
 
     #region NewByHeydari

CompanyManagement.Infrastructure.Excel/SalaryAid/SalaryAidImportExcel.cs

@@ -6,7 +6,7 @@ using LicenseContext = OfficeOpenXml.LicenseContext;
 
 namespace CompanyManagement.Infrastructure.Excel.SalaryAid;
 
-public record SalaryAidImportData(long EmployeeId, long WorkshopId, string FullName, double Amount, string AccountNumber, string NationalCode, string SalaryAidDateTime, int Row, bool Duplicated);
+public record SalaryAidImportData(long EmployeeId, long WorkshopId, string FullName, double Amount, string AccountNumber, string NationalCode, string SalaryAidDateTime, int calculationMonth, int calculationYear, int Row, bool Duplicated);
 
 public class ExcelValidation<T>
 {
@@ -80,35 +80,59 @@ public class SalaryAidImportExcel
 
 
         // بررسی اینکه هدرها همان چیزی هستند که ما انتظار داریم
-        if (worksheet.Cells[2, 1].Text != "نام و نام خانوادگی" ||
-            worksheet.Cells[2, 2].Text != "کد ملی" ||
-            worksheet.Cells[2, 3].Text != "شماره حساب" ||
-            worksheet.Cells[2, 4].Text != "مبلغ قابل پرداخت" ||
-            worksheet.Cells[1, 1].Text != "تاریخ پرداخت")
+        if (worksheet.Cells[3, 1].Text != "نام و نام خانوادگی" ||
+            worksheet.Cells[3, 2].Text != "کد ملی" ||
+            worksheet.Cells[3, 3].Text != "شماره حساب" ||
+            worksheet.Cells[3, 4].Text != "مبلغ قابل پرداخت" ||
+            worksheet.Cells[1, 3].Text != "تاریخ پرداخت" ||
+            worksheet.Cells[1, 1].Text != "سال محاسبه" ||
+            worksheet.Cells[1, 2].Text != "ماه محاسبه")
         {
             result.Errors.Add(new SalaryAidImportExcelError("ساختار فایل اکسل اشتباه است.", 0, SalaryAidExcelColumns.None.ToString()));
             return result;
         }
 
-        var salaryDateFa = worksheet.Cells[1, 4].Text;
+        var salaryDateFa = worksheet.Cells[2, 3].Text;
+
+        var calculationMonth = Convert.ToInt32(string.IsNullOrWhiteSpace(worksheet.Cells[2, 2].Text) ? "0" : worksheet.Cells[2, 2].Text);
+        var calculationYear = Convert.ToInt32(string.IsNullOrWhiteSpace(worksheet.Cells[2, 1].Text) ? "0" : worksheet.Cells[2, 1].Text);
+
 
         if (string.IsNullOrWhiteSpace(salaryDateFa))
         {
             result.Errors.Add(new SalaryAidImportExcelError("لطفا در سلول زرد رنگ تاریخ پرداخت را وارد کنید", 0, SalaryAidExcelColumns.None.ToString()));
             return result;
         }
+        if (calculationMonth == 0)
+        {
+            result.Errors.Add(new SalaryAidImportExcelError("لطفا در سلول آبی رنگ ماه محاسبه را وارد کنید", 0, SalaryAidExcelColumns.None.ToString()));
+            return result;
+        }
+        if (calculationYear == 0)
+        {
+            result.Errors.Add(new SalaryAidImportExcelError("لطفا در سلول آبی رنگ سال محاسبه را وارد کنید", 0, SalaryAidExcelColumns.None.ToString()));
+            return result;
+        }
+
+        var calculationDate = $"{calculationYear:0000}/{calculationMonth:00}/01";
 
         if (salaryDateFa.TryToGeorgianDateTime(out var salaryDateTime) == false)
         {
             result.Errors.Add(new SalaryAidImportExcelError("تاریخ وارد شده نامعتبر است", 0, SalaryAidExcelColumns.None.ToString()));
         }
+
+        if (calculationDate.TryToGeorgianDateTime(out var calculationDateTime) == false)
+        {
+            result.Errors.Add(new SalaryAidImportExcelError("تاریخ محاسبه وارد شده نامعتبر است", 0, SalaryAidExcelColumns.None.ToString()));
+        }
+
         if (salaryDateTime > DateTime.Now)
         {
             result.Errors.Add(new SalaryAidImportExcelError("تاریخ پرداخت مساعده می بایست تاریخ امروز یا قبل تر باشد", 0, SalaryAidExcelColumns.None.ToString()));
         }
         int rowCount = worksheet.Dimension.Rows;
 
-        int rowStart = 3;
+        int rowStart = 4;
 
         if (rowCount < rowStart)
         {
@@ -127,11 +151,11 @@ public class SalaryAidImportExcel
             if (!double.TryParse(amountText, out double amount) || amount <= 0)
             {
                 result.Errors.Add(new SalaryAidImportExcelError("مبلغ خالی یا نامعتبر است", row, SalaryAidExcelColumns.Amount.ToString()));
-        
-            }
-            result.RawData.Add(new SalaryAidImportData(0, workshopId, fullName, amount, accountNumber, nationalCode, salaryDateFa, row, false));
 
-			if (string.IsNullOrWhiteSpace(fullName))
+            }
+            result.RawData.Add(new SalaryAidImportData(0, workshopId, fullName, amount, accountNumber, nationalCode, salaryDateFa, calculationMonth, calculationYear, row, false));
+
+            if (string.IsNullOrWhiteSpace(fullName))
             {
                 result.Errors.Add(new SalaryAidImportExcelError(" نام و نام خانوادگی خالی است", row, SalaryAidExcelColumns.FullName.ToString()));
 
@@ -204,25 +228,61 @@ public class SalaryAidImportExcel
             var year = Convert.ToInt32(salaryDateFa.Substring(0, 4));
 
 
-            if (_companyContext.CustomizeCheckouts.Any(x => x.WorkshopId == workshopId && x.EmployeeId == employee.id && x.YearInt == year && x.MonthInt == month))
+            //if (_companyContext.CustomizeCheckouts.Any(x => x.WorkshopId == workshopId && x.EmployeeId == employee.id && x.YearInt == year && x.MonthInt == month))
+            //{
+            //    result.Errors.Add(new SalaryAidImportExcelError($" پرسنل {fullName} در تاریخ {salaryDateFa} دارای فیش حقوقی غیررسمی است.", row, SalaryAidExcelColumns.None.ToString()));
+            //}
+
+
+            _ = DateTime.Now.Date.AddMonthsFa(-1, out var oneMonthAgoGr);
+
+            if (oneMonthAgoGr > calculationDateTime)
             {
-                result.Errors.Add(new SalaryAidImportExcelError($" پرسنل {fullName} در تاریخ {salaryDateFa} دارای فیش حقوقی غیررسمی است.", row, SalaryAidExcelColumns.None.ToString()));
+                bool customizeCheckout = false;
+                bool customizeCheckoutTemp = false;
+                bool checkout = false;
+                if (_companyContext.CustomizeCheckouts.Any(x => x.WorkshopId == workshopId && employee.id == x.EmployeeId &&
+                                                                x.ContractStart <= oneMonthAgoGr && x.ContractEnd >= calculationDateTime))
+                {
+                    customizeCheckout = true;
+                }
+
+                if (_companyContext.CustomizeCheckoutTemps.Any(x => x.WorkshopId == workshopId && employee.id == x.EmployeeId &&
+                                                                    x.ContractStart <= calculationDateTime && x.ContractEnd >= oneMonthAgoGr))
+                {
+                    customizeCheckoutTemp = true;
+                }
+
+                if (_companyContext.CheckoutSet.Any(x => x.WorkshopId == workshopId && employee.id == x.EmployeeId &&
+                                                         x.ContractStart <= calculationDateTime && x.ContractEnd >= oneMonthAgoGr))
+                {
+                    checkout = true;
+                }
+                if (customizeCheckout || customizeCheckoutTemp)
+                {
+                    result.Errors.Add(new SalaryAidImportExcelError($"شما نمیتوانید به پرسنل {fullName} در تاریخ قبل از یک ماه گذشته که فیش صادر شده باشد مساعده دهید", row, SalaryAidExcelColumns.None.ToString()));
+                }
             }
 
+            //if(_companyContext.CheckoutSet.Any(x => x.WorkshopId == workshopId && employee.id == x.EmployeeId &&
+            //                                       x.ContractStart <= calculationDateTime && x.ContractEnd >= calculationDateTime))
+            //    result.Errors.Add(new SalaryAidImportExcelError($"پرسنل {fullName} در تاریخ {calculationDate} دارای فیش رسمی میباشد", row, SalaryAidExcelColumns.None.ToString()));
+
+
             if (_companyContext.SalaryAids.Any(x => x.Amount == amount && x.EmployeeId == employee.id && x.WorkshopId == workshopId && x.SalaryAidDateTime == salaryDateTime))
             {
                 // TODO MAHAN: Vafa Add this Code! Please Check it!
 
-                 result.RawData.Add(new SalaryAidImportData(employee.id, workshopId, fullName, amount, accountNumber, nationalCode, salaryDateFa, row, true));
-				continue;
+                result.RawData.Add(new SalaryAidImportData(employee.id, workshopId, fullName, amount, accountNumber, nationalCode, salaryDateFa, calculationMonth, calculationYear, row, true));
+                continue;
             }
-            result.ValidData.Add(new SalaryAidImportData(employee.id, workshopId, fullName, amount, accountNumber, nationalCode, salaryDateFa, row, false));
+            result.ValidData.Add(new SalaryAidImportData(employee.id, workshopId, fullName, amount, accountNumber, nationalCode, salaryDateFa, calculationMonth, calculationYear, row, false));
         }
 
-        result.RawData = result.RawData.GroupBy(x => x.Row).Select(x => new SalaryAidImportData(x.First().EmployeeId,
-	        x.First().WorkshopId, x.First().FullName,
-	        x.First().Amount, x.First().AccountNumber, x.First().NationalCode, x.First().SalaryAidDateTime, x.Key,
-	        x.Any(s => s.Duplicated))).ToList();
+        result.RawData = result.RawData.GroupBy(x => x.Row).Select(x => new SalaryAidImportData(x.Last().EmployeeId,
+            x.First().WorkshopId, x.First().FullName,
+            x.First().Amount, x.First().AccountNumber, x.First().NationalCode, x.First().SalaryAidDateTime, x.First().calculationMonth, x.First().calculationYear, x.Key,
+            x.Any(s => s.Duplicated))).ToList();
 
 
         //result.Errors.GroupBy(x => x.Row).Select(x => new

CompanyManagment.App.Contracts/AdminMonthlyOverview/AdminMonthlyOverviewStatus.cs

@@ -0,0 +1,17 @@
+namespace CompanyManagment.App.Contracts.AdminMonthlyOverview;
+
+public enum AdminMonthlyOverviewStatus
+{
+    /// <summary>
+    /// تنظیم مستندات - فیش و قرارداد
+    /// </summary>
+    CreateDocuments = 0,
+    /// <summary> در انتظار مراجعه </summary>
+    VisitPending = 1,
+    /// <summary> در حال مراجعه </summary>
+    VisitInProgress = 2,
+    /// <summary> اتمام مراجعه </summary>
+    VisitCompleted = 3,
+    /// <summary> بایگانی شد </summary>
+    Archived = 4
+}

CompanyManagment.App.Contracts/AdminMonthlyOverview/IAdminMonthlyOverviewApplication.cs

@@ -0,0 +1,80 @@
+using System.Collections.Generic;
+using System.Security.Cryptography;
+using System.Threading.Tasks;
+using _0_Framework.Application;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+namespace CompanyManagment.App.Contracts.AdminMonthlyOverview;
+
+public interface IAdminMonthlyOverviewApplication
+{
+    /// <summary>
+    /// نمایش لیست ماهانه کارگاه ها - درصورت وجود نداشتن اطلاعات در این ماه، یک رکورد جدید ایجاد میکند
+    /// </summary>
+    /// <returns></returns>
+    Task<List<AdminMonthlyOverviewListViewModel>> GetWorkshopListByStatus(AdminMonthlyOverviewSearchModel searchModel);
+
+    /// <summary>
+    /// شمارش تعداد هر تب 
+    /// </summary>
+    /// <param name="year"></param>
+    /// <param name="month"></param>
+    /// <param name="accountId"></param>
+    /// <returns></returns>
+    Task<AdminMonthlyOverViewCounterVm> GetCounter(int year, int month, long accountId);
+
+    /// <summary>
+    /// رفتن به مرحله بعدی
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    Task<OperationResult> Next(long id);
+
+    /// <summary>
+    /// برگشت به مرحله قبل
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    Task<OperationResult> Back(long id);
+}
+
+public class AdminMonthlyOverViewCounterVm
+{
+    public int CreateDocument { get; set; }
+    public int VisitPending { get; set; }
+    public int VisitInProgress { get; set; }
+    public int VisitCompleted { get; set; }
+    public int Archived { get; set; }
+    public int All { get; set; }
+    
+
+}
+
+public class AdminMonthlyOverviewSearchModel
+{
+    public int Year { get; set; }
+    public int Month { get; set; }
+    public long WorkshopId { get; set; }
+    public long EmployerId { get; set; }
+    public long AdminAccountId { get; set; }
+    public IsActive ActivationStatus { get; set; }
+
+}
+
+public class AdminMonthlyOverviewListViewModel
+{
+    public long Id { get; set; }
+    public long WorkshopId { get; set; }
+    public string WorkshopName { get; set; }
+    public string WorkshopArchiveCode { get; set; }
+    public string Province { get; set; }
+    public string City { get; set; }
+    public string Address { get; set; }
+    public string AgentPhoneNumber { get; set; }
+    public string AdminFullName { get; set; }
+    public string EmployerName { get; set; }
+    public string EmployerPhoneNumber { get; set; }
+    public int EmployeeCount { get; set; }
+    public AdminMonthlyOverviewStatus Status { get; set; }
+    public bool IsBlock { get; set; }
+}

CompanyManagment.App.Contracts/Checkout/CheckoutViewModel.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
 using CompanyManagment.App.Contracts.Employer;
+using CompanyManagment.App.Contracts.Loan;
 using CompanyManagment.App.Contracts.RollCall;
+using CompanyManagment.App.Contracts.SalaryAid;
 using CompanyManagment.App.Contracts.WorkingHoursTemp;
 
 namespace CompanyManagment.App.Contracts.Checkout;
@@ -120,5 +122,17 @@ public class CheckoutViewModel
     /// تعداد روزهای محاسبه شده برای عیدی و پاداش
     /// </summary>
     public string TotalDayOfBunosesCompute { get; set; }
+
+    /// <summary>
+    /// مدت مرخصی استعلاجی 
+    /// </summary>
+    public string TotalSickLeave { get; set; }
+
+    /// <summary>
+    /// مدت مرخصی استحقاقی
+    /// </summary>
+    public string TotalPaidLeave { get; set; }
 	public List<CheckoutDailyRollCallViewModel> MonthlyRollCall { get; set; }
+    public List<LoanInstallmentViewModel> InstallmentViewModels { get; set; }
+    public List<SalaryAidViewModel> SalaryAidViewModels { get; set; }
 }

CompanyManagment.App.Contracts/Checkout/CreateCheckout.cs

@@ -136,4 +136,6 @@ public class CreateCheckout
 
     public bool HolidayWorking { get; set; }
 
+    public string ShiftWork { get; set; }
+
 }

CompanyManagment.App.Contracts/ContactUs/IContactUsApplication.cs

@@ -0,0 +1,18 @@
+using _0_Framework.Application;
+
+namespace CompanyManagment.App.Contracts.ContactUs;
+
+public interface IContactUsApplication
+{
+    OperationResult Create(CreateContactUs command);
+}
+
+public class CreateContactUs
+{
+    public string FirstName { get; set; }
+    public string LastName { get; set; }
+    public string Email { get; set; }
+    public string PhoneNumber { get; set; }
+    public string Title { get; set; }
+    public string Message { get; set; }
+}

CompanyManagment.App.Contracts/Contract/ComputingViewModel.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using CompanyManagment.App.Contracts.Loan;
+using CompanyManagment.App.Contracts.SalaryAid;
 using CompanyManagment.App.Contracts.WorkingHoursTemp;
 
 namespace CompanyManagment.App.Contracts.Contract;
@@ -43,5 +45,6 @@ public class ComputingViewModel
 
     public bool HasRotatingShift { get; set; }
 
+
     //public List<string> holidays;
 }

CompanyManagment.App.Contracts/CustomizeCheckout/ICustomizeCheckoutApplication.cs

@@ -1,5 +1,6 @@
 
 
+using System;
 using _0_Framework.Application;
 using System.Collections.Generic;
 
@@ -17,5 +18,9 @@ namespace CompanyManagment.App.Contracts.CustomizeCheckout
         OperationResult GroupRemove(long workshopId,List<long> idList);
         OperationResult Create(CreateCustomizeCheckout command);
 
-    }
+        (bool Checkout, bool CustomizeCheckout, bool CustomizeCheckoutTemp) ValidateExistsCheckouts(
+	        DateTime startDate, DateTime endDate, long workshopId, List<long> employeeId);
+
+
+	}
 }

CompanyManagment.App.Contracts/CustomizeWorkshopSettings/CustomizeWorkshopGroupSettingsViewModel.cs

@@ -8,6 +8,7 @@ public class CustomizeWorkshopGroupSettingsViewModel
 {
 	public long Id { get; set; }
 	public double Salary { get; set; }
+	public string SalaryStr { get; set; }
     public string GroupName { get; set; }
     public bool MainGroup { get; set; }
     public List<CustomizeWorkshopShiftViewModel> RollCallWorkshopShifts { get; set; }
@@ -18,4 +19,5 @@ public class CustomizeWorkshopGroupSettingsViewModel
     public BreakTime BreakTime { get; set; }
     public FridayWork FridayWork { get; set; }
     public HolidayWork HolidayWork { get; set; }
+    public int LeavePermitted { get; set; }
 }

CompanyManagment.App.Contracts/CustomizeWorkshopSettings/ICustomizeWorkshopSettingsApplication.cs

@@ -33,7 +33,7 @@ public interface ICustomizeWorkshopSettingsApplication
     //Remove the Employee From the Group Settings
     OperationResult RemoveEmployeeFromRollCallWorkshopGroup(long employeeId, long groupId, long workshopId);
 
-    OperationResult EditSimpleRollCallGroupSetting(EditCustomizeWorkshopGroupSettings command);
+    OperationResult EditSimpleRollCallGroupSetting(EditCustomizeWorkshopGroupSettings command, List<ReCalculateRollCallValues> reCalculateCommand);
 
     #region Vafa
     OperationResult EditSimpleRollCallEmployeeSetting(EditCustomizeEmployeeSettings command,
@@ -90,7 +90,13 @@ public interface ICustomizeWorkshopSettingsApplication
     List<CustomizeWorkshopEmployeeSettingsViewModel> GetEmployeeSettingsByWorkshopId(long workshopId);
     CustomizeWorkshopGroupSettingsViewModel GetEmployeesGroupSettingsByEmployeeId(long employeeId, long workshopId);
 
-
+    /// <summary>
+    /// این متد برای قبل از ویرایش گروهی و محاسبه مجدد گروهی استفاده میشود برای اینکه پرسنل هایی که دارای فیش هستند رو فرانت نمایش بده
+    /// </summary>
+    /// <param name="command"></param>
+    /// <param name="workshopId"></param>
+    /// <returns></returns>
+    OperationResult<List<long>> ValidateReCalculateValueForGroupEdit(List<ReCalculateRollCallValues> command, long workshopId);
     bool HasAnyEmployeeWithoutGroup(long workshopId);
 
     /// <summary>

CompanyManagment.App.Contracts/DateSalary/DateSalaryViewModel.cs

@@ -1,4 +1,6 @@
-namespace CompanyManagment.App.Contracts.DateSalary;
+using System;
+
+namespace CompanyManagment.App.Contracts.DateSalary;
 
 public class DateSalaryViewModel
 {
@@ -7,4 +9,6 @@ public class DateSalaryViewModel
     public string Month { get; set; }
     public string StartDateFa { get; set; }
     public string EndDateFa { get; set; }
+    public DateTime StartDateGr { get; set; }
+    public DateTime EndDateGr { get; set; }
 }

CompanyManagment.App.Contracts/Employee/CreateEmployeeByClient.cs

@@ -28,6 +28,10 @@ public class CreateEmployeeByClient
     public List<AddEmployeeDocumentItem> EmployeeDocumentItems { get; set; }
     public bool HasEmployeeDocument { get; set; }
     public bool HasRollCallService { get; set; }
+    public bool HasCustomizeCheckoutService { get; set; }
+
+
+
 }
 
 

CompanyManagment.App.Contracts/EmployeeInsurancListData/CreateEmployeeInsurancListData.cs

@@ -90,4 +90,14 @@ public class CreateEmployeeInsurancListData
     /// DSW_SPOUSE
     /// </summary>
     public double MarriedAllowance { get; set; }
+
+    /// <summary>
+    /// اضافه کار فیش حقوقی
+    /// </summary>
+    public double OverTimePay { get; set; }
+
+    /// <summary>
+    /// حق اولاد فیش حقوقی
+    /// </summary>
+    public double FamilyAllowance { get; set; }
 }

CompanyManagment.App.Contracts/EmployeeInsurancListData/EmployeeInsurancListDataViewModel.cs

@@ -50,7 +50,7 @@ public class EmployeeInsurancListDataViewModel
     /// </summary>
     public double BenefitsIncludedNonContinuous { get; set; }
     /// <summary>
-    /// جمع کل دستمزد و مزایای ماهانه
+    /// جمع کل دستمزد و مزایای ماهانه مشمول و غیر مشمول
     /// DSW_TOTL
     /// </summary>
     public double IncludedAndNotIncluded { get; set; }
@@ -119,5 +119,15 @@ public class EmployeeInsurancListDataViewModel
     /// </summary>
     public double MarriedAllowance { get; set; }
 
+    /// <summary>
+    /// اضافه کار فیش حقوقی
+    /// </summary>
+    public double OverTimePay { get; set; }
+
+    /// <summary>
+    /// حق اولاد فیش حقوقی
+    /// </summary>
+    public double FamilyAllowance { get; set; }
+
 
 }

CompanyManagment.App.Contracts/Employer/EmployerSelectListViewModel.cs

@@ -0,0 +1,7 @@
+namespace CompanyManagment.App.Contracts.Employer;
+
+public class EmployerSelectListViewModel
+{
+    public long Id { get; set; }
+    public string Name { get; set; }
+}

CompanyManagment.App.Contracts/Employer/IEmployerApplication.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using _0_Framework.Application;
 using CompanyManagment.App.Contracts.Checkout;
 
@@ -35,6 +36,8 @@ public interface IEmployerApplication
     #region Mahan
 
     List<EmployerViewModel> GetEmployersHasWorkshop();
+    Task<List<EmployerSelectListViewModel>> GetSelectList(string search);
+
     #endregion
     #region NewByHeydari
     OperationResult DeleteEmployer(long id);

CompanyManagment.App.Contracts/InsuranceJob/CopyFromLastYearViewModel.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using CompanyManagment.App.Contracts.InsuranceJobItem;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace CompanyManagment.App.Contracts.InsuranceJob;
+
+public class CopyFromLastYearViewModel
+{
+    public string StartDate { get; set; }
+    public string EndDate { get; set; }
+
+    public long InsuranceJobItemId { get; set; }
+
+    public SelectList InsuranceJobItemViewModels { get; set; }
+}

CompanyManagment.App.Contracts/InsuranceJob/CreateInsuranceJob.cs

@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using CompanyManagment.App.Contracts.InsuranceJobItem;
 using CompanyManagment.App.Contracts.Job;
+using Microsoft.AspNetCore.Mvc.Rendering;
 
 namespace CompanyManagment.App.Contracts.InsuranceJob;
 
@@ -14,7 +15,20 @@ public class CreateInsuranceJob
     public long YearlySalaryId { get; set; }
     public string EconomicCode { get; set; }
     public string Year { get; set; }
+    public string Month { get; set; }
     public long JobId { get; set; }
+
+    public string StartDateFa { get; set; }
+    public string EndDateFa { get; set; }
     public List<JobViewModel> Jobs { get; set; }
     public List<InsuranceJobItemViewModel> InsuranceJobItems { get; set; }
+
+    public List<string> WorkshopList { get; set; }
+    public bool HasAnyWorkshop { get; set; }
+
+    public long InsuranceJobItemId { get; set; }
+
+    public SelectList InsuranceJobItemViewModels { get; set; }
+
+
 }

CompanyManagment.App.Contracts/InsuranceJob/IInsuranceJobApplication.cs

@@ -10,9 +10,12 @@ namespace CompanyManagment.App.Contracts.InsuranceJob;
 
 public interface IInsuranceJobApplication
 {
+    List<(long id, string date)> GetOldYersInsuranceItemIds();
+    OperationResult CopyFromLastYear(CopyFromLastYearViewModel command);
+    OperationResult RecoveryOldData1403();
     OperationResult Create(CreateInsuranceJob command);
     OperationResult Edit(EditInsuranceJob command);
-    EditInsuranceJob GetDetails(long id);
+    EditInsuranceJob GetDetails(long id,string year, string month);
     List<InsuranceJobViewModel> GetInsurancJob();
  
     List<InsuranceJobViewModel> Search(InsuranceJobSearchModel searchModel);

CompanyManagment.App.Contracts/InsuranceJob/InsuranceJobViewModel.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using CompanyManagment.App.Contracts.InsuranceJobItem;
 
 namespace CompanyManagment.App.Contracts.InsuranceJob;
 
@@ -13,4 +14,7 @@ public class InsuranceJobViewModel
     //public long YearlySalaryId { get; set; }
     public string EconomicCode { get; set; }
     public string Year { get; set; }
+    public string Month { get; set; }
+    public List<InsuranceJobItemViewModel> InsuranceJobItemViewModels { get; set; }
+
 }

CompanyManagment.App.Contracts/InsuranceJobItem/InsuranceJobItemViewModel.cs

@@ -11,14 +11,32 @@ namespace CompanyManagment.App.Contracts.InsuranceJobItem;
 public class InsuranceJobItemViewModel
 {
     public long Id { get; set; }
+
+   
+
+    /// <summary>
+    /// آیای این درصد در لیست مبالغ مبلغ پر شده دارد
+    /// </summary>
+    public bool IsPercentageLessThanUse { get; set; }
     public double PercentageLessThan { get; set; }
+
+  
+
+    /// <summary>
+    /// آیای این درصد در لیست مبالغ مبلغ پر شده دارد
+    /// </summary>
+    public bool IsPercentageMoreThanUse { get; set; }
     public double PercentageMoreThan { get; set; }
+
     public double SalaeyLessThan { get; set; }
     public double SalaryMoreThan { get; set; }
     public string SalaeyLessThanString { get; set; }
     public string SalaryMoreThanString { get; set; }
     public long InsuranceJobId { get; set; }
 
+    public DateTime? StartDate { get; set; }
+    public DateTime? EndDate { get; set; }
+
     public List<long> JobIds { get; set; }
     public List<JobViewModel> JobList { get; set; }
 }

CompanyManagment.App.Contracts/InsuranceList/EditInsuranceList.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using CompanyManagment.App.Contracts.LeftWork;
 
 namespace CompanyManagment.App.Contracts.InsuranceList;
 
@@ -14,4 +15,8 @@ public class EditInsuranceList:CreateInsuranceList
     public string Population { get; set; }
     public long? InsuranceJobId { get; set; }
 
+    /// <summary>
+    /// پرسنل هایی که قرارداد ترک کار کرده اند ولی ترک کار بیمه ندارند
+    /// </summary>
+    public List<LeftWorkViewModel> LeftWorkEmployees { get; set; }
 }

CompanyManagment.App.Contracts/InsuranceList/EmployeeDetailsForInsuranceListViewModel.cs

@@ -253,21 +253,49 @@ public class EmployeeDetailsForInsuranceListViewModel
     /// DSW_SPOUSE
     /// </summary>
     public double MarriedAllowance { get; set; }
-	///// <summary>
-	///// مجموع پایه سنواتی کارکنان
-	///// DSK_INC
-	///// </summary>
-	//public double SumOfBaseYears { get; set; }
 
-	///// <summary>
-	/////  جمع پایه سنوات و دستمزد روزانه کارکنان
-	///// DSW_INC
-	///// </summary>
-	//public double SumOfDailyWagePlusBaseYears { get; set; }
+    /// <summary>
+    /// آیا پرسنل دارای فیش حقوقی برای این ماه است
+    /// -
+    /// جهت محاسبه اضافه کار و حق اولاد
+    /// </summary>
+    public bool EmployeeHasCheckout { get; set; }
 
-	///// <summary>
-	///// مجموع حق تاهل کارکنان 
-	///// DSK_SPOUSE
-	///// </summary>
-	//public double SumOfMarriedAllowance { get; set; }
+    /// <summary>
+    /// اضافه کار فیش حقوقی
+    /// </summary>
+    public double OverTimePay { get; set; }
+
+    /// <summary>
+    /// حق اولاد فیش حقوقی
+    /// </summary>
+    public double FamilyAllowance { get; set; }
+
+    /// <summary>
+    /// محاسبه اضافه کار  
+    /// </summary>
+    public bool OverTimeIsSet { get; set; }
+
+
+    /// <summary>
+    ///محاسبه حق اولاد  
+    /// </summary>
+    public bool FamilyAllowanceIsSet { get; set; }
+    ///// <summary>
+    ///// مجموع پایه سنواتی کارکنان
+    ///// DSK_INC
+    ///// </summary>
+    //public double SumOfBaseYears { get; set; }
+
+    ///// <summary>
+    /////  جمع پایه سنوات و دستمزد روزانه کارکنان
+    ///// DSW_INC
+    ///// </summary>
+    //public double SumOfDailyWagePlusBaseYears { get; set; }
+
+    ///// <summary>
+    ///// مجموع حق تاهل کارکنان 
+    ///// DSK_SPOUSE
+    ///// </summary>
+    //public double SumOfMarriedAllowance { get; set; }
 }

CompanyManagment.App.Contracts/InsuranceWorkshopInfo/CreateInsuranceWorkshopInfo.cs

@@ -28,4 +28,13 @@ public class CreateInsuranceWorkshopInfo
     public long? InsuranceJobId { get;  set; }
     //public bool ConfirmSentlist { get;  set; }
 
+    /// <summary>
+    /// محاسبه اضافه کار فیش حقوقی در لیست بیمه
+    /// </summary>
+    public bool InsuranceCheckoutOvertime { get; set; }
+    /// <summary>
+    /// محاسبه حق اولاد در لیست بیمه
+    /// </summary>
+    public bool InsuranceCheckoutFamilyAllowance { get; set; }
+
 }

CompanyManagment.App.Contracts/LeftWork/ILeftWorkApplication.cs

@@ -16,6 +16,9 @@ public interface ILeftWorkApplication
     EditLeftWork GetDetails(long id);
     LeftWorkViewModel CheckoutleftWorkCheck(DateTime contractStart, long workshopId, long employeeId);
     List<LeftWorkViewModel> search(LeftWorkSearchModel searchModel);
+
+
+    List<LeftWorkViewModel> SearchCreateContract(LeftWorkSearchModel searchModel);
     Task<List<LeftWorkViewModel>> searchAsync(LeftWorkSearchModel searchModel);
     string StartWork(long employeeId, long workshopId, string leftWork);
     OperationResult RemoveLeftWork(long id);

CompanyManagment.App.Contracts/Loan/LoanInstallmentViewModel.cs

@@ -6,7 +6,8 @@ namespace CompanyManagment.App.Contracts.Loan;
 
 public class LoanInstallmentViewModel
 {
-	public string Year { get; set; }
+    public long Id { get; set; }
+    public string Year { get; set; }
 	public string Month { get; set; }
 	public string Amount { get; set; }
 	public double AmountDouble { get; set; }

CompanyManagment.App.Contracts/Reward/IRewardApplication.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using _0_Framework.Application;
 
 namespace CompanyManagment.App.Contracts.Reward;
@@ -6,7 +7,7 @@ namespace CompanyManagment.App.Contracts.Reward;
 public interface IRewardApplication
 {
     OperationResult Create(CreateRewardViewModel command);
-    OperationResult Edit(EditRewardViewModel  command);
+    OperationResult Edit(EditRewardViewModel command);
     List<RewardViewModel> GetSearchList(RewardSearchModel searchViewModel);
     EditRewardViewModel GetDetails(long id);
     OperationResult Remove(long id);

CompanyManagment.App.Contracts/RollCall/IRollCallMandatoryApplication.cs

@@ -8,7 +8,17 @@ namespace CompanyManagment.App.Contracts.RollCall;
 public interface IRollCallMandatoryApplication
 {
 	bool HasRollCallRecord(long employeeId, long workshopId, DateTime contractStart);
-	ComputingViewModel MandatoryCompute(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd, CreateWorkingHoursTemp command, bool holidayWorking);
+	ComputingViewModel MandatoryCompute(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd, CreateWorkingHoursTemp command, bool holidayWorking, bool isStaticCheckout);
+
+    /// <summary>
+    /// گزارش نوبت کاری حضور غیاب
+    /// </summary>
+    /// <param name="workshopId"></param>
+    /// <param name="employeeId"></param>
+    /// <param name="contractStart"></param>
+    /// <param name="contractEnd"></param>
+    /// <param name="shiftwork"></param>
+    /// <returns></returns>
     Task<ComputingViewModel> RotatingShiftReport(long workshopId, long employeeId, DateTime contractStart,
-        DateTime contractEnd, string shiftwork);
+        DateTime contractEnd, string shiftwork, bool hasRollCall, CreateWorkingHoursTemp command, bool holidayWorking);
 }

CompanyManagment.App.Contracts/RollCall/RollCallViewModel.cs

@@ -61,4 +61,10 @@ public class RollCallViewModel
     /// مقدار تایم شیفت (مدت زمان شیفت کاری)
     /// </summary>
     public TimeSpan ShiftDurationTimeSpan { get; set; }
+    /// <summary>
+    /// مدت زمان استراحت
+    /// </summary>
+    public TimeSpan BreakTimeSpan { get; set; }
+
+    public DateTime? ShiftEndWithoutRest { get; set; }
 }

CompanyManagment.App.Contracts/SalaryAid/CreateSalaryAidViewModel.cs

@@ -8,5 +8,8 @@ public class CreateSalaryAidViewModel
 	public long WorkshopId { get; set; }
 	public string Amount { get; set; }
 	public string SalaryDateTime { get; set; }
+	public string CalculationDateTime { get; set; }
     public string NationalCode { get; set; }
-}
+    public int CalculationMonth { get; set; }
+    public int CalculationYear { get; set; }
+}

CompanyManagment.App.Contracts/SalaryAid/ISalaryAidApplication.cs

@@ -22,5 +22,5 @@ public interface ISalaryAidApplication
 	SalaryAidsGroupedViewModel GetSearchListAsGrouped(SalaryAidSearchViewModel searchModel); 
 	#endregion
 
-    Task<OperationResult> CreateRange(List<CreateSalaryAidViewModel> commands);
+    OperationResult CreateRange(List<CreateSalaryAidViewModel> commands);
 }

CompanyManagment.App.Contracts/SalaryAid/SalaryAidViewModel.cs

@@ -4,17 +4,21 @@ namespace CompanyManagment.App.Contracts.SalaryAid;
 
 public class SalaryAidViewModel
 {
-	public long Id { get; set; }
-	public long EmployeeId { get; set; }
-	public string Amount { get; set; }
+    public long Id { get; set; }
+    public long EmployeeId { get; set; }
+    public string Amount { get; set; }
     public double AmountDouble { get; set; }
-	public long WorkshopId { get; set; }
-	public string CreationDate { get; set; }
-	public string SalaryAidDateTimeFa { get;  set; }
-	public DateTime SalaryAidDateTimeGe { get;  set; }
+    public long WorkshopId { get; set; }
+    public string CreationDate { get; set; }
+    public string SalaryAidDateTimeFa { get; set; }
+    public DateTime SalaryAidDateTimeGe { get; set; }
+    public string CalculationDateTimeFa { get; set; }
+    public DateTime CalculationDateTimeGe { get; set; }
 
-	public string EmployeeFullName { get; set; }
-	public string PersonnelCode { get; set; }
+
+
+    public string EmployeeFullName { get; set; }
+    public string PersonnelCode { get; set; }
     public string MonthFa { get; set; }
     public string YearFa { get; set; }
 }

CompanyManagment.App.Contracts/TemporaryClientRegistration/ITemporaryClientRegistrationApplication.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using CompanyManagment.App.Contracts.InstitutionPlan;
@@ -38,7 +39,7 @@ public interface ITemporaryClientRegistrationApplication
     /// </summary>
     /// <param name="command"></param>
     /// <returns></returns>
-    Task<OperationResult> CreateOrUpdateWorkshopTemp(List<WorkshopTempViewModel> command);
+    Task<OperationResult> CreateOrUpdateWorkshopTemp(List<WorkshopTempViewModel> command, long contractingPartyTempId);
 
     /// <summary>
     /// دریافت جمع کل خدمات برای یک کارگاه
@@ -55,14 +56,14 @@ public interface ITemporaryClientRegistrationApplication
     /// <param name="paymentModel"></param>
     /// <returns></returns>
     Task<ReviewAndPaymentViewModel> GetTotalPaymentAndWorkshopList(long contractingPartyTempId,
-        string periodModel = "12", string paymentModel = "OneTime");
+        string periodModel = "12", string paymentModel = "OneTime", string contractStartType = "currentMonth");
 
     /// <summary>
     /// ایجاد یا ویرایش قرارداد موقت
     /// </summary>
     /// <param name="contractingPartyTempId"></param>
     /// <returns></returns>
-    Task<OperationResult> CreateOrUpdateInstitutionContractTemp(long contractingPartyTempId, string periodModel, string paymentModel, double totalPayment, double valueAddedTax);
+    Task<OperationResult> CreateOrUpdateInstitutionContractTemp(long contractingPartyTempId, string periodModel, string paymentModel, double totalPayment, double valueAddedTax, DateTime contractStart);
 
     /// <summary>
     /// دریافت کد برای کلاینت

CompanyManagment.App.Contracts/TemporaryClientRegistration/MonthlyInstallment.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CompanyManagment.App.Contracts.TemporaryClientRegistration;
+
+public class MonthlyInstallment
+{
+    /// <summary>
+    /// مبلغ قسط ماهانه
+    /// </summary>
+    public string InstallmentAmountStr { get; set; }
+
+    /// <summary>
+    /// تاریخ قسط ماهانه
+    /// </summary>
+    public string InstalmentDate { get; set; }
+
+    /// <summary>
+    /// شمارنده قسط
+    /// </summary>
+    public string InstallmentCounter{ get; set; }
+}

CompanyManagment.App.Contracts/TemporaryClientRegistration/ReviewAndPaymentViewModel.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace CompanyManagment.App.Contracts.TemporaryClientRegistration;
 
@@ -23,28 +24,54 @@ public class ReviewAndPaymentViewModel
     /// مبلغ پرداخت بدون مالیات
     /// Double
     /// </summary>
-    public double WithoutTaxPaymentDouble { get; set; }
+    public double OneTimeWithoutTaxPaymentDouble { get; set; }
 
     /// <summary>
     /// مبلغ پرداخت بدون مالیات
     /// string
     /// </summary>
-    public string WithoutTaxPaymentStr { get; set; }
+    public string OneTimeWithoutTaxPaymentStr { get; set; }
 
 
     /// <summary>
     /// مبلغ پرداخت کامل
     /// Double
     /// </summary>
-    public double TotalPaymentDouble { get; set; }
+    public double OneTimeTotalPaymentDouble { get; set; }
 
     /// <summary>
     /// مبلغ پرداخت کامل
     /// string
     /// </summary>
-    public string TotalPaymentStr { get; set; }
+    public string OneTimeTotalPaymentStr { get; set; }
 
 
+
+    /// <summary>
+    /// مبلغ پرداخت بدون مالیات
+    /// Double
+    /// </summary>
+    public double MonthlyWithoutTaxPaymentDouble { get; set; }
+
+    /// <summary>
+    /// مبلغ پرداخت بدون مالیات
+    /// string
+    /// </summary>
+    public string MonthlyWithoutTaxPaymentStr { get; set; }
+
+
+    /// <summary>
+    /// مبلغ پرداخت کامل
+    /// Double
+    /// </summary>
+    public double MonthlyTotalPaymentDouble { get; set; }
+
+    /// <summary>
+    /// مبلغ پرداخت کامل
+    /// string
+    /// </summary>
+    public string MonthlyTotalPaymentStr { get; set; }
+
     /// <summary>
     /// مالیات بر ارزش افزوده
     /// Double
@@ -83,4 +110,52 @@ public class ReviewAndPaymentViewModel
     /// آی دی طرف حساب
     /// </summary>
     public long ContractingPartTempId { get; set; }
+
+    /// <summary>
+    /// لیست اقساط ماهیانه
+    /// </summary>
+    public List<MonthlyInstallment> MonthlyInstallments { get; set; }
+
+
+    /// <summary>
+    /// تاریخ شروع قرارداد در اول ماه جاری
+    /// -
+    /// شمسی
+    /// </summary>
+    public string ContractStartCurrentMonthFa { get; set; }
+
+    /// <summary>
+    /// تاریخ شروع قرارداد در اول ماه جاری
+    /// -
+    /// میلادی
+    /// </summary>
+    public DateTime ContractStartCurrentMonthGr { get; set; }
+
+    /// <summary>
+    /// تاریخ شروع قرارداد در اول ماه بعد
+    /// -
+    /// شمسی
+    /// </summary>
+    public string ContractStartNextMonthFa{ get; set; }
+
+    /// <summary>
+    /// تاریخ شروع قرارداد در اول ماه بعد
+    /// -
+    /// میلادی
+    /// </summary>
+    public DateTime ContractStartNextMonthGr { get; set; }
+
+    /// <summary>
+    /// تاریخ پایان قرارداد
+    /// -
+    /// میلادی
+    /// </summary>
+    public DateTime ContractEndGr { get; set; }
+
+    /// <summary>
+    /// تاریخ پایان قرارداد
+    /// -
+    /// شمسی
+    /// </summary>
+    public string ContractEndFa { get; set; }
 }

CompanyManagment.App.Contracts/Workshop/CreateWorkshop.cs

@@ -107,4 +107,13 @@ public class CreateWorkshop
 
     public string HasCustomizeCheckoutService { get; set; }
 
+    /// <summary>
+    /// محاسبه اضافه کار فیش حقوقی در لیست بیمه
+    /// </summary>
+    public bool InsuranceCheckoutOvertime { get;  set; }
+    /// <summary>
+    /// محاسبه حق اولاد در لیست بیمه
+    /// </summary>
+    public bool InsuranceCheckoutFamilyAllowance { get;  set; }
+
 }

CompanyManagment.App.Contracts/Workshop/IWorkshopApplication.cs

@@ -85,6 +85,8 @@ public interface IWorkshopApplication
 
     Task<List<WorkshopWithLeftWorkTempEmployeesDto>> GetWorkshopsForLeftWorkTemp(long accountId);
     Task<int> GetWorkshopsForLeftWorkTempCount(long accountId);
+    Task<List<WorkshopSelectListViewModel>> GetSelectList(string search);
+
 
     #endregion
 }

CompanyManagment.App.Contracts/Workshop/PrintListWorkshop.cs

@@ -22,6 +22,7 @@ public class PrintListWorkshop
     public string TypeOfOwnership { get; set; }
 
     public string ArchiveCode { get; set; }
+    public int ArchiveCodeInt { get; set; }
 
     public string AgentName { get; set; }
 

CompanyManagment.App.Contracts/Workshop/WorkshopSelectListViewModel.cs

@@ -0,0 +1,8 @@
+namespace CompanyManagment.App.Contracts.Workshop;
+
+public class WorkshopSelectListViewModel
+{
+    public long Id { get; set; }
+    public string Name { get; set; }
+    public string ArchiveCode { get; set; }
+}

CompanyManagment.Application/AdminMonthlyOverviewApplication.cs

@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using _0_Framework.Application;
+using Company.Domain.AdminMonthlyOverviewAgg;
+using CompanyManagment.App.Contracts.AdminMonthlyOverview;
+
+namespace CompanyManagment.Application;
+
+public class AdminMonthlyOverviewApplication:IAdminMonthlyOverviewApplication
+{
+    private readonly IAdminMonthlyOverviewRepository _adminMonthlyOverviewRepository;
+
+    public AdminMonthlyOverviewApplication(IAdminMonthlyOverviewRepository adminMonthlyOverviewRepository)
+    {
+        _adminMonthlyOverviewRepository = adminMonthlyOverviewRepository;
+    }
+
+    public async Task<List<AdminMonthlyOverviewListViewModel>> GetWorkshopListByStatus(AdminMonthlyOverviewSearchModel searchModel)
+    {
+        return await _adminMonthlyOverviewRepository.GetWorkshopStatus(searchModel);
+    }
+
+    public async Task<AdminMonthlyOverViewCounterVm> GetCounter(int year, int month, long accountId)
+    {
+        return await _adminMonthlyOverviewRepository.GetCounter(year, month, accountId);
+    }
+
+    public async Task<OperationResult> Next(long id)
+    {
+        var operation= new OperationResult();
+        var monthlyOverview = _adminMonthlyOverviewRepository.Get(id);
+        if (monthlyOverview == null)
+        {
+            return operation.Failed("آیتم موردنظر یافت نشد");
+        }
+
+        if (monthlyOverview.Status== AdminMonthlyOverviewStatus.CreateDocuments)
+        {
+            return operation.Failed("شما نمیتوانید تا زمانی که قرارداد و تصفیه را تنظیم نکردید به مرحله بعد بروید");
+        }
+
+        var maxValue = Enum.GetValues(typeof(AdminMonthlyOverviewStatus))
+            .Cast<AdminMonthlyOverviewStatus>()
+            .Max();
+
+        if (monthlyOverview.Status >= maxValue)
+        {
+           return operation.Failed("مرحله بعدی انتخاب شده نامعتبر است");
+        }
+
+        monthlyOverview.Next();
+      await  _adminMonthlyOverviewRepository.SaveChangesAsync();
+        return operation.Succcedded();
+    }
+
+    public async Task<OperationResult> Back(long id)
+    {
+        var operation = new OperationResult();
+        var monthlyOverview = _adminMonthlyOverviewRepository.Get(id);
+        if (monthlyOverview == null)
+        {
+            return operation.Failed("آیتم موردنظر یافت نشد");
+        }
+
+        if (monthlyOverview.Status == AdminMonthlyOverviewStatus.CreateDocuments+1)
+        {
+            return operation.Failed("شما امکان برگشت به مرحله قبل را ندارید");
+        }
+
+        var minValue = Enum.GetValues(typeof(AdminMonthlyOverviewStatus))
+            .Cast<AdminMonthlyOverviewStatus>()
+            .Min();
+
+        if (monthlyOverview.Status <= minValue)
+        {
+            return operation.Failed("مرحله قبلی انتخاب شده نامعتبر است");
+        }
+
+        monthlyOverview.Back();
+        await _adminMonthlyOverviewRepository.SaveChangesAsync();
+
+        return operation.Succcedded();
+    }
+}

CompanyManagment.Application/CheckoutApplication.cs

@@ -5,9 +5,11 @@ using System.Linq;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using Company.Domain.CheckoutAgg;
+using Company.Domain.CheckoutAgg.ValueObjects;
 using Company.Domain.LeftWorkAgg;
 using Company.Domain.YearlySalaryAgg;
 using Company.Domain.empolyerAgg;
+using Company.Domain.RollCallAgg;
 using CompanyManagment.App.Contracts.Checkout;
 using CompanyManagment.App.Contracts.PersonalContractingParty;
 using CompanyManagment.App.Contracts.Leave;
@@ -24,11 +26,12 @@ public class CheckoutApplication : ICheckoutApplication
     private readonly IPersonalContractingPartyApp _contractingPartyApp;
     private readonly ILeaveApplication _leaveApplication;
     private readonly IMandatoryHoursApplication _mandatoryHoursApplication;
+    private readonly IRollCallMandatoryRepository _rollCallMandatoryRepository;
 
 
     public CheckoutApplication(ICheckoutRepository checkoutRepository, IYearlySalaryRepository yearlySalaryRepository,
         ILeftWorkRepository leftWorkRepository,
-        IEmployerRepository employerRepository, IPersonalContractingPartyApp contractingPartyApp, ILeaveApplication leaveApplication, IMandatoryHoursApplication mandatoryHoursApplication)
+        IEmployerRepository employerRepository, IPersonalContractingPartyApp contractingPartyApp, ILeaveApplication leaveApplication, IMandatoryHoursApplication mandatoryHoursApplication, IRollCallMandatoryRepository rollCallMandatoryRepository)
     {
         _checkoutRepository = checkoutRepository;
         _yearlySalaryRepository = yearlySalaryRepository;
@@ -37,6 +40,7 @@ public class CheckoutApplication : ICheckoutApplication
         _contractingPartyApp = contractingPartyApp;
         _leaveApplication = leaveApplication;
         _mandatoryHoursApplication = mandatoryHoursApplication;
+        _rollCallMandatoryRepository = rollCallMandatoryRepository;
     }
 
     [SuppressMessage("ReSharper.DPA", "DPA0007: Large number of DB records", MessageId = "count: 241")]
@@ -48,73 +52,85 @@ public class CheckoutApplication : ICheckoutApplication
         string month = string.Empty;
         switch (smonth)
         {
-            case 1: month = "فروردین";
+            case 1:
+                month = "فروردین";
                 break;
-            case 2: month = "اردیبهشت";
+            case 2:
+                month = "اردیبهشت";
                 break;
-            case 3:month = "خرداد";
+            case 3:
+                month = "خرداد";
                 break;
-            case 4: month = "تیر";
+            case 4:
+                month = "تیر";
                 break;
-            case 5: month = "مرداد";
+            case 5:
+                month = "مرداد";
                 break;
-            case 6: month = "شهریور";
+            case 6:
+                month = "شهریور";
                 break;
-            case 7:month = "مهر";
+            case 7:
+                month = "مهر";
                 break;
-            case 8: month = "آبان";
+            case 8:
+                month = "آبان";
                 break;
-            case 9: month = "آذر";
+            case 9:
+                month = "آذر";
                 break;
-            case 10: month = "دی";
+            case 10:
+                month = "دی";
                 break;
-            case 11: month = "بهمن";
+            case 11:
+                month = "بهمن";
                 break;
-            case 12: month = "اسفند";
+            case 12:
+                month = "اسفند";
                 break;
         }
         var year = syear.ToString();
 
-		#region SickLeav
+        #region SickLeav
 
-		//var serachModel = new LeaveSearchModel()
-		//{
-		//	EmployeeId = command.EmployeeId,
-		//	WorkshopId = command.WorkshopId,
-		//	LeaveType = "استعلاجی",
-		//	StartLeave = command.ContractStart,
-		//	EndLeave = command.ContractEnd,
-		//	IsAccepted = true,
-		//};
-		//var leavList = _leaveApplication.search(serachModel);
-  //      int sickLeaveCount = 0;
-		//if (leavList.Count > 0)
-		//{
-			
-		//	foreach (var leave in leavList)
-		//	{
-		//		if (leave.StartLeaveGr < command.ContractStartGr && leave.EndLeaveGr <= command.ContractEndGr)
-		//		{
-  //                  int res = (int)((leave.EndLeaveGr - command.ContractStartGr).TotalDays +1);
-  //                  sickLeaveCount += res;
-		//		}
-		//		else if (leave.StartLeaveGr >= command.ContractStartGr && leave.EndLeaveGr > command.ContractEndGr)
-		//		{
-		//			int res = (int)((command.ContractEndGr - leave.StartLeaveGr).TotalDays + 1);
-		//			sickLeaveCount += res;
-		//		}
-		//		else
-		//		{
-		//			int res = (int)((leave.EndLeaveGr - leave.StartLeaveGr).TotalDays + 1);
-		//			sickLeaveCount += res;
-		//		}
-				
-		//	}
-		//}
+        //var serachModel = new LeaveSearchModel()
+        //{
+        //	EmployeeId = command.EmployeeId,
+        //	WorkshopId = command.WorkshopId,
+        //	LeaveType = "استعلاجی",
+        //	StartLeave = command.ContractStart,
+        //	EndLeave = command.ContractEnd,
+        //	IsAccepted = true,
+        //};
+        //var leavList = _leaveApplication.search(serachModel);
+        //      int sickLeaveCount = 0;
+        //if (leavList.Count > 0)
+        //{
 
-		#endregion
+        //	foreach (var leave in leavList)
+        //	{
+        //		if (leave.StartLeaveGr < command.ContractStartGr && leave.EndLeaveGr <= command.ContractEndGr)
+        //		{
+        //                  int res = (int)((leave.EndLeaveGr - command.ContractStartGr).TotalDays +1);
+        //                  sickLeaveCount += res;
+        //		}
+        //		else if (leave.StartLeaveGr >= command.ContractStartGr && leave.EndLeaveGr > command.ContractEndGr)
+        //		{
+        //			int res = (int)((command.ContractEndGr - leave.StartLeaveGr).TotalDays + 1);
+        //			sickLeaveCount += res;
+        //		}
+        //		else
+        //		{
+        //			int res = (int)((leave.EndLeaveGr - leave.StartLeaveGr).TotalDays + 1);
+        //			sickLeaveCount += res;
+        //		}
 
-		var dayliWage = command.DayliWage.MoneyToDouble();
+        //	}
+        //}
+
+        #endregion
+
+        var dayliWage = command.DayliWage.MoneyToDouble();
         // کمک هزینه اقلام
         var consumableItem = command.ConsumableItems.MoneyToDouble();
         //حق اولاد
@@ -124,8 +140,8 @@ public class CheckoutApplication : ICheckoutApplication
         //حق تاهل
         var marriedAllowance = command.MarriedAllowance.MoneyToDouble();
         var MontlyYearsBunos =
-            _yearlySalaryRepository.GetMontlyBunosYears(command.WeeklyTime, command.ContractStartGr, command.ContractEndGr, dayliWage,command.WorkingWeeklyTime,command.officialholiday,command.friday, command.TotalHolidaysAndNotH, command.TotalHolidaysAndNotM, command.Basic, command.FridayStarttoEnd,command.DailFeeComplete,command.HasRollCall, command.HolidayWorking);
-       //دستمزد ماهانه
+            _yearlySalaryRepository.GetMontlyBunosYears(command.WeeklyTime, command.ContractStartGr, command.ContractEndGr, dayliWage, command.WorkingWeeklyTime, command.officialholiday, command.friday, command.TotalHolidaysAndNotH, command.TotalHolidaysAndNotM, command.Basic, command.FridayStarttoEnd, command.DailFeeComplete, command.HasRollCall, command.HolidayWorking, command.ShiftWork);
+        //دستمزد ماهانه
         var monthlyWage = MontlyYearsBunos.MontlyWage;
         //سنوات
         var years = command.YearsPay;
@@ -143,7 +159,7 @@ public class CheckoutApplication : ICheckoutApplication
         //حق بیمه سهم کارگر
         var insuranceDeduction = (monthlyWage + bacicYears + consumableItem + housingAllowance + marriedAllowance) * 7 / 100;
 
-        if (command.OvertimePay > 0 && command.AbsenceDeduction>0)
+        if (command.OvertimePay > 0 && command.AbsenceDeduction > 0)
         {
             if (command.AbsenceDeduction >= command.OvertimePay)
             {
@@ -157,12 +173,26 @@ public class CheckoutApplication : ICheckoutApplication
             }
 
         }
+        var checkoutStart = $"{command.Year}/{command.Month}/01";
+        var checkoutEnd = checkoutStart.FindeEndOfMonth();
+        var salaryAids =
+            _rollCallMandatoryRepository.SalaryAidsForCheckout(command.EmployeeId, command.WorkshopId, checkoutStart.ToGeorgianDateTime(), checkoutEnd.ToGeorgianDateTime())
+                .Select(x => new CheckoutSalaryAid(x.Amount, x.SalaryAidDateTimeGe, x.SalaryAidDateTimeFa, x.CalculationDateTimeGe, x.CalculationDateTimeFa, x.Id)).ToList();
+
+        command.SalaryAidDeduction = salaryAids.Sum(x => x.Amount.MoneyToDouble());
+
+
+        var loanInstallments = _rollCallMandatoryRepository.LoanInstallmentForCheckout(command.EmployeeId,
+                command.WorkshopId, command.ContractStartGr, command.ContractEndGr)
+            .Select(x => new CheckoutLoanInstallment(x.Amount, x.Month, x.Year, x.IsActive, x.RemainingAmount, x.LoanAmount, x.Id)).ToList();
+
+        command.InstallmentDeduction = loanInstallments.Sum(x => x.AmountForMonth.MoneyToDouble());
 
 
         var totalClaimsDouble = monthlyWage + bacicYears + consumableItem + housingAllowance + marriedAllowance + command.OvertimePay +
                                 command.NightworkPay + familyAllowance + bunos + years + command.LeavePay + command.FridayPay + command.ShiftPay;
         var totalClaims = totalClaimsDouble.ToMoney();
-        var totalDeductionDouble = insuranceDeduction + command.AbsenceDeduction;
+        var totalDeductionDouble = insuranceDeduction + command.AbsenceDeduction + command.InstallmentDeduction + command.SalaryAidDeduction;
         var totalDeductions = totalDeductionDouble.ToMoney();
         var totalPayment = totalClaimsDouble - totalDeductionDouble;
 
@@ -177,14 +207,16 @@ public class CheckoutApplication : ICheckoutApplication
             {
                 command.Signature = "0";
             }
-                  
-            var checkout = new Checkout(command.EmployeeFullName, command.FathersName ,command.NationalCode
+
+
+
+            var checkout = new Checkout(command.EmployeeFullName, command.FathersName, command.NationalCode
                 , command.DateOfBirth, command.EmployeeId, command.WorkshopName, command.WorkshopId, command.ContractNo, command.ContractStartGr, command.ContractEndGr, month, year,
                 command.ContractId, command.WorkingHoursId, monthlyWage, bacicYears, consumableItem, housingAllowance
-                , command.OvertimePay, command.NightworkPay, command.FridayPay, 0, command.ShiftPay, familyAllowance, bunos, years, command.LeavePay, insuranceDeduction, 0, 0, 0, command.AbsenceDeduction, sumOfWorkingDays,
-                command.ArchiveCode, command.PersonnelCode, totalClaims, totalDeductions, totalPayment, command.Signature,marriedAllowance,command.LeaveCheckout,command.CreditLeaves,command.AbsencePeriod,command.AverageHoursPerDay,command.HasRollCall,command.OverTimeWorkValue,command.OverNightWorkValue
-                ,command.FridayWorkValue, command.RotatingShiftValue,command.AbsenceValue,command.TotalDayOfLeaveCompute,command.TotalDayOfYearsCompute,command.TotalDayOfBunosesCompute);
-            _checkoutRepository.CreateCkeckout(checkout);
+                , command.OvertimePay, command.NightworkPay, command.FridayPay, 0, command.ShiftPay, familyAllowance, bunos, years, command.LeavePay, insuranceDeduction, 0, command.InstallmentDeduction, command.SalaryAidDeduction, command.AbsenceDeduction, sumOfWorkingDays,
+                command.ArchiveCode, command.PersonnelCode, totalClaims, totalDeductions, totalPayment, command.Signature, marriedAllowance, command.LeaveCheckout, command.CreditLeaves, command.AbsencePeriod, command.AverageHoursPerDay, command.HasRollCall, command.OverTimeWorkValue, command.OverNightWorkValue
+                , command.FridayWorkValue, command.RotatingShiftValue, command.AbsenceValue, command.TotalDayOfLeaveCompute, command.TotalDayOfYearsCompute, command.TotalDayOfBunosesCompute, loanInstallments, salaryAids);
+            _checkoutRepository.CreateCkeckout(checkout).GetAwaiter().GetResult();
             //_checkoutRepository.SaveChanges();
 
             //var employeeFullName = new SqlParameter("@EmployeeFullName", SqlDbType.NVarChar, 50);
@@ -194,7 +226,7 @@ public class CheckoutApplication : ICheckoutApplication
 
         }
 
-           
+
     }
 
     public OperationResult Edit(EditCheckout command)
@@ -210,7 +242,7 @@ public class CheckoutApplication : ICheckoutApplication
     public async Task<List<CheckoutViewModel>> Search(CheckoutSearchModel searchModel)
     {
         var result = new List<CheckoutViewModel>();
-        var query =await _checkoutRepository.SearchForMainCheckout(searchModel);
+        var query = await _checkoutRepository.SearchForMainCheckout(searchModel);
         query = query.Select(x => new CheckoutViewModel()
         {
             Id = x.Id,
@@ -248,7 +280,7 @@ public class CheckoutApplication : ICheckoutApplication
         //    //        .Select(x => x.EmployerId).FirstOrDefault();
         //    //var employerName = _context.Employers?.FirstOrDefault(x => x.id == employeId).FullName;
         //    // = employerName;
-                
+
         //}
 
         return query;
@@ -268,31 +300,30 @@ public class CheckoutApplication : ICheckoutApplication
             return new();
         result.ForEach(x =>
         {
-            if (x.HasRollCall)
-            {
 
-                int yearFa;
-                int monthFa;
-                try
-                {
-                    yearFa = int.Parse(oneRecord.Year);
-                    monthFa = oneRecord.Month.ToMonthByStringValue();
-                }
-                catch (Exception e)
-                {
-                    return;
-                }
-                double mandatoryHours = _mandatoryHoursApplication.GetMandatoryHoursByYearAndMonth(yearFa, monthFa);
-                int mandatoryWholeHours = (int)mandatoryHours;
-                int mandatoryMinutes = (int)((mandatoryHours - mandatoryWholeHours) * 60);
-                var totalWorking = new TimeSpan(x.MonthlyRollCall.Sum(y => y.TotalhourseSpan.Ticks));
-                var totalBreakTime = new TimeSpan(x.MonthlyRollCall.Sum(y => y.BreakTimeTimeSpan.Ticks));
-                var totalPresent = totalWorking + totalBreakTime;
-                x.TotalWorkingTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalWorking.TotalHours, totalWorking.Minutes, "-");
-                x.TotalBreakTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalBreakTime.TotalHours, totalBreakTime.Minutes, "-");
-                x.TotalPresentTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalPresent.TotalHours, totalPresent.Minutes, "-");
-                x.TotalMandatoryTimeStr = Tools.ToFarsiHoursAndMinutes(mandatoryWholeHours, mandatoryMinutes, "-");
+
+            int yearFa;
+            int monthFa;
+            try
+            {
+                yearFa = int.Parse(oneRecord.Year);
+                monthFa = oneRecord.Month.ToMonthByStringValue();
             }
+            catch (Exception e)
+            {
+                return;
+            }
+            double mandatoryHours = _mandatoryHoursApplication.GetMandatoryHoursByYearAndMonth(yearFa, monthFa);
+            int mandatoryWholeHours = (int)mandatoryHours;
+            int mandatoryMinutes = (int)((mandatoryHours - mandatoryWholeHours) * 60);
+            var totalWorking = new TimeSpan(x.MonthlyRollCall.Sum(y => y.TotalhourseSpan.Ticks));
+            var totalBreakTime = new TimeSpan(x.MonthlyRollCall.Sum(y => y.BreakTimeTimeSpan.Ticks));
+            var totalPresent = totalWorking + totalBreakTime;
+            x.TotalWorkingTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalWorking.TotalHours, totalWorking.Minutes, "-");
+            x.TotalBreakTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalBreakTime.TotalHours, totalBreakTime.Minutes, "-");
+            x.TotalPresentTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalPresent.TotalHours, totalPresent.Minutes, "-");
+            x.TotalMandatoryTimeStr = Tools.ToFarsiHoursAndMinutes(mandatoryWholeHours, mandatoryMinutes, "-");
+
         });
         return result;
     }
@@ -301,31 +332,41 @@ public class CheckoutApplication : ICheckoutApplication
     {
         var result = _checkoutRepository.PrintOne(id);
 
+        int yearFa;
+        int monthFa;
+        try
+        {
+            yearFa = int.Parse(result.Year);
+            monthFa = result.Month.ToMonthByStringValue();
+        }
+        catch (Exception e)
+        {
+            return new();
+        }
+        double mandatoryHours = _mandatoryHoursApplication.GetMandatoryHoursByYearAndMonth(yearFa, monthFa);
+        int mandatoryWholeHours = (int)mandatoryHours;
+        int mandatoryMinutes = (int)((mandatoryHours - mandatoryWholeHours) * 60);
+        TimeSpan totalWorking;
+        TimeSpan totalBreakTime;
+        TimeSpan totalPresent;
         if (result.HasRollCall)
         {
-            int yearFa;
-            int monthFa;
-            try
-            {
-                yearFa = int.Parse(result.Year);
-                monthFa = result.Month.ToMonthByStringValue();
-            }
-            catch (Exception e)
-            {
-                return new();
-            }
-            double mandatoryHours = _mandatoryHoursApplication.GetMandatoryHoursByYearAndMonth(yearFa, monthFa);
-            int mandatoryWholeHours = (int)mandatoryHours;
-            int mandatoryMinutes = (int)((mandatoryHours - mandatoryWholeHours) * 60);
-            var totalWorking = new TimeSpan(result.MonthlyRollCall.Sum(x => x.TotalhourseSpan.Ticks));
-            var totalBreakTime = new TimeSpan(result.MonthlyRollCall.Sum(x => x.BreakTimeTimeSpan.Ticks));
-            var totalPresent = totalWorking + totalBreakTime;
-
-            result.TotalWorkingTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalWorking.TotalHours, totalWorking.Minutes, "-");
-            result.TotalBreakTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalBreakTime.TotalHours, totalBreakTime.Minutes, "-");
-            result.TotalPresentTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalPresent.TotalHours, totalPresent.Minutes, "-");
-            result.TotalMandatoryTimeStr = Tools.ToFarsiHoursAndMinutes(mandatoryWholeHours, mandatoryMinutes, "-");
+            totalWorking = new TimeSpan(result.MonthlyRollCall.Sum(x => x.TotalhourseSpan.Ticks));
+            totalBreakTime = new TimeSpan(result.MonthlyRollCall.Sum(x => x.BreakTimeTimeSpan.Ticks));
+            totalPresent = totalWorking + totalBreakTime;
         }
+        else
+        {
+            totalBreakTime = new TimeSpan(result.MonthlyRollCall.Sum(x => x.BreakTimeTimeSpan.Ticks));
+            totalPresent = new TimeSpan(result.MonthlyRollCall.Sum(x => x.TotalhourseSpan.Ticks));
+            totalWorking = totalPresent - totalBreakTime;
+        }
+
+        result.TotalWorkingTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalWorking.TotalHours, totalWorking.Minutes, "-");
+        result.TotalBreakTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalBreakTime.TotalHours, totalBreakTime.Minutes, "-");
+        result.TotalPresentTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalPresent.TotalHours, totalPresent.Minutes, "-");
+        result.TotalMandatoryTimeStr = Tools.ToFarsiHoursAndMinutes(mandatoryWholeHours, mandatoryMinutes, "-");
+
         return result;
     }
 
@@ -388,7 +429,7 @@ public class CheckoutApplication : ICheckoutApplication
 
 
         _checkoutRepository.SaveChanges();
-         
+
         return opration.Succcedded();
     }
 
@@ -403,7 +444,7 @@ public class CheckoutApplication : ICheckoutApplication
         var checkout = _checkoutRepository.Get(id);
         var totalClaimsDouble = checkout.TotalClaims.MoneyToDouble();
         var totalDeductionsDouble = checkout.TotalDeductions.MoneyToDouble();
-        totalClaimsDouble = (double) (totalClaimsDouble - checkout.RewardPay);
+        totalClaimsDouble = (double)(totalClaimsDouble - checkout.RewardPay);
         totalDeductionsDouble = totalDeductionsDouble - checkout.SalaryAidDeduction;
 
         var totalClaims = totalClaimsDouble + rewardPay;

CompanyManagment.Application/ContactUsApplication.cs

@@ -0,0 +1,70 @@
+using System.Text.RegularExpressions;
+using _0_Framework.Application;
+using Company.Domain.ContactUsAgg;
+using CompanyManagment.App.Contracts.ContactUs;
+
+namespace CompanyManagment.Application;
+
+public class ContactUsApplication : IContactUsApplication
+{
+    private readonly IContactUsRepository _contactUsRepository;
+
+    public ContactUsApplication(IContactUsRepository contactUsRepository)
+    {
+        _contactUsRepository = contactUsRepository;
+    }
+
+    public OperationResult Create(CreateContactUs command)
+    {
+        var op = new OperationResult();
+        if (string.IsNullOrWhiteSpace(command.FirstName))
+        {
+            return op.Failed("لطفا نام خود را وارد کنید");
+        }
+
+        if (string.IsNullOrWhiteSpace(command.LastName))
+        {
+            return op.Failed("لطفا نام خانوادگی خود را وارد کنید");
+        }
+
+        if (string.IsNullOrWhiteSpace(command.Email))
+        {
+            return op.Failed("لطفا ایمیل خود را وارد کنید");
+        }
+
+        if (string.IsNullOrWhiteSpace(command.PhoneNumber))
+        {
+            return op.Failed("لطفا شماره تماس خود را وارد کنید");
+        }
+
+        if (!Regex.IsMatch(command.PhoneNumber, @"^(\+98|0)?9\d{9}$"))
+        {
+            return op.Failed("شماره تماس وارد شده نامعتبر است");
+        }
+
+        if (!Regex.IsMatch(command.Email, @"^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$"))
+        {
+            return op.Failed("ایمیل وارد شده نامعتبر است");
+        }
+
+        if (string.IsNullOrWhiteSpace(command.Title))
+        {
+            return op.Failed("لطفا عنوان پیغام خود را وارد کنید");
+        }
+
+        if (string.IsNullOrWhiteSpace(command.Message))
+        {
+            return op.Failed("لطفا پیغام خود را وارد کنید");
+        }
+
+        var entity = new ContactUs(command.FirstName, command.LastName, command.Email, command.PhoneNumber,
+            command.Title, command.Message);
+
+        _contactUsRepository.Create(entity);
+
+        _contactUsRepository.SaveChanges();
+
+        return op.Succcedded();
+
+    }
+}

CompanyManagment.Application/CustomizeCheckoutApplication.cs

@@ -16,10 +16,12 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using Company.Domain.CheckoutAgg;
 using Company.Domain.CustomizeCheckoutAgg.ValueObjects;
-using Company.Domain.CustomizeWorkshopGroupSettingsAgg;
+using Company.Domain.CustomizeCheckoutTempAgg;
 using Company.Domain.PersonnelCodeAgg;
 using CompanyManagment.App.Contracts.PersonnleCode;
+using Company.Domain.CustomizeWorkshopGroupSettingsAgg;
 
 namespace CompanyManagment.Application
 {
@@ -34,10 +36,14 @@ namespace CompanyManagment.Application
         private readonly IContractRepository _contractRepository;
         private readonly IWorkshopRepository _workshopRepository;
         private readonly ICustomizeWorkshopSettingsRepository _customizeWorkshopSettingsRepository;
+        private readonly ICustomizeCheckoutTempRepository _customizeCheckoutTempRepository;
+        private readonly ICheckoutRepository _checkoutRepository;
+
         private readonly ICustomizeWorkshopGroupSettingsRepository _customizeWorkshopGroupSettingsRepository;
+
         public CustomizeCheckoutApplication(ICustomizeCheckoutRepository customizeCheckoutRepository,
             IRollCallEmployeeStatusRepository rollCallEmployeeStatusRepository, ILeftWorkRepository leftWorkRepository, IEmployeeRepository employeeRepository,
-            IRollCallMandatoryRepository rollCallMandatoryRepository, IContractRepository contractRepository, IWorkshopRepository workshopRepository, ICustomizeWorkshopSettingsRepository customizeWorkshopSettingsRepository, IPersonnelCodeRepository personnelCodeRepository, ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository)
+            IRollCallMandatoryRepository rollCallMandatoryRepository, IContractRepository contractRepository, IWorkshopRepository workshopRepository, ICustomizeWorkshopSettingsRepository customizeWorkshopSettingsRepository, IPersonnelCodeRepository personnelCodeRepository, ICustomizeCheckoutTempRepository customizeCheckoutTempRepository, ICheckoutRepository checkoutRepository, ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository)
         {
             _customizeCheckoutRepository = customizeCheckoutRepository;
             _rollCallEmployeeStatusRepository = rollCallEmployeeStatusRepository;
@@ -48,6 +54,8 @@ namespace CompanyManagment.Application
             _workshopRepository = workshopRepository;
             _customizeWorkshopSettingsRepository = customizeWorkshopSettingsRepository;
             _personnelCodeRepository = personnelCodeRepository;
+            _customizeCheckoutTempRepository = customizeCheckoutTempRepository;
+            _checkoutRepository = checkoutRepository;
             _customizeWorkshopGroupSettingsRepository = customizeWorkshopGroupSettingsRepository;
         }
 
@@ -89,18 +97,19 @@ namespace CompanyManagment.Application
                         x.Amount,
                         x.FineDate,
                         x.FineDate.ToGeorgianDateTime(),
-                        x.IsActive, x.CreationDate.ToGeorgianDateTime())
+                        x.IsActive, x.CreationDate.ToGeorgianDateTime(),
+                        x.Id)
                 ).ToList();
 
             var rewards = result.RewardViewModels.Select(x =>
                 new CustomizeCheckoutReward(x.Amount, x.Description, x.GrantDateGr, x.GrantDateFa,
-                    x.IsActive,x.Title)).ToList();
+                    x.IsActive, x.Title,x.Id)).ToList();
 
             var loanInstallments = result.InstallmentViewModels.Select(x =>
-                new CustomizeCheckoutLoanInstallments(x.Amount, x.Month, x.Year, x.IsActive,x.RemainingAmount,x.LoanAmount)).ToList();
+                new CustomizeCheckoutLoanInstallments(x.Amount, x.Month, x.Year, x.IsActive, x.RemainingAmount, x.LoanAmount,x.Id)).ToList();
 
             var salaryAids = result.SalaryAidViewModels.Select(x =>
-                new CustomizeCheckoutSalaryAid(x.Amount, x.SalaryAidDateTimeGe, x.SalaryAidDateTimeFa)).ToList();
+                new CustomizeCheckoutSalaryAid(x.Amount, x.SalaryAidDateTimeGe, x.SalaryAidDateTimeFa, x.CalculationDateTimeGe, x.CalculationDateTimeFa,x.Id)).ToList();
 
 
             var regularShift = result.EmployeeSettingsShifts.Select(x =>
@@ -113,15 +122,23 @@ namespace CompanyManagment.Application
                 result.FamilyAllowance, result.LeavePay, result.InsuranceDeduction, result.FineAbsenceDeduction,
                 result.LateToWorkDeduction, result.EarlyExitDeduction, result.RewardPay, result.SalaryAidDeduction, result.InstallmentDeduction, result.FineDeduction,
                 result.TaxDeduction, result.SumOfWorkingDays, result.TotalClaimsStr, result.TotalDeductionsStr, result.TotalPayment, contract?.ContractNo ?? "-",
-                fines,loanInstallments,salaryAids,rewards, result.LateToWorkValue, result.SettingSalary, result.DailyWage, result.ShiftStatus,result.IrregularShift,result.CustomizeRotatingShifts,
+                fines, loanInstallments, salaryAids, rewards, result.LateToWorkValue, result.SettingSalary, result.DailyWage, result.ShiftStatus, result.IrregularShift, result.CustomizeRotatingShifts,
                 regularShift);
 
 
-			_customizeCheckoutRepository.Create(entity);
+            _customizeCheckoutRepository.Create(entity);
             _customizeCheckoutRepository.RemoveEmployeeCustomizeCheckoutInDates(command.WorkshopId, employee.id, command.ContractStart, command.ContractEnd);
             _customizeCheckoutRepository.SaveChanges();
             return op.Succcedded();
         }
+
+        public (bool Checkout, bool CustomizeCheckout, bool CustomizeCheckoutTemp) ValidateExistsCheckouts(DateTime startDate,
+	        DateTime endDate, long workshopId, List<long> employeeId)
+        {
+	        return _customizeCheckoutRepository.ValidateExistsCheckouts(startDate, endDate, workshopId, employeeId);
+        }
+
+
         public OperationResult GroupCreate(CreateCustomizeCheckoutGroup command)
         {
             OperationResult op = new();
@@ -146,18 +163,18 @@ namespace CompanyManagment.Application
                             x.Amount,
                             x.FineDate,
                             x.FineDate.ToGeorgianDateTime(),
-                            x.IsActive, x.CreationDate.ToGeorgianDateTime())
+                            x.IsActive, x.CreationDate.ToGeorgianDateTime(), x.Id)
                     ).ToList();
 
                 var rewards = computations.RewardViewModels.Select(x =>
                     new CustomizeCheckoutReward(x.Amount, x.Description, x.GrantDateGr, x.GrantDateFa,
-                        x.IsActive,x.Title)).ToList();
+                        x.IsActive, x.Title,x.Id)).ToList();
 
                 var loanInstallments = computations.InstallmentViewModels.Select(x =>
-                    new CustomizeCheckoutLoanInstallments(x.Amount, x.Month, x.Year, x.IsActive,x.RemainingAmount, x.LoanAmount)).ToList();
+                    new CustomizeCheckoutLoanInstallments(x.Amount, x.Month, x.Year, x.IsActive, x.RemainingAmount, x.LoanAmount, x.Id)).ToList();
 
                 var salaryAids = computations.SalaryAidViewModels.Select(x =>
-                    new CustomizeCheckoutSalaryAid(x.Amount, x.SalaryAidDateTimeGe, x.SalaryAidDateTimeFa)).ToList();
+                    new CustomizeCheckoutSalaryAid(x.Amount, x.SalaryAidDateTimeGe, x.SalaryAidDateTimeFa, x.CalculationDateTimeGe, x.CalculationDateTimeFa,x.Id)).ToList();
 
                 var regularShift = computations.EmployeeSettingsShifts.Select(x =>
                     new CustomizeCheckoutRegularShift(x.StartTime, x.EndTime, x.Placement)).ToList();
@@ -169,20 +186,20 @@ namespace CompanyManagment.Application
                 computations.FamilyAllowance, computations.LeavePay, computations.InsuranceDeduction, computations.FineAbsenceDeduction,
                 computations.LateToWorkDeduction, computations.EarlyExitDeduction, computations.RewardPay, computations.SalaryAidDeduction, computations.InstallmentDeduction, computations.FineDeduction,
                 computations.TaxDeduction, computations.SumOfWorkingDays, computations.TotalClaimsStr, computations.TotalDeductionsStr, computations.TotalPayment, contract?.ContractNo ?? "-",
-                fines,loanInstallments,salaryAids,rewards, computations.LateToWorkValue, computations.SettingSalary, computations.DailyWage, computations.ShiftStatus,computations.IrregularShift,
+                fines, loanInstallments, salaryAids, rewards, computations.LateToWorkValue, computations.SettingSalary, computations.DailyWage, computations.ShiftStatus, computations.IrregularShift,
                 computations.CustomizeRotatingShifts, regularShift);
 
-				_customizeCheckoutRepository.Create(entity);
+                _customizeCheckoutRepository.Create(entity);
                 _customizeCheckoutRepository.RemoveEmployeeCustomizeCheckoutInDates(command.WorkshopId, employeeId, command.ContractStart, command.ContractEnd);
             }
             _customizeCheckoutRepository.SaveChanges();
             return op.Succcedded();
         }
 
-        public OperationResult GroupRemove(long workshopId,List<long> idList)
+        public OperationResult GroupRemove(long workshopId, List<long> idList)
         {
             OperationResult op = new();
-            var entities = _customizeCheckoutRepository.GetRange(workshopId,idList);
+            var entities = _customizeCheckoutRepository.GetRange(workshopId, idList);
             if (entities == null)
                 return op.Succcedded();
             _customizeCheckoutRepository.RemoveRange(entities);
@@ -218,12 +235,12 @@ namespace CompanyManagment.Application
                 return op.Failed("خطای سیستمی");
 
             var pc = new PersianCalendar();
-            var checkoutDate = new DateTime(yearFa, monthFa, 1,pc);
+            var checkoutDate = new DateTime(yearFa, monthFa, 1, pc);
             var nextMonth = checkoutDate.AddMonthsFa(1, out _).ToGeorgianDateTime().Date;
             var today = DateTime.Today;
 
             if (nextMonth > today)
-	            return op.Failed("امکان ایجاد فیش برای ماه جاری یا آینده وجود ندارد");
+                return op.Failed("امکان ایجاد فیش برای ماه جاری یا آینده وجود ندارد");
 
             //validate parsed datetime
             var startOfMonth = new DateTime(yearFa, monthFa, 1, new PersianCalendar()).Date;
@@ -261,7 +278,7 @@ namespace CompanyManagment.Application
                 WorkshopId = workshopId
             });
             var workshopGroups = _customizeWorkshopSettingsRepository
-	            .GetWorkshopIncludeGroupsByWorkshopId(workshopId)?
+                .GetWorkshopIncludeGroupsByWorkshopId(workshopId)?
                 .GroupSettings.Where(x => x.MainGroup == false);
             var employeeSettings = _customizeWorkshopSettingsRepository.GetEmployeeSettingsByWorkshopId(workshopId);
 
@@ -302,7 +319,7 @@ namespace CompanyManagment.Application
 
             if (workshopId == 170)
             {
-                var exceptionEmployeeIds =_customizeWorkshopGroupSettingsRepository.GetEmployeeSettingsByGroupSettingsId(117).Select(x=>x.EmployeeId).ToList();
+                var exceptionEmployeeIds = _customizeWorkshopGroupSettingsRepository.GetEmployeeSettingsByGroupSettingsId(117).Select(x => x.EmployeeId).ToList();
                 foreach (var employeesId in exceptionEmployeeIds)
                 {
 
@@ -334,16 +351,16 @@ namespace CompanyManagment.Application
                     }
                     color = reason switch
                     {
-	                    "فاقد تعیین حقوق" => "orange",
+                        "فاقد تعیین حقوق" => "orange",
 
-	                    "فاقد گروهبندی" => "red",
+                        "فاقد گروهبندی" => "red",
 
-	                    "خطای سیستمی" => "black",
+                        "خطای سیستمی" => "black",
 
-	                    "دارای فیش غیر رسمی" =>"green",
+                        "دارای فیش غیر رسمی" => "green",
 
-						_ => "white"
-					};
+                        _ => "white"
+                    };
                     return new EligibleEmployeesForCustomizeCheckoutViewModel()
                     {
                         Id = x.Id,
@@ -353,7 +370,7 @@ namespace CompanyManagment.Application
                         Color = color,
                         PersonnelCode = personnelCodes.FirstOrDefault(y => x.Id == y.EmployeeId)?.PersonnelCode.ToString() ?? "-"
                     };
-                }).OrderByDescending(x=>x.IsEligible).ThenByDescending(x=>x.Reason).ToList();
+                }).OrderByDescending(x => x.IsEligible).ThenByDescending(x => x.Reason).ToList();
             return op.Succcedded(employees);
         }
     }

CompanyManagment.Application/CustomizeCheckoutTempApplication.cs

@@ -74,18 +74,18 @@ namespace CompanyManagment.Application
                         x.Amount,
                         x.FineDate,
                         x.FineDate.ToGeorgianDateTime(),
-                        x.IsActive, x.CreationDate.ToGeorgianDateTime())
+                        x.IsActive, x.CreationDate.ToGeorgianDateTime(), x.Id)
                 ).ToList();
 
             var rewards = result.RewardViewModels.Select(x =>
                 new CustomizeCheckoutTempReward(x.Amount, x.Description, x.GrantDateGr, x.GrantDateFa,
-                    x.IsActive,x.Title)).ToList();
+                    x.IsActive, x.Title, x.Id)).ToList();
 
             var loanInstallments = result.InstallmentViewModels.Select(x =>
-                new CustomizeCheckoutTempLoanInstallments(x.Amount, x.Month, x.Year, x.IsActive, x.RemainingAmount,x.LoanAmount)).ToList();
+                new CustomizeCheckoutTempLoanInstallments(x.Amount, x.Month, x.Year, x.IsActive, x.RemainingAmount, x.LoanAmount, x.Id)).ToList();
 
             var salaryAids = result.SalaryAidViewModels.Select(x =>
-                new CustomizeCheckoutTempSalaryAid(x.Amount, x.SalaryAidDateTimeGe, x.SalaryAidDateTimeFa)).ToList();
+                new CustomizeCheckoutTempSalaryAid(x.Amount, x.SalaryAidDateTimeGe, x.SalaryAidDateTimeFa, x.CalculationDateTimeGe, x.CalculationDateTimeFa, x.Id)).ToList();
 
             var regularShift = result.EmployeeSettingsShifts.Select(x =>
                 new CustomizeCheckoutRegularShift(x.StartTime, x.EndTime, x.Placement)).ToList();
@@ -97,11 +97,11 @@ namespace CompanyManagment.Application
                 result.FamilyAllowance, result.LeavePay, result.InsuranceDeduction, result.FineAbsenceDeduction,
                 result.LateToWorkDeduction, result.EarlyExitDeduction, result.RewardPay, result.SalaryAidDeduction, result.InstallmentDeduction, result.FineDeduction,
                 result.TaxDeduction, result.SumOfWorkingDays, result.TotalClaimsStr, result.TotalDeductionsStr, result.TotalPayment, contract?.ContractNo ?? "-",
-                fines, loanInstallments, salaryAids, rewards,result.LateToWorkValue, result.SettingSalary,result.DailyWage, result.ShiftStatus, result.IrregularShift, result.CustomizeRotatingShifts,
+                fines, loanInstallments, salaryAids, rewards, result.LateToWorkValue, result.SettingSalary, result.DailyWage, result.ShiftStatus, result.IrregularShift, result.CustomizeRotatingShifts,
                 regularShift);
 
 
-			_customizeCheckoutTempRepository.Create(entity);
+            _customizeCheckoutTempRepository.Create(entity);
             _customizeCheckoutTempRepository.RemoveEmployeeTemporaryCheckoutInDates(command.WorkshopId, employee.id, command.ContractStart, command.ContractEnd);
             _customizeCheckoutTempRepository.SaveChanges();
             return op.Succcedded();
@@ -127,18 +127,18 @@ namespace CompanyManagment.Application
                             x.Amount,
                             x.FineDate,
                             x.FineDate.ToGeorgianDateTime(),
-                            x.IsActive, x.CreationDate.ToGeorgianDateTime())
+                            x.IsActive, x.CreationDate.ToGeorgianDateTime(), x.Id)
                     ).ToList();
 
                 var rewards = computations.RewardViewModels.Select(x =>
                     new CustomizeCheckoutTempReward(x.Amount, x.Description, x.GrantDateGr, x.GrantDateFa,
-                        x.IsActive,x.Title)).ToList();
+                        x.IsActive, x.Title, x.Id)).ToList();
 
                 var loanInstallments = computations.InstallmentViewModels.Select(x =>
-                    new CustomizeCheckoutTempLoanInstallments(x.Amount, x.Month, x.Year, x.IsActive, x.RemainingAmount,x.LoanAmount)).ToList();
+                    new CustomizeCheckoutTempLoanInstallments(x.Amount, x.Month, x.Year, x.IsActive, x.RemainingAmount, x.LoanAmount, x.Id)).ToList();
 
                 var salaryAids = computations.SalaryAidViewModels.Select(x =>
-                    new CustomizeCheckoutTempSalaryAid(x.Amount, x.SalaryAidDateTimeGe, x.SalaryAidDateTimeFa)).ToList();
+                    new CustomizeCheckoutTempSalaryAid(x.Amount, x.SalaryAidDateTimeGe, x.SalaryAidDateTimeFa, x.CalculationDateTimeGe, x.CalculationDateTimeFa, x.Id)).ToList();
 
                 var contract = contracts.Where(x => x.IsActiveString == "true").FirstOrDefault(x => x.EmployeeId == employeeId);
 
@@ -154,7 +154,7 @@ namespace CompanyManagment.Application
                 computations.FamilyAllowance, computations.LeavePay, computations.InsuranceDeduction, computations.FineAbsenceDeduction,
                 computations.LateToWorkDeduction, computations.EarlyExitDeduction, computations.RewardPay, computations.SalaryAidDeduction, computations.InstallmentDeduction, computations.FineDeduction,
                 computations.TaxDeduction, computations.SumOfWorkingDays, computations.TotalClaimsStr, computations.TotalDeductionsStr, computations.TotalPayment, contract?.ContractNo ?? "-",
-              fines, loanInstallments, salaryAids, rewards,computations.LateToWorkValue, computations.SettingSalary, computations.DailyWage, computations.ShiftStatus, computations.IrregularShift,
+              fines, loanInstallments, salaryAids, rewards, computations.LateToWorkValue, computations.SettingSalary, computations.DailyWage, computations.ShiftStatus, computations.IrregularShift,
               computations.CustomizeRotatingShifts, regularShift);
                 _customizeCheckoutTempRepository.Create(entity);
                 _customizeCheckoutTempRepository.RemoveEmployeeTemporaryCheckoutInDates(command.WorkshopId, employeeId, command.ContractStart, command.ContractEnd);

CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs

@@ -19,7 +19,12 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Transactions;
+using Company.Domain.CheckoutAgg;
+using Company.Domain.CustomizeCheckoutAgg;
+using Company.Domain.CustomizeCheckoutTempAgg;
 using CompanyManagment.App.Contracts.RollCall;
+using Hangfire.States;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
 using Microsoft.EntityFrameworkCore.Query;
 
 
@@ -30,7 +35,10 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
     ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository, IEmployeeRepository employeeRepository,
     ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository,
     IRollCallEmployeeApplication rollCallEmployeeApplication,
-    IRollCallApplication rollCallAppllication)
+    IRollCallApplication rollCallAppllication,
+    ICheckoutRepository checkoutRepository,
+    ICustomizeCheckoutRepository customizeCheckoutRepository,
+    ICustomizeCheckoutTempRepository customizeCheckoutTempRepository)
     : ICustomizeWorkshopSettingsApplication
 {
     private readonly ICustomizeWorkshopSettingsRepository _customizeWorkshopSettingsRepository = customizeWorkshopSettingsRepository;
@@ -42,6 +50,9 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
     private readonly ICameraAccountApplication _cameraAccountApplication = cameraAccountApplication;
     private readonly IRollCallEmployeeApplication _rollCallEmployeeApplication = rollCallEmployeeApplication;
     private readonly IRollCallApplication _rollCallApplication = rollCallAppllication;
+    private readonly ICheckoutRepository _checkoutRepository = checkoutRepository;
+    private readonly ICustomizeCheckoutRepository _customizeCheckoutRepository = customizeCheckoutRepository;
+    private readonly ICustomizeCheckoutTempRepository _customizeCheckoutTempRepository = customizeCheckoutTempRepository;
 
     #region RollCallShifts
 
@@ -352,12 +363,21 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
             return op.Failed("گروه انتخاب شده نا معتبر است");
         }
 
-        if (customizeWorkshopGroupSettings.MainGroup)
+        if (_customizeWorkshopEmployeeSettingsRepository
+            .Exists(x => x.WorkshopId == command.WorkshopId && command.EmployeeIds.Contains(x.EmployeeId)))
         {
-            var createDefaultEmployee = CreateEmployeeSettings(command);
-            return createDefaultEmployee;
+            foreach (var employeeId in command.EmployeeIds)
+            {
+                _customizeWorkshopEmployeeSettingsRepository.RemoveByWorkshopIdAndEmployeeId(command.WorkshopId, employeeId);
+            }
         }
 
+        if (customizeWorkshopGroupSettings.MainGroup)
+		{
+			var createDefaultEmployee = CreateEmployeeSettings(command);
+			return createDefaultEmployee;
+		}
+
 
         List<CustomizeWorkshopEmployeeSettingsShift> shiftCollection = new List<CustomizeWorkshopEmployeeSettingsShift>();
         List<CustomizeRotatingShift> rotatingShift = [];
@@ -538,7 +558,13 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 
         _customizeWorkshopEmployeeSettingsRepository.Create(entity);
 
-        entity.SimpleEdit(shiftCollection, command.IrregularShift, command.WorkshopShiftStatus, command.BreakTime, isChanged, command.FridayWork, command.HolidayWork, rotatingShift);
+		entity.SimpleEdit(shiftCollection, command.IrregularShift, command.WorkshopShiftStatus, command.BreakTime, isChanged, command.FridayWork, command.HolidayWork, rotatingShift);
+        var employeeSalary = command.Salary?.MoneyToDouble() ?? 0;
+
+        if (employeeSalary > 0)
+        {
+            entity.SetSalary(employeeSalary);
+        }
 
         _customizeWorkshopGroupSettingsRepository.SaveChanges();
         return op.Succcedded();
@@ -661,7 +687,8 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
         transActionScope.Complete();
         return op.Succcedded();
     }
-    public OperationResult EditSimpleRollCallGroupSetting(EditCustomizeWorkshopGroupSettings command)
+    public OperationResult EditSimpleRollCallGroupSetting(EditCustomizeWorkshopGroupSettings command,
+        List<ReCalculateRollCallValues> reCalculateCommand)
     {
         OperationResult op = new();
 
@@ -680,9 +707,11 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 
         var workshopSettings = _customizeWorkshopSettingsRepository.Get(entity.CustomizeWorkshopSettingId);
 
-        var employeeIds = command.IsShiftChanged ? entity.CustomizeWorkshopEmployeeSettingsCollection
-            .Select(x => x.id).ToList() : entity.CustomizeWorkshopEmployeeSettingsCollection.Where(x => !x.IsShiftChanged)
-            .Select(x => x.id).ToList();
+        //var employeeIds = command.IsShiftChanged ? entity.CustomizeWorkshopEmployeeSettingsCollection
+        //	.Select(x => x.id).ToList() : entity.CustomizeWorkshopEmployeeSettingsCollection.Where(x => !x.IsShiftChanged)
+        //	.Select(x => x.id).ToList();
+
+
         var groupSettingsShifts = new List<CustomizeWorkshopGroupSettingsShift>();
         ICollection<CustomizeRotatingShift> rotatingShift = [];
         bool isChanged;
@@ -690,16 +719,16 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
         {
 
             groupSettingsShifts = command.ShiftViewModel.Select(x =>
-            {
-                if (!TimeOnly.TryParseExact(x.StartTime, "HH:mm", out TimeOnly start))
-                    throw new InvalidDataException();
-                if (!TimeOnly.TryParseExact(x.EndTime, "HH:mm", out TimeOnly end))
-                    throw new InvalidDataException();
+                {
+                    if (!TimeOnly.TryParseExact(x.StartTime, "HH:mm", out TimeOnly start))
+                        throw new InvalidDataException();
+                    if (!TimeOnly.TryParseExact(x.EndTime, "HH:mm", out TimeOnly end))
+                        throw new InvalidDataException();
 
-                return new CustomizeWorkshopGroupSettingsShift(start, end, x.Placement);
+                    return new CustomizeWorkshopGroupSettingsShift(start, end, x.Placement);
+
+                }).ToList();
 
-            }).ToList();
-            ;
             if (groupSettingsShifts.All(x => workshopSettings.CustomizeWorkshopSettingsShifts.Any(y => x.Equals(y)))
                 && command.WorkshopShiftStatus == workshopSettings.WorkshopShiftStatus && command.FridayWork == workshopSettings.FridayWork &&
                 command.HolidayWork == workshopSettings.HolidayWork &&
@@ -773,10 +802,38 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 
         var breakTime = new BreakTime(command.BreakTime.HasBreakTimeValue, command.BreakTime.BreakTimeValue);
 
-        entity.EditSimpleAndOverwriteOnEmployee(command.Name, employeeIds, groupSettingsShifts, command.WorkshopShiftStatus,
+        var employeeSettings = entity.CustomizeWorkshopEmployeeSettingsCollection;
+
+        var employeeSettingIds = employeeSettings.Select(x => x.EmployeeId).ToList();
+
+        reCalculateCommand = reCalculateCommand.Where(x => employeeSettingIds.Contains(x.EmployeeId)).ToList();
+
+        var selectedEmployeesIds = reCalculateCommand.Select(x => x.EmployeeId).ToList();
+
+        var notSelectedEmployeeSettings = employeeSettings.Where(x => !selectedEmployeesIds.Contains(x.EmployeeId));
+
+        using var transaction = new TransactionScope();
+
+        entity.EditSimpleAndOverwriteOnEmployee(command.Name, selectedEmployeesIds, groupSettingsShifts, command.WorkshopShiftStatus,
             command.IrregularShift, breakTime, isChanged, command.FridayWork, command.HolidayWork, rotatingShift);
+        if (reCalculateCommand.Count > 0)
+        {
+            var result = _rollCallApplication.RecalculateValues(workshopSettings.WorkshopId, reCalculateCommand);
+
+            if (result.IsSuccedded == false)
+            {
+                return result;
+            }
+        }
+
+        foreach (var notSelectedEmployeeSetting in notSelectedEmployeeSettings)
+        {
+            notSelectedEmployeeSetting.UpdateIsShiftChange();
+        }
 
         _customizeWorkshopGroupSettingsRepository.SaveChanges();
+
+        transaction.Complete();
         return op.Succcedded();
     }
     public OperationResult EditSimpleRollCallEmployeeSetting(EditCustomizeEmployeeSettings command,
@@ -1539,6 +1596,41 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
         return _customizeWorkshopGroupSettingsRepository.GetEmployeesGroupSettingsByEmployeeId(employeeId, workshopId);
     }
 
+    public OperationResult<List<long>> ValidateReCalculateValueForGroupEdit(List<ReCalculateRollCallValues> commands,
+        long workshopId)
+    {
+        var operationResult = new OperationResult<List<long>>();
+        bool isSuccess = true;
+        List<long> employeeIdsHasCheckout = [];
+        foreach (var command in commands)
+        {
+            var fromDateGr = command.FromDate.ToGeorgianDateTime();
+            if (_checkoutRepository.Exists(x => x.WorkshopId == workshopId && x.EmployeeId == command.EmployeeId && fromDateGr <= x.ContractEnd))
+            {
+                isSuccess = false;
+                employeeIdsHasCheckout.Add(command.EmployeeId);
+            }
+
+            if (_customizeCheckoutRepository.Exists(x => x.WorkshopId == workshopId && x.EmployeeId == command.EmployeeId && fromDateGr <= x.ContractEnd))
+            {
+                isSuccess = false;
+                employeeIdsHasCheckout.Add(command.EmployeeId);
+            }
+
+            if (_customizeCheckoutTempRepository.Exists(x => x.WorkshopId == workshopId && x.EmployeeId == command.EmployeeId && fromDateGr <= x.ContractEnd))
+            {
+                isSuccess = false;
+                employeeIdsHasCheckout.Add(command.EmployeeId);
+            }
+        }
+
+        employeeIdsHasCheckout = employeeIdsHasCheckout.Distinct().ToList();
+        return isSuccess ?
+            operationResult.Succcedded(employeeIdsHasCheckout) 
+            :
+            operationResult.Failed("پرسنل هایی دارای فیش هستند لطفا نسبت به تعیین تکلیف این ها اقدام نمایید", employeeIdsHasCheckout);
+    }
+
     public bool HasAnyEmployeeWithoutGroup(long workshopId)
     {
         return _customizeWorkshopGroupSettingsRepository.HasAnyEmployeeWithoutGroup(workshopId);

CompanyManagment.Application/EmployeeAplication.cs

@@ -1,35 +1,38 @@
-using System;
-using System.IO;
-using System.Collections.Generic;
+using _0_Framework.Application;
 using _0_Framework.InfraStructure;
 using Company.Domain.EmployeeAgg;
-using CompanyManagment.App.Contracts.Employee;
-using CompanyManagment.EFCore;
-using _0_Framework.Application;
-using CompanyManagment.App.Contracts.EmployeeInsuranceRecord;
-using Company.Domain.EmployeeInsuranceRecordAgg;
+using Company.Domain.LeftWorkAgg;
 using Company.Domain.WorkshopAgg;
+using CompanyManagment.App.Contracts.Employee;
+using CompanyManagment.App.Contracts.EmployeeInsuranceRecord;
+using CompanyManagment.EFCore;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Transactions;
+using Company.Domain.EmployeeClientTempAgg;
 using Company.Domain.PersonnelCodeAgg;
+using EmployeeInsuranceRecord = Company.Domain.EmployeeInsuranceRecordAgg.EmployeeInsuranceRecord;
+using Microsoft.AspNetCore.Hosting;
+using System.IO;
+using _0_Framework.Application.UID;
+using Company.Domain.CustomizeWorkshopEmployeeSettingsAgg;
+using Company.Domain.CustomizeWorkshopGroupSettingsAgg;
+using Company.Domain.EmployeeDocumentsAgg;
+using Company.Domain.LeftWorkTempAgg;
+using Company.Domain.RollCallEmployeeAgg;
 using CompanyManagment.App.Contracts.CustomizeWorkshopSettings;
 using CompanyManagment.App.Contracts.EmployeeBankInformation;
 using CompanyManagment.App.Contracts.EmployeeDocuments;
 using CompanyManagment.App.Contracts.RollCallEmployeeStatus;
-using Microsoft.AspNetCore.Hosting;
-using System.IO;
-using System.Transactions;
-using Company.Domain.EmployeeClientTempAgg;
-using Company.Domain.LeftWorkTempAgg;
-using CompanyManagment.App.Contracts.LeftWorkTemp;
-using _0_Framework.Application.UID;
-using Company.Domain.CustomizeWorkshopEmployeeSettingsAgg;
-using Company.Domain.EmployeeDocumentsAgg;
-using Company.Domain.RollCallEmployeeAgg;
-using Company.Domain.CustomizeWorkshopGroupSettingsAgg;
-using Company.Domain.LeftWorkAgg;
+using RollCallEmployee = Company.Domain.RollCallEmployeeAgg.RollCallEmployee;
 using CompanyManagment.App.Contracts.Employee.DTO;
+using CompanyManagment.App.Contracts.LeftWorkTemp;
+using System.Reflection;
 using Company.Domain.EmployeeAuthorizeTempAgg;
+using Company.Domain.RollCallServiceAgg;
+using Microsoft.Extensions.Configuration;
 
 namespace CompanyManagment.Application;
 
@@ -37,6 +40,9 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 {
     private readonly IEmployeeRepository _EmployeeRepository;
     private readonly IWorkshopRepository _WorkShopRepository;
+    private readonly ILeftWorkRepository _leftWorkRepository;
+    private readonly IPersonnelCodeRepository _personnelCodeRepository;
+    private readonly IEmployeeClientTempRepository _employeeClientTempRepository;
     private readonly CompanyContext _context;
     public bool nationalCodValid = false;
     public bool idnumberIsOk = true;
@@ -54,16 +60,25 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
     private readonly ILeftWorkTempRepository _leftWorkTempRepository;
     private readonly IUidService _uidService;
     private readonly ICustomizeWorkshopEmployeeSettingsRepository _customizeWorkshopEmployeeSettingsRepository;
-    private readonly ILeftWorkRepository _leftWorkRepository;
-    private readonly IPersonnelCodeRepository _personnelCodeRepository;
-    private readonly IEmployeeClientTempRepository _employeeClientTempRepository;
-    private readonly ICustomizeWorkshopGroupSettingsRepository _customizeWorkshopGroupSettingsRepository;
     private readonly IEmployeeAuthorizeTempRepository _employeeAuthorizeTempRepository;
+    private readonly IRollCallServiceRepository _rollCallServiceRepository;
 
-    public EmployeeAplication(IEmployeeRepository employeeRepository, CompanyContext context, IWorkshopRepository workShopRepository, IWebHostEnvironment webHostEnvironment, IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication, IRollCallEmployeeRepository rollCallEmployeeRepository, ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication, IEmployeeDocumentsApplication employeeDocumentsApplication, IEmployeeDocumentsRepository employeeDocumentsRepository, IEmployeeBankInformationApplication employeeBankInformationApplication, ILeftWorkTempRepository leftWorkTempRepository, IUidService uidService, ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository, IPersonnelCodeRepository personnelCodeRepository, IEmployeeClientTempRepository employeeClientTempRepository, ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository, ILeftWorkRepository leftWorkRepository, IEmployeeAuthorizeTempRepository employeeAuthorizeTempRepository) : base(context)
+    public EmployeeAplication(IEmployeeRepository employeeRepository, CompanyContext context, IWorkshopRepository workShopRepository,
+        ILeftWorkRepository leftWorkRepository, IPersonnelCodeRepository personnelCodeRepository,
+        IEmployeeClientTempRepository employeeClientTempRepository, IWebHostEnvironment webHostEnvironment,
+        IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication, IRollCallEmployeeRepository rollCallEmployeeRepository,
+        ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository,
+        ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication, IEmployeeDocumentsApplication employeeDocumentsApplication,
+        IEmployeeBankInformationApplication employeeBankInformationApplication, ILeftWorkTempRepository leftWorkTempRepository,
+        IUidService uidService, ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository,
+        IEmployeeAuthorizeTempRepository employeeAuthorizeTempRepository, IRollCallServiceRepository rollCallServiceRepository) : base(context)
     {
         _context = context;
         _WorkShopRepository = workShopRepository;
+        _EmployeeRepository = employeeRepository;
+        this._leftWorkRepository = leftWorkRepository;
+        _personnelCodeRepository = personnelCodeRepository;
+        _employeeClientTempRepository = employeeClientTempRepository;
         _webHostEnvironment = webHostEnvironment;
         _rollCallEmployeeStatusApplication = rollCallEmployeeStatusApplication;
         _rollCallEmployeeRepository = rollCallEmployeeRepository;
@@ -73,18 +88,15 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         _leftWorkTempRepository = leftWorkTempRepository;
         _uidService = uidService;
         _customizeWorkshopEmployeeSettingsRepository = customizeWorkshopEmployeeSettingsRepository;
-        _personnelCodeRepository = personnelCodeRepository;
-        _employeeClientTempRepository = employeeClientTempRepository;
-        _leftWorkRepository = leftWorkRepository;
         _employeeAuthorizeTempRepository = employeeAuthorizeTempRepository;
-        _EmployeeRepository = employeeRepository;
+        _rollCallServiceRepository = rollCallServiceRepository;
     }
 
     public OperationResult Create(CreateEmployee command)
     {
         var opration = new OperationResult();
         if (_EmployeeRepository.Exists(x =>
-                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.NationalCode != null && x.IsActiveString == "true"))
+                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.NationalCode != null))
             return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
 
         //if (_EmployeeRepository.Exists(x => x.IdNumber == command.IdNumber && x.IdNumber !=null))
@@ -102,7 +114,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         //}
 
-       
+
 
         if (command.Address != null && command.State == null)
         {
@@ -141,8 +153,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 {
                     case "0000000000":
                     case "1111111111":
-                    case "22222222222":
-                    case "33333333333":
+                    case "2222222222":
+                    case "3333333333":
                     case "4444444444":
                     case "5555555555":
                     case "6666666666":
@@ -194,9 +206,9 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 return opration.Failed("کد ملی وارد شده تکراری است");
             }
         }
-                
 
-           
+
+
         string initial = "1300/10/11";
         var dateOfBirth = command.DateOfBirth != null ? command.DateOfBirth.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
         var dateOfIssue = command.DateOfIssue != null ? command.DateOfIssue.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
@@ -221,9 +233,10 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         return opration.Succcedded(employeeData.id);
 
-          
+
     }
 
+
     public OperationResult Edit(EditEmployee command)
     {
         var opration = new OperationResult();
@@ -232,11 +245,11 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             return opration.Failed("رکورد مورد نظر یافت نشد");
 
         if (_EmployeeRepository.Exists(x =>
-                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.id != command.Id && x.IsActiveString == "true"))
+                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.id != command.Id))
             return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
         //if (_EmployeeRepository.Exists(x => x.IdNumber == command.IdNumber && x.IdNumber != null && x.id != command.Id))
         //    return opration.Failed("شماره شناسنامه وارد شده تکراری است");
-           
+
         if (command.Address != null && command.State == null)
         {
             StatCity = false;
@@ -274,8 +287,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 {
                     case "0000000000":
                     case "1111111111":
-                    case "22222222222":
-                    case "33333333333":
+                    case "2222222222":
+                    case "3333333333":
                     case "4444444444":
                     case "5555555555":
                     case "6666666666":
@@ -328,7 +341,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             }
         }
 
-            
+
         string initial = "1300/10/11";
         var dateOfBirth = command.DateOfBirth != null ? command.DateOfBirth.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
         var dateOfIssue = command.DateOfIssue != null ? command.DateOfIssue.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
@@ -336,7 +349,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             dateOfIssue,
             command.PlaceOfIssue, command.NationalCode, command.IdNumber, command.Gender, command.Nationality,
             command.Phone, command.Address,
-            command.State,command.City, command.MaritalStatus, command.MilitaryService, command.LevelOfEducation,
+            command.State, command.City, command.MaritalStatus, command.MilitaryService, command.LevelOfEducation,
             command.FieldOfStudy, command.BankCardNumber,
             command.BankBranch, command.InsuranceCode, command.InsuranceHistoryByYear,
             command.InsuranceHistoryByMonth, command.NumberOfChildren, command.OfficePhone
@@ -349,7 +362,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         return opration.Succcedded();
 
-         
+
     }
 
     public EditEmployee GetDetails(long id)
@@ -357,6 +370,11 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         return _EmployeeRepository.GetDetails(id);
     }
 
+    public EditEmployee GetDetailsIgnoreQueryFilter(long id)
+    {
+        return _EmployeeRepository.GetDetails(id);
+    }
+
     public OperationResult Active(long id)
     {
         var opration = new OperationResult();
@@ -395,8 +413,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
     public async Task<List<EmployeeViewModel>> Search(EmployeeSearchModel searchModel)
     {
-        var res=await _EmployeeRepository.Search(searchModel);
-     
+        var res = await _EmployeeRepository.Search(searchModel);
+
         foreach (var item in res)
         {
             var children = _context.EmployeeChildrenSet.Count(x => x.EmployeeId == item.Id);
@@ -687,8 +705,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 {
                     case "0000000000":
                     case "1111111111":
-                    case "22222222222":
-                    case "33333333333":
+                    case "2222222222":
+                    case "3333333333":
                     case "4444444444":
                     case "5555555555":
                     case "6666666666":
@@ -817,8 +835,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 {
                     case "0000000000":
                     case "1111111111":
-                    case "22222222222":
-                    case "33333333333":
+                    case "2222222222":
+                    case "3333333333":
                     case "4444444444":
                     case "5555555555":
                     case "6666666666":
@@ -898,11 +916,17 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         return res;
     }
+
     #endregion
 
-
     #region Pooya
 
+
+    public List<EmployeeViewModel> GetWorkingEmployeesByWorkshopId(long workshopId)
+    {
+        return _EmployeeRepository.GetWorkingEmployeesByWorkshopId(workshopId);
+    }
+
     public EmployeeViewModel GetEmployeeByNationalCodeIfHasActiveLeftWork(string nationalCode, List<long> workshopIds)
     {
         if (nationalCode.NationalCodeValid() != "valid")
@@ -910,7 +934,6 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         var workshopEmployeesWithLeftWork = _EmployeeRepository.GetWorkingEmployeesByWorkshopIdsAndNationalCodeAndDate(workshopIds, nationalCode, DateTime.Now.Date);
         return workshopEmployeesWithLeftWork.FirstOrDefault();
     }
-
     public EmployeeViewModel GetEmployeeByNationalCodeIfHasLeftWork(string nationalCode, List<long> workshopIds)
     {
         if (nationalCode.NationalCodeValid() != "valid")
@@ -918,11 +941,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         var workshopEmployeesWithLeftWork = _EmployeeRepository.GetWorkedEmployeesByWorkshopIdsAndNationalCodeAndDate(workshopIds, nationalCode, DateTime.Now.Date);
         return workshopEmployeesWithLeftWork.FirstOrDefault();
     }
-    public List<EmployeeViewModel> GetWorkingEmployeesByWorkshopId(long workshopId)
-    {
-        return _EmployeeRepository.GetWorkingEmployeesByWorkshopId(workshopId);
 
-    }
+
 
     public List<EmployeeViewModel> GetRangeByIds(IEnumerable<long> employeeIds)
     {
@@ -958,6 +978,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         }).ToList();
     }
 
+
     #endregion
 
     #region Mahan
@@ -1041,6 +1062,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             _personnelCodeRepository.SaveChanges();
         }
 
+        var rollCallService = _rollCallServiceRepository.GetActiveServiceByWorkshopId(command.WorkshopId);
 
         if (string.IsNullOrWhiteSpace(command.RollCallUploadEmployeePicture?.Picture1) == false &&
             string.IsNullOrWhiteSpace(command.RollCallUploadEmployeePicture?.Picture2) == false)
@@ -1050,14 +1072,14 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 Directory.CreateDirectory(directoryPath);
 
             var filePath1 = Path.Combine(directoryPath) + $@"\1.jpg";
-         
-                CreateImageFromBase64(command.RollCallUploadEmployeePicture.Picture1, filePath1);
-            
+
+            CreateImageFromBase64(command.RollCallUploadEmployeePicture.Picture1, filePath1);
+
 
             var filePath2 = Path.Combine(directoryPath) + $@"\2.jpg";
-            
-                CreateImageFromBase64(command.RollCallUploadEmployeePicture.Picture2, filePath2);
-            
+
+            CreateImageFromBase64(command.RollCallUploadEmployeePicture.Picture2, filePath2);
+
 
 
             var rollCallEmployee =
@@ -1090,6 +1112,16 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
             if (command.CreateCustomizeEmployeeSettings.GroupId > 0)
             {
+                if (rollCallService?.HasCustomizeCheckoutService == "true")
+                {
+                    var employeeSalary = command.CreateCustomizeEmployeeSettings.Salary?.MoneyToDouble() ?? 0;
+
+                    if (employeeSalary < 1)
+                    {
+                        return op.Failed("لطفا حقوق پرسنل را وارد کنید");
+                    }
+
+                }
                 if (_customizeWorkshopEmployeeSettingsRepository
                     .Exists(x => x.WorkshopId == workshop.Id && x.EmployeeId == employee.id))
                 {
@@ -1117,6 +1149,16 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         }
         else if (command.CreateCustomizeEmployeeSettings.GroupId > 0)
         {
+            if (rollCallService?.HasCustomizeCheckoutService == "true")
+            {
+                var employeeSalary = command.CreateCustomizeEmployeeSettings.Salary?.MoneyToDouble() ?? 0;
+
+                if (employeeSalary < 1)
+                {
+                    return op.Failed("لطفا حقوق پرسنل را وارد کنید");
+                }
+
+            }
             if (_customizeWorkshopEmployeeSettingsRepository
                 .Exists(x => x.WorkshopId == workshop.Id && x.EmployeeId == employee.id))
             {
@@ -1210,6 +1252,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         byte[] bytes = Convert.FromBase64String(subBase64);
         System.IO.File.WriteAllBytes(filePath, bytes);
     }
+
     public async Task<OperationResult<EmployeeByNationalCodeInWorkshopViewModel>>
         ValidateCreateEmployeeClientByNationalCodeAndWorkshopId(string nationalCode, string birthDate, long workshopId)
     {
@@ -1499,9 +1542,9 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         {
             employee.EditAuthorizeEmployee(employee.DateOfIssue, employee.PlaceOfIssue,
                 employee.Phone, employee.Address, employee.State, employee.City, command.MaritalStatus,
-                command.MilitaryService, employee.LevelOfEducation, employee.FieldOfStudy, 
+                command.MilitaryService, employee.LevelOfEducation, employee.FieldOfStudy,
                 employee.BankCardNumber, employee.BankBranch, employee.InsuranceCode,
-                employee.InsuranceHistoryByYear, employee.InsuranceHistoryByMonth, employee.NumberOfChildren, 
+                employee.InsuranceHistoryByYear, employee.InsuranceHistoryByMonth, employee.NumberOfChildren,
                 employee.OfficePhone, employee.MclsUserName, employee.MclsPassword,
                 employee.EserviceUserName, employee.EservicePassword, employee.TaxOfficeUserName,
                 employee.TaxOfficepassword, employee.SanaUserName, employee.SanaPassword);
@@ -1615,6 +1658,5 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
     }
 
-
     #endregion
 }

CompanyManagment.Application/EmployeeInsurancListDataApplication.cs

@@ -28,7 +28,7 @@ public class EmployeeInsurancListDataApplication : IEmployeeInsurancListDataAppl
 
         var employeeInsurancListData = new EmployeeInsurancListData(command.InsuranceListId, command.EmployeeId, command.WorkingDays, command.DailyWage, command.MonthlySalary, command.MonthlyBenefits,
             command.MonthlyBenefitsIncluded, command.BenefitsIncludedContinuous, command.BenefitsIncludedNonContinuous, command.InsuranceShare,
-            command.StartWorkDate,command.LeftWorkDate,command.JobId,command.IncludeStatus, command.BaseYears,command.MarriedAllowance);
+            command.StartWorkDate,command.LeftWorkDate,command.JobId,command.IncludeStatus, command.BaseYears,command.MarriedAllowance,command.OverTimePay,command.FamilyAllowance);
         _employeeInsurancListDataRepository.Create(employeeInsurancListData);
         _employeeInsurancListDataRepository.SaveChanges();
         return operation.Succcedded();

CompanyManagment.Application/EmployerApplication.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using _0_Framework.Application;
 using Company.Domain.empolyerAgg;
 using Company.Domain.WorkshopAgg;
@@ -892,6 +893,11 @@ public class EmployerApplication : IEmployerApplication
     {
         return _EmployerRepository.GetEmployersHasWorkshop();
     }
+
+    public async Task<List<EmployerSelectListViewModel>> GetSelectList(string search)
+    {
+        return await _EmployerRepository.GetSelectList(search);
+    }
     #endregion
 
     #region NewByHeydari