build tailwind

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;
+    }
 }

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

@@ -22,7 +22,7 @@ public interface ICheckoutRepository : IRepository<long, Checkout>
         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/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/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/IRollCallMandatoryRepository.cs

@@ -6,7 +6,9 @@ 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;
@@ -24,6 +26,12 @@ public interface IRollCallMandatoryRepository : IRepository<long, RollCall>
     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>

Company.Domain/SalaryAidAgg/SalaryAid.cs

@@ -23,7 +23,6 @@ public class SalaryAid : EntityBase
         CalculationMonth = calculationMonth;
         CalculationYear = calculationYear;
     }
-
     public long EmployeeId { get; private set; }
     public long WorkshopId { get; private set; }
     public double Amount { 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/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

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/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;

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/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/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/RollCall/RollCallViewModel.cs

@@ -65,4 +65,6 @@ public class RollCallViewModel
     /// مدت زمان استراحت
     /// </summary>
     public TimeSpan BreakTimeSpan { get; set; }
+
+    public DateTime? ShiftEndWithoutRest { get; set; }
 }

CompanyManagment.App.Contracts/SalaryAid/CreateSalaryAidViewModel.cs

@@ -8,6 +8,7 @@ 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/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/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, command.ShiftWork);
-       //دستمزد ماهانه
+            _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/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
 
@@ -362,10 +373,10 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
         }
 
         if (customizeWorkshopGroupSettings.MainGroup)
-        {
-            var createDefaultEmployee = CreateEmployeeSettings(command);
-            return createDefaultEmployee;
-        }
+		{
+			var createDefaultEmployee = CreateEmployeeSettings(command);
+			return createDefaultEmployee;
+		}
 
 
         List<CustomizeWorkshopEmployeeSettingsShift> shiftCollection = new List<CustomizeWorkshopEmployeeSettingsShift>();
@@ -547,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();
@@ -670,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();
 
@@ -689,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;
@@ -699,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 &&
@@ -782,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,
@@ -1548,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/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

CompanyManagment.Application/InsuranceJobApplication.cs

@@ -19,6 +19,21 @@ public class InsuranceJobApplication: IInsuranceJobApplication
         _insuranceJobItemRepositpry = insuranceJobItemRepositpry;
     }
 
+    public List<(long id, string date)> GetOldYersInsuranceItemIds()
+    {
+        return _insuranceJobRepositpry.GetOldYersInsuranceItemIds();
+    }
+
+    public OperationResult CopyFromLastYear(CopyFromLastYearViewModel command)
+    {
+        return _insuranceJobRepositpry.CopyFromLastYear(command);
+    }
+
+    public OperationResult RecoveryOldData1403()
+    {
+        return _insuranceJobRepositpry.RecoveryOldData1403();
+    }
+
     public OperationResult Create(CreateInsuranceJob command)
     {
         var opration = new OperationResult();
@@ -32,6 +47,10 @@ public class InsuranceJobApplication: IInsuranceJobApplication
         if (_insuranceJobRepositpry.Exists(x => x.InsuranceJobTitle == command.InsuranceJobTitle))
             return opration.Failed("عنوان صنف و درجه تکراری است");
 
+   
+        if (command.InsuranceJobItemId == 0)
+            return opration.Failed("بازه را انتخاب کنید");
+
         //if (_insuranceJobRepositpry.Exists(x => x.EconomicCode == command.EconomicCode))
         //    return opration.Failed("کد اقتصادی تکراری است");
 
@@ -116,9 +135,9 @@ public class InsuranceJobApplication: IInsuranceJobApplication
             return opration.Failed("ویرایش با خطا مواجه شد.");
         }
     }
-    public EditInsuranceJob GetDetails(long id)
+    public EditInsuranceJob GetDetails(long id, string year, string month)
     {
-        return _insuranceJobRepositpry.GetDetails(id);
+        return _insuranceJobRepositpry.GetDetails(id, year,month);
     }
 
     public List<InsuranceJobViewModel> GetInsurancJob()

CompanyManagment.Application/InsuranceListApplication.cs

@@ -292,12 +292,12 @@ public class InsuranceListApplication: IInsuranceListApplication
         var consumableItems = new YearlysalaryItemViewModel();
         if (yearSalaryObj != null)
         {
-            yearlysalaryItem = _yearlySalaryItemApplication.GetItemsByYearlySalaryId(yearSalaryObj.Id)
-                .Where(x => x.ItemName == "مزد روزانه").FirstOrDefault();
-            housingAllowance = _yearlySalaryItemApplication.GetItemsByYearlySalaryId(yearSalaryObj.Id)
-                .Where(x => x.ItemName == "کمک هزینه مسکن").FirstOrDefault();
-            consumableItems = _yearlySalaryItemApplication.GetItemsByYearlySalaryId(yearSalaryObj.Id)
-                .Where(x => x.ItemName == "کمک هزینه اقلام").FirstOrDefault();
+            yearlysalaryItem = _yearlySalaryItemApplication
+                .GetItemsByYearlySalaryId(yearSalaryObj.Id).FirstOrDefault(x => x.ItemName == "مزد روزانه");
+            housingAllowance = _yearlySalaryItemApplication
+                .GetItemsByYearlySalaryId(yearSalaryObj.Id).FirstOrDefault(x => x.ItemName == "کمک هزینه مسکن");
+            consumableItems = _yearlySalaryItemApplication
+                .GetItemsByYearlySalaryId(yearSalaryObj.Id).FirstOrDefault(x => x.ItemName == "کمک هزینه اقلام");
         }
 
         foreach (var item in insuranceListDetails.EmployeeDetailsForInsuranceList)
@@ -341,6 +341,10 @@ public class InsuranceListApplication: IInsuranceListApplication
         insuranceListDetails.AllInsuredShare = insuranceListDetails.InsuredShare +
                                                insuranceListDetails.EmployerShare +
                                                insuranceListDetails.UnEmploymentInsurance;
+
+        insuranceListDetails.LeftWorkEmployees =
+            _leftWorkInsuranceRepository.GetEmployeesWithContractExitOnly(insuranceListDetails.WorkshopId);
+
         return insuranceListDetails;
     }
 
@@ -1676,6 +1680,7 @@ public class InsuranceListApplication: IInsuranceListApplication
     {
        
         double? result = 0;
+        string month = $"{startDateGr.ToFarsi()}".Substring(5, 2);
         //اگر مشاغل مقطوع بود و شغلش کارفرما بود 
         // در جدول لیست بیمه قبلی چک شود
         try
@@ -1722,7 +1727,7 @@ public class InsuranceListApplication: IInsuranceListApplication
 
                 {
                     var inJob = _insuranceJobItemRepository
-                        .GetInsuranceJobItemByInsuranceJobId((long)workshop.InsuranceJobId);
+                        .GetInsuranceJobItemByInsuranceJobId((long)workshop.InsuranceJobId,year, month);
                     if (workshop.Population == "MoreThan500")
                     {
                         var max = inJob.MaxBy(x => x.PercentageMoreThan);
@@ -1771,9 +1776,9 @@ public class InsuranceListApplication: IInsuranceListApplication
             else
             {
 
-                var searchModel = new InsuranceJobItemSearchModel();
-                searchModel.InsuranceJobId = (long)insuranceJobId;
-                var JobItem = _insuranceJobItemRepository.GetInsuranceJobItemByInsuranceJobIdForFixedSalary((long)insuranceJobId, jobId);
+            var searchModel = new InsuranceJobItemSearchModel();
+            searchModel.InsuranceJobId = (long)insuranceJobId;
+            var JobItem = _insuranceJobItemRepository.GetInsuranceJobItemByInsuranceJobIdForFixedSalary((long)insuranceJobId, jobId, year, month);
 
                 if (JobItem != null && JobItem.Id != 0)
                 {

CompanyManagment.Application/LeftWorkApplication.cs

@@ -211,6 +211,14 @@ public class LeftWorkApplication : ILeftWorkApplication
         return _leftWorkRepository.search(searchModel);
     }
 
+    public List<LeftWorkViewModel> SearchCreateContract(LeftWorkSearchModel searchModel)
+    {
+
+        return _leftWorkRepository.SearchCreateContract(searchModel);
+    }
+
+ 
+
     public async Task<List<LeftWorkViewModel>> searchAsync(LeftWorkSearchModel searchModel)
     {
         var res = search(searchModel);

CompanyManagment.Application/LoanApplication.cs

@@ -1,21 +1,15 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
-using System.Reflection.Metadata.Ecma335;
 using System.Threading.Tasks;
 using System.Transactions;
 using _0_Framework.Application;
-using Company.Domain.CheckoutAgg;
 using Company.Domain.CustomizeCheckoutAgg;
 using Company.Domain.CustomizeCheckoutTempAgg;
 using Company.Domain.LoanAgg;
 using Company.Domain.LoanAgg.Entities;
 using CompanyManagment.App.Contracts.CustomizeCheckout;
 using CompanyManagment.App.Contracts.Loan;
-using Hangfire.States;
-using Microsoft.AspNetCore.Mvc.Infrastructure;
-using Microsoft.Extensions.Configuration.UserSecrets;
 
 namespace CompanyManagment.Application;
 
@@ -27,14 +21,16 @@ public class LoanApplication : ILoanApplication
     private readonly ICustomizeCheckoutTempRepository _customizeCheckoutTempRepository;
     private readonly ICustomizeCheckoutApplication _customizeCheckoutApplication;
     private readonly ICustomizeCheckoutTempApplication _customizeCheckoutTempApplication;
+    private readonly ICustomizeCheckoutRepository _checkoutRepository;
 
-    public LoanApplication(ILoanRepository loanRepository, ICustomizeCheckoutRepository customizeCheckoutRepository, ICustomizeCheckoutTempRepository customizeCheckoutTempRepository, IAuthHelper authHelper, ICustomizeCheckoutApplication customizeCheckoutApplication, ICustomizeCheckoutTempApplication customizeCheckoutTempApplication)
+    public LoanApplication(ILoanRepository loanRepository, ICustomizeCheckoutRepository customizeCheckoutRepository, ICustomizeCheckoutTempRepository customizeCheckoutTempRepository, IAuthHelper authHelper, ICustomizeCheckoutApplication customizeCheckoutApplication, ICustomizeCheckoutTempApplication customizeCheckoutTempApplication, ICustomizeCheckoutRepository checkoutRepository)
     {
         _loanRepository = loanRepository;
         _customizeCheckoutRepository = customizeCheckoutRepository;
         _authHelper = authHelper;
         _customizeCheckoutApplication = customizeCheckoutApplication;
         _customizeCheckoutTempApplication = customizeCheckoutTempApplication;
+        _checkoutRepository = checkoutRepository;
         _customizeCheckoutTempRepository = customizeCheckoutTempRepository;
     }
 
@@ -90,7 +86,7 @@ public class LoanApplication : ILoanApplication
         }
         #endregion
 
-        var (userId, userType,_) = _authHelper.GetUserTypeWithId();
+        var (userId, userType, _) = _authHelper.GetUserTypeWithId();
         using var transaction = new TransactionScope();
         foreach (var employeeId in command.EmployeeIds)
         {
@@ -307,6 +303,14 @@ public class LoanApplication : ILoanApplication
             return op.Failed("این پرسنل در این تاریخ دارای فیش حقوقی است");
         }
 
+
+        if (_checkoutRepository.Exists(x =>
+                entity.EmployeeId == x.EmployeeId && x.WorkshopId == entity.WorkshopId &&
+                (x.ContractStart >= entity.StartInstallmentPayment && x.ContractStart <= lastInstallment)))
+        {
+            return op.Failed("پرسنل در بازه اقساط خود دارای فیش رسمی است");
+        }
+
         if (_customizeCheckoutTempRepository.Exists(x =>
                 entity.EmployeeId == x.EmployeeId && x.WorkshopId == entity.WorkshopId &&
                 (x.ContractStart >= entity.StartInstallmentPayment && x.ContractStart <= lastInstallment)))
@@ -325,6 +329,33 @@ public class LoanApplication : ILoanApplication
     {
         OperationResult op = new OperationResult();
         var loans = _loanRepository.GetBy(ids);
+        foreach (var entity in loans)
+        {
+            var lastInstallment = entity.LoanInstallments.MaxBy(x => x.InstallmentDate).InstallmentDate;
+
+            if (_customizeCheckoutRepository.Exists(x =>
+            entity.EmployeeId == x.EmployeeId && x.WorkshopId == entity.WorkshopId &&
+                    (x.ContractStart >= entity.StartInstallmentPayment && x.ContractStart <= lastInstallment)))
+            {
+                return op.Failed("این پرسنل در این تاریخ دارای فیش حقوقی است");
+            }
+
+
+            if (_checkoutRepository.Exists(x =>
+            entity.EmployeeId == x.EmployeeId && x.WorkshopId == entity.WorkshopId &&
+                    (x.ContractStart >= entity.StartInstallmentPayment && x.ContractStart <= lastInstallment)))
+            {
+                return op.Failed("پرسنل در بازه اقساط خود دارای فیش رسمی است");
+            }
+
+            if (_customizeCheckoutTempRepository.Exists(x =>
+            entity.EmployeeId == x.EmployeeId && x.WorkshopId == entity.WorkshopId &&
+                    (x.ContractStart >= entity.StartInstallmentPayment && x.ContractStart <= lastInstallment)))
+            {
+                return op.Failed("پرسنل در بازه اقساط خود دارای فیش غیررسمی است");
+            }
+
+        }
 
         _loanRepository.RemoveRange(loans);
         _loanRepository.SaveChanges();

CompanyManagment.Application/SalaryAidApplication.cs

@@ -27,16 +27,18 @@ public class SalaryAidApplication : ISalaryAidApplication
     private readonly IAuthHelper _authHelper;
     private readonly ICustomizeCheckoutApplication _customizeCheckoutApplication;
     private readonly ICustomizeCheckoutTempApplication _customizeCheckoutTempApplication;
+    private readonly ICheckoutRepository _checkoutRepository;
 
 
     public SalaryAidApplication(ISalaryAidRepository salaryAidRepository, ICustomizeCheckoutRepository customizeCheckoutRepository,
-        IEmployeeRepository employeeRepository, ICustomizeCheckoutTempRepository customizeCheckoutTempRepository, IAuthHelper authHelper, ICustomizeCheckoutApplication customizeCheckoutApplication, ICustomizeCheckoutTempApplication customizeCheckoutTempApplication)
+        IEmployeeRepository employeeRepository, ICustomizeCheckoutTempRepository customizeCheckoutTempRepository, IAuthHelper authHelper, ICustomizeCheckoutApplication customizeCheckoutApplication, ICustomizeCheckoutTempApplication customizeCheckoutTempApplication, ICheckoutRepository checkoutRepository)
     {
         _salaryAidRepository = salaryAidRepository;
         _customizeCheckoutRepository = customizeCheckoutRepository;
         _authHelper = authHelper;
         _customizeCheckoutApplication = customizeCheckoutApplication;
         _customizeCheckoutTempApplication = customizeCheckoutTempApplication;
+        _checkoutRepository = checkoutRepository;
         _employeeRepository = employeeRepository;
         _customizeCheckoutTempRepository = customizeCheckoutTempRepository;
     }
@@ -95,18 +97,18 @@ public class SalaryAidApplication : ISalaryAidApplication
         }
 
         var existsCheckouts = _customizeCheckoutRepository.ValidateExistsCheckouts(calculationDateGr,
-	        calculationDateGr, command.WorkshopId, command.EmployeeIds);
+            calculationDateGr, command.WorkshopId, command.EmployeeIds);
 
-        //if (existsCheckouts.Checkout)
-        //    return op.Failed("شما نمیتوانید برای پرسنلی در تاریخی که برای فیش حقوقی رسمی صادر شده است مساعده ای دهید");
+        if (existsCheckouts.Checkout)
+            return op.Failed("شما نمیتوانید برای پرسنلی در تاریخی که برای فیش حقوقی رسمی صادر شده است مساعده ای دهید");
 
 
-        var (userId, userType,_) = _authHelper.GetUserTypeWithId();
+        var (userId, userType, _) = _authHelper.GetUserTypeWithId();
         using var transaction = new TransactionScope();
         foreach (var employeeId in command.EmployeeIds)
         {
 
-            var entity = new SalaryAid(employeeId, command.WorkshopId, command.Amount.MoneyToDouble(), startDate,userId,userType,command.CalculationMonth,command.CalculationYear);
+            var entity = new SalaryAid(employeeId, command.WorkshopId, command.Amount.MoneyToDouble(), startDate, userId, userType, command.CalculationMonth, command.CalculationYear);
             _salaryAidRepository.Create(entity);
             _salaryAidRepository.SaveChanges();
             if (existsCheckouts.CustomizeCheckout)
@@ -186,7 +188,7 @@ public class SalaryAidApplication : ISalaryAidApplication
             var prevCheckouts = _customizeCheckoutRepository.ValidateExistsCheckouts(calculationDateGr,
                 oneMonthAgoGr, entity.WorkshopId, [entity.EmployeeId]);
 
-            if (prevCheckouts.CustomizeCheckout  || prevCheckouts.CustomizeCheckoutTemp)
+            if (prevCheckouts.CustomizeCheckout || prevCheckouts.CustomizeCheckoutTemp)
             {
                 return op.Failed("شما نمیتوانید در تاریخ قبل از یک ماه گذشته که فیش صادر شده باشد مساعده ای دهید");
             }
@@ -194,16 +196,16 @@ public class SalaryAidApplication : ISalaryAidApplication
 
 
         var existsCheckouts = _customizeCheckoutRepository.ValidateExistsCheckouts(calculationDateGr,
-	        calculationDateGr, entity.WorkshopId, [entity.EmployeeId]);
+            calculationDateGr, entity.WorkshopId, [entity.EmployeeId]);
 
-        //if (existsCheckouts.Checkout)
-        //    return op.Failed("شما نمیتوانید برای پرسنلی در تاریخی که برای فیش حقوقی رسمی صادر شده است مساعده ای دهید");
+        if (existsCheckouts.Checkout)
+            return op.Failed("شما نمیتوانید برای پرسنلی در تاریخی که برای فیش حقوقی رسمی صادر شده است مساعده ای دهید");
 
 
         using var transaction = new TransactionScope();
-        var (userId, userType,_) = _authHelper.GetUserTypeWithId();
+        var (userId, userType, _) = _authHelper.GetUserTypeWithId();
 
-		entity.Edit(Tools.MoneyToDouble(command.Amount),startDate,userId,userType,command.CalculationMonth,command.CalculationYear);
+        entity.Edit(Tools.MoneyToDouble(command.Amount), startDate, userId, userType, command.CalculationMonth, command.CalculationYear);
         _salaryAidRepository.SaveChanges();
 
         if (existsCheckouts.CustomizeCheckout)
@@ -270,6 +272,12 @@ public class SalaryAidApplication : ISalaryAidApplication
             return op.Failed("این پرسنل در این تاریخ دارای فیش حقوقی موقت است");
         }
 
+        if (_checkoutRepository.Exists(x => x.WorkshopId == entity.WorkshopId && entity.EmployeeId == x.EmployeeId &&
+                                            x.ContractStart <= entity.CalculationDate && x.ContractEnd >= entity.CalculationDate))
+        {
+            return op.Failed("این پرسنل در این تاریخ دارای فیش حقوقی رسمی است");
+        }
+
         _salaryAidRepository.Remove(entity);
         _salaryAidRepository.SaveChanges();
         return op.Succcedded();
@@ -325,14 +333,18 @@ public class SalaryAidApplication : ISalaryAidApplication
             }
 
             var existsCheckouts = _customizeCheckoutRepository.ValidateExistsCheckouts(calculationDateGr,
-	            calculationDateGr, command.WorkshopId, command.EmployeeIds);
+                calculationDateGr, command.WorkshopId, command.EmployeeIds);
+
+
+            if (existsCheckouts.Checkout)
+                return op.Failed("شما نمیتوانید برای پرسنلی در تاریخی که برای فیش حقوقی رسمی صادر شده است مساعده ای دهید");
 
             var month = Convert.ToInt32(command.CalculationMonth);
             var year = Convert.ToInt32(command.CalculationYear);
 
 
 
-            var (userId, userType,_) = _authHelper.GetUserTypeWithId();
+            var (userId, userType, _) = _authHelper.GetUserTypeWithId();
 
             foreach (var employeeId in command.EmployeeIds)
             {
@@ -343,8 +355,8 @@ public class SalaryAidApplication : ISalaryAidApplication
                     id = employee.id;
                 }
 
-				var entity = new SalaryAid(id, command.WorkshopId, command.Amount.MoneyToDouble(), startDate, userId, userType, command.CalculationMonth, command.CalculationYear);
-				_salaryAidRepository.Create(entity);
+                var entity = new SalaryAid(id, command.WorkshopId, command.Amount.MoneyToDouble(), startDate, userId, userType, command.CalculationMonth, command.CalculationYear);
+                _salaryAidRepository.Create(entity);
                 _salaryAidRepository.SaveChanges();
 
                 if (existsCheckouts.CustomizeCheckout)

CompanyManagment.Application/WorkshopAppliction.cs

@@ -864,6 +864,11 @@ public class WorkshopAppliction : IWorkshopApplication
         return _workshopRepository.GetWorkshopsForLeftWorkTempCount(accountId);
     }
 
+    public async Task<List<WorkshopSelectListViewModel>> GetSelectList(string search)
+    {
+        return await _workshopRepository.GetSelectList(search);
+    }
+
     #endregion
 
 

CompanyManagment.EFCore/CompanyContext.cs

@@ -1,4 +1,5 @@
-using Company.Domain.AndroidApkVersionAgg;
+using Company.Domain.AdminMonthlyOverviewAgg;
+using Company.Domain.AndroidApkVersionAgg;
 using Company.Domain.BankAgg;
 using Company.Domain.BillAgg;
 using Company.Domain.Board;
@@ -179,6 +180,7 @@ public class CompanyContext : DbContext
 
 
     public DbSet<EmployeeAuthorizeTemp> EmployeeAuthorizeTemps { get; set; }
+    public DbSet<AdminMonthlyOverview> AdminMonthlyOverviews { get; set; }
     #endregion
 
     #region Pooya

CompanyManagment.EFCore/Mapping/AdminMonthlyOverviewMapping.cs

@@ -0,0 +1,14 @@
+using Company.Domain.AdminMonthlyOverviewAgg;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace CompanyManagment.EFCore.Mapping;
+
+public class AdminMonthlyOverviewMapping:IEntityTypeConfiguration<AdminMonthlyOverview>
+{
+    public void Configure(EntityTypeBuilder<AdminMonthlyOverview> builder)
+    {
+        builder.HasKey(x => x.id);
+        builder.Property(x => x.Status).HasConversion<string>().HasMaxLength(155);
+    }
+}

CompanyManagment.EFCore/Mapping/CheckoutMapping.cs

@@ -1,4 +1,6 @@
-using Company.Domain.CheckoutAgg;
+using System;
+using _0_Framework.Application;
+using Company.Domain.CheckoutAgg;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
@@ -52,5 +54,24 @@ class CheckoutMapping : IEntityTypeConfiguration<Checkout>
             .WithMany(x => x.Checkouts)
             .HasForeignKey(x => x.WorkshopId);
 
+        builder.OwnsMany(x => x.LoanInstallments, installments =>
+        {
+            installments.Property(x => x.AmountForMonth).HasMaxLength(25);
+            installments.Property(x => x.IsActive).HasConversion(
+                v => v.ToString(),
+                v => (IsActive)Enum.Parse(typeof(IsActive), v)).HasMaxLength(5);
+            installments.Property(x => x.Year).HasMaxLength(4);
+            installments.Property(x => x.Month).HasMaxLength(2);
+            installments.Property(x => x.LoanRemaining).HasMaxLength(25);
+            installments.Property(x => x.LoanAmount).HasMaxLength(30);
+
+        });
+
+        builder.OwnsMany(x => x.SalaryAids, salaryAid =>
+        {
+            salaryAid.Property(x => x.SalaryAidDateTimeFa).HasMaxLength(15);
+            salaryAid.Property(x => x.Amount).HasMaxLength(25);
+            salaryAid.Property(x => x.CalculationDateTimeFa).HasMaxLength(15);
+        });
     }
 }

CompanyManagment.EFCore/Mapping/InsuranceJobeItemMapping.cs

@@ -11,6 +11,9 @@ public class InsuranceJobeItemMapping : IEntityTypeConfiguration<InsuranceJobIte
         builder.ToTable("InsuranceJobItems");
         builder.HasKey(x => x.id);
 
+        builder.Property(x => x.StartDate).IsRequired(false);
+        builder.Property(x => x.EndDate).IsRequired(false);
+
         builder.HasOne(x => x.InsuranceJob)
             .WithMany(x => x.InsuranceJobItemList)
             .HasForeignKey(x => x.InsuranceJobId);

CompanyManagment.EFCore/Migrations/20250423104557_add calculationDate to salaryAid.cs

@@ -0,0 +1,23 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class addcalculationDatetosalaryAid : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+           
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+          
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/20250423111927_add calculationDate to customize checkout salaryAid.cs

@@ -0,0 +1,23 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class addcalculationDatetocustomizecheckoutsalaryAid : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+           
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+           
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/20250423132557_add salaryAid and loan to checkout.cs

@@ -0,0 +1,74 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class addsalaryAidandloantocheckout : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "CheckoutLoanInstallment",
+                columns: table => new
+                {
+                    Checkoutid = table.Column<long>(type: "bigint", nullable: false),
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    AmountForMonth = table.Column<string>(type: "nvarchar(25)", maxLength: 25, nullable: true),
+                    Month = table.Column<string>(type: "nvarchar(2)", maxLength: 2, nullable: true),
+                    Year = table.Column<string>(type: "nvarchar(4)", maxLength: 4, nullable: true),
+                    LoanRemaining = table.Column<string>(type: "nvarchar(25)", maxLength: 25, nullable: true),
+                    IsActive = table.Column<string>(type: "nvarchar(5)", maxLength: 5, nullable: false),
+                    LoanAmount = table.Column<string>(type: "nvarchar(30)", maxLength: 30, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CheckoutLoanInstallment", x => new { x.Checkoutid, x.Id });
+                    table.ForeignKey(
+                        name: "FK_CheckoutLoanInstallment_Checkouts_Checkoutid",
+                        column: x => x.Checkoutid,
+                        principalTable: "Checkouts",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "CheckoutSalaryAid",
+                columns: table => new
+                {
+                    Checkoutid = table.Column<long>(type: "bigint", nullable: false),
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    Amount = table.Column<string>(type: "nvarchar(25)", maxLength: 25, nullable: true),
+                    SalaryAidDateTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    SalaryAidDateTimeFa = table.Column<string>(type: "nvarchar(15)", maxLength: 15, nullable: true),
+                    CalculationDateTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CalculationDateTimeFa = table.Column<string>(type: "nvarchar(15)", maxLength: 15, nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CheckoutSalaryAid", x => new { x.Checkoutid, x.Id });
+                    table.ForeignKey(
+                        name: "FK_CheckoutSalaryAid_Checkouts_Checkoutid",
+                        column: x => x.Checkoutid,
+                        principalTable: "Checkouts",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "CheckoutLoanInstallment");
+
+            migrationBuilder.DropTable(
+                name: "CheckoutSalaryAid");
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/20250427155240_add salaryAid calculation date.cs

@@ -0,0 +1,23 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class addsalaryAidcalculationdate : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+           
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/20250427160638_add salaryAid calculation date to customize checkouts.cs

@@ -0,0 +1,23 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class addsalaryAidcalculationdatetocustomizecheckouts : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+          
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+           
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/20250512140344_add entity Id to Checkout ValueObjects.cs

@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class addentityIdtoCheckoutValueObjects : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<long>(
+                name: "EntityId",
+                table: "CheckoutSalaryAid",
+                type: "bigint",
+                nullable: false,
+                defaultValue: 0L);
+
+            migrationBuilder.AddColumn<long>(
+                name: "EntityId",
+                table: "CheckoutLoanInstallment",
+                type: "bigint",
+                nullable: false,
+                defaultValue: 0L);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "EntityId",
+                table: "CheckoutSalaryAid");
+
+            migrationBuilder.DropColumn(
+                name: "EntityId",
+                table: "CheckoutLoanInstallment");
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/20250517165553_add startEndToInsuranceJobItems.cs

@@ -0,0 +1,39 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class addstartEndToInsuranceJobItems : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "EndDate",
+                table: "InsuranceJobItems",
+                type: "datetime2",
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "StartDate",
+                table: "InsuranceJobItems",
+                type: "datetime2",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "EndDate",
+                table: "InsuranceJobItems");
+
+            migrationBuilder.DropColumn(
+                name: "StartDate",
+                table: "InsuranceJobItems");
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/20250518144114_add admin monthly overview table.cs

@@ -0,0 +1,39 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class addadminmonthlyoverviewtable : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "AdminMonthlyOverviews",
+                columns: table => new
+                {
+                    id = table.Column<long>(type: "bigint", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    WorkshopId = table.Column<long>(type: "bigint", nullable: false),
+                    Month = table.Column<int>(type: "int", nullable: false),
+                    Year = table.Column<int>(type: "int", nullable: false),
+                    Status = table.Column<string>(type: "nvarchar(155)", maxLength: 155, nullable: false),
+                    CreationDate = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AdminMonthlyOverviews", x => x.id);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "AdminMonthlyOverviews");
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs

@@ -22,6 +22,36 @@ namespace CompanyManagment.EFCore.Migrations
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
 
+            modelBuilder.Entity("Company.Domain.AdminMonthlyOverviewAgg.AdminMonthlyOverview", b =>
+                {
+                    b.Property<long>("id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("Month")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(155)
+                        .HasColumnType("nvarchar(155)");
+
+                    b.Property<long>("WorkshopId")
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("Year")
+                        .HasColumnType("int");
+
+                    b.HasKey("id");
+
+                    b.ToTable("AdminMonthlyOverviews");
+                });
+
             modelBuilder.Entity("Company.Domain.AndroidApkVersionAgg.AndroidApkVersion", b =>
                 {
                     b.Property<long>("id")
@@ -3263,6 +3293,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime2");
+
                     b.Property<long>("InsuranceJobId")
                         .HasColumnType("bigint");
 
@@ -3278,6 +3311,9 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<double>("SalaryMoreThan")
                         .HasColumnType("float");
 
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime2");
+
                     b.HasKey("id");
 
                     b.HasIndex("InsuranceJobId");
@@ -6117,6 +6153,97 @@ namespace CompanyManagment.EFCore.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.OwnsMany("Company.Domain.CheckoutAgg.ValueObjects.CheckoutLoanInstallment", "LoanInstallments", b1 =>
+                        {
+                            b1.Property<long>("Checkoutid")
+                                .HasColumnType("bigint");
+
+                            b1.Property<int>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("int");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<int>("Id"));
+
+                            b1.Property<string>("AmountForMonth")
+                                .HasMaxLength(25)
+                                .HasColumnType("nvarchar(25)");
+
+                            b1.Property<long>("EntityId")
+                                .HasColumnType("bigint");
+
+                            b1.Property<string>("IsActive")
+                                .IsRequired()
+                                .HasMaxLength(5)
+                                .HasColumnType("nvarchar(5)");
+
+                            b1.Property<string>("LoanAmount")
+                                .HasMaxLength(30)
+                                .HasColumnType("nvarchar(30)");
+
+                            b1.Property<string>("LoanRemaining")
+                                .HasMaxLength(25)
+                                .HasColumnType("nvarchar(25)");
+
+                            b1.Property<string>("Month")
+                                .HasMaxLength(2)
+                                .HasColumnType("nvarchar(2)");
+
+                            b1.Property<string>("Year")
+                                .HasMaxLength(4)
+                                .HasColumnType("nvarchar(4)");
+
+                            b1.HasKey("Checkoutid", "Id");
+
+                            b1.ToTable("CheckoutLoanInstallment");
+
+                            b1.WithOwner()
+                                .HasForeignKey("Checkoutid");
+                        });
+
+                    b.OwnsMany("Company.Domain.CheckoutAgg.ValueObjects.CheckoutSalaryAid", "SalaryAids", b1 =>
+                        {
+                            b1.Property<long>("Checkoutid")
+                                .HasColumnType("bigint");
+
+                            b1.Property<int>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("int");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<int>("Id"));
+
+                            b1.Property<string>("Amount")
+                                .HasMaxLength(25)
+                                .HasColumnType("nvarchar(25)");
+
+                            b1.Property<DateTime>("CalculationDateTime")
+                                .HasColumnType("datetime2");
+
+                            b1.Property<string>("CalculationDateTimeFa")
+                                .HasMaxLength(15)
+                                .HasColumnType("nvarchar(15)");
+
+                            b1.Property<long>("EntityId")
+                                .HasColumnType("bigint");
+
+                            b1.Property<DateTime>("SalaryAidDateTime")
+                                .HasColumnType("datetime2");
+
+                            b1.Property<string>("SalaryAidDateTimeFa")
+                                .HasMaxLength(15)
+                                .HasColumnType("nvarchar(15)");
+
+                            b1.HasKey("Checkoutid", "Id");
+
+                            b1.ToTable("CheckoutSalaryAid");
+
+                            b1.WithOwner()
+                                .HasForeignKey("Checkoutid");
+                        });
+
+                    b.Navigation("LoanInstallments");
+
+                    b.Navigation("SalaryAids");
+
                     b.Navigation("Workshop");
                 });
 

CompanyManagment.EFCore/Repository/AdminMonthlyOverviewRepository.cs

@@ -0,0 +1,274 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using _0_Framework.Application;
+using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
+using _0_Framework.InfraStructure;
+using AccountMangement.Infrastructure.EFCore;
+using Company.Domain.AdminMonthlyOverviewAgg;
+using CompanyManagment.App.Contracts.AdminMonthlyOverview;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.EntityFrameworkCore;
+
+namespace CompanyManagment.EFCore.Repository;
+
+public class AdminMonthlyOverviewRepository : RepositoryBase<long, AdminMonthlyOverview>, IAdminMonthlyOverviewRepository
+{
+    private readonly CompanyContext _companyContext;
+    private readonly AccountContext _accountContext;
+    public AdminMonthlyOverviewRepository(CompanyContext companyContext, AccountContext accountContext) : base(companyContext)
+    {
+        _companyContext = companyContext;
+        _accountContext = accountContext;
+    }
+
+    public async Task<List<AdminMonthlyOverviewListViewModel>> GetWorkshopStatus(AdminMonthlyOverviewSearchModel searchModel)
+    {
+       
+        var year = searchModel.Year;
+        var month = searchModel.Month;
+        var accountId = searchModel.AdminAccountId;
+        // اگر تبدیل تاریخ به میلادی موفق نبود، لیست خالی برگردان
+        if ($"{year:0000}/{month:00}/01".TryToGeorgianDateTime(out var targetDate) == false)
+            return [];
+
+        // دریافت اطلاعات ادمین
+        var adminAccount = await _accountContext.Accounts.FirstOrDefaultAsync(x => x.id == searchModel.AdminAccountId);
+
+        // اگر ادمین پیدا نشد، لیست خالی برگردان
+        if (adminAccount == null)
+            return [];
+
+        // دریافت طرف حساب های معتبر برای تاریخ مورد نظر
+        var contractingPartyIds = _companyContext.InstitutionContractSet.AsNoTracking()
+            .Where(c => c.ContractStartGr <= targetDate && c.ContractEndGr >= targetDate && c.IsActiveString == "true")
+            .Select(c => c.ContractingPartyId);
+
+        // دریافت کارگاه‌های مرتبط با اکانت
+        var accountWorkshopIds = _companyContext.WorkshopAccounts
+            .AsNoTracking()
+            .Where(w => w.AccountId == accountId)
+            .Select(w => w.WorkshopId);
+
+        // دریافت کارگاه‌های مربوط به طرف حساب و اکانت
+        // Replace the selected code with the following to return a list of anonymous objects containing both workshop and contractingParty
+
+         
+
+
+
+        var workshopsWithContractingParty =await _companyContext.Workshops
+            .AsNoTracking()
+            .Where(w => accountWorkshopIds.Contains(w.id))
+            .Include(w => w.WorkshopEmployers)
+            .ThenInclude(we => we.Employer)
+            .ThenInclude(e => e.ContractingParty).AsSplitQuery().
+            Where(w => w.WorkshopEmployers.Any(we =>
+                we.Employer != null &&
+                contractingPartyIds.Contains(we.Employer.ContractingPartyId)))
+            .Select(w => new
+            {
+                Workshop = w,
+                ContractingParty = w.WorkshopEmployers
+                    .Where(we => we.Employer != null && contractingPartyIds.Contains(we.Employer.ContractingPartyId))
+                    .Select(we => we.Employer.ContractingParty)
+                    .FirstOrDefault()
+            })
+            .ToListAsync();
+
+        var workshopIds = workshopsWithContractingParty.Select(x => x.Workshop.id).ToList();
+
+        // پیدا کردن کارگاه‌هایی که قبلاً برای این ماه/سال AdminMonthlyOverview دارند
+        var adminMonthlyOverviewWorkshopIds = await _companyContext.AdminMonthlyOverviews
+            .AsNoTracking()
+            .Where(x => workshopIds.Contains(x.WorkshopId) && x.Month == month && x.Year == year)
+            .Select(x => x.WorkshopId)
+            .ToListAsync();
+
+        // پیدا کردن کارگاه‌هایی که نیاز به ایجاد AdminMonthlyOverview جدید دارند
+        var notExistAdminMonthlyReviewsWorkshopIds = workshopIds
+            .Except(adminMonthlyOverviewWorkshopIds)
+            .ToList();
+
+       
+        // ایجاد رکوردهای AdminMonthlyOverview که وجود ندارند
+        if (notExistAdminMonthlyReviewsWorkshopIds.Any())
+            await CreateRangeAdminMonthlyOverview(notExistAdminMonthlyReviewsWorkshopIds, month, year);
+
+        // به‌روزرسانی وضعیت‌ها
+        await UpdateAdminMonthlyOverviewStatus(year, month, workshopIds);
+
+        if (searchModel.ActivationStatus != IsActive.None)
+        {
+            var isBlock = searchModel.ActivationStatus == IsActive.True ? "true" : "false";
+
+            workshopsWithContractingParty = workshopsWithContractingParty
+                .Where(x => x.ContractingParty?.IsBlock == isBlock).ToList();
+
+            workshopIds = workshopsWithContractingParty.Select(x => x.Workshop.id).ToList();
+        }
+
+        // دریافت همه AdminMonthlyOverview برای این کارگاه‌ها/ماه/سال
+        var adminMonthlyOverviewsQuery = _companyContext.AdminMonthlyOverviews
+            .Where(x => workshopIds.Contains(x.WorkshopId) && x.Month == month && x.Year == year);
+
+        if (searchModel.WorkshopId > 0)
+        {
+            adminMonthlyOverviewsQuery = adminMonthlyOverviewsQuery.Where(x => x.WorkshopId == searchModel.WorkshopId);
+        }
+
+        if (searchModel.EmployerId > 0)
+        {
+            var searchWorkshopId = workshopsWithContractingParty.Where(x => x.Workshop.WorkshopEmployers.Any(e => e.EmployerId == searchModel.EmployerId)).Select(x => x.Workshop.id).ToList();
+            adminMonthlyOverviewsQuery = adminMonthlyOverviewsQuery.Where(x => searchWorkshopId.Contains(x.WorkshopId));
+        }
+
+
+
+        var adminMonthlyOverviewsList = await adminMonthlyOverviewsQuery.ToListAsync();
+        var employeeCounts = _companyContext.LeftWorkList.Where(x =>
+                x.StartWorkDate < targetDate && x.LeftWorkDate > targetDate && workshopIds.Contains(x.WorkshopId))
+            .GroupBy(x => x.WorkshopId).Select(x => new { EmployeeCounts = x.Count(), WorkshopId = x.Key }).ToList();
+
+        var adminMonthlyOverviewList = adminMonthlyOverviewsList.Select(x =>
+        {
+            var employeeCount = employeeCounts.FirstOrDefault(e => e.WorkshopId == x.WorkshopId);
+            var workshopWithContractingParty =
+                workshopsWithContractingParty.FirstOrDefault(w => w.Workshop.id == x.WorkshopId);
+
+            var workshop = workshopWithContractingParty?.Workshop;
+            var contractingParty = workshopWithContractingParty?.ContractingParty;
+            var employer = workshop?.WorkshopEmployers.FirstOrDefault()?.Employer;
+            return new AdminMonthlyOverviewListViewModel
+            {
+                WorkshopId = x.WorkshopId,
+                Status = x.Status,
+                Id = x.id,
+                WorkshopName = workshop?.WorkshopFullName ?? "",
+                WorkshopArchiveCode = workshop?.ArchiveCode ?? "",
+                Address = workshop?.Address ?? "",
+                City = workshop?.City ?? "",
+                Province = workshop?.State ?? "",
+                EmployerName = employer?.FullName ?? "",
+                EmployerPhoneNumber = employer?.Phone ?? "",
+                AdminFullName = adminAccount.Fullname,
+                EmployeeCount = employeeCount?.EmployeeCounts ?? 0,
+                AgentPhoneNumber = "",
+                IsBlock = contractingParty?.IsBlock == "true"
+            };
+        }).OrderBy(x => x.IsBlock).ToList();
+      
+
+        return adminMonthlyOverviewList;
+    }
+
+    public async Task<AdminMonthlyOverViewCounterVm> GetCounter(int year, int month, long accountId)
+    {
+        var searchModel = new AdminMonthlyOverviewSearchModel()
+        {
+            AdminAccountId = accountId,
+            Month = month,
+            Year = year
+        };
+        var list = await GetWorkshopStatus(searchModel);
+
+        var allCount = list.Count;
+        var archivedCount = list.Count(x => x.Status == AdminMonthlyOverviewStatus.Archived);
+        var createDocCount = list.Count(x => x.Status == AdminMonthlyOverviewStatus.CreateDocuments);
+        var visitCompleteCount = list.Count(x => x.Status == AdminMonthlyOverviewStatus.VisitCompleted);
+        var visitInProgressCount = list.Count(x => x.Status == AdminMonthlyOverviewStatus.VisitInProgress);
+        var visitPendingCount = list.Count(x => x.Status == AdminMonthlyOverviewStatus.VisitPending);
+
+        return new AdminMonthlyOverViewCounterVm
+        {
+            All = allCount,
+            Archived = archivedCount,
+            VisitPending = visitPendingCount,
+            VisitInProgress = visitInProgressCount,
+            VisitCompleted = visitCompleteCount,
+            CreateDocument = createDocCount
+
+        };
+
+    }
+
+    private async Task UpdateAdminMonthlyOverviewStatus(int year, int month, List<long> workshopIds)
+    {
+        var targetDate = $"{year:0000}/{month:00}/01".ToGeorgianDateTime();
+        _ = $"{year:0000}/{month:00}/01".ToGeorgianDateTime().AddMonthsFa(1, out var nextMonth);
+
+
+        var workingEmployeeIds = (await _companyContext.LeftWorkList.AsNoTracking()
+            .Where(x => workshopIds.Contains(x.WorkshopId) && x.StartWorkDate <= targetDate && x.LeftWorkDate >= targetDate)
+            .Select(x => new { x.WorkshopId, x.EmployeeId })
+            .ToListAsync()).Distinct();
+
+        var contractSet = (await _companyContext.Contracts.AsNoTracking()
+            .Where(x => x.ContarctStart <= nextMonth && x.ContractEnd >= nextMonth)
+            .Select(x => new { x.WorkshopIds, x.EmployeeId })
+            .ToListAsync())
+            .Select(x => (x.WorkshopIds, x.EmployeeId))
+            .ToHashSet();
+
+        var checkoutSet = (await _companyContext.CheckoutSet.AsNoTracking()
+            .Where(x => x.ContractStart <= targetDate && x.ContractEnd >= targetDate)
+            .Select(x => new { x.WorkshopId, x.EmployeeId })
+            .ToListAsync())
+            .Select(x => (x.WorkshopId, x.EmployeeId))
+            .ToHashSet();
+
+        var grouped = workingEmployeeIds.GroupBy(x => x.WorkshopId).ToList();
+
+        var workshopsWithFullContracts = grouped
+            .Where(g => g.All(emp => contractSet.Contains((emp.WorkshopId, emp.EmployeeId))))
+            .Select(g => g.Key)
+            .ToList();
+
+        var workshopsWithFullCheckout = grouped
+            .Where(g => g.All(emp => checkoutSet.Contains((emp.WorkshopId, emp.EmployeeId))))
+            .Select(g => g.Key)
+            .ToList();
+
+        var fullyCoveredWorkshops = workshopsWithFullContracts.Intersect(workshopsWithFullCheckout).ToList();
+
+        var notFullyCoveredWorkshops = grouped
+            .Where(g => g.Any(emp =>
+                !contractSet.Contains((emp.WorkshopId, emp.EmployeeId)) ||
+                !checkoutSet.Contains((emp.WorkshopId, emp.EmployeeId))))
+            .Select(g => g.Key)
+            .ToList();
+
+        var adminMonthlyOverviews = _companyContext.AdminMonthlyOverviews
+            .Where(x => x.Month == month && x.Year == year);
+
+        var adminMonthlyOverviewsWithFullContracts = await adminMonthlyOverviews
+            .Where(x => fullyCoveredWorkshops.Contains(x.WorkshopId) && x.Status == AdminMonthlyOverviewStatus.CreateDocuments)
+            .ToListAsync();
+
+        var adminMonthlyOverviewsWithNotFullContracts = await adminMonthlyOverviews
+            .Where(x => notFullyCoveredWorkshops.Contains(x.WorkshopId) && x.Status != AdminMonthlyOverviewStatus.CreateDocuments)
+            .ToListAsync();
+
+        foreach (var adminMonthlyOverview in adminMonthlyOverviewsWithFullContracts)
+            adminMonthlyOverview.SetStatus(AdminMonthlyOverviewStatus.VisitPending);
+
+        foreach (var adminMonthlyOverview in adminMonthlyOverviewsWithNotFullContracts)
+            adminMonthlyOverview.SetStatus(AdminMonthlyOverviewStatus.CreateDocuments);
+
+        await _companyContext.SaveChangesAsync();
+    }
+
+    private async Task CreateRangeAdminMonthlyOverview(List<long> workshopIds, int month, int year)
+    {
+        foreach (var workshopId in workshopIds)
+        {
+            var adminMonthlyOverview =
+                new AdminMonthlyOverview(workshopId, month, year, AdminMonthlyOverviewStatus.CreateDocuments);
+            await _companyContext.AddAsync(adminMonthlyOverview);
+        }
+
+        await _companyContext.SaveChangesAsync();
+    }
+}

CompanyManagment.EFCore/Repository/CustomizeCheckoutRepository.cs

@@ -395,7 +395,7 @@ namespace CompanyManagment.EFCore.Repository
             }
 
 
-            if (searchModel.Year > 0 && searchModel.Month > 0 && searchModel.Month < 12)
+            if (searchModel.Year > 0 && searchModel.Month > 0 && searchModel.Month < 13)
             {
                 var queryStartDate = $"{searchModel.Year:0000}/{searchModel.Month:00}/01".ToGeorgianDateTime();
                 queryStartDate.FindFirstDayOfNextMonth(out var queryEndDate);

CompanyManagment.EFCore/Repository/CustomizeWorkshopEmployeeSettingsRepository.cs

@@ -196,6 +196,11 @@ public class CustomizeWorkshopEmployeeSettingsRepository(CompanyContext companyC
             return true;
         }
 
+        if (command.BreakTime.BreakTimeValue != employeeSettings.BreakTime.BreakTimeValue || command.BreakTime.HasBreakTimeValue != employeeSettings.BreakTime.HasBreakTimeValue)
+        {
+            return true;
+        }
+
         switch (employeeSettings.WorkshopShiftStatus)
         {
             case WorkshopShiftStatus.Irregular:

CompanyManagment.EFCore/Repository/CustomizeWorkshopSettingsRepository.cs

@@ -8,364 +8,351 @@ using CompanyManagment.App.Contracts.CustomizeWorkshopSettings.ValueObjectsViewM
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 
-namespace CompanyManagment.EFCore.Repository;
-
-public class CustomizeWorkshopSettingsRepository(CompanyContext companyContext, IAuthHelper authHelper, IEmployeeRepository employeeRepository)
-    : RepositoryBase<long, CustomizeWorkshopSettings>(companyContext), ICustomizeWorkshopSettingsRepository
+namespace CompanyManagment.EFCore.Repository
 {
-    private readonly CompanyContext _companyContext = companyContext;
-    private readonly IAuthHelper _authHelper = authHelper;
-    private readonly IEmployeeRepository _employeeRepository = employeeRepository;
-
-    public CustomizeWorkshopSettingsViewModel GetWorkshopSettingsByWorkshopId(long workshopId, AuthViewModel auth)
+    public class CustomizeWorkshopSettingsRepository(CompanyContext companyContext, IAuthHelper authHelper, IEmployeeRepository employeeRepository)
+        : RepositoryBase<long, CustomizeWorkshopSettings>(companyContext), ICustomizeWorkshopSettingsRepository
     {
-        var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().Where(x => x.WorkshopId == workshopId)
-            .Include(x => x.CustomizeWorkshopGroupSettingsCollection)
-            .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection).AsSplitQuery()
-            .FirstOrDefault();
-        if (entity == null)
-            return new();
+        private readonly CompanyContext _companyContext = companyContext;
+        private readonly IAuthHelper _authHelper = authHelper;
+        private readonly IEmployeeRepository _employeeRepository = employeeRepository;
 
-        var employeeIds = entity.CustomizeWorkshopGroupSettingsCollection
-            .SelectMany(x => x.CustomizeWorkshopEmployeeSettingsCollection)
-            .Select(y => y.EmployeeId)
-            .ToList();
-        var employees = _employeeRepository.GetBy(employeeIds);
-        return new CustomizeWorkshopSettingsViewModel()
+        public CustomizeWorkshopSettingsViewModel GetWorkshopSettingsByWorkshopId(long workshopId, AuthViewModel auth)
         {
-            Id = entity.id,
-            Name = auth.WorkshopList.FirstOrDefault(w => w.Id == entity.WorkshopId)?.Name,
-            GroupSettings = entity.CustomizeWorkshopGroupSettingsCollection.Where(x => !x.MainGroup).Select(x =>
-                new CustomizeWorkshopGroupSettingsViewModel()
-                {
-                    Id = x.id,
-                    GroupName = x.GroupName,
-                    RollCallWorkshopEmployeesSettings = x.CustomizeWorkshopEmployeeSettingsCollection.Select(y =>
-                    {
-                        var employee = employees.First(e => e.Id == y.EmployeeId);
-                        return new CustomizeWorkshopEmployeeSettingsViewModel()
-                        {
-                            Id = y.id,
-                            EmployeeId = y.EmployeeId,
-                            IsSettingChanged = y.IsSettingChanged,
-                            IsShiftChanged = y.IsShiftChanged,
-                            Name = $"{employee}",
-                            RollCallWorkshopShifts = y.CustomizeWorkshopEmployeeSettingsShifts.Select(s =>
-                                new CustomizeWorkshopShiftViewModel()
-                                {
-                                    EndTime = s.EndTime.ToString("HH:mm"),
-                                    Placement = s.Placement,
-                                    StartTime = s.StartTime.ToString("HH:mm")
-                                }).ToList(),
-                            Salary = y.Salary,
+            var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().Where(x => x.WorkshopId == workshopId)
+                .Include(x => x.CustomizeWorkshopGroupSettingsCollection)
+                .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection).AsSplitQuery()
+                .FirstOrDefault();
+            if (entity == null)
+                return new();
 
-                        };
-                    }).ToList(),
-                    WorkshopShiftStatus = x.WorkshopShiftStatus,
-                    IrregularShift = x.IrregularShift,
-                    Salary = x.Salary,
-                    RollCallWorkshopShifts = x.CustomizeWorkshopGroupSettingsShifts.Select(s =>
-                        new CustomizeWorkshopShiftViewModel()
-                        {
-                            EndTime = s.EndTime.ToString("HH:mm"),
-                            Placement = s.Placement,
-                            StartTime = s.StartTime.ToString("HH:mm")
-
-                        }).ToList(),
-                    MainGroup = x.MainGroup,
-                    CustomizeRotatingShiftsViewModels = x.CustomizeRotatingShifts.
-                        Select(r=>new CustomizeRotatingShiftsViewModel(){StartTime = r.StartTime.ToString("HH:mm"), EndTime = r.EndTime.ToString("HH:mm")}).ToList()
-                }).ToList(),
-
-        };
-    }
-    public CustomizeWorkshopSettingsViewModel GetWorkshopSettingsByWorkshopIdForAdmin(long workshopId)
-    {
-        var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().Where(x => x.WorkshopId == workshopId)
-            .Include(x => x.CustomizeWorkshopGroupSettingsCollection)
-            .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection).AsSplitQuery()
-            .FirstOrDefault();
-        if (entity == null)
-            return new();
-
-        return new CustomizeWorkshopSettingsViewModel()
-        {
-            Id = entity.id,
-            Offset = entity.EndTimeOffSet,
-            GroupSettings = entity.CustomizeWorkshopGroupSettingsCollection.Where(x => !x.MainGroup).Select(x =>
-                new CustomizeWorkshopGroupSettingsViewModel()
-                {
-                    Id = x.id,
-                    GroupName = x.GroupName,
-                    RollCallWorkshopEmployeesSettings = x.CustomizeWorkshopEmployeeSettingsCollection.Select(y =>
-                    {
-                        var employee = _employeeRepository.Get(y.EmployeeId);
-                        return new CustomizeWorkshopEmployeeSettingsViewModel()
-                        {
-                            Id = y.id,
-                            EmployeeId = y.EmployeeId,
-                            IsSettingChanged = y.IsSettingChanged,
-                            IsShiftChanged = y.IsShiftChanged,
-                            Name = $"{employee?.FName} {employee?.LName}",
-                            RollCallWorkshopShifts = y.CustomizeWorkshopEmployeeSettingsShifts.Select(s =>
-                                new CustomizeWorkshopShiftViewModel()
-                                {
-                                    EndTime = s.EndTime.ToString("HH:mm"),
-                                    Placement = s.Placement,
-                                    StartTime = s.StartTime.ToString("HH:mm")
-                                }).ToList(),
-                            Salary = y.Salary,
-                            CustomizeRotatingShiftsViewModels = y.CustomizeRotatingShifts.Select(r => new CustomizeRotatingShiftsViewModel
-                            {
-                                StartTime = r.StartTime.ToString("HH:mm"),
-                                EndTime = r.EndTime.ToString("HH:mm")
-                            }).ToList(),
-                            LeavePermittedDays = y.LeavePermittedDays,
-                            IrregularShift = y.IrregularShift,
-                            WorkshopShiftStatus = y.WorkshopShiftStatus
-                        };
-                    }).ToList(),
-                    Salary = x.Salary,
-                    RollCallWorkshopShifts = x.CustomizeWorkshopGroupSettingsShifts.Select(s =>
-                        new CustomizeWorkshopShiftViewModel()
-                        {
-                            EndTime = s.EndTime.ToString("HH:mm"),
-                            Placement = s.Placement,
-                            StartTime = s.StartTime.ToString("HH:mm")
-
-                        }).ToList(),
-                    MainGroup = x.MainGroup,
-                    WorkshopShiftStatus = x.WorkshopShiftStatus,
-                    CustomizeRotatingShiftsViewModels = x.CustomizeRotatingShifts.Select(r => new CustomizeRotatingShiftsViewModel
-                    {
-                        StartTime = r.StartTime.ToString("HH:mm"),
-                        EndTime = r.EndTime.ToString("HH:mm")
-                    }).ToList(),
-                    IrregularShift = x.IrregularShift
-
-
-
-                }).ToList(),
-        };
-    }
-
-
-    public EditCustomizeWorkshopSettings GetWorkshopSettingsDetails(long workshopId)
-    {
-
-        var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().FirstOrDefault(x => x.WorkshopId == workshopId);
-        if (entity == null)
-            return new();
-        var viewModel = new EditCustomizeWorkshopSettings()
-        {
-            FridayWork = entity.FridayWork,
-            FridayPay = new() { FridayPayType = entity.FridayPay.FridayPayType, Value = entity.FridayPay.Value },
-            LateToWork = new()
+            var employeeIds = entity.CustomizeWorkshopGroupSettingsCollection
+                .SelectMany(x => x.CustomizeWorkshopEmployeeSettingsCollection)
+                .Select(y => y.EmployeeId)
+                .ToList();
+            var employees = _employeeRepository.GetBy(employeeIds);
+            return new CustomizeWorkshopSettingsViewModel()
             {
-                LateToWorkTimeFinesVewModels = entity.LateToWork.LateToWorkTimeFines.Select(x =>
-                    new LateToWorkTimeFineVewModel() { FineMoney = x.FineMoney, Minute = x.Minute }).ToList(),
-                Value = entity.LateToWork.Value,
-                LateToWorkType = entity.LateToWork.LateToWorkType
-            },
-            HolidayWork = entity.HolidayWork,
-            FineAbsenceDeduction = new()
-            {
-                Value = entity.FineAbsenceDeduction.Value,
-                FineAbsenceDayOfWeekViewModels = entity.FineAbsenceDeduction.FineAbsenceDayOfWeekCollection
-                    .Select(x => new FineAbsenceDayOfWeekViewModel() { DayOfWeek = x.DayOfWeek }).ToList(),
-                FineAbsenceDeductionType = entity.FineAbsenceDeduction.FineAbsenceDeductionType
-            },
-            EarlyExit = new()
-            {
-                EarlyExitTimeFinesViewModels = entity.EarlyExit.EarlyExitTimeFines.Select(x =>
-                    new EarlyExitTimeFineViewModel() { FineMoney = x.FineMoney, Minute = x.Minute }).ToList(),
-                Value = entity.EarlyExit.Value,
-                EarlyExitType = entity.EarlyExit.EarlyExitType
-            },
-            BonusesPay = new()
-            {
-                Value = entity.BonusesPay.Value,
-                BonusesPayType = entity.BonusesPay.BonusesPayType,
-                PaymentType = entity.BonusesPay.PaymentType
-            },
-            ShiftPay = new()
-            {
-                Value = entity.ShiftPay.Value,
-                ShiftPayType = entity.ShiftPay.ShiftPayType,
-                ShiftType = entity.ShiftPay.ShiftType
-            },
-            InsuranceDeduction = new()
-            {
-                Value = entity.InsuranceDeduction.Value,
-                InsuranceDeductionType = entity.InsuranceDeduction.InsuranceDeductionType
-            },
-            OverTimePay = new()
-                { OverTimePayType = entity.OverTimePay.OverTimePayType, Value = entity.OverTimePay.Value },
-            BaseYearsPay = new()
-            {
-                BaseYearsPayType = entity.BaseYearsPay.BaseYearsPayType,
-                Value = entity.BaseYearsPay.Value,
-                PaymentType = entity.BaseYearsPay.PaymentType
-            },
-            NightWorkPay = new()
-                { NightWorkingType = entity.NightWorkPay.NightWorkingType, Value = entity.NightWorkPay.Value },
-            LeavePay = new()
-            {
-                Value = entity.LeavePay.Value,
-                LeavePayType = entity.LeavePay.LeavePayType
-            },
-            MarriedAllowance = new()
-            {
-                Value = entity.MarriedAllowance.Value,
-                MarriedAllowanceType = entity.MarriedAllowance.MarriedAllowanceType
-            },
-            FamilyAllowance = new()
-            {
-                FamilyAllowanceType = entity.FamilyAllowance.FamilyAllowanceType,
-                Value = entity.FamilyAllowance.Value
-            },
-            Currency = entity.Currency,
-            MaxMonthDays = entity.MaxMonthDays,
-            Id = entity.id,
-            ShiftsList = entity.CustomizeWorkshopSettingsShifts.Select(x => new CustomizeWorkshopShiftViewModel()
-                { EndTime = x.EndTime.ToString("HH:mm"), Placement = x.Placement, StartTime = x.StartTime.ToString("HH:mm") }).ToList(),
-            BonusesPaysInEndOfMonth = entity.BonusesPaysInEndOfMonth,
-            LeavePermittedDays = entity.LeavePermittedDays,
-            BaseYearsPayInEndOfYear = entity.BaseYearsPayInEndOfYear,
-            WorkshopId = entity.WorkshopId,
-            WorkshopShiftStatus = entity.WorkshopShiftStatus
-
-        };
-        return viewModel;
-
-    }
-
-
-    public EditCustomizeWorkshopSettings GetSimpleWorkshopSettings(long workshopId)
-    {
-        var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().FirstOrDefault(x => x.WorkshopId == workshopId);
-        if (entity == null)
-        {
-            return new();
-        }
-
-        return new()
-        {
-            ShiftsList = entity.CustomizeWorkshopSettingsShifts.Select(x => new CustomizeWorkshopShiftViewModel()
-            {
-                EndTime = x.EndTime.ToString("HH:mm"),
-                StartTime = x.StartTime.ToString("HH:mm"),
-                Placement = x.Placement
-            }).ToList(),
-            Id = entity.id,
-            WorkshopId = entity.WorkshopId,
-            WorkshopShiftStatus = entity.WorkshopShiftStatus,
-            FridayWork = entity.FridayWork,
-            HolidayWork = entity.HolidayWork
-
-        };
-    }
-
-    public List<ChangedGroupedViewModel> GetShiftChangesGroupAndEmployees(long customizeWorkshopSettingsId)
-    {
-
-
-        var result = from groupSetting in _companyContext.CustomizeWorkshopGroupSettings.AsSplitQuery()
-            where groupSetting.IsShiftChange // Filter parent tables where isChange is true
-            join employeeSettings in _companyContext.CustomizeWorkshopEmployeeSettings on groupSetting.id equals employeeSettings.CustomizeWorkshopGroupSettingId
-            where employeeSettings.IsShiftChanged// Filter child tables where isChange is true
-            join employee in _companyContext.Employees on employeeSettings.EmployeeId equals employee.id
-            group new { employee.FullName, groupSetting.GroupName } by groupSetting.id into grouped
-            select new ChangedGroupedViewModel
-            {
-                GroupName = grouped.First().GroupName,
-                EmployeeName = grouped.Select(e => e.FullName).ToList()
-            };
-
-        return result.ToList();
-
-    }
-
-    public CustomizeWorkshopSettingsViewModel GetWorkshopIncludeGroupsByWorkshopId(long workshopId)
-    {
-        var customizeWorkshopSettings = _companyContext.CustomizeWorkshopSettings
-            .AsNoTracking().AsSplitQuery().Where(x => x.WorkshopId == workshopId)
-            .Include(x => x.CustomizeWorkshopGroupSettingsCollection)
-            .Select(x => new CustomizeWorkshopSettingsViewModel()
-            {
-                Id = x.id,
-                WorkshopShiftStatus = x.WorkshopShiftStatus,
-                GroupSettings = x.CustomizeWorkshopGroupSettingsCollection.Select(g =>
+                Id = entity.id,
+                Name = auth.WorkshopList.FirstOrDefault(w => w.Id == entity.WorkshopId)?.Name,
+                GroupSettings = entity.CustomizeWorkshopGroupSettingsCollection.Where(x => !x.MainGroup).Select(x =>
                     new CustomizeWorkshopGroupSettingsViewModel()
                     {
-                        Id = g.id,
-                        IrregularShift = g.IrregularShift,
-                        WorkshopShiftStatus = g.WorkshopShiftStatus,
-                        GroupName = g.GroupName,
-                        MainGroup = g.MainGroup,
-                        RollCallWorkshopShifts = g.CustomizeWorkshopGroupSettingsShifts.Select(s =>
+                        Id = x.id,
+                        GroupName = x.GroupName,
+                        WorkshopShiftStatus = x.WorkshopShiftStatus,
+                        IrregularShift = x.IrregularShift,
+                        Salary = x.Salary,
+                        RollCallWorkshopShifts = x.CustomizeWorkshopGroupSettingsShifts.Select(s =>
                             new CustomizeWorkshopShiftViewModel()
                             {
-                                StartTime = s.StartTime.ToString("HH:mm"),
                                 EndTime = s.EndTime.ToString("HH:mm"),
                                 Placement = s.Placement,
-                            }).ToList(),
-                        BreakTime = g.BreakTime,
-                        HolidayWork = g.HolidayWork,
-                        FridayWork = g.FridayWork,
-                        CustomizeRotatingShiftsViewModels = g.CustomizeRotatingShifts.Select(r => new CustomizeRotatingShiftsViewModel()
-                        {
-                            EndTime = r.EndTime.ToString("HH:mm"),
-                            StartTime = r.StartTime.ToString("HH:mm")
-                        }).ToList()
+                                StartTime = s.StartTime.ToString("HH:mm")
 
+                            }).ToList(),
+                        MainGroup = x.MainGroup,
+                        CustomizeRotatingShiftsViewModels = x.CustomizeRotatingShifts.
+	                        Select(r=>new CustomizeRotatingShiftsViewModel(){StartTime = r.StartTime.ToString("HH:mm"), EndTime = r.EndTime.ToString("HH:mm")}).ToList()
                     }).ToList(),
 
-
-            }).FirstOrDefault();
-
-        return customizeWorkshopSettings;
-    }
-
-    public CustomizeWorkshopEmployeeSettingsViewModel GetEmployeeSettingsByWorkshopIdEmployeeId(long workshopId, long employeeId)
-    {
-        var employee = _companyContext.CustomizeWorkshopSettings
-            .AsSplitQuery().Include(x => x.CustomizeWorkshopGroupSettingsCollection)
-            .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection)
-            .FirstOrDefault(x => x.WorkshopId == workshopId)?.CustomizeWorkshopGroupSettingsCollection.SelectMany(x => x.CustomizeWorkshopEmployeeSettingsCollection)
-            .FirstOrDefault(x => x.EmployeeId == employeeId);
-
-        if (employee == null)
-            return new();
-
-        var employeeName = _companyContext.Employees.Select(x => new { x.FullName, x.id })
-            .FirstOrDefault(x => x.id == employee.EmployeeId);
-        return new CustomizeWorkshopEmployeeSettingsViewModel()
+            };
+        }
+        public CustomizeWorkshopSettingsViewModel GetWorkshopSettingsByWorkshopIdForAdmin(long workshopId)
         {
-            Id = employee.id,
-            EmployeeId = employee.EmployeeId,
-            IsSettingChanged = employee.IsSettingChanged,
-            IsShiftChanged = employee.IsShiftChanged,
-            Name = employeeName?.FullName,
-            RollCallWorkshopShifts = employee.CustomizeWorkshopEmployeeSettingsShifts.Select(x =>
-                new CustomizeWorkshopShiftViewModel()
+            var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().Where(x => x.WorkshopId == workshopId)
+                .Include(x => x.CustomizeWorkshopGroupSettingsCollection)
+                .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection).AsSplitQuery()
+                .FirstOrDefault();
+            if (entity == null)
+                return new();
+
+            return new CustomizeWorkshopSettingsViewModel()
+            {
+                Id = entity.id,
+                Offset = entity.EndTimeOffSet,
+                GroupSettings = entity.CustomizeWorkshopGroupSettingsCollection.Where(x => !x.MainGroup).Select(x =>
+                    new CustomizeWorkshopGroupSettingsViewModel()
+                    {
+                        Id = x.id,
+                        GroupName = x.GroupName,
+                        RollCallWorkshopEmployeesSettings = x.CustomizeWorkshopEmployeeSettingsCollection.Select(y =>
+                        {
+                            var employee = _employeeRepository.Get(y.EmployeeId);
+                            return new CustomizeWorkshopEmployeeSettingsViewModel()
+                            {
+                                Id = y.id,
+                                EmployeeId = y.EmployeeId,
+                                IsSettingChanged = y.IsSettingChanged,
+                                IsShiftChanged = y.IsShiftChanged,
+                                Name = $"{employee?.FName} {employee?.LName}",
+                                RollCallWorkshopShifts = y.CustomizeWorkshopEmployeeSettingsShifts.Select(s =>
+                                    new CustomizeWorkshopShiftViewModel()
+                                    {
+                                        EndTime = s.EndTime.ToString("HH:mm"),
+                                        Placement = s.Placement,
+                                        StartTime = s.StartTime.ToString("HH:mm")
+                                    }).ToList(),
+                                Salary = y.Salary,
+                                CustomizeRotatingShiftsViewModels = y.CustomizeRotatingShifts.Select(r => new CustomizeRotatingShiftsViewModel
+                                {
+                                    StartTime = r.StartTime.ToString("HH:mm"),
+                                    EndTime = r.EndTime.ToString("HH:mm")
+                                }).ToList(),
+                                LeavePermittedDays = y.LeavePermittedDays,
+                                IrregularShift = y.IrregularShift,
+                                WorkshopShiftStatus = y.WorkshopShiftStatus
+                            };
+                        }).ToList(),
+                        Salary = x.Salary,
+                        RollCallWorkshopShifts = x.CustomizeWorkshopGroupSettingsShifts.Select(s =>
+                            new CustomizeWorkshopShiftViewModel()
+                            {
+                                EndTime = s.EndTime.ToString("HH:mm"),
+                                Placement = s.Placement,
+                                StartTime = s.StartTime.ToString("HH:mm")
+
+                            }).ToList(),
+                        MainGroup = x.MainGroup,
+                        WorkshopShiftStatus = x.WorkshopShiftStatus,
+                        CustomizeRotatingShiftsViewModels = x.CustomizeRotatingShifts.Select(r=>new CustomizeRotatingShiftsViewModel
+                        {
+                            StartTime = r.StartTime.ToString("HH:mm"),
+                            EndTime = r.EndTime.ToString("HH:mm")
+                        }).ToList(),
+                        IrregularShift = x.IrregularShift
+
+
+
+                    }).ToList(),
+            };
+        }
+
+
+        public EditCustomizeWorkshopSettings GetWorkshopSettingsDetails(long workshopId)
+        {
+
+            var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().FirstOrDefault(x => x.WorkshopId == workshopId);
+            if (entity == null)
+                return new();
+            var viewModel = new EditCustomizeWorkshopSettings()
+            {
+                FridayWork = entity.FridayWork,
+                FridayPay = new() { FridayPayType = entity.FridayPay.FridayPayType, Value = entity.FridayPay.Value },
+                LateToWork = new()
+                {
+                    LateToWorkTimeFinesVewModels = entity.LateToWork.LateToWorkTimeFines.Select(x =>
+                        new LateToWorkTimeFineVewModel() { FineMoney = x.FineMoney, Minute = x.Minute }).ToList(),
+                    Value = entity.LateToWork.Value,
+                    LateToWorkType = entity.LateToWork.LateToWorkType
+                },
+                HolidayWork = entity.HolidayWork,
+                FineAbsenceDeduction = new()
+                {
+                    Value = entity.FineAbsenceDeduction.Value,
+                    FineAbsenceDayOfWeekViewModels = entity.FineAbsenceDeduction.FineAbsenceDayOfWeekCollection
+                        .Select(x => new FineAbsenceDayOfWeekViewModel() { DayOfWeek = x.DayOfWeek }).ToList(),
+                    FineAbsenceDeductionType = entity.FineAbsenceDeduction.FineAbsenceDeductionType
+                },
+                EarlyExit = new()
+                {
+                    EarlyExitTimeFinesViewModels = entity.EarlyExit.EarlyExitTimeFines.Select(x =>
+                        new EarlyExitTimeFineViewModel() { FineMoney = x.FineMoney, Minute = x.Minute }).ToList(),
+                    Value = entity.EarlyExit.Value,
+                    EarlyExitType = entity.EarlyExit.EarlyExitType
+                },
+                BonusesPay = new()
+                {
+                    Value = entity.BonusesPay.Value,
+                    BonusesPayType = entity.BonusesPay.BonusesPayType,
+                    PaymentType = entity.BonusesPay.PaymentType
+                },
+                ShiftPay = new()
+                {
+                    Value = entity.ShiftPay.Value,
+                    ShiftPayType = entity.ShiftPay.ShiftPayType,
+                    ShiftType = entity.ShiftPay.ShiftType
+                },
+                InsuranceDeduction = new()
+                {
+                    Value = entity.InsuranceDeduction.Value,
+                    InsuranceDeductionType = entity.InsuranceDeduction.InsuranceDeductionType
+                },
+                OverTimePay = new()
+                { OverTimePayType = entity.OverTimePay.OverTimePayType, Value = entity.OverTimePay.Value },
+                BaseYearsPay = new()
+                {
+                    BaseYearsPayType = entity.BaseYearsPay.BaseYearsPayType,
+                    Value = entity.BaseYearsPay.Value,
+                    PaymentType = entity.BaseYearsPay.PaymentType
+                },
+                NightWorkPay = new()
+                { NightWorkingType = entity.NightWorkPay.NightWorkingType, Value = entity.NightWorkPay.Value },
+                LeavePay = new()
+                {
+                    Value = entity.LeavePay.Value,
+                    LeavePayType = entity.LeavePay.LeavePayType
+                },
+                MarriedAllowance = new()
+                {
+                    Value = entity.MarriedAllowance.Value,
+                    MarriedAllowanceType = entity.MarriedAllowance.MarriedAllowanceType
+                },
+                FamilyAllowance = new()
+                {
+                    FamilyAllowanceType = entity.FamilyAllowance.FamilyAllowanceType,
+                    Value = entity.FamilyAllowance.Value
+                },
+                Currency = entity.Currency,
+                MaxMonthDays = entity.MaxMonthDays,
+                Id = entity.id,
+                ShiftsList = entity.CustomizeWorkshopSettingsShifts.Select(x => new CustomizeWorkshopShiftViewModel()
+                { EndTime = x.EndTime.ToString("HH:mm"), Placement = x.Placement, StartTime = x.StartTime.ToString("HH:mm") }).ToList(),
+                BonusesPaysInEndOfMonth = entity.BonusesPaysInEndOfMonth,
+                LeavePermittedDays = entity.LeavePermittedDays,
+                BaseYearsPayInEndOfYear = entity.BaseYearsPayInEndOfYear,
+                WorkshopId = entity.WorkshopId,
+                WorkshopShiftStatus = entity.WorkshopShiftStatus
+
+            };
+            return viewModel;
+
+        }
+
+        public CustomizeWorkshopSettings GetBy(long workshopId)
+        {
+            return _companyContext.CustomizeWorkshopSettings.FirstOrDefault(x => x.WorkshopId == workshopId);
+        }
+
+        public EditCustomizeWorkshopSettings GetSimpleWorkshopSettings(long workshopId)
+        {
+            var entity = _companyContext.CustomizeWorkshopSettings.AsSplitQuery().FirstOrDefault(x => x.WorkshopId == workshopId);
+            if (entity == null)
+            {
+                return new();
+            }
+
+            return new()
+            {
+                ShiftsList = entity.CustomizeWorkshopSettingsShifts.Select(x => new CustomizeWorkshopShiftViewModel()
                 {
                     EndTime = x.EndTime.ToString("HH:mm"),
-                    Placement = x.Placement,
-                    StartTime = x.StartTime.ToString("HH:mm")
+                    StartTime = x.StartTime.ToString("HH:mm"),
+                    Placement = x.Placement
                 }).ToList(),
-            Salary = employee.Salary
-        };
-    }
+                Id = entity.id,
+                WorkshopId = entity.WorkshopId,
+                WorkshopShiftStatus = entity.WorkshopShiftStatus,
+                FridayWork = entity.FridayWork,
+                HolidayWork = entity.HolidayWork
 
-    #region Pooya
-    public List<CustomizeWorkshopEmployeeSettingsViewModel> GetEmployeeSettingsWithMonthlySalary(long workshopId)
-    {
-        var query = _companyContext.CustomizeWorkshopGroupSettings.Where(x => x.MainGroup == false).Include(x => x)
-            .Include(x => x.CustomizeWorkshopEmployeeSettingsCollection).Where(x => x.CustomizeWorkshopEmployeeSettingsCollection.Any(y =>
+            };
+        }
+
+        public List<ChangedGroupedViewModel> GetShiftChangesGroupAndEmployees(long customizeWorkshopSettingsId)
+        {
+
+
+            var result = from groupSetting in _companyContext.CustomizeWorkshopGroupSettings.AsSplitQuery()
+                         where groupSetting.IsShiftChange // Filter parent tables where isChange is true
+                         join employeeSettings in _companyContext.CustomizeWorkshopEmployeeSettings on groupSetting.id equals employeeSettings.CustomizeWorkshopGroupSettingId
+                         where employeeSettings.IsShiftChanged// Filter child tables where isChange is true
+                         join employee in _companyContext.Employees on employeeSettings.EmployeeId equals employee.id
+                         group new { employee.FullName, groupSetting.GroupName } by groupSetting.id into grouped
+                         select new ChangedGroupedViewModel
+                         {
+                             GroupName = grouped.First().GroupName,
+                             EmployeeName = grouped.Select(e => e.FullName).ToList()
+                         };
+
+            return result.ToList();
+
+        }
+
+        public CustomizeWorkshopSettingsViewModel GetWorkshopIncludeGroupsByWorkshopId(long workshopId)
+        {
+            var customizeWorkshopSettings = _companyContext.CustomizeWorkshopSettings
+                .AsNoTracking().AsSplitQuery().Where(x => x.WorkshopId == workshopId)
+                .Include(x => x.CustomizeWorkshopGroupSettingsCollection)
+                .Select(x => new CustomizeWorkshopSettingsViewModel()
+                {
+                    Id = x.id,
+                    WorkshopShiftStatus = x.WorkshopShiftStatus,
+                    GroupSettings = x.CustomizeWorkshopGroupSettingsCollection.Select(g =>
+                        new CustomizeWorkshopGroupSettingsViewModel()
+                        {
+                            Id = g.id,
+                            IrregularShift = g.IrregularShift,
+                            WorkshopShiftStatus = g.WorkshopShiftStatus,
+                            GroupName = g.GroupName,
+                            MainGroup = g.MainGroup,
+                            Salary = g.Salary,
+                            SalaryStr = g.Salary.ToMoney(),
+                            LeavePermitted = g.LeavePermittedDays,
+                            RollCallWorkshopShifts = g.CustomizeWorkshopGroupSettingsShifts.Select(s =>
+                                new CustomizeWorkshopShiftViewModel()
+                                {
+                                    StartTime = s.StartTime.ToString("HH:mm"),
+                                    EndTime = s.EndTime.ToString("HH:mm"),
+                                    Placement = s.Placement,
+                                }).ToList(),
+                            BreakTime = g.BreakTime,
+                            HolidayWork = g.HolidayWork,
+                            FridayWork = g.FridayWork,
+                            CustomizeRotatingShiftsViewModels = g.CustomizeRotatingShifts.Select(r=>new CustomizeRotatingShiftsViewModel()
+                            {
+                                EndTime = r.EndTime.ToString("HH:mm"),
+                                StartTime= r.StartTime.ToString("HH:mm")
+                            }).ToList()
+                            
+                        }).ToList(),
+
+
+                }).FirstOrDefault();
+
+            return customizeWorkshopSettings;
+        }
+
+        public CustomizeWorkshopEmployeeSettingsViewModel GetEmployeeSettingsByWorkshopIdEmployeeId(long workshopId, long employeeId)
+        {
+            var employee = _companyContext.CustomizeWorkshopSettings
+                .AsSplitQuery().Include(x => x.CustomizeWorkshopGroupSettingsCollection)
+                .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection)
+                .FirstOrDefault(x => x.WorkshopId == workshopId)?.CustomizeWorkshopGroupSettingsCollection.SelectMany(x => x.CustomizeWorkshopEmployeeSettingsCollection)
+                .FirstOrDefault(x => x.EmployeeId == employeeId);
+
+            if (employee == null)
+                return new();
+
+            var employeeName = _companyContext.Employees.Select(x => new { x.FullName, x.id })
+                .FirstOrDefault(x => x.id == employee.EmployeeId);
+            return new CustomizeWorkshopEmployeeSettingsViewModel()
+            {
+                Id = employee.id,
+                EmployeeId = employee.EmployeeId,
+                IsSettingChanged = employee.IsSettingChanged,
+                IsShiftChanged = employee.IsShiftChanged,
+                Name = employeeName?.FullName,
+                RollCallWorkshopShifts = employee.CustomizeWorkshopEmployeeSettingsShifts.Select(x =>
+                    new CustomizeWorkshopShiftViewModel()
+                    {
+                        EndTime = x.EndTime.ToString("HH:mm"),
+                        Placement = x.Placement,
+                        StartTime = x.StartTime.ToString("HH:mm")
+                    }).ToList(),
+                Salary = employee.Salary
+            };
+        }
+
+        #region Pooya
+        public List<CustomizeWorkshopEmployeeSettingsViewModel> GetEmployeeSettingsWithMonthlySalary(long workshopId)
+        {
+            var query = _companyContext.CustomizeWorkshopGroupSettings.Where(x => x.MainGroup == false).Include(x => x)
+                .Include(x => x.CustomizeWorkshopEmployeeSettingsCollection).Where(x => x.CustomizeWorkshopEmployeeSettingsCollection.Any(y =>
                 y.WorkshopId == workshopId)).SelectMany(x => x.CustomizeWorkshopEmployeeSettingsCollection)
-            .Where(x => x.Salary > 0).Select(x =>
+                .Where(x => x.Salary > 0).Select(x =>
                 new CustomizeWorkshopEmployeeSettingsViewModel()
                 {
                     WorkshopShiftStatus = x.WorkshopShiftStatus,
@@ -374,31 +361,26 @@ public class CustomizeWorkshopSettingsRepository(CompanyContext companyContext,
                     EmployeeId = x.EmployeeId,
                     BreakTime = x.BreakTime
                 });
-        return query.ToList();
-    }
+            return query.ToList();
+        }
 
-    public List<CustomizeWorkshopEmployeeSettingsViewModel> GetEmployeeSettingsByWorkshopId(long workshopId)
-    {
-        return _companyContext.CustomizeWorkshopSettings.AsNoTracking().Where(x => x.WorkshopId == workshopId).Include(x => x.CustomizeWorkshopGroupSettingsCollection)
-            .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection).SelectMany(x => x.CustomizeWorkshopGroupSettingsCollection
+        public List<CustomizeWorkshopEmployeeSettingsViewModel> GetEmployeeSettingsByWorkshopId(long workshopId)
+        {
+            return _companyContext.CustomizeWorkshopSettings.AsNoTracking().Where(x => x.WorkshopId == workshopId).Include(x => x.CustomizeWorkshopGroupSettingsCollection)
+                .ThenInclude(x => x.CustomizeWorkshopEmployeeSettingsCollection).SelectMany(x => x.CustomizeWorkshopGroupSettingsCollection
                 .SelectMany(y => y.CustomizeWorkshopEmployeeSettingsCollection))
-            .Select(x => new CustomizeWorkshopEmployeeSettingsViewModel
-            {
-                BreakTime = x.BreakTime,
-                IsShiftChanged = x.IsShiftChanged,
-                IsSettingChanged = x.IsSettingChanged,
-                EmployeeId = x.EmployeeId,
-                Id = x.id,
-                Salary = x.Salary,
-                GroupSettingsId = x.CustomizeWorkshopGroupSettingId
-            }).ToList();
-    }
+                .Select(x => new CustomizeWorkshopEmployeeSettingsViewModel
+                {
+                    BreakTime = x.BreakTime,
+                    IsShiftChanged = x.IsShiftChanged,
+                    IsSettingChanged = x.IsSettingChanged,
+                    EmployeeId = x.EmployeeId,
+                    Id = x.id,
+                    Salary = x.Salary,
+                    GroupSettingsId = x.CustomizeWorkshopGroupSettingId
+                }).ToList();
+        }
 
-    public CustomizeWorkshopSettings GetBy(long workshopId)
-    {
-        return _companyContext.CustomizeWorkshopSettings.AsSplitQuery()
-            .FirstOrDefault(x => x.WorkshopId == workshopId);
+        #endregion
     }
-
-    #endregion
 }

CompanyManagment.EFCore/Repository/DateSalaryRepository.cs

@@ -43,6 +43,9 @@ public class DateSalaryRepository : RepositoryBase<long, DateSalary>, IDateSalar
             Year = x.Year,
             StartDateFa = x.StartDateFa,
             EndDateFa = x.EndDateFa,
+            StartDateGr = x.StartDateGr,
+            EndDateGr = x.EndDateGr
+            
         });
         var list = query.OrderByDescending(x => x.Id).ToList();
 
@@ -51,7 +54,7 @@ public class DateSalaryRepository : RepositoryBase<long, DateSalary>, IDateSalar
 
         if (!string.IsNullOrWhiteSpace(searchModel.Month))
             list = list.Where(x => x.Year == searchModel.Month).OrderByDescending(x => x.Year).ToList();
-        return list;
+        return list.OrderByDescending(x=>x.StartDateGr).ToList();
     }
     public DateSalaryViewModel GetDateSalaryViewModel(DateSalarySearchModel searchModel)
     {
@@ -106,7 +109,7 @@ public class DateSalaryRepository : RepositoryBase<long, DateSalary>, IDateSalar
                 var dateSalary = Get(command.Id);
                 dateSalary.Edit(command.StartDateFa, command.EndDateFa);
                 SaveChanges();
-                command.DateSalaryItems = command.DateSalaryItems.Where(x => x.Salary > 0).ToList();
+                //command.DateSalaryItems = command.DateSalaryItems.Where(x => x.Salary > 0).ToList();
                 foreach (var item in command.DateSalaryItems)
                 {
                     if (item.Id == 0)

CompanyManagment.EFCore/Repository/EmployerRepository.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.InfraStructure;
 using Company.Domain.EmployerAccountAgg;
@@ -580,6 +581,21 @@ public class EmployerRepository : RepositoryBase<long, Employer>, IEmployerRepos
             }).ToList();
     }
 
+    public async Task<List<EmployerSelectListViewModel>> GetSelectList(string search)
+    {
+        var query = _context.Employers.Select(x => new EmployerSelectListViewModel()
+        {
+            Id = x.id,
+            Name = x.FullName
+        });
+        if (!string.IsNullOrWhiteSpace(search))
+        {
+            query = query.Where(x => x.Name.Contains(search));
+        }
+
+        return await query.Take(100).ToListAsync();
+    }
+
     #endregion
 
     #region NewByHeydari

CompanyManagment.EFCore/Repository/InsuranceJobItemRepository.cs

@@ -6,8 +6,10 @@ using _0_Framework.InfraStructure;
 
 using Company.Domain.InsuranceJobAndJobsAgg;
 using Company.Domain.InsuranceJobItemAgg;
+using CompanyManagment.App.Contracts.DateSalaryItem;
 using CompanyManagment.App.Contracts.InsuranceJobItem;
 using CompanyManagment.App.Contracts.Job;
+using Microsoft.EntityFrameworkCore;
 
 namespace CompanyManagment.EFCore.Repository;
 
@@ -22,8 +24,8 @@ public class InsuranceJobItemRepository : RepositoryBase<long, InsuranceJobItem>
     public void CreateInsuranceJobItem(InsuranceJobItemViewModel model)
     {
 
-        InsuranceJobItem incuranceJobItemObj = new InsuranceJobItem(model.PercentageLessThan, model.SalaeyLessThan,
-            model.PercentageMoreThan, model.SalaryMoreThan, model.InsuranceJobId);
+        InsuranceJobItem incuranceJobItemObj = new InsuranceJobItem(0, 0,
+            0, 0, model.InsuranceJobId, model.StartDate,model.EndDate);
         _context.InsuranceJobItems.Add(incuranceJobItemObj);
         _context.SaveChanges();
         List<InsuranceJobAndJobs> insuranceJobAndJobsList = new List<InsuranceJobAndJobs>();
@@ -44,7 +46,7 @@ public class InsuranceJobItemRepository : RepositoryBase<long, InsuranceJobItem>
         throw new NotImplementedException();
     }
 
-    public List<InsuranceJobItemViewModel> GetInsuranceJobItemByInsuranceJobId(long Id)
+    public List<InsuranceJobItemViewModel> GetInsuranceJobItemByInsuranceJobId(long Id, string year, string month)
     {
 
         //var list = _context.InsuranceJobItems.Where(x => x.InsuranceJobId == Id).ToList().Select(x=>new InsuranceJobItemViewModel()
@@ -91,21 +93,37 @@ public class InsuranceJobItemRepository : RepositoryBase<long, InsuranceJobItem>
 
         //    list.Add(obj);
         //}
-
-        var insuranceJobItems = _context.InsuranceJobItems.Where(x => x.InsuranceJobId == Id).ToList();
+        var searcheDate = ($"{year}/{month}/01").ToGeorgianDateTime();
+        var insuranceJobItems = _context.InsuranceJobItems.Where(i => i.InsuranceJobId == Id && i.StartDate <= searcheDate && i.EndDate >= searcheDate).ToList();
         var list = new List<InsuranceJobItemViewModel>();
+        var usedParcentsInDateSalaryItems = _context.DateSalaries
+            .Where(x => x.StartDateGr <= searcheDate && x.EndDateGr >= searcheDate)
+            .Include(x => x.DateSalaryItemList)
+            .SelectMany(x => x.DateSalaryItemList)
+            .ToList();
 
         foreach (var item in insuranceJobItems)
         {
+            double lessThan = usedParcentsInDateSalaryItems.Any(x => x.Percent == item.PercentageLessThan && x.Salary > 0)
+                ? usedParcentsInDateSalaryItems.FirstOrDefault(x => x.Percent == item.PercentageLessThan).Salary
+                : 0;
+
+            double moreThan = usedParcentsInDateSalaryItems.Any(x => x.Percent == item.PercentageMoreThan && x.Salary > 0)
+                ? usedParcentsInDateSalaryItems.FirstOrDefault(x => x.Percent == item.PercentageMoreThan).Salary
+                : 0;
             var obj = new InsuranceJobItemViewModel();
             obj.Id = item.id;
             obj.PercentageLessThan = item.PercentageLessThan;
+            obj.IsPercentageLessThanUse = lessThan > 0 ;
             obj.PercentageMoreThan = item.PercentageMoreThan;
+            obj.IsPercentageMoreThanUse = moreThan > 0;
             obj.SalaeyLessThan = item.SalaeyLessThan;
             obj.SalaryMoreThan = item.SalaryMoreThan;
-            obj.SalaeyLessThanString = item.SalaryMoreThan.ToMoney();
-            obj.SalaryMoreThanString = item.SalaryMoreThan.ToMoney();
+            obj.SalaeyLessThanString = lessThan > 0 ? lessThan.ToMoney() : "0";
+            obj.SalaryMoreThanString = moreThan > 0 ? moreThan.ToMoney() : "0";
             obj.InsuranceJobId = item.InsuranceJobId;
+            obj.StartDate = item.StartDate;
+            obj.EndDate = item.EndDate;
             obj.JobIds = _context.InsuranceJobAndJobsSet.Where(p => p.InsuranceJobItemId == item.id)
                 .Select(p => p.JobId).ToList();
             obj.JobList = _context.Jobs.Where(x => obj.JobIds.Contains(x.id)).ToList().Select(x =>
@@ -122,10 +140,11 @@ public class InsuranceJobItemRepository : RepositoryBase<long, InsuranceJobItem>
     }
 
 
-    public InsuranceJobItemViewModel GetInsuranceJobItemByInsuranceJobIdForFixedSalary(long insuranceJobId, long jobId)
+    public InsuranceJobItemViewModel GetInsuranceJobItemByInsuranceJobIdForFixedSalary(long insuranceJobId, long jobId, string year, string month)
     {
+        var searcheDate = ($"{year}/{month}/01").ToGeorgianDateTime();
         var insuranceJobItemViewModel = new InsuranceJobItemViewModel();
-        var insuranceJobItems = _context.InsuranceJobItems.Where(x => x.InsuranceJobId == insuranceJobId).ToList();
+        var insuranceJobItems = _context.InsuranceJobItems.Where(i => i.InsuranceJobId == insuranceJobId && i.StartDate <= searcheDate && i.EndDate >= searcheDate).ToList();
         var insuranceJobItemIds = insuranceJobItems.Select(x => x.id).ToList();
         var jobAndJob = _context.InsuranceJobAndJobsSet
             .Where(x => insuranceJobItemIds.Contains(x.InsuranceJobItemId) && x.JobId == jobId).FirstOrDefault();
@@ -146,6 +165,17 @@ public class InsuranceJobItemRepository : RepositoryBase<long, InsuranceJobItem>
         return insuranceJobItemViewModel;
     }
 
+    public (List<string> workshopList, bool hasAnyWorkshop) GetWorkshopUsedThisInsuranceJob(long insuranceJobId)
+    {
+        var workshops = _context.Workshops.Where(x => x.InsuranceJobId == insuranceJobId);
+        if (!workshops.Any())
+        {
+            return (new List<string>(), false);
+        }
+
+        return (workshops.Select(x => x.WorkshopFullName).ToList(), true);
+    }
+
     public List<InsuranceJobItemViewModel> Search(InsuranceJobItemSearchModel searchModel)
     {
         throw new NotImplementedException();

CompanyManagment.EFCore/Repository/InsuranceJobRepository.cs

@@ -3,11 +3,17 @@ using System.Collections.Generic;
 using System.Linq;
 using _0_Framework.Application;
 using _0_Framework.InfraStructure;
+using Company.Domain.DateSalaryAgg;
+using Company.Domain.DateSalaryItemAgg;
 using Company.Domain.InsuranceJobAndJobsAgg;
 using Company.Domain.InsuranceJobItemAgg;
 using Company.Domain.InsurancJobAgg;
 using Company.Domain.PercentageAgg;
 using CompanyManagment.App.Contracts.InsuranceJob;
+using CompanyManagment.App.Contracts.InsuranceJobItem;
+using CompanyManagment.App.Contracts.Percentage;
+using Microsoft.EntityFrameworkCore;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
 
 
 namespace CompanyManagment.EFCore.Repository;
@@ -15,16 +21,21 @@ namespace CompanyManagment.EFCore.Repository;
 public class InsuranceJobRepository : RepositoryBase<long, InsuranceJob>, IInsuranceJobRepositpry
 {
     private readonly CompanyContext _context;
+    private readonly TestDbContext _testDbContext;
     private readonly IInsuranceJobItemRepositpry _insuranceJobItemRepositpry;
     private readonly IPercentageRepository _percentageRepository;
-    public InsuranceJobRepository(CompanyContext context, IInsuranceJobItemRepositpry insuranceJobItemRepositpry , IPercentageRepository percentageRepository) : base(context)
+    private readonly IDateSalaryItemRepository _dateSalaryItemRepository;
+    
+    public InsuranceJobRepository(CompanyContext context, IInsuranceJobItemRepositpry insuranceJobItemRepositpry, IPercentageRepository percentageRepository, TestDbContext testDbContext, IDateSalaryItemRepository dateSalaryItemRepository) : base(context)
     {
         _context = context;
         _insuranceJobItemRepositpry = insuranceJobItemRepositpry;
         _percentageRepository = percentageRepository;
+        _testDbContext = testDbContext;
+        _dateSalaryItemRepository = dateSalaryItemRepository;
     }
 
-    public EditInsuranceJob GetDetails(long id)
+    public EditInsuranceJob GetDetails(long id, string year, string month)
     {
         var insuranceJob = new EditInsuranceJob();
         var details = Get(id);
@@ -32,7 +43,13 @@ public class InsuranceJobRepository : RepositoryBase<long, InsuranceJob>, IInsur
         insuranceJob.Year = details.Year;
         insuranceJob.EconomicCode = details.EconomicCode;
         insuranceJob.InsuranceJobTitle = details.InsuranceJobTitle;
-        insuranceJob.InsuranceJobItems = _insuranceJobItemRepositpry.GetInsuranceJobItemByInsuranceJobId(id);
+        insuranceJob.InsuranceJobItems = _insuranceJobItemRepositpry.GetInsuranceJobItemByInsuranceJobId(id, year, month);
+        var workshopsUsedThis  = _insuranceJobItemRepositpry.GetWorkshopUsedThisInsuranceJob(id);
+        var item = insuranceJob.InsuranceJobItems.FirstOrDefault();
+        insuranceJob.StartDateFa = item != null ? $"{item.StartDate.ToFarsi()}" : "-";
+        insuranceJob.EndDateFa = item != null ? $"{item.EndDate.ToFarsi()}" : "-";
+        insuranceJob.WorkshopList = workshopsUsedThis.workshopList;
+        insuranceJob.HasAnyWorkshop = workshopsUsedThis.hasAnyWorkshop;
         return insuranceJob;
     }
 
@@ -49,16 +66,33 @@ public class InsuranceJobRepository : RepositoryBase<long, InsuranceJob>, IInsur
 
     public List<InsuranceJobViewModel> Search(InsuranceJobSearchModel searchModel)
     {
-        var query = _context.InsuranceJobs.Select(x => new InsuranceJobViewModel
-        {
-            Id = x.id,
-            InsuranceJobTitle = x.InsuranceJobTitle,
-            EconomicCode = x.EconomicCode
-        });
+
+        string now = Tools.ToFarsi(DateTime.Now);
+        string year = now.Substring(0, 4);
+        string month = now.Substring(5, 2);
+        if (!string.IsNullOrWhiteSpace(searchModel.Year))
+            year = searchModel.Year;
+        if (!string.IsNullOrWhiteSpace(searchModel.Month))
+            month = searchModel.Month;
+
+
+        var searcheDate = ($"{year}/{month}/01").ToGeorgianDateTime();
+        var query = _context.InsuranceJobs
+            .Include(x => x.InsuranceJobItemList).Where(x => x.InsuranceJobItemList.Any(i => i.StartDate <= searcheDate && i.EndDate >= searcheDate))
+            .Select(x => new InsuranceJobViewModel
+            {
+                Id = x.id,
+                InsuranceJobTitle = x.InsuranceJobTitle,
+                EconomicCode = x.EconomicCode,
+                Year = year,
+                Month = month,
+                
+
+            });
 
         if (!string.IsNullOrWhiteSpace(searchModel.EconomicCode))
-            query = query.Where(x => x.EconomicCode.Contains(searchModel.EconomicCode));    
-            
+            query = query.Where(x => x.EconomicCode.Contains(searchModel.EconomicCode));
+
         if (!string.IsNullOrWhiteSpace(searchModel.InsuranceJobTitle))
             query = query.Where(x => x.InsuranceJobTitle.Contains(searchModel.InsuranceJobTitle));
 
@@ -67,7 +101,21 @@ public class InsuranceJobRepository : RepositoryBase<long, InsuranceJob>, IInsur
 
     public OperationResult CreateInsuranceJob(CreateInsuranceJob command)
     {
-        OperationResult result = new OperationResult();
+        OperationResult result = new OperationResult(); 
+        var insuranceJobItemObj = _insuranceJobItemRepositpry.Get(command.InsuranceJobItemId);
+        if (insuranceJobItemObj == null)
+            return result.Failed("آیتم شغلی انتخاب شده وجود ندارد");
+
+        List<double> percentaegJoin = new List<double>();
+        var percentageLessThan = command.InsuranceJobItems.Select(x => x.PercentageLessThan).ToList();
+        var percentageMoreThan = command.InsuranceJobItems.Select(x => x.PercentageMoreThan).ToList();
+        if (percentageMoreThan != null)
+        {
+            percentaegJoin = percentageLessThan
+                .Concat(percentageMoreThan)
+                .Distinct()
+                .ToList();
+        }
         using (var transaction = _context.Database.BeginTransaction())
         {
             try
@@ -80,6 +128,8 @@ public class InsuranceJobRepository : RepositoryBase<long, InsuranceJob>, IInsur
                     item.PercentageLessThan = item.PercentageLessThan;
                     item.PercentageMoreThan = item.PercentageMoreThan;
                     item.InsuranceJobId = insuranceJobObj.id;
+                    item.StartDate = insuranceJobItemObj.StartDate;
+                    item.EndDate = insuranceJobItemObj.EndDate;
                     _insuranceJobItemRepositpry.CreateInsuranceJobItem(item);
 
                     if (!_percentageRepository.Exists(x => x.Percent == item.PercentageLessThan))
@@ -93,16 +143,39 @@ public class InsuranceJobRepository : RepositoryBase<long, InsuranceJob>, IInsur
                         var percentage2 = new Percentage(item.PercentageMoreThan);
                         _percentageRepository.Create(percentage2);
                     }
-                       
+
                     _percentageRepository.SaveChanges();
                 }
+
+                var dateSalary = _context.DateSalaries.FirstOrDefault(x =>
+                    x.StartDateGr == insuranceJobItemObj.StartDate && x.EndDateGr == insuranceJobItemObj.EndDate);
+                var percentages = _context.Percentages.Select(x => new { x.id, x.Percent }).ToList();
+                var dateSalaryItemList = new List<DateSalaryItem>();
+                foreach (var percent in percentaegJoin)
+                {
+                    var percentageId = percentages.FirstOrDefault(x => x.Percent == percent);
+                    if (percentageId != null)
+                    {
+
+                        var dateSalaryItem = new DateSalaryItem(percent, percentageId.id, 0, dateSalary.id);
+                        dateSalaryItemList.Add(dateSalaryItem);
+                    }
+
+
+                }
+
+                if (dateSalaryItemList.Count > 0)
+                {
+                    _context.DateSalaryItems.AddRange(dateSalaryItemList);
+                    _context.SaveChanges();
+                }
                 // SaveChanges();
                 transaction.Commit();
                 result.IsSuccedded = true;
                 result.Message = "ثبت اطلاعات با موفقیت انجام شد";
             }
             catch (Exception ex)
-            { 
+            {
                 transaction.Rollback();
                 result.Failed("ثبت اطلاعات با خطا مواجه شد");
             }
@@ -110,19 +183,240 @@ public class InsuranceJobRepository : RepositoryBase<long, InsuranceJob>, IInsur
         return result;
     }
 
-    public OperationResult Remove(long id)
+    public List<(long id, string date)> GetOldYersInsuranceItemIds()
     {
+        var res = _context.InsuranceJobItems.Where(x=>x.StartDate != null && x.EndDate != null)
+             .GroupBy(x => x.StartDate)
+             .Select(g => g.First())
+            .ToList().Select(x => new InsuranceJobItemViewModel()
+             {
+                 Id = x.id,
+                 StartDate = x.StartDate,
+                 EndDate = x.EndDate,
+
+
+             }).OrderByDescending(x=>x.StartDate);
+
+        return res.Select(x => (x.Id, $"{(x.StartDate.HasValue ? x.StartDate.Value.ToFarsi() : "نامشخص")} - {(x.EndDate.HasValue ? x.EndDate.Value.ToFarsi() : "نامشخص")}")).ToList();
+
+    }
+
+    public OperationResult CopyFromLastYear(CopyFromLastYearViewModel command)
+    {
+        var op = new OperationResult();
+        if (command.InsuranceJobItemId == 0)
+            return op.Failed("بازه را انتخاب کنید");
+        DateTime startDateGr = new DateTime();
+        DateTime endDateGr = new DateTime();
+        try
+        {
+            startDateGr = command.StartDate.ToGeorgianDateTime();
+            endDateGr = command.EndDate.ToGeorgianDateTime();
+
+        }
+        catch (Exception e)
+        {
+            return op.Failed("تاریخ به درستی وارد نشده است");
+
+        }
+
+
+        var chekExist = _insuranceJobItemRepositpry.Exists(x => x.StartDate < endDateGr && x.EndDate > startDateGr);
+        if (chekExist)
+            return op.Failed("بازه تاریخ وارد شده با بازه های قبلی تداخل دارد");
+
+        var insuranceJobItemObj = _insuranceJobItemRepositpry.Get(command.InsuranceJobItemId);
+        if (insuranceJobItemObj == null)
+            return op.Failed("آیتم شغلی انتخاب شده وجود ندارد");
+        var insuranceJobItemList = _context.InsuranceJobItems
+            .Include(jobs => jobs.InsuranceJobAndJobs)
+            .Where(x => x.StartDate == insuranceJobItemObj.StartDate).Select(x => new InsuranceJobItemViewModel()
+            {
+                PercentageLessThan = x.PercentageLessThan,
+                PercentageMoreThan = x.PercentageMoreThan,
+                InsuranceJobId = x.InsuranceJobId,
+                StartDate = startDateGr,
+                EndDate = endDateGr,
+                JobIds = x.InsuranceJobAndJobs.Select(j => j.JobId).ToList()
+            }).ToList();
+
+        if (!insuranceJobItemList.Any())
+            return op.Failed("خطا");
+        List<double> percentaegJoin = new List<double>();
+        var percentageLessThan = insuranceJobItemList.Select(x => x.PercentageLessThan).ToList();
+        var percentageMoreThan = insuranceJobItemList.Select(x => x.PercentageMoreThan).ToList();
+        if (percentageMoreThan != null)
+        {
+            percentaegJoin = percentageLessThan
+                .Concat(percentageMoreThan)
+                .Distinct()
+                .ToList();
+        }
+
+        using (var transaction = _context.Database.BeginTransaction())
+        {
+            try
+            {
+           
+                foreach (var item in insuranceJobItemList)
+                {
+
+                    _insuranceJobItemRepositpry.CreateInsuranceJobItem(item);
+
+                  
+                    if (!_percentageRepository.Exists(x => x.Percent == item.PercentageLessThan))
+                    {
+                        var percentage = new Percentage(item.PercentageLessThan);
+                        _percentageRepository.Create(percentage);
+                    }
+
+                    if (!_percentageRepository.Exists(x => x.Percent == item.PercentageMoreThan))
+                    {
+                        var percentage2 = new Percentage(item.PercentageMoreThan);
+                        _percentageRepository.Create(percentage2);
+                    }
+
+                    _percentageRepository.SaveChanges();
+                }
+
+                var dateSalary = new DateSalary(command.StartDate, command.EndDate);
+                _context.DateSalaries.Add(dateSalary);
+                _context.SaveChanges();
+                var percentages = _context.Percentages.Select(x=> new{x.id, x.Percent}).ToList();
+                var dateSalaryItemList = new List<DateSalaryItem>();
+                foreach (var percent in percentaegJoin)
+                {
+                    var percentageId = percentages.FirstOrDefault(x => x.Percent == percent);
+                    if (percentageId != null)
+                    {
+                       
+                        var dateSalaryItem = new DateSalaryItem(percent, percentageId.id, 0, dateSalary.id);
+                        dateSalaryItemList.Add(dateSalaryItem);
+                    }
+                   
+
+                }
+
+                if (dateSalaryItemList.Count > 0)
+                {
+                    _context.DateSalaryItems.AddRange(dateSalaryItemList);
+                    _context.SaveChanges();
+                }
+                   
+          
+               
+                // SaveChanges();
+                transaction.Commit();
+                op.IsSuccedded = true;
+                op.Message = "ثبت اطلاعات با موفقیت انجام شد";
+                return op;
+            }
+            catch (Exception ex)
+            {
+                transaction.Rollback();
+                return op.Failed("ثبت اطلاعات با خطا مواجه شد");
+            }
+        }
+
+    }
+
+    public OperationResult RecoveryOldData1403()
+    {
+
         OperationResult result = new OperationResult();
         using (var transaction = _context.Database.BeginTransaction())
         {
             try
             {
-                var insuranceJobItems = _context.InsuranceJobItems.Where(x=>x.InsuranceJobId==id).ToList();
+                var res = _testDbContext.InsuranceJobItems.Include(x => x.InsuranceJobAndJobs).ToList();
+                foreach (var item in res)
+                {
+                    var createItem = new InsuranceJobItem(item.PercentageLessThan, 0, item.PercentageMoreThan, 0,
+                        item.InsuranceJobId, item.StartDate, item.EndDate);
+                    _context.InsuranceJobItems.Add(createItem);
+                    _context.SaveChanges();
+                    Console.WriteLine(createItem.InsuranceJobId + " " + createItem.PercentageLessThan);
+                    List<InsuranceJobAndJobs> insuranceJobAndJobsList = new List<InsuranceJobAndJobs>();
+                    foreach (var jobItem in item.InsuranceJobAndJobs)
+                    {
+                        var insuranceJobAndJobsObj = new InsuranceJobAndJobs();
+                        insuranceJobAndJobsObj.JobId = jobItem.JobId;
+                        insuranceJobAndJobsObj.InsuranceJobItemId = createItem.id;
+                        insuranceJobAndJobsList.Add(insuranceJobAndJobsObj);
+                    }
+                    _context.InsuranceJobAndJobsSet.AddRange(insuranceJobAndJobsList);
+                    _context.SaveChanges();
+
+
+                    if (!_percentageRepository.Exists(x => x.Percent == item.PercentageLessThan))
+                    {
+                        var percentage = new Percentage(item.PercentageLessThan);
+                        _percentageRepository.Create(percentage);
+                    }
+
+                    if (!_percentageRepository.Exists(x => x.Percent == item.PercentageMoreThan))
+                    {
+                        var percentage2 = new Percentage(item.PercentageMoreThan);
+                        _percentageRepository.Create(percentage2);
+                    }
+
+                    _percentageRepository.SaveChanges();
+
+                }
+
+                transaction.Commit();
+                result.IsSuccedded = true;
+                result.Message = "حذف اطلاعات با موفقیت انجام شد";
+            }
+            catch (Exception ex)
+            {
+                transaction.Rollback();
+                result.Failed("ثبت اطلاعات با خطا مواجه شد");
+            }
+        }
+
+        return result;
+
+
+    }
+    public OperationResult Remove(long id)
+    {
+        OperationResult result = new OperationResult();
+        var insuranceJobItems = _context.InsuranceJobItems.Where(x => x.InsuranceJobId == id).ToList();
+        var start = insuranceJobItems.FirstOrDefault()!.StartDate;
+        var end = insuranceJobItems.FirstOrDefault()!.StartDate;
+        var usedParcentsInDateSalaryItems = _context.DateSalaries
+            .Where(x => x.StartDateGr == start && x.EndDateGr >= end)
+            .Include(x => x.DateSalaryItemList)
+            .SelectMany(x => x.DateSalaryItemList)
+            .ToList();
+        var itemsLessThan = insuranceJobItems.Select(x => x.PercentageLessThan).ToList();
+        var itemsMoreThan = insuranceJobItems.Select(x => x.PercentageMoreThan).ToList();
+        bool lessThan = usedParcentsInDateSalaryItems.Any(x => itemsLessThan.Contains(x.Percent) && x.Salary > 0);
+        bool moreThan = usedParcentsInDateSalaryItems.Any(x => itemsMoreThan.Contains(x.Percent) && x.Salary > 0);
+        if (lessThan || moreThan)
+            return result.Failed("درصد های این صنف دارای مبلغ می باشند");
+
+        var percentaegJoin = itemsLessThan
+            .Concat(itemsMoreThan)
+            .Distinct()
+            .ToList();
+        using (var transaction = _context.Database.BeginTransaction())
+        {
+            try
+            {
+                
                 _context.InsuranceJobItems.RemoveRange(insuranceJobItems);
 
                 var insuranceJobObj = Get(id);
                 _context.InsuranceJobs.Remove(insuranceJobObj);
 
+
+
+                var toBeRemove = usedParcentsInDateSalaryItems.Where(x => percentaegJoin.Contains(x.Percent)).Select(x=>x.id);
+                var dateSalaryItemToBeRemovde = _context.DateSalaryItems.Where(x => toBeRemove.Contains(x.id));
+                _context.DateSalaryItems.RemoveRange(dateSalaryItemToBeRemovde);
+
                 _context.SaveChanges();
                 transaction.Commit();
                 result.IsSuccedded = true;
@@ -147,33 +441,54 @@ public class InsuranceJobRepository : RepositoryBase<long, InsuranceJob>, IInsur
             {
                 var insuranceJob = Get(command.Id);
                 insuranceJob.Edit(command.InsuranceJobTitle, command.YearlySalaryId, command.EconomicCode, command.Year);
-                   
-                var insuranceJobItemsIds = _context.InsuranceJobItems.Where(x => x.InsuranceJobId == command.Id).Select(x=>x.id).ToList();
-                //List<long> deleteIds = new List<long>();
+                var searcheDate = ($"{command.Year}/{command.Month}/01").ToGeorgianDateTime();
+                var insuranceJobItems = _context.InsuranceJobItems
+                    .Include(x=>x.InsuranceJobAndJobs)
+                    .Where(i => i.InsuranceJobId == command.Id && i.StartDate <= searcheDate && i.EndDate >= searcheDate);
+  
+                DateTime? startDate = insuranceJobItems.Select(x => x.StartDate).FirstOrDefault();
+                DateTime? endDate = insuranceJobItems.Select(x => x.EndDate).FirstOrDefault();
+                var insuranceJobItemsIds = insuranceJobItems.Select(x => x.id).ToList();
 
+                var usedParcentsInDateSalaryItems = _context.DateSalaries
+                    .Where(x => x.StartDateGr <= searcheDate && x.EndDateGr >= searcheDate)
+                    .Include(x => x.DateSalaryItemList)
+                    .SelectMany(x => x.DateSalaryItemList)
+                    .ToList();
+                //var editedJobItems = command.InsuranceJobItems.Where(x => x.Id != 0).ToList();
+                //var newAdedJobItems = command.InsuranceJobItems.Where(x => x.Id == 0).ToList();
+
+                //foreach (var item in insuranceJobItems)
+                //{
+
+                //}
                 foreach (var item in command.InsuranceJobItems)
                 {
-                    long deleteId = insuranceJobItemsIds.Where(x => x==item.Id).FirstOrDefault();
-                    if (deleteId !=0)
-                    { insuranceJobItemsIds.Remove(deleteId);}
+                    long deleteId = insuranceJobItemsIds.Where(x => x == item.Id).FirstOrDefault();
+                    if (deleteId != 0)
+                    {
+                        insuranceJobItemsIds.Remove(deleteId);
+                    }
 
                     if (item.Id == 0)
                     {
                         item.PercentageLessThan = item.PercentageLessThan;
                         item.PercentageMoreThan = item.PercentageMoreThan;
                         item.InsuranceJobId = command.Id;
+                        item.StartDate = startDate;
+                        item.EndDate = endDate;
                         _insuranceJobItemRepositpry.CreateInsuranceJobItem(item);
                     }
                     else
                     {
                         var insuranceJobItem = _insuranceJobItemRepositpry.Get(item.Id);
-                        insuranceJobItem.Edit(item.PercentageLessThan, item.SalaeyLessThan, item.PercentageMoreThan, item.SalaryMoreThan, command.Id);
+                        insuranceJobItem.Edit(item.PercentageLessThan, item.SalaeyLessThan, item.PercentageMoreThan, item.SalaryMoreThan, command.Id, startDate, endDate);
 
                         #region JobAndJob
 
-                        var jobAndJobList = _context.InsuranceJobAndJobsSet .Where(x => x.InsuranceJobItemId == item.Id).ToList();
+                        var jobAndJobList = _context.InsuranceJobAndJobsSet.Where(x => x.InsuranceJobItemId == item.Id).ToList();
                         _context.InsuranceJobAndJobsSet.RemoveRange(jobAndJobList);
-                        List <InsuranceJobAndJobs> insuranceJobAndJobsList = new List<InsuranceJobAndJobs>();
+                        List<InsuranceJobAndJobs> insuranceJobAndJobsList = new List<InsuranceJobAndJobs>();
                         foreach (var item2 in item.JobIds)
                         {
                             var insuranceJobAndJobsObj = new InsuranceJobAndJobs();
@@ -186,25 +501,59 @@ public class InsuranceJobRepository : RepositoryBase<long, InsuranceJob>, IInsur
                     }
 
                     #region Percentage
+                    var percentage = new Percentage(item.PercentageLessThan);
                     if (!_percentageRepository.Exists(x => x.Percent == item.PercentageLessThan))
                     {
-                        var percentage = new Percentage(item.PercentageLessThan);
+                        
                         _percentageRepository.Create(percentage);
                     }
+                    var percentage2 = new Percentage(item.PercentageMoreThan);
                     if (!_percentageRepository.Exists(x => x.Percent == item.PercentageMoreThan))
                     {
-                        var percentage2 = new Percentage(item.PercentageMoreThan);
+                      
                         _percentageRepository.Create(percentage2);
                     }
-                    _percentageRepository.SaveChanges();  
+                    _percentageRepository.SaveChanges();
+                    #endregion
+
+
+                    #region DateSalaryItems
+
+                    var checkExitLeesThan = usedParcentsInDateSalaryItems.Any(x => x.Percent == item.PercentageLessThan);
+                    if (!checkExitLeesThan && usedParcentsInDateSalaryItems.Any())
+                    {
+                
+                        if(percentage.id == 0)
+                            percentage.id = _percentageRepository.Search(new PercentageSearchModel(){Percent = item.PercentageLessThan }).FirstOrDefault()!.Id;
+                            
+                        var dateSalaryId =usedParcentsInDateSalaryItems.FirstOrDefault()!.DateSalaryId;
+                        var dateSalaryItem = new DateSalaryItem(item.PercentageLessThan, percentage.id, 0, dateSalaryId);
+                       _dateSalaryItemRepository.Create(dateSalaryItem);
+                      
+                    }
+
+                    var checkExitMoreThan = usedParcentsInDateSalaryItems.Any(x => x.Percent == item.PercentageMoreThan);
+                    if (!checkExitMoreThan && usedParcentsInDateSalaryItems.Any())
+                    {
+                        if (percentage2.id == 0)
+                            percentage2.id = _percentageRepository.Search(new PercentageSearchModel() { Percent = item.PercentageMoreThan }).FirstOrDefault()!.Id;
+
+                        var dateSalaryId = usedParcentsInDateSalaryItems.FirstOrDefault()!.DateSalaryId;
+                        var dateSalaryItem = new DateSalaryItem(item.PercentageMoreThan, percentage2.id, 0, dateSalaryId);
+                        _dateSalaryItemRepository.Create(dateSalaryItem);
+
+                    }
+
+                    _dateSalaryItemRepository.SaveChanges();
+
                     #endregion
                 }
-               
+
                 #region removeJobItems
                 var deleteList = _context.InsuranceJobItems.Where(x => insuranceJobItemsIds.Contains(x.id)).ToList();
                 _context.InsuranceJobItems.RemoveRange(deleteList);
                 #endregion
-               
+
 
                 _context.SaveChanges();
                 transaction.Commit();

CompanyManagment.EFCore/Repository/LeaveRepository.cs

@@ -410,8 +410,7 @@ public class LeaveRepository : RepositoryBase<long, Leave>, ILeaveRepository
         //                (startLeav >= x.ContractStart && endLeav <= x.ContractEnd) ||
         //                (startLeav < x.ContractStart && endLeav <= x.ContractEnd && endLeav >= x.ContractStart) ||
         //                (startLeav < x.ContractStart && endLeav > x.ContractEnd)).ToList();
-        var checkoutExist = _context.CheckoutSet.Where(x => x.WorkshopId == workshopId && x.EmployeeId == employeeId)
-            .Where(x => startLeav <= x.ContractEnd).ToList();
+        var checkoutExist = _context.CheckoutSet.Where(x => x.WorkshopId == workshopId && x.EmployeeId == employeeId && startLeav <= x.ContractEnd).ToList();
         if (checkoutExist.Count > 0)
         {
             res.HasChekout = true;

CompanyManagment.EFCore/Repository/LeftWorkInsuranceRepository.cs

@@ -8,6 +8,7 @@ using Company.Domain.InsuranceListAgg;
 using Company.Domain.LeftWorkInsuranceAgg;
 using Company.Domain.PersonnelCodeAgg;
 using CompanyManagment.App.Contracts.InsuranceList;
+using CompanyManagment.App.Contracts.LeftWork;
 using CompanyManagment.App.Contracts.LeftWorkInsurance;
 using CompanyManagment.App.Contracts.PersonnleCode;
 using Microsoft.EntityFrameworkCore;
@@ -25,15 +26,15 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
     public EditLeftWorkInsurance GetDetails(long id)
     {
         return _context.LeftWorkInsuranceList.Select(x => new EditLeftWorkInsurance()
-            {
-                Id = x.id,
-                LeftWorkDate = x.LeftWorkDate != null ? x.LeftWorkDate.ToFarsi() : "",
-                StartWorkDate = x.StartWorkDate.ToFarsi(),
-                EmployeeFullName = x.EmployeeFullName,
-                WorkshopName = x.WorkshopName,
-                WorkshopId = x.WorkshopId,
-                EmployeeId = x.EmployeeId
-            })
+        {
+            Id = x.id,
+            LeftWorkDate = x.LeftWorkDate != null ? x.LeftWorkDate.ToFarsi() : "",
+            StartWorkDate = x.StartWorkDate.ToFarsi(),
+            EmployeeFullName = x.EmployeeFullName,
+            WorkshopName = x.WorkshopName,
+            WorkshopId = x.WorkshopId,
+            EmployeeId = x.EmployeeId
+        })
             .FirstOrDefault(x => x.Id == id);
     }
 
@@ -89,7 +90,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
             EmployeeId = x.EmployeeId,
             JobId = x.JobId,
 
-        }).Where(x=>x.WorkshopId == workshopId);
+        }).Where(x => x.WorkshopId == workshopId);
         return query.ToList();
     }
 
@@ -108,10 +109,10 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
         foreach (var item in query)
         {
             var jobObj = _context.Jobs.Where(x => x.id == item.JobId).FirstOrDefault();
-            var insuranceListIds = _context.EmployeeInsurancListDataSet.Where(x => x.EmployeeId == searchModel.EmployeeId && (x.StartWorkDate == item.StartWorkDate ||x.LeftWorkDate==item.LeftWorkDate))
-                .Select(x=>x.InsuranceListId).ToList();
-            var hasInsuranceList = _context.InsuranceListSet.Any(x => insuranceListIds.Contains(x.id) && x.WorkshopId==item.WorkshopId);
-               
+            var insuranceListIds = _context.EmployeeInsurancListDataSet.Where(x => x.EmployeeId == searchModel.EmployeeId && (x.StartWorkDate == item.StartWorkDate || x.LeftWorkDate == item.LeftWorkDate))
+                .Select(x => x.InsuranceListId).ToList();
+            var hasInsuranceList = _context.InsuranceListSet.Any(x => insuranceListIds.Contains(x.id) && x.WorkshopId == item.WorkshopId);
+
             list.Add(new LeftWorkInsuranceViewModel()
             {
                 Id = item.id,
@@ -125,7 +126,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
                 EmployeeId = item.EmployeeId,
                 JobId = item.JobId,
                 IncludeStatus = item.IncludeStatus,
-                JobName = jobObj!=null?jobObj.JobName:string.Empty,
+                JobName = jobObj != null ? jobObj.JobName : string.Empty,
                 JobCode = jobObj != null ? jobObj.JobCode : string.Empty,
                 HasInsuranceList = hasInsuranceList,
             });
@@ -142,14 +143,14 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
     {
         var op = new OperationResult();
 
-        var item = _context.LeftWorkInsuranceList.FirstOrDefault(x=>x.id==id);
-        if(item !=null)
+        var item = _context.LeftWorkInsuranceList.FirstOrDefault(x => x.id == id);
+        if (item != null)
             _context.LeftWorkInsuranceList.Remove(item);
-           
+
         _context.SaveChanges();
         return op.Succcedded();
     }
-    public OperationResult  RemoveAllLeftWorkInsurance(long workshopId, long employeeId)
+    public OperationResult RemoveAllLeftWorkInsurance(long workshopId, long employeeId)
     {
         var op = new OperationResult();
 
@@ -161,8 +162,8 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
                 var insuranceList = _context.InsuranceListSet.Where(x => x.WorkshopId == workshopId).ToList();
                 foreach (var item in insuranceList)
                 {
-                    hasInsurance =_context.EmployeeInsurancListDataSet.Any(x => x.EmployeeId == employeeId && x.InsuranceListId==item.id);
-                    if(hasInsurance)
+                    hasInsurance = _context.EmployeeInsurancListDataSet.Any(x => x.EmployeeId == employeeId && x.InsuranceListId == item.id);
+                    if (hasInsurance)
                         break;
                 }
                 //tempChange
@@ -174,7 +175,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
                 if (list != null && list.Count > 0)
                     _context.LeftWorkInsuranceList.RemoveRange(list);
 
-                bool hasLeftWork = _context.LeftWorkList.Any(x => x.EmployeeId == employeeId && x.WorkshopId==workshopId);
+                bool hasLeftWork = _context.LeftWorkList.Any(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId);
                 if (!hasLeftWork)
                 {
                     var personelCodeList = _context.PersonnelCodeSet.Where(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId).ToList();
@@ -186,8 +187,8 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
                 string Message = "";
 
                 if (hasLeftWork)
-                {  
-                    op.Message="حذف با موفقیت انجام شد." + "<br/>" + "<span class='text-warning'>" +"کد پرسنلی این شخص در این کارگاه به دلیل استفاده در ترک کار قرارداد قابل حذف نمی باشد.  " + "</span>";
+                {
+                    op.Message = "حذف با موفقیت انجام شد." + "<br/>" + "<span class='text-warning'>" + "کد پرسنلی این شخص در این کارگاه به دلیل استفاده در ترک کار قرارداد قابل حذف نمی باشد.  " + "</span>";
                     op.IsSuccedded = true;
                 }
                 else
@@ -231,7 +232,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
 
     public List<LeftWorkInsuranceViewModel> SearchForCreateInsuranceList(EmployeeForCreateInsuranceListSearchModel searchModel)
     {
-        List <LeftWorkInsuranceViewModel> listLeftWorkInsurance = new List<LeftWorkInsuranceViewModel>();
+        List<LeftWorkInsuranceViewModel> listLeftWorkInsurance = new List<LeftWorkInsuranceViewModel>();
         // IQueryable<LeftWorkInsuranceViewModel> query;
 
         //if (searchModel.WorkshopIds != null && searchModel.WorkshopIds.Count > 0)
@@ -286,7 +287,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
                 leftWorkInsurance.EmployeeId = item.EmployeeId;
                 leftWorkInsurance.IncludeStatus = item.IncludeStatus;
                 leftWorkInsurance.JobId = item.JobId;
-                leftWorkInsurance.JobName = job!=null?job.JobName:string.Empty;
+                leftWorkInsurance.JobName = job != null ? job.JobName : string.Empty;
                 leftWorkInsurance.JobCode = job != null ? job.JobCode : string.Empty;
                 listLeftWorkInsurance.Add(leftWorkInsurance);
             }
@@ -319,7 +320,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
     public LeftWorkInsuranceViewModel GetLeftPersonelByWorkshopIdAndEmployeeId(long workshopId, long employeeId)
     {
         var leftWorkInsurance = new LeftWorkInsuranceViewModel();
-        var leftWorkInsuranceObj = _context.LeftWorkInsuranceList.Where(x=>x.EmployeeId==employeeId && x.WorkshopId==workshopId).OrderByDescending(x=>x.id).FirstOrDefault();
+        var leftWorkInsuranceObj = _context.LeftWorkInsuranceList.Where(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId).OrderByDescending(x => x.id).FirstOrDefault();
 
         if (leftWorkInsuranceObj != null)
         {
@@ -327,7 +328,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
             leftWorkInsurance.LeftWorkDateGr = leftWorkInsuranceObj.LeftWorkDate;
             leftWorkInsurance.StartWorkDateGr = leftWorkInsuranceObj.StartWorkDate;
 
-            if(leftWorkInsuranceObj.LeftWorkDate!=null)
+            if (leftWorkInsuranceObj.LeftWorkDate != null)
                 leftWorkInsurance.LeftWorkDate = leftWorkInsuranceObj.LeftWorkDate.ToFarsi();
 
             leftWorkInsurance.StartWorkDate = leftWorkInsuranceObj.StartWorkDate.ToFarsi();
@@ -361,7 +362,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
                     var personelcode = command.PersonnelCodeList.Where(x => x.EmployeeId == command.EmployeeId && x.WorkshopId == command.WorkshopId).FirstOrDefault();
                     if (personelcode != null)
                     {
-                        if(_context.PersonnelCodeSet.Any(x=> x.WorkshopId == command.WorkshopId && x.PersonnelCode == personelcode.PersonnelCode))
+                        if (_context.PersonnelCodeSet.Any(x => x.WorkshopId == command.WorkshopId && x.PersonnelCode == personelcode.PersonnelCode))
                         {
                             op.Failed(" کد پرسنلی در کارگاه " + command.WorkshopName + " تکراری می باشد. ");
                         }
@@ -370,7 +371,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
                         {
                             return op.Failed(" کد پرسنلی در کارگاه " + command.WorkshopName + "نامعتبر است.");
                         }
-                        _context.PersonnelCodeSet.Add(new PersonnelCodeDomain(command.WorkshopId,  command.EmployeeId, personelcode.PersonnelCode));
+                        _context.PersonnelCodeSet.Add(new PersonnelCodeDomain(command.WorkshopId, command.EmployeeId, personelcode.PersonnelCode));
                     }
                 }
                 #endregion
@@ -453,11 +454,11 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
 
                         foreach (var removeItem in leftworkInsuranceList)
                         {
-                            if(!item.LeftworkInsuranceViewModels.Any(x=>x.Id==removeItem.id))
+                            if (!item.LeftworkInsuranceViewModels.Any(x => x.Id == removeItem.id))
                                 removeList.Add(removeItem);
                         }
                         foreach (var item2 in item.LeftworkInsuranceViewModels)
-                        {   
+                        {
                             DateTime? left = null;
                             if (!string.IsNullOrWhiteSpace(item2.LeftWorkDate))
                                 left = item2.LeftWorkDate.ToGeorgianDateTime();
@@ -469,7 +470,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
                                 var check = _context.LeftWorkInsuranceList.Any(x =>
                                     x.EmployeeId == item2.EmployeeId && x.WorkshopId == item2.WorkshopId &&
                                     x.StartWorkDate == start);
-                         
+
                                 if (!check)
                                 {
 
@@ -477,11 +478,11 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
                                         employeeFullName, item2.WorkshopName, item2.JobId, item2.IncludeStatus);
                                     Create(leftworkInsuranceObj);
                                 }
-                              
+
                             }
                             else
                             {
-                                var leftworkInsurance = _context.LeftWorkInsuranceList.Where(x => x.id==item2.Id)?.FirstOrDefault();
+                                var leftworkInsurance = _context.LeftWorkInsuranceList.Where(x => x.id == item2.Id)?.FirstOrDefault();
                                 leftworkInsurance.Edit(left, start, item2.WorkshopId, item2.EmployeeId, item2.JobId, item2.IncludeStatus);
                             }
                         }
@@ -508,13 +509,13 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
 
     public OperationResult CheckDeleteLeftWorkInsurance(long workshopId, long employeeId, DateTime date, int type)
     {
-            
+
         var op = new OperationResult();
         bool hasInsurance = false;
         var insuranceList = _context.InsuranceListSet.Where(x => x.WorkshopId == workshopId).ToList();
         foreach (var item in insuranceList)
         {
-            if(type == 1)
+            if (type == 1)
                 hasInsurance = _context.EmployeeInsurancListDataSet.Any(x => x.EmployeeId == employeeId && x.InsuranceListId == item.id && x.StartWorkDate.Date >= date.Date && item.ConfirmSentlist);
             else
                 hasInsurance = _context.EmployeeInsurancListDataSet.Any(x => x.EmployeeId == employeeId && x.InsuranceListId == item.id && (x.LeftWorkDate != null && ((DateTime)x.LeftWorkDate).Date == date.Date));
@@ -555,7 +556,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
 
         insuranceList = _context.InsuranceListSet.Where(x => x.Year == year && x.Month == month && x.WorkshopId == workshopId).ToList();
         if (insuranceList != null && insuranceList.Count > 0)
-        { 
+        {
             foreach (var item in insuranceList)
             {
                 if (type == 1)
@@ -587,7 +588,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
                     }
                 }
 
-                   
+
             }
         }
 
@@ -658,7 +659,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
             {
                 string resulDate = month.ToFarsiMonthByNumber() + " " + year;
                 //tempChange
-               // return op.Failed("در صورت تمایل به ثبت  تاریخ ترک کار به کار این پرسنل می بایست لیست تنظیمی بیمه "+ resulDate + " را حذف نمایید.");
+                // return op.Failed("در صورت تمایل به ثبت  تاریخ ترک کار به کار این پرسنل می بایست لیست تنظیمی بیمه "+ resulDate + " را حذف نمایید.");
             }
         }
 
@@ -670,7 +671,7 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
     {
         var lefts = _context.LeftWorkInsuranceList
             .Where(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId && x.StartWorkDate < startDate)
-            .OrderBy(x=>x.StartWorkDate)
+            .OrderBy(x => x.StartWorkDate)
             .ToList();
         if (lefts.Count > 0)
         {
@@ -689,74 +690,110 @@ public class LeftWorkInsuranceRepository : RepositoryBase<long, LeftWorkInsuranc
                 }
             }
 
-            var sum = totalDays.Sum(x=>x);
+            var sum = totalDays.Sum(x => x);
             return (sum / 365);
         }
         else
         {
             return 0;
         }
-      
+
     }
 
     #region Insurance
 
     public List<EmployeeDetailsForInsuranceListViewModel> GetEmployeeInsuranceLeftWorksAndInformation(long workshopId, DateTime startDate, DateTime endDate)
     {
-	    if (workshopId == 0)
-		    return [];
-	    var query = _context.LeftWorkInsuranceList.Include(x => x.Employee)
-		    .Where(x => x.WorkshopId == workshopId)
-		    .Where(x =>
-			    ((x.LeftWorkDate != null && x.LeftWorkDate != DateTime.MinValue) &&
-			     ((DateTime)x.LeftWorkDate >= startDate &&
-			      (DateTime)x.LeftWorkDate <= endDate)) ||
-			    ((x.LeftWorkDate != null && x.LeftWorkDate != DateTime.MinValue) &&
-			     (DateTime)x.LeftWorkDate >= endDate) ||
-			    (x.LeftWorkDate == null || x.LeftWorkDate == DateTime.MinValue))
-		    .Where(x => x.StartWorkDate <= endDate)
-		    .Join(_context.Jobs,
-			    left => left.JobId,
-			    job => job.id,
-			    (left, job) => new { left, job })
-		    .GroupJoin(_context.InsuranceEmployeeInformationSet.AsSplitQuery(),
-			    result => result.left.EmployeeId,
-			    employeeInfo => employeeInfo.EmployeeId,
-			    (result, employeeInfo) => new
-			    {
-				    result.left,
-				    result.job,
-				    employeeInfo
-			    })
-		    .SelectMany(x => x.employeeInfo.DefaultIfEmpty(), (x, employeeInfo) => new { x, employeeInfo })
-		    .Select(result => new EmployeeDetailsForInsuranceListViewModel
-		    {
-			    StartWorkDateGr = result.x.left.StartWorkDate,
-			    LeftWorkDateGr = result.x.left.LeftWorkDate,
-			    IncludeStatus = result.x.left.IncludeStatus,
-			    JobId = result.x.left.JobId,
-			    JobName = result.x.job != null ? result.x.job.JobName : string.Empty,
-			    JobCode = result.x.job != null ? result.x.job.JobCode : string.Empty,
-			    InsuranceEmployeeInformationId = result.employeeInfo != null ? result.employeeInfo.id : 0,
-			    EmployeeId = result.x.left.EmployeeId,
-                
-			    //اطلاعات هویتی
-			    FName = result.employeeInfo != null ? result.employeeInfo.FName : result.x.left.Employee.FName,
-			    LName = result.employeeInfo != null ? result.employeeInfo.LName : result.x.left.Employee.LName,
-			    FatherName = result.employeeInfo != null ? result.employeeInfo.FatherName : result.x.left.Employee.FatherName,
-			    DateOfBirthGr = result.employeeInfo != null ? result.employeeInfo.DateOfBirth : result.x.left.Employee.DateOfBirth,
-				DateOfIssueGr = result.employeeInfo != null ? result.employeeInfo.DateOfIssue : result.x.left.Employee.DateOfIssue,
-				PlaceOfIssue = result.employeeInfo != null ? result.employeeInfo.PlaceOfIssue : result.x.left.Employee.PlaceOfIssue,
-				IdNumber = result.employeeInfo != null ? result.employeeInfo.IdNumber : result.x.left.Employee.IdNumber,
-				Gender = result.employeeInfo != null ? result.employeeInfo.Gender : result.x.left.Employee.Gender,
-				NationalCode  = result.x.left.Employee.NationalCode,
-				Nationality   = result.x.left.Employee.Nationality,
-				InsuranceCode = result.x.left.Employee.InsuranceCode,
-				MaritalStatus = result.x.left.Employee.MaritalStatus,
-                IsMaritalStatusSet = !string.IsNullOrWhiteSpace(result.x.left.Employee.MaritalStatus)
-			}).ToList();
+        if (workshopId == 0)
+            return [];
+        var query = _context.LeftWorkInsuranceList.Include(x => x.Employee)
+            .Where(x => x.WorkshopId == workshopId)
+            .Where(x =>
+                ((x.LeftWorkDate != null && x.LeftWorkDate != DateTime.MinValue) &&
+                 ((DateTime)x.LeftWorkDate >= startDate &&
+                  (DateTime)x.LeftWorkDate <= endDate)) ||
+                ((x.LeftWorkDate != null && x.LeftWorkDate != DateTime.MinValue) &&
+                 (DateTime)x.LeftWorkDate >= endDate) ||
+                (x.LeftWorkDate == null || x.LeftWorkDate == DateTime.MinValue))
+            .Where(x => x.StartWorkDate <= endDate)
+            .Join(_context.Jobs,
+                left => left.JobId,
+                job => job.id,
+                (left, job) => new { left, job })
+            .GroupJoin(_context.InsuranceEmployeeInformationSet.AsSplitQuery(),
+                result => result.left.EmployeeId,
+                employeeInfo => employeeInfo.EmployeeId,
+                (result, employeeInfo) => new
+                {
+                    result.left,
+                    result.job,
+                    employeeInfo
+                })
+            .SelectMany(x => x.employeeInfo.DefaultIfEmpty(), (x, employeeInfo) => new { x, employeeInfo })
+            .Select(result => new EmployeeDetailsForInsuranceListViewModel
+            {
+                StartWorkDateGr = result.x.left.StartWorkDate,
+                LeftWorkDateGr = result.x.left.LeftWorkDate,
+                IncludeStatus = result.x.left.IncludeStatus,
+                JobId = result.x.left.JobId,
+                JobName = result.x.job != null ? result.x.job.JobName : string.Empty,
+                JobCode = result.x.job != null ? result.x.job.JobCode : string.Empty,
+                InsuranceEmployeeInformationId = result.employeeInfo != null ? result.employeeInfo.id : 0,
+                EmployeeId = result.x.left.EmployeeId,
 
-		return query;
+                //اطلاعات هویتی
+                FName = result.employeeInfo != null ? result.employeeInfo.FName : result.x.left.Employee.FName,
+                LName = result.employeeInfo != null ? result.employeeInfo.LName : result.x.left.Employee.LName,
+                FatherName = result.employeeInfo != null ? result.employeeInfo.FatherName : result.x.left.Employee.FatherName,
+                DateOfBirthGr = result.employeeInfo != null ? result.employeeInfo.DateOfBirth : result.x.left.Employee.DateOfBirth,
+                DateOfIssueGr = result.employeeInfo != null ? result.employeeInfo.DateOfIssue : result.x.left.Employee.DateOfIssue,
+                PlaceOfIssue = result.employeeInfo != null ? result.employeeInfo.PlaceOfIssue : result.x.left.Employee.PlaceOfIssue,
+                IdNumber = result.employeeInfo != null ? result.employeeInfo.IdNumber : result.x.left.Employee.IdNumber,
+                Gender = result.employeeInfo != null ? result.employeeInfo.Gender : result.x.left.Employee.Gender,
+                NationalCode = result.x.left.Employee.NationalCode,
+                Nationality = result.x.left.Employee.Nationality,
+                InsuranceCode = result.x.left.Employee.InsuranceCode,
+                MaritalStatus = result.x.left.Employee.MaritalStatus,
+                IsMaritalStatusSet = !string.IsNullOrWhiteSpace(result.x.left.Employee.MaritalStatus)
+            }).ToList();
+
+        return query;
+    }
+
+    #endregion
+
+    #region Mahan
+
+    public List<LeftWorkViewModel> GetEmployeesWithContractExitOnly(long workshopId)
+    {
+        var leftWorkedEmployees = _context.LeftWorkList
+            .Where(x => x.WorkshopId == workshopId)
+            .GroupBy(x => x.EmployeeId)
+            .Select(x => new
+            {
+                EmployeeId = x.Key,
+                x.OrderByDescending(s => s.StartWorkDate).FirstOrDefault().LeftWorkDate
+            }).Where(x => x.LeftWorkDate != new DateTime(2121, 3, 21))
+            .ToList();
+
+        var leftWorkEmployeeIds = leftWorkedEmployees.Select(x => x.EmployeeId);
+
+        var insuranceLeftWorkWithContractExitOnly = _context.LeftWorkInsuranceList.Where(x =>
+                x.WorkshopId == workshopId && leftWorkEmployeeIds.Contains(x.EmployeeId) && x.LeftWorkDate == null).ToList()
+            .Select(x =>
+            {
+                var employee = leftWorkedEmployees.First(l => l.EmployeeId == x.EmployeeId);
+                return new LeftWorkViewModel()
+                {
+                    WorkshopId = x.WorkshopId,
+                    EmployeeId = x.EmployeeId,
+                    EmployeeFullName = x.EmployeeFullName,
+                    LeftWorkDate = employee.LeftWorkDate.ToFarsi(),
+                    LeftWorkDateGr = employee.LeftWorkDate
+                };
+            });
+
+        return insuranceLeftWorkWithContractExitOnly.ToList();
     }
 
     #endregion

CompanyManagment.EFCore/Repository/LeftWorkRepository.cs

@@ -173,7 +173,7 @@ public class LeftWorkRepository : RepositoryBase<long, LeftWork>, ILeftWorkRepos
         }
 
 
-
+        _context.SaveChanges();
         return op.Succcedded();
     }
 
@@ -649,6 +649,38 @@ public class LeftWorkRepository : RepositoryBase<long, LeftWork>, ILeftWorkRepos
         return leftWork;
     }
 
+    public List<LeftWorkViewModel> SearchCreateContract(LeftWorkSearchModel searchModel)
+    {
+        var vipGroup = _context.CustomizeWorkshopEmployeeSettings.Where(x => x.CustomizeWorkshopGroupSettingId == 117)
+            .Select(x => x.EmployeeId).ToList();
+        var query = _context.LeftWorkList.Select(x => new LeftWorkViewModel()
+        {
+            Id = x.id,
+            LeftWorkDate = x.LeftWorkDate.ToFarsi(),
+            StartWorkDate = x.StartWorkDate.ToFarsi(),
+            LeftWorkDateGr = x.LeftWorkDate,
+            StartWorkDateGr = x.StartWorkDate,
+            EmployeeFullName = x.EmployeeFullName,
+            WorkshopName = x.WorkshopName,
+            WorkshopId = x.WorkshopId,
+            EmployeeId = x.EmployeeId,
+            AddBonusesPay = x.AddBonusesPay,
+            AddYearsPay = x.AddYearsPay,
+            AddLeavePay = x.AddLeavePay,
+            JobId = x.JobId,
+            JobName = _context.Jobs.FirstOrDefault(j => j.id == x.JobId).JobName
+
+
+        }).Where(x=> !vipGroup.Contains(x.EmployeeId));
+        if (searchModel.WorkshopId != 0 && searchModel.EmployeeId != 0)
+            query = query.Where(x => x.WorkshopId == searchModel.WorkshopId && x.EmployeeId == searchModel.EmployeeId);
+        if (searchModel.EmployeeId != 0 && searchModel.WorkshopId == 0)
+            query = query.Where(x => x.EmployeeId == searchModel.EmployeeId);
+        if (searchModel.WorkshopId != 0 && searchModel.EmployeeId == 0)
+            query = query.Where(x => x.WorkshopId == searchModel.WorkshopId);
+        return query.OrderByDescending(x => x.StartWorkDateGr).ToList();
+    }
+
     private bool HasActiveRollCallStatus(long workshopId, long employeeId)
     {
         var now = DateTime.Today;

CompanyManagment.EFCore/Repository/RollCallRepository.cs

@@ -151,6 +151,7 @@ public class RollCallRepository : RepositoryBase<long, RollCall>, IRollCallRepos
 	//حضور غیاب در پرینت فیش حقوقی رسمی
 	public List<CheckoutDailyRollCallViewModel> GetEmployeeRollCallsForMonth(long employeeId, long workshopId, DateTime startMonthDay, DateTime endMonthDay)
     {
+        var firstDayOfMonth = $"{startMonthDay.ToFarsi().Substring(0,8)}01".ToGeorgianDateTime();
 
         //گرفتن ساعت استراحت پرسنل از تنظیمات
         #region breakTime
@@ -169,8 +170,8 @@ public class RollCallRepository : RepositoryBase<long, RollCall>, IRollCallRepos
             x.WorkshopId == workshopId && x.EmployeeId == employeeId && x.EndLeave.Date >= startMonthDay.Date &&
             x.StartLeave.Date <= endMonthDay.Date).ToList();
 
-        var year = Convert.ToInt32(startMonthDay.ToFarsi().Substring(0, 4));
-        var month = Convert.ToInt32(startMonthDay.ToFarsi().Substring(5, 2));
+        var year = Convert.ToInt32(firstDayOfMonth.ToFarsi().Substring(0, 4));
+        var month = Convert.ToInt32(firstDayOfMonth.ToFarsi().Substring(5, 2));
         var firstDayOfCurrentMonth = new DateTime(year, month, 1, new PersianCalendar());
 
 
@@ -193,7 +194,7 @@ public class RollCallRepository : RepositoryBase<long, RollCall>, IRollCallRepos
             HolidayYear = startMonthDay.ToFarsiYear()
         });
         //all the dates from start to end, to be compared with present days to get absent dates
-        var completeDaysList = Enumerable.Range(0, dateRange).Select(offset => startMonthDay.AddDays(offset).Date).ToList();
+        var completeDaysList = Enumerable.Range(0, dateRange).Select(offset => firstDayOfCurrentMonth.AddDays(offset).Date).ToList();
 
         var absentRecords = completeDaysList
                 .ExceptBy(rollCalls.Select(x => x.ShiftDate.Date), y => y.Date)

CompanyManagment.EFCore/Repository/WorkshopRepository.cs

@@ -1148,6 +1148,21 @@ public class WorkshopRepository : RepositoryBase<long, Company.Domain.WorkshopAg
 
     }
 
+    public async Task<List<WorkshopSelectListViewModel>> GetSelectList(string search)
+    {
+        var query = _context.Workshops.Select(x => new WorkshopSelectListViewModel()
+        {
+            ArchiveCode = x.ArchiveCode,
+            Id = x.id,
+            Name = x.WorkshopFullName
+        });
+        if (!string.IsNullOrWhiteSpace(search))
+        {
+            query = query.Where(x => x.Name.Contains(search));
+        }
+
+        return await query.Take(100).ToListAsync();
+    }
 
 
     #endregion

CompanyManagment.EFCore/TestDbContext.cs

@@ -0,0 +1,44 @@
+using Company.Domain.InsuranceJobItemAgg;
+using Company.Domain.InsurancJobAgg;
+using Company.Domain.RollCallAgg;
+using CompanyManagment.EFCore.Mapping;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities;
+using Company.Domain.CustomizeWorkshopSettingsAgg.Entities;
+using CompanyManagment.EFCore.Migrations;
+
+namespace CompanyManagment.EFCore
+{
+    public class TestDbContext : DbContext
+    {
+        public DbSet<InsuranceJobItem> InsuranceJobItems { get; set; }
+        public DbSet<InsuranceJob> InsuranceJobs { get; set; }
+        public DbSet<CustomizeWorkshopEmployeeSettings> CustomizeWorkshopEmployeeSettings { get; set; }
+        public DbSet<CustomizeWorkshopSettings> CustomizeWorkshopSettings { get; set; }
+
+        public TestDbContext(DbContextOptions<TestDbContext> options) : base(options)
+        {
+
+        }
+
+
+        public TestDbContext()
+        {
+
+        }
+
+
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            var assembly = typeof(PersonalContractingpartyMapping).Assembly;
+            modelBuilder.ApplyConfigurationsFromAssembly(assembly);
+            base.OnModelCreating(modelBuilder);
+
+        }
+    }
+}

PersonalContractingParty.Config/PersonalBootstrapper.cs

@@ -208,6 +208,8 @@ using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using Company.Domain.ContactUsAgg;
 using CompanyManagment.App.Contracts.ContactUs;
 using Company.Domain.EmployeeAuthorizeTempAgg;
+using Company.Domain.AdminMonthlyOverviewAgg;
+using CompanyManagment.App.Contracts.AdminMonthlyOverview;
 
 namespace PersonalContractingParty.Config;
 
@@ -432,6 +434,11 @@ public class PersonalBootstrapper
 
         services.AddTransient<IEmployeeAuthorizeTempRepository, EmployeeAuthorizeTempRepository>();
 
+
+        services.AddTransient<IContactUsRepository, ContactUsRepository>();
+        services.AddTransient<IContactUsApplication, ContactUsApplication>();
+        services.AddTransient<IAdminMonthlyOverviewRepository, AdminMonthlyOverviewRepository>();
+        services.AddTransient<IAdminMonthlyOverviewApplication, AdminMonthlyOverviewApplication>();
         #endregion
         #region Pooya