add employer controller

0_Framework/Application/Enums/ActivationStatus.cs

@@ -0,0 +1,8 @@
+namespace _0_Framework.Application.Enums;
+
+public enum ActivationStatus
+{
+    None = 0,
+    Active = 1,
+    DeActive = 2
+}

0_Framework/Application/Enums/LegalType.cs

@@ -0,0 +1,8 @@
+namespace _0_Framework.Application.Enums;
+
+public enum LegalType
+{
+    None = 0,
+    Real = 1,
+    Legal = 2
+}

0_Framework/Application/SelectListViewModel.cs

@@ -0,0 +1,7 @@
+namespace _0_Framework.Application;
+
+public class SelectListViewModel
+{
+    public long Id { get; set; }
+    public string Text { get; set; }
+}

0_Framework/Application/Tools.cs

@@ -41,6 +41,23 @@ public static class Tools
         return Regex.IsMatch(mobileNo, "^((09))(\\d{9})$");
     }
 
+    /// <summary>
+    /// تاریخ شروع و تعداد ماه را میگیرد و تاریخ پایان قراردا را بر میگرداند
+    /// </summary>
+    /// <param name="startDate"></param>
+    /// <param name="monthPlus"></param>
+    /// <returns></returns>
+    public static (DateTime endDateGr, string endDateFa) FindEndOfContract(string startDate, string monthPlus)
+    {
+
+        int startYear = Convert.ToInt32(startDate.Substring(0, 4));
+        int startMonth = Convert.ToInt32(startDate.Substring(5, 2));
+        int startDay = Convert.ToInt32(startDate.Substring(8, 2));
+        var start = new PersianDateTime(startYear, startMonth, startDay);
+        var end = (start.AddMonths(Convert.ToInt32(monthPlus))).AddDays(-1);
+        return ($"{end}".ToGeorgianDateTime(), $"{end}");
+
+    }
 
     /// <summary>
     /// دریافت روزهای کارکرد پرسنل در لیست بیمه ماه مشخص شده

Company.Domain/CheckoutAgg/Checkout.cs

@@ -3,7 +3,6 @@ using System.Collections;
 using System.Collections.Generic;
 using _0_Framework.Application;
 using _0_Framework.Domain;
-using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using Company.Domain.CheckoutAgg.ValueObjects;
 using Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 using Company.Domain.WorkshopAgg;
@@ -30,7 +29,7 @@ public class Checkout : EntityBase
         string overNightWorkValue, string fridayWorkValue, string rotatingShifValue, string absenceValue,
         string totalDayOfLeaveCompute, string totalDayOfYearsCompute, string totalDayOfBunosesCompute,
         ICollection<CheckoutLoanInstallment> loanInstallments,
-        ICollection<CheckoutSalaryAid> salaryAids,CheckoutRollCall checkoutRollCall)
+        ICollection<CheckoutSalaryAid> salaryAids)
     {
         EmployeeFullName = employeeFullName;
         FathersName = fathersName;
@@ -89,7 +88,6 @@ public class Checkout : EntityBase
         TotalDayOfBunosesCompute = totalDayOfBunosesCompute;
         LoanInstallments = loanInstallments;
         SalaryAids = salaryAids;
-        CheckoutRollCall = checkoutRollCall;
     }
 
     public string EmployeeFullName { get; private set; }
@@ -198,8 +196,7 @@ public class Checkout : EntityBase
 
    public ICollection<CheckoutLoanInstallment> LoanInstallments { get; set; } = [];
    public ICollection<CheckoutSalaryAid> SalaryAids { get; set; } = [];
-    public CheckoutRollCall CheckoutRollCall { get; private set; }
-    #endregion
+   #endregion
 
 
     public Workshop Workshop { get; set; }
@@ -311,149 +308,4 @@ public class Checkout : EntityBase
         LoanInstallments = lonaInstallments;
         InstallmentDeduction = installmentsAmount;
     }
-
-    public void SetCheckoutRollCall(CheckoutRollCall checkoutRollCall)
-    {
-        CheckoutRollCall = checkoutRollCall;
-    }
-}
-
-public class CheckoutRollCall
-{
-    private CheckoutRollCall(){}
-	public CheckoutRollCall(TimeSpan totalMandatoryTimeSpan, TimeSpan totalPresentTimeSpan, TimeSpan totalBreakTimeSpan,
-		TimeSpan totalWorkingTimeSpan, TimeSpan totalPaidLeaveTmeSpan, TimeSpan totalSickLeaveTimeSpan,
-		ICollection<CheckoutRollCallDay> rollCallDaysCollection)
-	{
-		TotalMandatoryTimeSpan = totalMandatoryTimeSpan;
-		TotalPresentTimeSpan = totalPresentTimeSpan;
-		TotalBreakTimeSpan = totalBreakTimeSpan;
-		TotalWorkingTimeSpan = totalWorkingTimeSpan;
-		TotalPaidLeaveTmeSpan = totalPaidLeaveTmeSpan;
-		TotalSickLeaveTimeSpan = totalSickLeaveTimeSpan;
-		RollCallDaysCollection = rollCallDaysCollection;
-	}
-
-
-    /// <summary>
-    /// مجموع ساعت موظفی
-    /// </summary>
-	public TimeSpan TotalMandatoryTimeSpan { get; private set; }
-
-    /// <summary>
-    /// مجموع ساعت حضور
-    /// </summary>
-	public TimeSpan TotalPresentTimeSpan { get; private set; }
-
-    /// <summary>
-    /// مجموع ساعت استراحت
-    /// </summary>
-	public TimeSpan TotalBreakTimeSpan { get; private set; }
-
-    /// <summary>
-    /// مجموع ساعت کارکرد
-    /// </summary>
-	public TimeSpan TotalWorkingTimeSpan { get; private set; }
-
-    /// <summary>
-    /// مجموع ساعت مرخصی استحقاقی
-    /// </summary>
-	public TimeSpan TotalPaidLeaveTmeSpan { get; private set; }
-
-    /// <summary>
-    /// مجموع ساعت مرخصی استعلاجی
-    /// </summary>
-    public TimeSpan TotalSickLeaveTimeSpan { get; private set; }
-
-    /// <summary>
-    /// روز های حضور غیاب
-    /// </summary>
-    public ICollection<CheckoutRollCallDay> RollCallDaysCollection { get; private set; }
-}
-
-public class CheckoutRollCallDay
-{
-    private CheckoutRollCallDay(){}
-	public CheckoutRollCallDay(DateTime date, string firstStartDate, string firstEndDate,
-		string secondStartDate, string secondEndDate, TimeSpan breakTimeSpan,
-		bool isSliced, TimeSpan workingTimeSpan, bool isAbsent, bool isFriday,
-		bool isHoliday, string leaveType)
-	{
-		Date = date;
-		FirstStartDate = firstStartDate;
-		FirstEndDate = firstEndDate;
-		SecondStartDate = secondStartDate;
-		SecondEndDate = secondEndDate;
-		BreakTimeSpan = breakTimeSpan;
-		IsSliced = isSliced;
-		WorkingTimeSpan = workingTimeSpan;
-		IsAbsent = isAbsent;
-		IsFriday = isFriday;
-		IsHoliday = isHoliday;
-		LeaveType = leaveType;
-	}
-
-	public long Id { get; set; }
-
-    /// <summary>
-    /// تاریخ
-    /// </summary>
-	public DateTime Date { get; private set; }
-    /// <summary>
-    /// ورود اول 
-    /// </summary>
-	public string FirstStartDate { get; private set; }
-
-    /// <summary>
-    /// خروج اول
-    /// </summary>
-	public string FirstEndDate { get; private set; }
-
-    /// <summary>
-    /// ورود دوم
-    /// </summary>
-	public string SecondStartDate { get; private set; }
-
-    /// <summary>
-    /// خروج دوم
-    /// </summary>
-	public string SecondEndDate { get; private set; }
-
-    /// <summary>
-    /// ساعت استراحت
-    /// </summary>
-	public TimeSpan BreakTimeSpan { get; private set; }
-
-    /// <summary>
-    /// مقدار زمان کارکرد
-    /// </summary>
-	public TimeSpan WorkingTimeSpan { get; private set; }
-
-    /// <summary>
-    /// آیا منقطع است؟
-    /// </summary>
-	public bool IsSliced { get; private set; }
-
-    /// <summary>
-    /// آیا غیبت است
-    /// </summary>
-	public bool IsAbsent { get; private set; }  
-
-    /// <summary>
-    /// آیا جمعه است
-    /// </summary>
-	public bool IsFriday { get; private set; }
-
-    /// <summary>
-    /// آیا تعطیل رسمی است
-    /// </summary>
-	public bool IsHoliday { get; private set; }
-
-    /// <summary>
-    /// نوع مرخصی - درصورت نداشتن مرخصی مقدارش null میباشد
-    /// </summary>
-	public string LeaveType { get; private set; }
-
-	public long CheckoutId { get; set; }
-
 }

Company.Domain/ContactUsAgg/ContactUs.cs

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

Company.Domain/ContactUsAgg/IContactUsRepository.cs

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

Company.Domain/ContarctingPartyAgg/IPersonalContractingPartyRepository.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using AccountManagement.Application.Contracts.Account;
+using System.Threading.Tasks;
 
 namespace Company.Domain.ContarctingPartyAgg;
 
@@ -42,6 +43,34 @@ public interface IPersonalContractingPartyRepository :IRepository<long, Personal
 
     #endregion
 
+    /// <summary>
+    /// لیست طرف حساب ها
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <returns></returns>
+    Task<ICollection<ContractingPartyGetListViewModel>> GetList(ContractingPartyGetListSearchModel searchModel);
 
+    /// <summary>
+    /// لیست طرف حساب برای سلکت لیست سرچ
+    /// </summary>
+    /// <returns></returns>
+    Task<List<ContractingPartySelectListViewModel>> GetSelectList();
+
+    /// <summary>
+    /// لیستی از شماره ملی یا شناسه ملی بر اساس حقیقی یا حقوقی بودن
+    /// </summary>
+    /// <returns></returns>
+    Task<List<GetContractingPartyNationalCodeOrNationalIdViewModel>> GetNationalCodeOrNationalId();
+
+    /// <summary>
+    /// غیرفعال کردن طرف حساب و زیرمجموعه های آن
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    Task<OperationResult<string>> DeactivateWithSubordinates(long id);
+
+    void Remove(PersonalContractingParty entity);
+    Task<GetRealContractingPartyDetailsViewModel> GetRealDetails(long id);
+    Task<GetLegalContractingPartyDetailsViewModel> GetLegalDetails(long id);
 
 }

Company.Domain/CustomizeWorkshopEmployeeSettingsAgg/Entities/CustomizeWorkshopEmployeeSettings.cs

@@ -213,6 +213,7 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
             earlyExit.EarlyExitTimeFines.Select(x => new EarlyExitTimeFine(x.Minute, x.FineMoney))
                 .ToList(), earlyExit.Value);
     }
+
     public void UpdateIsShiftChange()
     {
         var groupSetting = CustomizeWorkshopGroupSettings;
@@ -269,4 +270,10 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
 
         IsShiftChanged = isShiftChange;
     }
+
+
+    public void SetSalary(double salary)
+    {
+        Salary = salary;
+    }
 }

Company.Domain/InsuranceListAgg/IInsuranceListRepository.cs

@@ -64,9 +64,9 @@ public interface IInsuranceListRepository:IRepository<long, InsuranceList>
     #region Mahan
     Task<InsuranceListConfirmOperation> GetInsuranceOperationDetails(long id);
 
-	Task<InsuranceListTabsCountViewModel> GetTabCounts(InsuranceListSearchModel searchModel);
+    Task<InsuranceListTabsCountViewModel> GetTabCounts(long accountId,int month,int year);
 
-	#endregion
+    #endregion
 }
 
 

Company.Domain/RollCallAgg/IRollCallMandatoryRepository.cs

@@ -38,6 +38,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>
@@ -47,12 +53,6 @@ public interface IRollCallMandatoryRepository : IRepository<long, RollCall>
     /// <param name="contractEnd"></param>
     /// <param name="shiftwork"></param>
     /// <returns></returns>
-    List<LoanInstallmentViewModel> LoanInstallmentForCheckout(long employeeId, long workshopId, DateTime contractStart,
-        DateTime contractEnd);
-
-    List<SalaryAidViewModel> SalaryAidsForCheckout(long employeeId, long workshopId, DateTime checkoutStart,
-        DateTime checkoutEnd);
-
     Task<ComputingViewModel> RotatingShiftReport(long workshopId, long employeeId, DateTime contractStart,
         DateTime contractEnd, string shiftwork, bool hasRollCall, CreateWorkingHoursTemp command,bool holidayWorking);
 }

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/TemporaryClientRegistrationAgg/IWorkshopTempRepository.cs

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

Company.Domain/TemporaryClientRegistrationAgg/InstitutionContractTemp.cs

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

Company.Domain/empolyerAgg/IEmployerRepository.cs

@@ -56,6 +56,16 @@ public interface IEmployerRepository : IRepository<long, Employer>
 
 	#endregion
 
+	#region Api
+	Task<List<GetEmployerListViewModel>> GetEmployerList(GetEmployerSearchModel searchModel);
+
+	Task<GetLegalEmployerDetailViewModel> GetLegalEmployerDetail(long id);
+	Task<GetRealEmployerDetailViewModel> GetRealEmployerDetail(long id);
+	//Task<List<EmployerSelectListViewModel>> GetSelectList(string search);
+	Task<OperationResult<string>> DeactivateWithSubordinates(long id);
+
+
+	#endregion
 
 
 }

CompanyManagment.App.Contracts/Checkout/CheckoutViewModel.cs

@@ -132,115 +132,7 @@ public class CheckoutViewModel
     /// مدت مرخصی استحقاقی
     /// </summary>
     public string TotalPaidLeave { get; set; }
-
-    public TimeSpan TotalHourlyLeave { get; set; }
 	public List<CheckoutDailyRollCallViewModel> MonthlyRollCall { get; set; }
     public List<LoanInstallmentViewModel> InstallmentViewModels { get; set; }
     public List<SalaryAidViewModel> SalaryAidViewModels { get; set; }
-    public CheckoutRollCallViewModel CheckoutRollCall { get; set; }
-
-}
-
-public class CheckoutRollCallViewModel
-{
-	/// <summary>
-	/// مجموع ساعت موظفی
-	/// </summary>
-	public TimeSpan TotalMandatoryTimeSpan { get; set; }
-
-	/// <summary>
-	/// مجموع ساعت حضور
-	/// </summary>
-	public TimeSpan TotalPresentTimeSpan { get; set; }
-
-	/// <summary>
-	/// مجموع ساعت استراحت
-	/// </summary>
-	public TimeSpan TotalBreakTimeSpan { get; set; }
-
-	/// <summary>
-	/// مجموع ساعت کارکرد
-	/// </summary>
-	public TimeSpan TotalWorkingTimeSpan { get; set; }
-
-	/// <summary>
-	/// مجموع ساعت مرخصی استحقاقی
-	/// </summary>
-	public TimeSpan TotalPaidLeaveTmeSpan { get; set; }
-
-	/// <summary>
-	/// مجموع ساعت مرخصی استعلاجی
-	/// </summary>
-	public TimeSpan TotalSickLeaveTimeSpan { get; set; }
-
-	/// <summary>
-	/// روز های حضور غیاب
-	/// </summary>
-	public ICollection<CheckoutRollCallDayViewModel> RollCallDaysCollection { get; set; }
-}
-
-public class CheckoutRollCallDayViewModel
-{
-	public long Id { get; set; }
-
-	/// <summary>
-	/// تاریخ
-	/// </summary>
-	public DateTime Date { get; set; }
-	/// <summary>
-	/// ورود اول 
-	/// </summary>
-	public string FirstStartDate { get; set; }
-
-	/// <summary>
-	/// خروج اول
-	/// </summary>
-	public string FirstEndDate { get; set; }
-
-	/// <summary>
-	/// ورود دوم
-	/// </summary>
-	public string SecondStartDate { get; set; }
-
-	/// <summary>
-	/// خروج دوم
-	/// </summary>
-	public string SecondEndDate { get; set; }
-
-	/// <summary>
-	/// ساعت استراحت
-	/// </summary>
-	public TimeSpan BreakTimeSpan { get; set; }
-
-	/// <summary>
-	/// مقدار زمان کارکرد
-	/// </summary>
-	public TimeSpan WorkingTimeSpan { get; set; }
-
-	/// <summary>
-	/// آیا منقطع است؟
-	/// </summary>
-	public bool IsSliced { get; set; }
-
-	/// <summary>
-	/// آیا غیبت است
-	/// </summary>
-	public bool IsAbsent { get; set; }
-
-	/// <summary>
-	/// آیا جمعه است
-	/// </summary>
-	public bool IsFriday { get; set; }
-
-	/// <summary>
-	/// آیا تعطیل رسمی است
-	/// </summary>
-	public bool IsHoliday { get; set; }
-
-	/// <summary>
-	/// نوع مرخصی - درصورت نداشتن مرخصی مقدارش null میباشد
-	/// </summary>
-	public string LeaveType { get; set; }
-
-	public long CheckoutId { get; set; }
 }

CompanyManagment.App.Contracts/Checkout/CreateCheckout.cs

@@ -5,7 +5,6 @@ using System.Text;
 using System.Threading.Tasks;
 using CompanyManagment.App.Contracts.Contract;
 using CompanyManagment.App.Contracts.Employee;
-using CompanyManagment.App.Contracts.RollCall;
 using CompanyManagment.App.Contracts.YearlySalary;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
@@ -139,15 +138,4 @@ public class CreateCheckout
 
     public string ShiftWork { get; set; }
 
-
-    public List<GroupedRollCalls> GroupedRollCalls { get; set; }
-
-    public TimeSpan TotalWorkingTimeSpan { get; set; }
-
-    public TimeSpan TotalBreakTimeSpan { get; set; }
-
-    public TimeSpan TotalPresentTimeSpan { get; set; }
-    public TimeSpan TotalPaidLeave { get; set; }
-    public TimeSpan TotalSickLeave { get; set; }
-
 }

CompanyManagment.App.Contracts/ContactUs/IContactUsApplication.cs

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

CompanyManagment.App.Contracts/Contract/ComputingViewModel.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using CompanyManagment.App.Contracts.Loan;
-using CompanyManagment.App.Contracts.RollCall;
 using CompanyManagment.App.Contracts.SalaryAid;
 using CompanyManagment.App.Contracts.WorkingHoursTemp;
 
@@ -46,15 +45,6 @@ public class ComputingViewModel
 
     public bool HasRotatingShift { get; set; }
 
-    public List<GroupedRollCalls> GroupedRollCalls { get; set; }
-
-    public TimeSpan TotalWorkingTimeSpan { get; set; }
-
-    public TimeSpan TotalBreakTimeSpan { get; set; }
-
-    public TimeSpan TotalPresentTimeSpan { get; set; }
-    public TimeSpan TotalPaidLeave { get; set; }
-    public TimeSpan TotalSickLeave { get; set; }
 
     //public List<string> holidays;
 }

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/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/CreateLegalEmployer.cs

@@ -0,0 +1,84 @@
+using System.ComponentModel.DataAnnotations;
+using _0_Framework.Application;
+using _0_Framework.Application.Enums;
+
+namespace CompanyManagment.App.Contracts.Employer;
+
+/// <summary>
+/// ایجاد کارفرمای حقیقی
+/// </summary>
+public class CreateLegalEmployer
+{
+    /// <summary>
+    /// آیدی طرف حساب
+    /// </summary>
+    [Required]
+    public long ContractingPartyId { get; set; }
+
+    /// <summary>
+    /// نام شرکت
+    /// </summary>
+    public string CompanyName { get; set; }
+
+    /// <summary>
+    /// شناسه ملی
+    /// </summary>
+    public string NationalId { get; set; }
+
+    /// <summary>
+    /// شماره ثبت
+    /// </summary>
+    public string RegisterId { get; set; }
+
+    /// <summary>
+    /// شماره تلفن همراه
+    /// </summary>
+    public string PhoneNumber { get; set; }
+
+    /// <summary>
+    /// شماره تلفن ثابت
+    /// </summary>
+    public string TelephoneNumber { get; set; }
+
+    /// <summary>
+    /// نام مدیر عامل
+    /// </summary>
+    public string EmployerFName { get; set; }
+    /// <summary>
+    /// نام خانوادگی مدیر عامل
+    /// </summary>
+    public string EmployerLName { get; set; }
+    /// <summary>
+    /// جنسیت مدیر عامل
+    /// </summary>
+    public Gender EmployerGender { get; set; }
+    /// <summary>
+    /// کد ملی مدیر عامل
+    /// </summary>
+    public string EmployerNationalCode { get; set; }
+    /// <summary>
+    /// شماره شناسنامه مدیر عامل
+    /// </summary>
+    public string EmployerIdNumber { get; set; }
+    /// <summary>
+    /// نام پدر مدیر عامل
+    /// </summary>
+    public string EmployerFatherName { get; set; }
+    /// <summary>
+    /// تاریخ تولد مدیر عامل
+    /// </summary>
+    public string EmployerDateOfBirth { get; set; }
+    /// <summary>
+    /// تاریخ صدور شناسنامه مدیر عامل
+    /// </summary>
+    public string EmployerDateOfIssue { get; set; }
+    /// <summary>
+    /// محل صدور شناسنامه مدیر عامل
+    /// </summary>
+    public string EmployerPlaceOfIssue { get; set; }
+
+    /// <summary>
+    /// اطلاعات سامانه ای
+    /// </summary>
+    public GovernmentSystemInfo GovernmentSystemInfo { get; set; }
+}

CompanyManagment.App.Contracts/Employer/CreateRealEmployer.cs

@@ -0,0 +1,80 @@
+using System.ComponentModel.DataAnnotations;
+using _0_Framework.Application;
+using _0_Framework.Application.Enums;
+
+namespace CompanyManagment.App.Contracts.Employer;
+
+/// <summary>
+/// ایجاد کارفرما حقیقی
+/// </summary>
+public class CreateRealEmployer
+{
+    /// <summary>
+    /// آیدی طرف حساب
+    /// </summary>
+    [Required]
+    public long ContractingPartyId { get; set; }
+
+    /// <summary>
+    /// جنسیت
+    /// </summary>
+    [Required]
+    public Gender Gender { get; set; }
+
+    /// <summary>
+    /// نام
+    /// </summary>
+    [Required]
+    public string FName { get; set; }
+
+    /// <summary>
+    ///نام خانوادگی
+    /// </summary>
+    [Required]
+    public string LName { get; set; }
+
+    /// <summary>
+    /// کد ملی
+    /// </summary>
+    public string NationalCode { get; set; }
+
+    /// <summary>
+    /// شماره شناسنامه
+    /// </summary>
+    public string IdNumber { get; set; }
+
+    /// <summary>
+    /// شماره تلفن همراه
+    /// </summary>
+    public string PhoneNumber { get; set; }
+
+    /// <summary>
+    /// شماره تلفن ثابت
+    /// </summary>
+    public string Telephone { get; set; }
+
+    /// <summary>
+    /// تاریخ صدور شناسنامه
+    /// </summary>
+    public string DateOfIssue { get; set; }
+
+    /// <summary>
+    /// محل صدور شناسنامه
+    /// </summary>
+    public string PlaceOfIssue { get; set; }
+
+    /// <summary>
+    /// تاریخ تولد
+    /// </summary>
+    public string DateOfBirth { get; set; }
+
+    /// <summary>
+    /// نام پدر
+    /// </summary>
+    public string FatherName { get; set; }
+
+    /// <summary>
+    /// اطلاعات سامانه ای
+    /// </summary>
+    public GovernmentSystemInfo GovernmentSystemInfo { get; set; }
+}

CompanyManagment.App.Contracts/Employer/EditLegalEmployer.cs

@@ -0,0 +1,9 @@
+namespace CompanyManagment.App.Contracts.Employer;
+
+public class EditLegalEmployer: CreateLegalEmployer
+{
+	/// <summary>
+	/// آیدی کارفرما
+	/// </summary>
+	public long Id { get; set; }
+}

CompanyManagment.App.Contracts/Employer/EditRealEmployer.cs

@@ -0,0 +1,12 @@
+namespace CompanyManagment.App.Contracts.Employer;
+
+/// <summary>
+/// ویرایش کارفرما حقیقی
+/// </summary>
+public class EditRealEmployer:CreateRealEmployer
+{
+    /// <summary>
+    /// آیدی کارفرما
+    /// </summary>
+    public long Id { get; set; }
+}

CompanyManagment.App.Contracts/Employer/GetEmployerListViewModel.cs

@@ -0,0 +1,50 @@
+using System.Collections.Generic;
+using _0_Framework.Application.Enums;
+
+namespace CompanyManagment.App.Contracts.Employer;
+
+/// <summary>
+/// مدل برای گرفتن لیست کارفرما
+/// </summary>
+public class GetEmployerListViewModel
+{
+    /// <summary>
+    /// آیدی کارفرما
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// کدملی / شناسه ملی
+    /// </summary>
+    public string NationalCodeOrNationalId { get; set; }
+
+    /// <summary>
+    /// نام کارفرما
+    /// </summary>
+    public string FullName { get; set; }
+
+    /// <summary>
+    /// نام های کارگاه
+    /// </summary>
+    public ICollection<string> WorkshopNames { get; set; }
+
+    /// <summary>
+    /// دارای طرف حساب
+    /// </summary>
+    public bool HasContractingParty { get; set; }
+
+    /// <summary>
+    /// طرف حساب بلاک شده یا نه
+    /// </summary>
+    public bool HasBlockContractingParty { get; set; }
+
+    /// <summary>
+    /// نوع کارفرما
+    /// </summary>
+    public LegalType LegalType { get; set; }
+
+    /// <summary>
+    /// وضعیت کارفرما
+    /// </summary>
+    public ActivationStatus EmployerStatus { get; set; }
+}

CompanyManagment.App.Contracts/Employer/GetEmployerSearchModel.cs

@@ -0,0 +1,44 @@
+using _0_Framework.Application.Enums;
+
+namespace CompanyManagment.App.Contracts.Employer;
+
+/// <summary>
+/// مدل جستجوی لیست کارفرما
+/// </summary>
+public class GetEmployerSearchModel
+{
+    /// <summary>
+    /// نام شرکت / نام و نام خانوادگی
+    /// </summary>
+    public string FullNameOrCompanyName { get; set; }
+
+    /// <summary>
+    /// کدملی/ شناسه ملی
+    /// </summary>
+    public string NationalCodeOrNationalId { get; set; }
+
+    /// <summary>
+    /// شماره شناسنامه یا شماره ثبت
+    /// </summary>
+    public string IdNumberOrRegisterId { get; set; }
+
+    /// <summary>
+    /// نام طرف حساب
+    /// </summary>
+    public string ContractingPartyName { get; set; }
+
+    /// <summary>
+    /// وضعیت کارفرما
+    /// </summary>
+    public ActivationStatus EmployerStatus { get; set; }
+
+    /// <summary>
+    /// نوع کارفرما
+    /// </summary>
+    public LegalType EmployerType { get; set; }
+
+    /// <summary>
+    /// پیج ایندکس برای دسته بندی سی تایی
+    /// </summary>
+    public int PageIndex { get; set; }
+}

CompanyManagment.App.Contracts/Employer/GetLegalEmployerDetailViewModel.cs

@@ -0,0 +1,120 @@
+using _0_Framework.Application;
+using _0_Framework.Application.Enums;
+
+namespace CompanyManagment.App.Contracts.Employer;
+
+/// <summary>
+/// اطلاعات کارفرمای حقوقی
+/// </summary>
+public class GetLegalEmployerDetailViewModel
+{
+    /// <summary>
+    /// آیدی کارفرما
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// نام شرکت
+    /// </summary>
+    public string CompanyName { get; set; }
+
+    /// <summary>
+    /// شناسه ملی
+    /// </summary>
+    public string NationalId { get; set; }
+
+    /// <summary>
+    /// شماره ثبت
+    /// </summary>
+    public string RegisterId { get; set; }
+
+    /// <summary>
+    /// شماره تلفن همراه
+    /// </summary>
+    public string PhoneNumber { get; set; }
+
+    /// <summary>
+    /// شماره تلفن ثابت
+    /// </summary>
+    public string TelephoneNumber { get; set; }
+
+    /// <summary>
+    /// کد کارفرما
+    /// </summary>
+    public string EmployerNo { get; set; }
+
+    /// <summary>
+    /// نام کارفرما
+    /// </summary>
+    public string ContractingPartyName { get; set; }
+
+    /// <summary>
+    /// نام کارفرما
+    /// </summary>
+    public long ContractingPartyId { get; set; }
+
+    /// <summary>
+    /// نام و خانوادگی مدیر عامل
+    /// </summary>
+    public string CeoFullName { get; set; }
+
+    /// <summary>
+    /// نام و خانوادگی مدیر عامل
+    /// </summary>
+    public string CeoFName { get; set; }
+
+    /// <summary>
+    /// نام و خانوادگی مدیر عامل
+    /// </summary>
+    public string CeoLName { get; set; }
+
+    /// <summary>
+    /// جنسیت مدیر عامل
+    /// </summary>
+    public Gender Gender { get; set; }
+
+	/// <summary>
+	/// جنیست
+	/// </summary>
+	public string GenderStr { get; set; }
+
+    /// <summary>
+    /// ملیت
+    /// </summary>
+    public string Nationality { get; set; }
+
+    /// <summary>
+    /// نام پدر
+    /// </summary>
+    public string FatherName { get; set; }
+
+    /// <summary>
+    /// کد ملی
+    /// </summary>
+    public string NationalCode { get; set; }
+
+    /// <summary>
+    /// شماره شناسنامه
+    /// </summary>
+    public string IdNumber { get; set; }
+
+    /// <summary>
+    /// تاریخ تولد
+    /// </summary>
+    public string DateOfBirth { get; set; }
+    /// <summary>
+    /// تاریخ صدور شناسنامه
+    /// </summary>
+    public string DateOfIssue { get; set; }
+
+    /// <summary>
+    /// محل صدور شناسنامه
+    /// </summary>
+    public string PlaceOfIssue { get; set; }
+
+    /// <summary>
+    /// اطلاعات سامانه های دولتی
+    /// </summary>
+    public GovernmentSystemInfo GovernmentSystemInfo { get; set; }
+
+}

CompanyManagment.App.Contracts/Employer/GetRealEmployerDetailViewModel.cs

@@ -0,0 +1,107 @@
+using _0_Framework.Application;
+using _0_Framework.Application.Enums;
+
+namespace CompanyManagment.App.Contracts.Employer;
+
+/// <summary>
+/// اطلاعات کارفرمای حقوقی
+/// </summary>
+public class GetRealEmployerDetailViewModel
+{
+    /// <summary>
+    /// آیدی کارفرما
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// نام و نام خانوادگی
+    /// </summary>
+    public string FullName { get; set; }  
+    
+    /// <summary>
+    /// نام 
+    /// </summary>
+    public string FName{ get; set; }
+    
+    /// <summary>
+    /// نام خانوادگی
+    /// </summary>
+    public string LName { get; set; }
+
+    /// <summary>
+    /// کدملی
+    /// </summary>
+    public string NationalCode { get; set; }
+
+    /// <summary>
+    /// جنسیت فارسی
+    /// </summary>
+    public string GenderStr { get; set; }
+
+    /// <summary>
+    /// جنسیت
+    /// </summary>
+	public Gender Gender { get; set; }
+
+    /// <summary>
+    /// ملیت
+    /// </summary>
+    public string Nationality { get; set; }
+
+    /// <summary>
+    /// شماره تلفن همراه
+    /// </summary>
+    public string PhoneNumber { get; set; }
+
+    /// <summary>
+    /// نام پدر
+    /// </summary>
+    public string FatherName { get; set; }
+
+    /// <summary>
+    /// شماره شناسنامه
+    /// </summary>
+    public string IdNumber { get; set; }
+
+    /// <summary>
+    /// تاریخ تولد
+    /// </summary>
+    public string DateOfBirth { get; set; }
+
+    /// <summary>
+    /// نام طرف حساب
+    /// </summary>
+    public string ContractingPartyName { get; set; }  
+    
+    
+    /// <summary>
+    /// آیدی طرف حساب
+    /// </summary>
+    public long ContractingPartyId { get; set; }
+
+    /// <summary>
+    /// کد کارفرما
+    /// </summary>
+    public string EmployerNo { get; set; }
+
+
+    /// <summary>
+    /// شماره تلفن ثابت
+    /// </summary>
+    public string TelephoneNumber { get; set; }
+
+    /// <summary>
+    /// تاریخ صدور شناسنامه
+    /// </summary>
+    public string DateOfIssue { get; set; }
+
+    /// <summary>
+    /// محل صدور شناسنامه
+    /// </summary>
+    public string PlaceOfIssue { get; set; }
+
+    /// <summary>
+    /// اطلاعات سامانه های دولتی
+    /// </summary>
+    public GovernmentSystemInfo GovernmentSystemInfo { get; set; }
+}

CompanyManagment.App.Contracts/Employer/GovernmentSystemInfo.cs

@@ -0,0 +1,54 @@
+using System;
+
+namespace CompanyManagment.App.Contracts.Employer;
+
+/// <summary>
+/// اطلاعات سامانه های دولتی
+/// </summary>
+public class GovernmentSystemInfo
+{
+    #region MCL
+    /// <summary>
+    /// نام کاربری اداره کار
+    /// </summary>
+    public string MclUsername { get; set; }
+    /// <summary>
+    /// رمز عبور اداره کار
+    /// </summary>
+    public string MclPassword { get; set; }
+    #endregion
+
+    #region E-Service تامین اجتماعی
+    /// <summary>
+    /// نام کاربری سازمان تامین اجتماعی
+    /// </summary>
+    public string EServiceUsername { get; set; }
+    /// <summary>
+    /// رمز عبور سازمان تامین اجتماعی
+    /// </summary>
+    public string EServicePassword { get; set; }
+    #endregion
+
+    #region Tax سامانه مالیاتی
+    /// <summary>
+    /// نام کاربری سامانه مالیاتی
+    /// </summary>
+    public string TaxUsername { get; set; }
+    /// <summary>
+    /// رمز عبور سامانه مالیاتی
+    /// </summary>
+    public string TaxPassword { get; set; }
+    #endregion
+
+    #region Sana سامانه ثنا
+    /// <summary>
+    /// نام کاربری ثنا
+    /// </summary>
+    public string SanaUsername { get; set; }
+    /// <summary>
+    /// رمز عبور ثنا
+    /// </summary>
+    public string SanaPassword { get; set; } 
+    #endregion
+     
+}

CompanyManagment.App.Contracts/Employer/IEmployerApplication.cs

@@ -55,4 +55,71 @@ public interface IEmployerApplication
 
 	#endregion
 
-}
+	#region Api
+
+	/// <summary>
+	/// لیست کارفرما ها
+	/// </summary>
+	/// <returns></returns>
+	Task<List<GetEmployerListViewModel>> GetEmployerList(GetEmployerSearchModel searchModel);
+
+	/// <summary>
+	/// جزئیات کارفرما حقوقی
+	/// </summary>
+	/// <param name="id"></param>
+	/// <returns></returns>
+	Task<GetLegalEmployerDetailViewModel> GetLegalEmployerDetail(long id);
+
+	/// <summary>
+	/// جزئیات کارفرما حقیقی
+	/// </summary>
+	/// <param name="id"></param>
+	/// <returns></returns>
+	Task<GetRealEmployerDetailViewModel> GetRealEmployerDetail(long id);
+
+	/// <summary>
+	/// ایجاد کارفرمای حقیقی
+	/// </summary>
+	/// <param name="command"></param>
+	/// <returns></returns>
+	Task<OperationResult> CreateReal(CreateRealEmployer command);
+
+	/// <summary>
+	/// ایجاد کارفرمای حقوقی
+	/// </summary>
+	/// <param name="command"></param>
+	/// <returns></returns>
+	Task<OperationResult> CreateLegal(CreateLegalEmployer command);
+
+	/// <summary>
+	/// ویرایش کارفرمای حقیقی
+	/// </summary>
+	/// <param name="command"></param>
+	/// <returns></returns>
+	Task<OperationResult> EditReal(EditRealEmployer command);
+
+
+	/// <summary>
+	/// ویرایش کارفرمای حقوقی
+	/// </summary>
+	/// <param name="command"></param>
+	/// <returns></returns>
+	Task<OperationResult> EditLegal(EditLegalEmployer command);
+
+	///// <summary>
+	///// لیست نام کارفرما ها برای جستجو
+	///// </summary>
+	///// <param name="search"></param>
+	///// <returns></returns>
+	//public Task<List<EmployerSelectListViewModel>> GetSelectList(string search);
+
+	/// <summary>
+	/// حذف کارفرما - درصورت داشتن کارگاه کارفرما غیرفعال میشود
+	/// </summary>
+	/// <param name="id"></param>
+	/// <returns></returns>
+	public Task<OperationResult<string>> RemoveApi(long id);
+
+	#endregion
+}
+

CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs

@@ -44,7 +44,7 @@ public interface IInsuranceListApplication
     Task<OperationResult> ConfirmInsuranceOperation(InsuranceListConfirmOperation command);
     Task<InsuranceListConfirmOperation> GetInsuranceOperationDetails(long id);
 
-	Task<InsuranceListTabsCountViewModel> GetTabCounts(InsuranceListSearchModel searchModel);
+    Task<InsuranceListTabsCountViewModel> GetTabCounts(long accountId, int month, int year);
 
-	#endregion
+    #endregion
 }

CompanyManagment.App.Contracts/PersonalContractingParty/ContractingPartyGetListSearchModel.cs

@@ -0,0 +1,37 @@
+using _0_Framework.Application.Enums;
+
+namespace CompanyManagment.App.Contracts.PersonalContractingParty;
+
+public class ContractingPartyGetListSearchModel
+{
+    /// <summary>
+    /// تعدادی که برای لیست بعدی آیتم باید رد کنه
+    /// </summary>
+    public int PageIndex { get; set; }
+
+    /// <summary>
+    /// نام شرکت یا نام و نام خانوادگی طرف حساب
+    /// </summary>
+    public string FullNameOrCompanyName { get; set; }
+
+    /// <summary>
+    /// شناسه ملی یا شماره ملی
+    /// </summary>
+    public string NationalIdOrNationalCode { get; set; }
+
+    /// <summary>
+    /// نام معرف
+    /// </summary>
+    public string RepresentativeName { get; set; }
+
+    /// <summary>
+    /// نوع طرف حساب
+    /// </summary>
+    public LegalType ContractingPartyType { get; set; }
+
+    /// <summary>
+    /// وضعیت طرف حساب
+    /// </summary>
+    public ActivationStatus ContractingPartyStatus { get; set; }
+
+}

CompanyManagment.App.Contracts/PersonalContractingParty/ContractingPartyGetListViewModel.cs

@@ -0,0 +1,60 @@
+using System.Collections.Generic;
+using _0_Framework.Application.Enums;
+
+namespace CompanyManagment.App.Contracts.PersonalContractingParty;
+
+public record ContractingPartyGetListEmployerViewModel(long EmployerId, string EmployerName);
+
+public class ContractingPartyGetListViewModel
+{
+    /// <summary>
+    /// آیدی طرف حساب
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// کد طرف حساب
+    /// </summary>
+    public int ArchiveCode { get; set; }
+
+    /// <summary>
+    /// شناسه ملی یا شماره ملی
+    /// </summary>
+    public string NationalIdOrNationalCode { get; set; }
+
+    /// <summary>
+    /// نام طرف حساب
+    /// </summary>
+    public string ContractingPartyName { get; set; }
+
+    /// <summary>
+    /// لیست کارفرما ها
+    /// </summary>
+    public ICollection<ContractingPartyGetListEmployerViewModel> Employers { get; set; }
+
+    /// <summary>
+    /// تعداد بلاک
+    /// </summary>
+    public int BlockTimes { get; set; }
+
+    /// <summary>
+    /// آیا بلاک هست
+    /// </summary>
+    public bool IsBlock { get; set; }
+
+    /// <summary>
+    /// آیا دارای قرارداد مالی است
+    /// </summary>
+    public bool HasInstitutionContract { get; set; }
+
+    /// <summary>
+    /// نوع طرف حساب
+    /// </summary>
+    public LegalType ContractingPartyType { get; set; }
+
+    /// <summary>
+    /// وضعیت طرف حساب
+    /// </summary>
+    public ActivationStatus Status { get; set; }
+
+}

CompanyManagment.App.Contracts/PersonalContractingParty/ContractingPartySelectListViewModel.cs

@@ -0,0 +1,8 @@
+using _0_Framework.Application;
+
+namespace CompanyManagment.App.Contracts.PersonalContractingParty;
+
+public class ContractingPartySelectListViewModel: SelectListViewModel
+{
+
+}

CompanyManagment.App.Contracts/PersonalContractingParty/CreateLegalContractingParty.cs

@@ -0,0 +1,74 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace CompanyManagment.App.Contracts.PersonalContractingParty;
+
+public class CreateLegalContractingParty
+{
+    /// <summary>
+    /// آیدی معرف
+    /// </summary>
+    [Required]
+    public long RepresentativeId { get; set; }
+
+    /// <summary>
+    /// نام شرکت
+    /// </summary>
+    [Required]
+    public string CompanyName { get; set; }
+
+    /// <summary>
+    /// شناسه ملی
+    /// </summary>
+    [Required]
+    public string NationalId { get; set; }
+
+    /// <summary>
+    /// کد طرف حساب
+    /// </summary>
+    [Required]
+    public int ArchiveCode { get; set; }
+
+    /// <summary>
+    /// نام مستعار
+    /// </summary>
+    public string SureName { get; set; }
+
+    /// <summary>
+    /// شماره ثبت
+    /// </summary>
+    public string RegisterId { get; set; }
+
+ 
+
+    /// <summary>
+    /// شماره تلفن
+    /// </summary>
+    public string PhoneNumber { get; set; }
+
+    /// <summary>
+    /// شماره تلفن نماینده
+    /// </summary>
+    public string AgentPhone { get; set; }
+
+    /// <summary>
+    /// استان
+    /// </summary>
+    public string State { get; set; }
+
+    /// <summary>
+    /// شهر
+    /// </summary>
+    public string City { get; set; }
+
+    /// <summary>
+    /// محله
+    /// </summary>
+    public string Zone { get; set; }
+
+    /// <summary>
+    /// نشانی
+    /// </summary>
+    public string Address { get; set; }
+
+
+}

CompanyManagment.App.Contracts/PersonalContractingParty/CreateRealContractingParty.cs

@@ -0,0 +1,77 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace CompanyManagment.App.Contracts.PersonalContractingParty;
+
+public class CreateRealContractingParty
+{
+    /// <summary>
+    /// نام
+    /// </summary>
+    [Required]
+    public string FName { get; set; }
+
+    /// <summary>
+    /// نام خانوادگی
+    /// </summary>
+    [Required]
+    public string LName { get; set; }
+
+    /// <summary>
+    /// آیدی معرف
+    /// </summary>
+    [Required]
+    public long RepresentativeId { get; set; }
+
+    /// <summary>
+    /// کد ملی
+    /// </summary>
+    [Required]
+    public string NationalCode { get; set; }
+
+    /// <summary>
+    /// شماره شناسنامه
+    /// </summary>
+    [Required]
+    public string IdNumber { get; set; }
+
+    /// <summary>
+    /// کد طرف حساب
+    /// </summary>
+    [Required]
+    public int ArchiveCode { get; set; }
+
+    /// <summary>
+    /// نام مستعار
+    /// </summary>
+    public string SureName { get; set; }
+
+    /// <summary>
+    /// شماره تلفن
+    /// </summary>
+    public string PhoneNumber { get; set; }
+
+    /// <summary>
+    /// شماره تلفن نماینده
+    /// </summary>
+    public string AgentPhone { get; set; }
+
+    /// <summary>
+    /// استان
+    /// </summary>
+    public string State { get; set; }
+
+    /// <summary>
+    /// شهر
+    /// </summary>
+    public string City { get; set; }
+
+    /// <summary>
+    /// محله
+    /// </summary>
+    public string Zone { get; set; }
+
+    /// <summary>
+    /// نشانی
+    /// </summary>
+    public string Address { get; set; }
+}

CompanyManagment.App.Contracts/PersonalContractingParty/EditLegalContractingParty.cs

@@ -0,0 +1,12 @@
+namespace CompanyManagment.App.Contracts.PersonalContractingParty;
+
+/// <summary>
+/// ویرایش طرف حساب حقوقی
+/// </summary>
+public class EditLegalContractingParty:CreateLegalContractingParty
+{
+    /// <summary>
+    /// آیدی طرف حساب
+    /// </summary>
+    public long Id { get; set; }
+}

CompanyManagment.App.Contracts/PersonalContractingParty/EditRealContractingParty.cs

@@ -0,0 +1,13 @@
+namespace CompanyManagment.App.Contracts.PersonalContractingParty;
+
+/// <summary>
+/// ویرایش طرف حساب حقیقی
+/// </summary>
+public class EditRealContractingParty:CreateRealContractingParty
+{
+    /// <summary>
+    /// آیدی طرف حساب
+    /// </summary>
+    public long Id { get; set; }
+
+}

CompanyManagment.App.Contracts/PersonalContractingParty/GetContractingPartyNationalCodeOrNationalIdViewModel.cs

@@ -0,0 +1,12 @@
+namespace CompanyManagment.App.Contracts.PersonalContractingParty;
+
+/// <summary>
+/// شماره ملی یا شناسه ملی بر اساس حقیقی یا حقوقی بودن
+/// </summary>
+public class GetContractingPartyNationalCodeOrNationalIdViewModel
+{
+    /// <summary>
+    /// شماره ملی یا شناسه ملی
+    /// </summary>
+    public string NationalCodeOrNationalId { get; set; }
+}

CompanyManagment.App.Contracts/PersonalContractingParty/GetLegalContractingPartyDetailsViewModel.cs

@@ -0,0 +1,83 @@
+namespace CompanyManagment.App.Contracts.PersonalContractingParty;
+
+/// <summary>
+/// ویو مدل جزئیات طرف حساب حقوقی
+/// </summary>
+public class GetLegalContractingPartyDetailsViewModel
+{
+    /// <summary>
+    /// آیدی طرف حساب
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// نام کامل شرکت(به همراه نام مستعار)ء
+    /// </summary>
+    public string CompanyFullName { get; set; }
+
+    /// <summary>
+    /// نام شرکت (بدون نام مستعار)ء
+    /// </summary>
+    public string CompanyName { get; set; }
+
+    /// <summary>
+    /// نام مستعار
+    /// </summary>
+    public string SureName { get; set; }
+
+    /// <summary>
+    /// شماره ثبت
+    /// </summary>
+    public string RegisterId { get; set; }
+
+    /// <summary>
+    /// شماره ملی
+    /// </summary>
+    public string NationalId { get; set; }
+
+    /// <summary>
+    /// شماره تماس
+    /// </summary>
+    public string PhoneNumber { get; set; }
+
+    /// <summary>
+    /// شماره تماس نماینده
+    /// </summary>
+    public string AgentPhone { get; set; }
+
+    /// <summary>
+    /// آدرس
+    /// </summary>
+    public string Address { get; set; }
+
+    /// <summary>
+    /// معرف
+    /// </summary>
+    public string RepresentativeName { get; set; }
+
+    /// <summary>
+    /// آیدی معرف
+    /// </summary>
+    public long RepresentativeId { get; set; }
+
+    /// <summary>
+    /// کد طرف حساب
+    /// </summary>
+    public int ArchiveCode { get; set; }
+
+    /// <summary>
+    /// استان
+    /// </summary>
+    public string State { get; set; }
+
+    /// <summary>
+    /// شهر
+    /// </summary>
+    public string City { get; set; }
+
+    /// <summary>
+    /// محله
+    /// </summary>
+    public string Zone { get; set; }
+
+}

CompanyManagment.App.Contracts/PersonalContractingParty/GetRealContractingPartyDetailsViewModel.cs

@@ -0,0 +1,94 @@
+using System.Runtime.CompilerServices;
+using Microsoft.AspNetCore.Builder;
+
+namespace CompanyManagment.App.Contracts.PersonalContractingParty;
+
+/// <summary>
+/// ویو مدل جزئیات طرف حساب حقیقی
+/// </summary>
+public class GetRealContractingPartyDetailsViewModel
+{
+    /// <summary>
+    /// آیدی طرف حساب
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// نام
+    /// </summary>
+    public string FName { get; set; }
+
+    /// <summary>
+    /// نام خانوادگی
+    /// </summary>
+    public string LName { get; set; }
+
+    /// <summary>
+    /// نام و نام خانوادگی
+    /// </summary>
+    public string FullName { get; set; }
+
+    /// <summary>
+    /// کد ملی
+    /// </summary>
+    public string NationalCode { get; set; }
+
+    /// <summary>
+    /// شماره شناسنامه
+    /// </summary>
+    public string IdNumber { get; set; }
+
+    /// <summary>
+    /// شماره تلفن
+    /// </summary>
+    public string PhoneNumber { get; set; }
+
+    /// <summary>
+    /// شماره تلفن نماینده
+    /// </summary>
+    public string AgentPhone { get; set; }
+
+    /// <summary>
+    /// آدرس
+    /// </summary>
+    public string Address { get; set; }
+
+
+    /// <summary>
+    /// نام معرف
+    /// </summary>
+    public string RepresentativeName { get; set; }
+
+    /// <summary>
+    /// آیدی معرف
+    /// </summary>
+    public long RepresentativeId { get; set; }
+
+    /// <summary>
+    /// نام مستعار
+    /// </summary>
+    public string SureName { get; set; }
+
+    /// <summary>
+    /// کد طرف حساب
+    /// </summary>
+    public int ArchiveCode { get; set; }
+
+    
+    /// <summary>
+    /// استان
+    /// </summary>
+    public string State { get; set; }
+
+    /// <summary>
+    /// شهر
+    /// </summary>
+    public string City { get; set; }
+
+    /// <summary>
+    /// محله
+    /// </summary>
+    public string Zone { get; set; }
+    
+
+}

CompanyManagment.App.Contracts/PersonalContractingParty/IPersonalContractingPartyApp.cs

@@ -1,5 +1,6 @@
 using _0_Framework.Application;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 
 namespace CompanyManagment.App.Contracts.PersonalContractingParty;
@@ -54,4 +55,79 @@ public interface IPersonalContractingPartyApp
 
     #endregion
 
+
+    #region Api
+    /// <summary>
+    /// لیست طرف حساب ها
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <returns></returns>
+    Task<ICollection<ContractingPartyGetListViewModel>> GetList(ContractingPartyGetListSearchModel searchModel);
+
+    /// <summary>
+    /// لیست طرف حساب برای سلکت لیست سرچ
+    /// </summary>
+    /// <returns></returns>
+    Task<List<ContractingPartySelectListViewModel>> GetSelectList();
+
+    /// <summary>
+    /// ایجاد طرف حساب حقیقی
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    Task<OperationResult> CreateReal(CreateRealContractingParty command);
+
+    /// <summary>
+    /// ایجاد ظرف حساب حقوقی
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    Task<OperationResult> CreateLegal(CreateLegalContractingParty command);
+
+
+    /// <summary>
+    /// لیستی از شماره ملی یا شناسه ملی بر اساس حقیقی یا حقوقی بودن
+    /// </summary>
+    /// <returns></returns>
+    Task<List<GetContractingPartyNationalCodeOrNationalIdViewModel>> GetNationalCodeOrNationalId();
+
+
+    /// <summary>
+    /// حذف طرف حساب. در صورتی که طرف حساب دارای قرارداد مالی یا دارای کارفرما باشد غیرفعال میشود
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    Task<OperationResult<string>> Delete(long id);
+
+    /// <summary>
+    /// ویرایش طرف حساب حقیقی
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    OperationResult EditRealApi(EditRealContractingParty command);
+
+
+    /// <summary>
+    /// ویرایش طرف حساب حقوقی
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    OperationResult EditLegal(EditLegalContractingParty command);
+
+    /// <summary>
+    /// گرفتن جزئیات طرف حساب حقوقی
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    Task<GetRealContractingPartyDetailsViewModel> GetRealDetails(long id);
+
+    /// <summary>
+    /// گرفتن جزئیات طرف حساب حقوقی
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    Task<GetLegalContractingPartyDetailsViewModel> GetLegalDetails(long id);
+
+    #endregion
+
 }

CompanyManagment.App.Contracts/PersonalContractingParty/PersonalContractingPartyViewModel.cs

@@ -47,4 +47,6 @@ public class PersonalContractingPartyViewModel
     public bool IsAuthenticated { get; set; }
     public List<EmployerViewModel> EmployerList { get; set; }
 
+
+
 }

CompanyManagment.App.Contracts/RollCall/ShiftList.cs

@@ -6,12 +6,10 @@ public class ShiftList
 {
 	public DateTime Start { get; set; }
 	public DateTime End { get; set; }
-
-	public DateTime EndWithOutResTime { get; set; }
-	/// <summary>
-	/// تاخیر در ورود (مدت زمانی که کارمند با تأخیر وارد شده است)
-	/// </summary>
-	public TimeSpan LateEntryDuration { get; set; }
+    /// <summary>
+    /// تاخیر در ورود (مدت زمانی که کارمند با تأخیر وارد شده است)
+    /// </summary>
+    public TimeSpan LateEntryDuration { get; set; }
 
     /// <summary>
     /// تعجیل در ورود (مدت زمانی که کارمند زودتر از زمان مشخص وارد شده است)

CompanyManagment.App.Contracts/TemporaryClientRegistration/ITemporaryClientRegistrationApplication.cs

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

CompanyManagment.App.Contracts/TemporaryClientRegistration/MonthlyInstallment.cs

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

CompanyManagment.App.Contracts/TemporaryClientRegistration/ReviewAndPaymentViewModel.cs

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

CompanyManagment.Application/AndroidApkVersionApplication.cs

@@ -48,9 +48,9 @@ public class AndroidApkVersionApplication : IAndroidApkVersionApplication
 
         Directory.CreateDirectory(path);
 
-        //var apk = new ApkReader.ApkReader().Read(file.OpenReadStream());
+        var apk = new ApkReader.ApkReader().Read(file.OpenReadStream());
 
-        string uniqueFileName = $"{Path.GetFileNameWithoutExtension(file.FileName)}{Path.GetExtension(file.FileName)}";
+        string uniqueFileName = $"{Path.GetFileNameWithoutExtension(file.FileName)}.v{apk.VersionName}{Path.GetExtension(file.FileName)}";
 
 
         string filepath = Path.Combine(path, uniqueFileName);
@@ -60,7 +60,7 @@ public class AndroidApkVersionApplication : IAndroidApkVersionApplication
             await file.CopyToAsync(stream);
         }
 
-        var entity = new AndroidApkVersion("0", "0", IsActive.True, filepath);
+        var entity = new AndroidApkVersion(apk.VersionName, apk.VersionCode, IsActive.True, filepath);
         _androidApkVersionRepository.Create(entity);
         _androidApkVersionRepository.SaveChanges();
         return op.Succcedded();

CompanyManagment.Application/ContactUsApplication.cs

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

CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs

@@ -19,12 +19,13 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Transactions;
-using CompanyManagment.App.Contracts.RollCall;
-using Microsoft.EntityFrameworkCore.Query;
 using Company.Domain.CheckoutAgg;
 using Company.Domain.CustomizeCheckoutAgg;
 using Company.Domain.CustomizeCheckoutTempAgg;
-using CompanyManagment.EFCore.Repository;
+using CompanyManagment.App.Contracts.RollCall;
+using Hangfire.States;
+using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using Microsoft.EntityFrameworkCore.Query;
 
 
 namespace CompanyManagment.Application;
@@ -372,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>();
@@ -557,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();
@@ -681,7 +688,7 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
         return op.Succcedded();
     }
     public OperationResult EditSimpleRollCallGroupSetting(EditCustomizeWorkshopGroupSettings command,
-       List<ReCalculateRollCallValues> reCalculateCommand)
+        List<ReCalculateRollCallValues> reCalculateCommand)
     {
         OperationResult op = new();
 
@@ -712,15 +719,15 @@ 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 &&
@@ -1589,10 +1596,6 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
         return _customizeWorkshopGroupSettingsRepository.GetEmployeesGroupSettingsByEmployeeId(employeeId, workshopId);
     }
 
-    public bool HasAnyEmployeeWithoutGroup(long workshopId)
-    {
-        return _customizeWorkshopGroupSettingsRepository.HasAnyEmployeeWithoutGroup(workshopId);
-    }
     public OperationResult<List<long>> ValidateReCalculateValueForGroupEdit(List<ReCalculateRollCallValues> commands,
         long workshopId)
     {
@@ -1623,10 +1626,16 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 
         employeeIdsHasCheckout = employeeIdsHasCheckout.Distinct().ToList();
         return isSuccess ?
-            operationResult.Succcedded(employeeIdsHasCheckout)
+            operationResult.Succcedded(employeeIdsHasCheckout) 
             :
             operationResult.Failed("پرسنل هایی دارای فیش هستند لطفا نسبت به تعیین تکلیف این ها اقدام نمایید", employeeIdsHasCheckout);
     }
+
+    public bool HasAnyEmployeeWithoutGroup(long workshopId)
+    {
+        return _customizeWorkshopGroupSettingsRepository.HasAnyEmployeeWithoutGroup(workshopId);
+    }
+
     public bool CheckEmployeeShiftHasChanged(EditCustomizeEmployeeSettings command)
     {
         return _customizeWorkshopEmployeeSettingsRepository.CheckEmployeeShiftHasChanged(command);

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;
 using Company.Domain.LeftWorkInsuranceAgg;
 
 namespace CompanyManagment.Application;
@@ -38,6 +41,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;
@@ -55,17 +61,32 @@ 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 ILeftWorkInsuranceRepository _leftWorkInsuranceRepository ;
+    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, ILeftWorkInsuranceRepository leftWorkInsuranceRepository) : 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, ILeftWorkInsuranceRepository leftWorkInsuranceRepository) : base(context)
     {
         _context = context;
         _WorkShopRepository = workShopRepository;
+        _EmployeeRepository = employeeRepository;
+        this._leftWorkRepository = leftWorkRepository;  
+        _personnelCodeRepository = personnelCodeRepository;
+        _employeeClientTempRepository = employeeClientTempRepository;
         _webHostEnvironment = webHostEnvironment;
         _rollCallEmployeeStatusApplication = rollCallEmployeeStatusApplication;
         _rollCallEmployeeRepository = rollCallEmployeeRepository;
@@ -75,19 +96,17 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         _leftWorkTempRepository = leftWorkTempRepository;
         _uidService = uidService;
         _customizeWorkshopEmployeeSettingsRepository = customizeWorkshopEmployeeSettingsRepository;
-        _personnelCodeRepository = personnelCodeRepository;
-        _employeeClientTempRepository = employeeClientTempRepository;
-        _leftWorkRepository = leftWorkRepository;
         _employeeAuthorizeTempRepository = employeeAuthorizeTempRepository;
         _leftWorkInsuranceRepository = leftWorkInsuranceRepository;
         _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))
@@ -105,7 +124,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         //}
 
-       
+
 
         if (command.Address != null && command.State == null)
         {
@@ -144,8 +163,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":
@@ -197,9 +216,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();
@@ -224,9 +243,10 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         return opration.Succcedded(employeeData.id);
 
-          
+
     }
 
+
     public OperationResult Edit(EditEmployee command)
     {
         var opration = new OperationResult();
@@ -235,11 +255,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;
@@ -277,8 +297,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":
@@ -331,7 +351,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();
@@ -339,7 +359,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
@@ -352,7 +372,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         return opration.Succcedded();
 
-         
+
     }
 
     public EditEmployee GetDetails(long id)
@@ -360,6 +380,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();
@@ -398,8 +423,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);
@@ -690,8 +715,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":
@@ -820,8 +845,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":
@@ -901,11 +926,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")
@@ -913,7 +944,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")
@@ -921,11 +951,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)
     {
@@ -961,6 +988,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         }).ToList();
     }
 
+
     #endregion
 
     #region Mahan
@@ -1052,6 +1080,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)
@@ -1061,14 +1090,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 =
@@ -1101,6 +1130,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))
                 {
@@ -1128,6 +1167,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))
             {
@@ -1221,6 +1270,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)
     {
@@ -1510,9 +1560,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);
@@ -1626,6 +1676,5 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
     }
 
-
     #endregion
 }

CompanyManagment.Application/EmployerApplication.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using _0_Framework.Application;
+using _0_Framework.Exceptions;
 using Company.Domain.empolyerAgg;
 using Company.Domain.WorkshopAgg;
 using CompanyManagment.App.Contracts.Checkout;
@@ -957,4 +958,256 @@ public class EmployerApplication : IEmployerApplication
 	}
 
 	#endregion
+	#region Api
+	public async Task<List<GetEmployerListViewModel>> GetEmployerList(GetEmployerSearchModel searchModel)
+	{
+		return await _EmployerRepository.GetEmployerList(searchModel);
+	}
+	public async Task<GetLegalEmployerDetailViewModel> GetLegalEmployerDetail(long id)
+	{
+		var employer = await _EmployerRepository.GetLegalEmployerDetail(id);
+		if (employer == null)
+		{
+			throw new NotFoundException("کارفرمای مورد نطر یافت نشد");
+		}
+		return employer;
+
+	}
+
+	public async Task<GetRealEmployerDetailViewModel> GetRealEmployerDetail(long id)
+	{
+		var employer = await _EmployerRepository.GetRealEmployerDetail(id);
+		if (employer == null)
+		{
+			throw new NotFoundException("کارفرمای مورد نطر یافت نشد");
+		}
+		return employer;
+	}
+
+	public async Task<OperationResult> CreateReal(CreateRealEmployer command)
+	{
+		var opration = new OperationResult();
+		if (_EmployerRepository.Exists(x =>
+				(x.FName == command.FName && x.LName == command.LName) && x.Nationalcode == command.NationalCode && x.Nationalcode != null))
+			return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
+
+		if (string.IsNullOrWhiteSpace(command.FName))
+			return opration.Failed("لطفا نام را وارد کنید");
+
+		if (!string.IsNullOrWhiteSpace(command.NationalCode))
+		{
+			if (command.NationalCode.NationalCodeValid() != "valid")
+			{
+				return opration.Failed("کدملی وارد شده نامعتبر است");
+			}
+			if (_EmployerRepository.Exists(x => x.Nationalcode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode)))
+			{
+				return opration.Failed("کد ملی وارد شده تکراری است");
+			}
+		}
+		string initial = "1300/10/11";
+		var dateOfBirth = command.DateOfBirth?.ToGeorgianDateTime() ?? initial.ToGeorgianDateTime();
+		var dateOfIssue = command.DateOfIssue?.ToGeorgianDateTime() ?? initial.ToGeorgianDateTime();
+
+		var gender = command.Gender switch
+		{
+			Gender.Male => "مرد",
+			Gender.Female => "زن",
+			Gender.None => null,
+			_ => throw new BadRequestException("جنسیت وارد شده نامعتبر است")
+		};
+
+		var employerData = new Employer(command.FName, command.LName, command.ContractingPartyId, gender,
+			command.NationalCode, command.IdNumber, "ایرانی", command.FatherName, dateOfBirth,
+			dateOfIssue, command.PlaceOfIssue, "*", "*", "*", "حقیقی", command.PhoneNumber,
+			command.Telephone, "true", command.GovernmentSystemInfo.MclUsername, command.GovernmentSystemInfo.MclPassword, command.GovernmentSystemInfo.EServiceUsername, command.GovernmentSystemInfo.EServicePassword,
+			command.GovernmentSystemInfo.TaxUsername, command.GovernmentSystemInfo.TaxPassword, command.GovernmentSystemInfo.SanaUsername, command.GovernmentSystemInfo.SanaPassword);
+
+		await _EmployerRepository.CreateAsync(employerData);
+		await _EmployerRepository.SaveChangesAsync();
+
+		return opration.Succcedded();
+	}
+
+	public async Task<OperationResult> CreateLegal(CreateLegalEmployer command)
+	{
+		if (string.IsNullOrWhiteSpace(command.EmployerLName))
+			command.EmployerLName = "#";
+		var opration = new OperationResult();
+		if (_EmployerRepository.Exists(x =>
+				x.LName == command.CompanyName && x.NationalId == command.NationalId && x.EmployerLName == command.EmployerLName))
+			return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
+
+		if (_EmployerRepository.Exists(x => x.NationalId == command.NationalId && !string.IsNullOrWhiteSpace(command.NationalId) && x.NationalId != null))
+		{
+			return opration.Failed(" شناسه ملی وارد شده تکراری است");
+		}
+		if (_EmployerRepository.Exists(x => x.LName == command.CompanyName))
+		{
+			return opration.Failed("نام شرکت وارد شده تکراری است");
+		}
+		if (_EmployerRepository.Exists(x => x.RegisterId == command.RegisterId && !string.IsNullOrWhiteSpace(command.RegisterId) && x.RegisterId != null))
+		{
+			return opration.Failed(" شماره ثبت وارد شده تکراری است");
+		}
+
+		if (!string.IsNullOrEmpty(command.NationalId) && command.NationalId.Length != 11)
+		{
+			return opration.Failed(" شناسه ملی باید 11 رقم باشد");
+		}
+
+		if (!string.IsNullOrWhiteSpace(command.EmployerNationalCode))
+		{
+			if (command.EmployerNationalCode.NationalCodeValid() != "valid")
+			{
+				return opration.Failed("کد ملی وارد شده نا معتبر است");
+			}
+		}
+
+		string initial = "1300/10/11";
+		var dateOfBirth = command.EmployerDateOfBirth?.ToGeorgianDateTime() ?? initial.ToGeorgianDateTime();
+		var dateOfIssue = command.EmployerDateOfIssue?.ToGeorgianDateTime() ?? initial.ToGeorgianDateTime();
+
+		var gender = command.EmployerGender switch
+		{
+			Gender.Male => "مرد",
+			Gender.Female => "زن",
+			Gender.None => null,
+			_ => throw new BadRequestException("جنسیت وارد شده نامعتبر است")
+		};
+
+
+		var legalEmployerData = new Employer(command.EmployerFName, command.CompanyName, command.ContractingPartyId, gender,
+			command.EmployerNationalCode, command.EmployerIdNumber, "ایرانی", command.EmployerFatherName, dateOfBirth,
+			dateOfIssue, command.EmployerPlaceOfIssue, command.RegisterId, command.NationalId, command.EmployerLName, "حقوقی", command.PhoneNumber,
+			command.TelephoneNumber, "true", command.GovernmentSystemInfo.MclUsername, command.GovernmentSystemInfo.MclPassword,
+			command.GovernmentSystemInfo.EServiceUsername, command.GovernmentSystemInfo.EServicePassword,
+			command.GovernmentSystemInfo.TaxUsername, command.GovernmentSystemInfo.TaxPassword, command.GovernmentSystemInfo.SanaUsername, command.GovernmentSystemInfo.SanaPassword);
+
+		await _EmployerRepository.CreateAsync(legalEmployerData);
+		await _EmployerRepository.SaveChangesAsync();
+
+		return opration.Succcedded();
+	}
+
+	public async Task<OperationResult> EditReal(EditRealEmployer command)
+	{
+		var opration = new OperationResult();
+		var employer = _EmployerRepository.Get(command.Id);
+		if (employer == null)
+			return opration.Failed("رکورد مورد نظر یافت نشد");
+
+		if (_EmployerRepository.Exists(x =>
+				(x.FName == command.FName && x.LName == command.LName) && x.Nationalcode == command.NationalCode && x.id != command.Id))
+			return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
+		if (!string.IsNullOrWhiteSpace(command.NationalCode))
+		{
+			if (command.NationalCode.NationalCodeValid() != "valid")
+			{
+				return opration.Failed("کد ملی وارد شده نا معتبر است");
+			}
+		}
+
+		if (_EmployerRepository.Exists(x => x.Nationalcode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.id != command.Id))
+		{
+
+			return opration.Failed("  کد ملی  وارد شده تکراری است");
+		}
+
+
+
+		string initial = "1300/10/11";
+
+		var dateOfBirth = command.DateOfBirth?.ToGeorgianDateTime() ?? initial.ToGeorgianDateTime();
+		var dateOfIssue = command.DateOfIssue?.ToGeorgianDateTime() ?? initial.ToGeorgianDateTime();
+
+		var gender = command.Gender switch
+		{
+			Gender.Male => "مرد",
+			Gender.Female => "زن",
+			Gender.None => null,
+			_ => throw new BadRequestException("جنسیت وارد شده نامعتبر است")
+		};
+
+		employer.Edit(command.FName, command.LName, command.ContractingPartyId,
+			gender, command.NationalCode, command.IdNumber, "ایرانی", command.FatherName,
+			dateOfBirth, dateOfIssue, command.PlaceOfIssue, command.PhoneNumber, command.Telephone,
+			command.GovernmentSystemInfo.MclUsername, command.GovernmentSystemInfo.MclPassword, command.GovernmentSystemInfo.EServiceUsername, command.GovernmentSystemInfo.EServicePassword,
+			command.GovernmentSystemInfo.TaxUsername, command.GovernmentSystemInfo.TaxPassword, command.GovernmentSystemInfo.SanaUsername, command.GovernmentSystemInfo.SanaPassword, null);
+
+		await _EmployerRepository.SaveChangesAsync();
+		return opration.Succcedded();
+	}
+
+	public async Task<OperationResult> EditLegal(EditLegalEmployer command)
+	{
+		var opration = new OperationResult();
+		var legalEmployer = _EmployerRepository.Get(command.Id);
+		if (legalEmployer == null)
+			return opration.Failed("رکورد مورد نظر یافت نشد");
+
+		if (_EmployerRepository.Exists(x =>
+				x.LName == command.CompanyName && x.NationalId == command.NationalId && !string.IsNullOrWhiteSpace(command.NationalId) && x.id != command.Id))
+			return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
+
+
+		if (!string.IsNullOrEmpty(command.NationalId) && command.NationalId.Length != 11)
+		{
+			return opration.Failed(" شناسه ملی باید 11 رقم باشد");
+		}
+
+		if (!string.IsNullOrWhiteSpace(command.EmployerNationalCode))
+		{
+			if (command.EmployerNationalCode.NationalCodeValid() != "valid")
+			{
+				return opration.Failed("کد ملی وارد شده نا معتبر است");
+			}
+		}
+
+		var gender = command.EmployerGender switch
+		{
+			Gender.Male => "مرد",
+			Gender.Female => "زن",
+			Gender.None => null,
+			_ => throw new BadRequestException("جنسیت وارد شده نامعتبر است")
+		};
+
+		string initial = "1300/10/11";
+		var dateOfBirth = command.EmployerDateOfBirth?.ToGeorgianDateTime() ?? initial.ToGeorgianDateTime();
+		var dateOfIssue = command.EmployerDateOfIssue?.ToGeorgianDateTime() ?? initial.ToGeorgianDateTime();
+		legalEmployer.EditLegal(command.EmployerFName, command.CompanyName, command.ContractingPartyId, gender,
+			command.EmployerNationalCode, command.EmployerIdNumber, "ایرانی", command.EmployerFatherName, dateOfBirth,
+			dateOfIssue, command.EmployerPlaceOfIssue, command.RegisterId, command.NationalId, command.EmployerLName,
+			command.PhoneNumber, command.TelephoneNumber, command.GovernmentSystemInfo.MclUsername, command.GovernmentSystemInfo.MclUsername, command.GovernmentSystemInfo.EServiceUsername, command.GovernmentSystemInfo.EServicePassword,
+			command.GovernmentSystemInfo.TaxUsername, command.GovernmentSystemInfo.TaxPassword, command.GovernmentSystemInfo.SanaUsername, command.GovernmentSystemInfo.SanaPassword, null);
+
+		await _EmployerRepository.SaveChangesAsync();
+		return opration.Succcedded();
+	}
+
+	//public async Task<List<EmployerSelectListViewModel>> GetSelectList(string search)
+	//{
+	//	return await _EmployerRepository.GetSelectList(search);
+	//}
+
+	async Task<OperationResult<string>> IEmployerApplication.RemoveApi(long id)
+	{
+		var employer = _EmployerRepository.Get(id);
+		if (employer == null)
+			throw new NotFoundException("دیتای مورد نظر یافت نشد");
+
+		var workshops = _workshopRepository.GetWorkshopsByEmployerId([id]);
+
+		if (workshops.Any())
+		{
+			return await _EmployerRepository.DeactivateWithSubordinates(id);
+		}
+
+		_EmployerRepository.Remove(id);
+
+		return new OperationResult<string>().Succcedded("Deleted");
+
+	}
+
+#endregion
 }

CompanyManagment.Application/PersonalContractingPartyApplication.cs

@@ -1,17 +1,19 @@
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using _0_Framework.Application;
 using CompanyManagment.App.Contracts.PersonalContractingParty;
 using Company.Domain.ContarctingPartyAgg;
 using Company.Domain.empolyerAgg;
 using CompanyManagment.App.Contracts.Representative;
 using Company.Domain.InstitutionContractAgg;
+using CompanyManagment.EFCore.Repository;
 
 namespace CompanyManagment.Application;
 
 public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
 {
-    private readonly IPersonalContractingPartyRepository _personalContractingPartyRepository2;
+    private readonly IPersonalContractingPartyRepository _personalContractingPartyRepository;
     private readonly IRepresentativeApplication _representativeApplication;
     private readonly IEmployerRepository _employerRepository;
     private readonly IInstitutionContractRepository _institutionContractRepository;
@@ -26,7 +28,7 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
     public PersonalContractingPartyApplication(
         IPersonalContractingPartyRepository personalContractingPartyRepository, IRepresentativeApplication representativeApplication, IEmployerRepository employerRepository,  IInstitutionContractRepository institutionContractRepository)
     {
-        _personalContractingPartyRepository2 = personalContractingPartyRepository;
+        _personalContractingPartyRepository = personalContractingPartyRepository;
         _representativeApplication = representativeApplication;
         _employerRepository = employerRepository;
         _institutionContractRepository = institutionContractRepository;
@@ -36,7 +38,7 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
     public OperationResult Create(CreatePersonalContractingParty command)
     {
         var opration = new OperationResult();
-        if (_personalContractingPartyRepository2.Exists(x =>
+        if (_personalContractingPartyRepository.Exists(x =>
                 x.LName == command.LName && x.Nationalcode == command.Nationalcode && x.SureName == command.SureName ))
             return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
         if (command.RepresentativeId < 1)
@@ -54,14 +56,14 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
         //    return opration.Failed("نام خانوادگی وارد شده تکراری است");
 
         //}
-        if (_personalContractingPartyRepository2.Exists(x => x.Nationalcode == command.Nationalcode && x.LName != command.LName))
+        if (_personalContractingPartyRepository.Exists(x => x.Nationalcode == command.Nationalcode && x.LName != command.LName))
         {
             nationalcodeIsOk = false;
                
             return opration.Failed("کد ملی وارد شده تکراری است");
         }
 
-        if (_personalContractingPartyRepository2.Exists(x => x.ArchiveCode == command.ArchiveCode))
+        if (_personalContractingPartyRepository.Exists(x => x.ArchiveCode == command.ArchiveCode))
             return opration.Failed("کد طرف حساب تکراری است");
 
         try
@@ -132,8 +134,8 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
                 command.State,command.City,command.Zone,command.SureName);
 
 
-            _personalContractingPartyRepository2.Create(personalContractingParty);
-            _personalContractingPartyRepository2.SaveChanges();
+            _personalContractingPartyRepository.Create(personalContractingParty);
+            _personalContractingPartyRepository.SaveChanges();
 
             return opration.Succcedded();
 
@@ -152,13 +154,13 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
     public OperationResult Edit2(EditPersonalContractingParty command)
     {
         var opration = new OperationResult();
-        var personalContractingParty = _personalContractingPartyRepository2.Get(command.Id);
+        var personalContractingParty = _personalContractingPartyRepository.Get(command.Id);
         if (personalContractingParty == null)
             return opration.Failed("رکورد مورد نظر یافت نشد");
 
         personalContractingParty.Edit2(command.Address);
 
-        _personalContractingPartyRepository2.SaveChanges();
+        _personalContractingPartyRepository.SaveChanges();
         return opration.Succcedded();
     }
 
@@ -166,7 +168,7 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
     {
            
         var opration = new OperationResult();
-        if (_personalContractingPartyRepository2.Exists(x =>
+        if (_personalContractingPartyRepository.Exists(x =>
                 x.LName == command.LName && x.RegisterId == command.RegisterId && x.SureName == command.SureName))
             return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
         if (command.RepresentativeId < 1)
@@ -174,23 +176,23 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
 
 
 
-        if (_personalContractingPartyRepository2.Exists(x => x.LName == command.LName && x.SureName == command.SureName))
+        if (_personalContractingPartyRepository.Exists(x => x.LName == command.LName && x.SureName == command.SureName))
         {
             legalNameIsOk = false;
             return opration.Failed("نام شرکت  وارد شده تکراری است");
         }
-        if (_personalContractingPartyRepository2.Exists(x => x.RegisterId == command.RegisterId && x.LName != command.LName))
+        if (_personalContractingPartyRepository.Exists(x => x.RegisterId == command.RegisterId && x.LName != command.LName))
         {
             registerIdIsOk = false;
             return opration.Failed("شماره ثبت وارد شده تکراری است");
 
         }
-        if (_personalContractingPartyRepository2.Exists(x => x.NationalId == command.NationalId && x.LName != command.LName))
+        if (_personalContractingPartyRepository.Exists(x => x.NationalId == command.NationalId && x.LName != command.LName))
         {
             nationalIdIsOk = false;
             return opration.Failed("شناسه ملی وارد شده تکراری است");
         }
-        if (_personalContractingPartyRepository2.Exists(x => x.ArchiveCode == command.ArchiveCode))
+        if (_personalContractingPartyRepository.Exists(x => x.ArchiveCode == command.ArchiveCode))
             return opration.Failed("کد طرف حساب تکراری است");
 
 
@@ -204,8 +206,8 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
                 command.State, command.City, command.Zone,command.SureName);
 
 
-            _personalContractingPartyRepository2.Create(legalContractingParty);
-            _personalContractingPartyRepository2.SaveChanges();
+            _personalContractingPartyRepository.Create(legalContractingParty);
+            _personalContractingPartyRepository.SaveChanges();
 
             return opration.Succcedded();
 
@@ -223,15 +225,15 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
     {
             
         var opration = new OperationResult();
-        var personalContractingParty = _personalContractingPartyRepository2.Get(command.Id);
+        var personalContractingParty = _personalContractingPartyRepository.Get(command.Id);
         if (personalContractingParty == null)
             return opration.Failed("رکورد مورد نظر یافت نشد");
         if (command.RepresentativeId < 1)
             return opration.Failed("لطفا معرف را انتخاب کنید");
-        if (_personalContractingPartyRepository2.Exists(x =>
+        if (_personalContractingPartyRepository.Exists(x =>
                 x.LName == command.LName && x.Nationalcode == command.Nationalcode && x.SureName == command.SureName && x.id != command.Id))
             return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
-        if (_personalContractingPartyRepository2.Exists(x => x.ArchiveCode == command.ArchiveCode &&  x.id != command.Id))
+        if (_personalContractingPartyRepository.Exists(x => x.ArchiveCode == command.ArchiveCode &&  x.id != command.Id))
             return opration.Failed("کد طرف حساب تکراری است");
         try
         {
@@ -300,7 +302,7 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
                 command.Phone, command.AgentPhone, command.Address, command.RepresentativeId, representative.FullName, command.ArchiveCode,
                 command.State, command.City, command.Zone,command.SureName);
 
-            _personalContractingPartyRepository2.SaveChanges();
+            _personalContractingPartyRepository.SaveChanges();
             return opration.Succcedded();
         }
         else
@@ -314,16 +316,16 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
     {
             
         var opration = new OperationResult();
-        var legalContractingParty = _personalContractingPartyRepository2.Get(command.Id);
+        var legalContractingParty = _personalContractingPartyRepository.Get(command.Id);
         if (legalContractingParty == null)
             return opration.Failed("رکورد مورد نظر یافت نشد");
 
-        if (_personalContractingPartyRepository2.Exists(x =>
+        if (_personalContractingPartyRepository.Exists(x =>
                 x.LName== command.LName && x.RegisterId == command.RegisterId &&x.SureName == command.SureName &&x.id != command.Id))
             return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
         if (command.RepresentativeId < 1)
             return opration.Failed("لطفا معرف را انتخاب کنید");
-        if (_personalContractingPartyRepository2.Exists(x => x.ArchiveCode == command.ArchiveCode && x.id != command.Id))
+        if (_personalContractingPartyRepository.Exists(x => x.ArchiveCode == command.ArchiveCode && x.id != command.Id))
             return opration.Failed("کد طرف حساب تکراری است");
         var representative = _representativeApplication.GetDetails(command.RepresentativeId);
         legalContractingParty.EditLegal(command.LName, command.RegisterId,
@@ -331,54 +333,54 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
             command.Phone, command.AgentPhone, command.Address, command.RepresentativeId, representative.FullName,command.ArchiveCode,
             command.State, command.City, command.Zone, command.SureName);
 
-        _personalContractingPartyRepository2.SaveChanges();
+        _personalContractingPartyRepository.SaveChanges();
         return opration.Succcedded();
     }
 
     public EditPersonalContractingParty GetDetails(long id)
     {
-        return _personalContractingPartyRepository2.GetDetails(id);
+        return _personalContractingPartyRepository.GetDetails(id);
     }
 
     public string IsBlockByEmployerId(long employerId)
     {
-        return _personalContractingPartyRepository2.IsBlockByEmployerId(employerId);
+        return _personalContractingPartyRepository.IsBlockByEmployerId(employerId);
     }
 
     public EditPersonalContractingParty GetDetailsToEdit(long id)
     { 
-        return _personalContractingPartyRepository2.GetDetailsToEdit(id);
+        return _personalContractingPartyRepository.GetDetailsToEdit(id);
    
     }
 
     public string GetFullName(long id)
     {
-        return _personalContractingPartyRepository2.GetFullName(id);
+        return _personalContractingPartyRepository.GetFullName(id);
     }
 
     public List<PersonalContractingPartyViewModel> GetPersonalContractingParties()
     {
-        return _personalContractingPartyRepository2.GetPersonalContractingParties();
+        return _personalContractingPartyRepository.GetPersonalContractingParties();
     }
 
     public List<PersonalContractingPartyViewModel> Search(PersonalContractingPartySearchModel searchModel2)
     {
-        return _personalContractingPartyRepository2.Search(searchModel2);
+        return _personalContractingPartyRepository.Search(searchModel2);
     }
 
     public int GetLastArchiveCode()
     {
-        return _personalContractingPartyRepository2.GetLastArchiveCode();
+        return _personalContractingPartyRepository.GetLastArchiveCode();
     }
 	#region Mahan
 	public List<string> SearchByName(string name)
 	{
-		return _personalContractingPartyRepository2.SearchByName(name);
+		return _personalContractingPartyRepository.SearchByName(name);
 	}
 	#endregion
 	public ContractingPartyAndStatmentIdViewModel GetContractingpartyIdByAccountId(long accountId)
     {
-        return _personalContractingPartyRepository2.GetContractingpartyIdByAccountId(accountId);
+        return _personalContractingPartyRepository.GetContractingpartyIdByAccountId(accountId);
     }
 
 
@@ -386,15 +388,15 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
 
     public List<PersonalContractingPartyViewModel> GetPersonalContractingPartiesForNationalcode(string searchText)
     {
-        return _personalContractingPartyRepository2.GetPersonalContractingPartiesForNationalcode(searchText);
+        return _personalContractingPartyRepository.GetPersonalContractingPartiesForNationalcode(searchText);
 
     }
     public List<PersonalContractingPartyViewModel> SearchForMain(PersonalContractingPartySearchModel searchModel2)
     {
-        var result= _personalContractingPartyRepository2.SearchForMain(searchModel2);
+        var result= _personalContractingPartyRepository.SearchForMain(searchModel2);
         foreach (var item in result)
         {
-            item.HasInstitutionContract = _personalContractingPartyRepository2.GetHasContract(item.id);
+            item.HasInstitutionContract = _personalContractingPartyRepository.GetHasContract(item.id);
         }
         return result;
     }
@@ -411,12 +413,12 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
         //اونهایی که کارفرما یا قرارداد غیر فعال دارند غیر فعال می شوند
         if (_employerRepository.Exists(x => x.ContractingPartyId == id)|| _institutionContractRepository.Exists(x => x.ContractingPartyId == id))
         {
-            opration= _personalContractingPartyRepository2.DeActiveAll(id);
+            opration= _personalContractingPartyRepository.DeActiveAll(id);
             return opration;
         }
         else
         {
-            opration = _personalContractingPartyRepository2.DeletePersonalContractingParties(id);
+            opration = _personalContractingPartyRepository.DeletePersonalContractingParties(id);
         }
 
         return opration;
@@ -428,10 +430,10 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
     {
 
         var opration = new OperationResult();
-        var contract = _personalContractingPartyRepository2.Get(id);
+        var contract = _personalContractingPartyRepository.Get(id);
         if (contract == null)
             return opration.Failed("رکورد مورد نظر یافت نشد");
-        return _personalContractingPartyRepository2.ActiveAll(id);
+        return _personalContractingPartyRepository.ActiveAll(id);
 
 
         //var opration = new OperationResult();
@@ -446,44 +448,44 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
     public OperationResult DeActive(long id)
     {
         var opration = new OperationResult();
-        var personalContracting = _personalContractingPartyRepository2.Get(id);
+        var personalContracting = _personalContractingPartyRepository.Get(id);
         if (personalContracting == null)
             return opration.Failed("رکورد مورد نظر یافت نشد");
 
         personalContracting.DeActive();
 
 
-        _personalContractingPartyRepository2.SaveChanges();
+        _personalContractingPartyRepository.SaveChanges();
         return opration.Succcedded();
     }    
     public  bool GetHasContract(long id)
     {
            
-        return  _personalContractingPartyRepository2.GetHasContract(id);
+        return  _personalContractingPartyRepository.GetHasContract(id);
 
     }
 
     public OperationResult Block(long id)
     {
         var opration = new OperationResult();
-        var contract = _personalContractingPartyRepository2.Get(id);
+        var contract = _personalContractingPartyRepository.Get(id);
         if (contract == null)
             return opration.Failed("رکورد مورد نظر یافت نشد");
         contract.Block();
 
-        _personalContractingPartyRepository2.SaveChanges();
+        _personalContractingPartyRepository.SaveChanges();
         return opration.Succcedded();
     }
     public OperationResult DisableBlock(long id)
     {
         var opration = new OperationResult();
-        var personalContracting = _personalContractingPartyRepository2.Get(id);
+        var personalContracting = _personalContractingPartyRepository.Get(id);
         if (personalContracting == null)
             return opration.Failed("رکورد مورد نظر یافت نشد");
        
             int blockTimes = personalContracting.BlockTimes + 1;
             personalContracting.DisableBlock(blockTimes);
-            _personalContractingPartyRepository2.SaveChanges();
+            _personalContractingPartyRepository.SaveChanges();
       
         
     
@@ -499,7 +501,225 @@ public class PersonalContractingPartyApplication : IPersonalContractingPartyApp
 
     public bool IsBlockCheckByWorkshopId(long workshopId)
     {
-        return _personalContractingPartyRepository2.IsBlockCheckByWorkshopId(workshopId);
+        return _personalContractingPartyRepository.IsBlockCheckByWorkshopId(workshopId);
+    }
+
+
+
+    #endregion
+
+
+    #region Api
+
+
+    public async Task<ICollection<ContractingPartyGetListViewModel>> GetList(
+        ContractingPartyGetListSearchModel searchModel)
+    {
+        return await _personalContractingPartyRepository.GetList(searchModel);
+    }
+
+    public async Task<List<ContractingPartySelectListViewModel>> GetSelectList()
+    {
+        return await _personalContractingPartyRepository.GetSelectList();
+    }
+    public async Task<OperationResult> CreateReal(CreateRealContractingParty command)
+    {
+        var operation = new OperationResult();
+
+        if (_personalContractingPartyRepository.Exists(x =>
+                x.LName == command.LName && x.Nationalcode == command.NationalCode && x.SureName == command.SureName))
+            return operation.Failed("امکان ثبت رکورد تکراری وجود ندارد");
+
+        if (command.RepresentativeId < 1)
+            return operation.Failed("لطفا معرف را انتخاب کنید");
+
+        if (_personalContractingPartyRepository.Exists(x => x.Nationalcode == command.NationalCode && x.LName != command.LName))
+        {
+            nationalcodeIsOk = false;
+
+            return operation.Failed("کد ملی وارد شده تکراری است");
+        }
+
+
+        if (_personalContractingPartyRepository.Exists(x => x.ArchiveCode == command.ArchiveCode))
+            return operation.Failed("کد طرف حساب تکراری است");
+
+        if (command.NationalCode.NationalCodeValid() != "valid")
+        {
+            return operation.Failed("کد ملی وارد شده نا معتبر است");
+        }
+
+        var representative = _representativeApplication.GetDetails(command.RepresentativeId);
+        var personalContractingParty = new PersonalContractingParty(command.FName, command.LName,
+            command.NationalCode, command.IdNumber, "*", "*",
+            "حقیقی",
+            command.PhoneNumber, command.AgentPhone, command.Address, command.RepresentativeId, representative.FullName, command.ArchiveCode,
+            command.State, command.City, command.Zone, command.SureName);
+
+
+        await _personalContractingPartyRepository.CreateAsync(personalContractingParty);
+        await _personalContractingPartyRepository.SaveChangesAsync();
+
+        return operation.Succcedded();
+    }
+
+    public async Task<OperationResult> CreateLegal(CreateLegalContractingParty command)
+    {
+        var opration = new OperationResult();
+
+        if (_personalContractingPartyRepository.Exists(x =>
+                x.LName == command.CompanyName && x.RegisterId == command.RegisterId && x.SureName == command.SureName))
+            return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
+
+        if (command.RepresentativeId < 1)
+            return opration.Failed("لطفا معرف را انتخاب کنید");
+
+        if (_personalContractingPartyRepository.Exists(x =>
+                x.LName == command.CompanyName && x.SureName == command.SureName))
+        {
+            legalNameIsOk = false;
+            return opration.Failed("نام شرکت  وارد شده تکراری است");
+        }
+
+        if (_personalContractingPartyRepository.Exists(x =>
+                x.RegisterId == command.RegisterId && x.LName != command.CompanyName))
+        {
+            registerIdIsOk = false;
+            return opration.Failed("شماره ثبت وارد شده تکراری است");
+
+        }
+
+        if (_personalContractingPartyRepository.Exists(x =>
+                x.NationalId == command.NationalId && x.LName != command.CompanyName))
+        {
+            nationalIdIsOk = false;
+            return opration.Failed("شناسه ملی وارد شده تکراری است");
+        }
+
+        if (_personalContractingPartyRepository.Exists(x => x.ArchiveCode == command.ArchiveCode))
+            return opration.Failed("کد طرف حساب تکراری است");
+
+
+
+        var representative = _representativeApplication.GetDetails(command.RepresentativeId);
+        var legalContractingParty = new PersonalContractingParty("*", command.CompanyName,
+            "*", "*", command.RegisterId, command.NationalId,
+            "حقوقی",
+            command.PhoneNumber, command.AgentPhone, command.Address, command.RepresentativeId, representative.FullName,
+            command.ArchiveCode,
+            command.State, command.City, command.Zone, command.SureName);
+
+
+        await _personalContractingPartyRepository.CreateAsync(legalContractingParty);
+        await _personalContractingPartyRepository.SaveChangesAsync();
+
+        return opration.Succcedded();
+
+    }
+
+    public async Task<List<GetContractingPartyNationalCodeOrNationalIdViewModel>> GetNationalCodeOrNationalId()
+    {
+        return await _personalContractingPartyRepository.GetNationalCodeOrNationalId();
+    }
+
+    public async Task<OperationResult<string>> Delete(long id)
+    {
+        var operationResult = new OperationResult<string>();
+
+        try
+        {
+            //اگر دارای قرارداد یا دازای کارفرما باشد غیر فعال می شود
+            if (_employerRepository.Exists(x => x.ContractingPartyId == id) || _institutionContractRepository.Exists(x => x.ContractingPartyId == id))
+            {
+                operationResult = await _personalContractingPartyRepository.DeactivateWithSubordinates(id);
+                return operationResult;
+            }
+
+            var entity = _personalContractingPartyRepository.Get(id);
+            _personalContractingPartyRepository.Remove(entity);
+            operationResult.Succcedded("Deleted");
+        }
+        catch
+        {
+            return operationResult.Failed("خطایی رخ داده است");
+        }
+
+        return operationResult;
+    }
+
+    public OperationResult EditRealApi(EditRealContractingParty command)
+    {
+        var opration = new OperationResult();
+        var personalContractingParty = _personalContractingPartyRepository.Get(command.Id);
+
+        if (personalContractingParty == null)
+            return opration.Failed("رکورد مورد نظر یافت نشد");
+
+        if (command.RepresentativeId < 1)
+            return opration.Failed("لطفا معرف را انتخاب کنید");
+
+        if (_personalContractingPartyRepository.Exists(x =>
+                x.LName == command.LName && x.Nationalcode == command.NationalCode && x.SureName == command.SureName && x.id != command.Id))
+            return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
+
+        if (_personalContractingPartyRepository.Exists(x => x.ArchiveCode == command.ArchiveCode && x.id != command.Id))
+            return opration.Failed("کد طرف حساب تکراری است");
+
+        if (command.NationalCode.NationalCodeValid() != "valid")
+        {
+            return opration.Failed("کد ملی وارد شده نا معتبر است");
+        }
+
+        try
+        {
+            var representative = _representativeApplication.GetDetails(command.RepresentativeId);
+            personalContractingParty.Edit(command.FName, command.LName,
+                command.NationalCode, command.IdNumber,
+                command.PhoneNumber, command.AgentPhone, command.Address, command.RepresentativeId, representative.FullName, command.ArchiveCode,
+                command.State, command.City, command.Zone, command.SureName);
+
+            _personalContractingPartyRepository.SaveChanges();
+            return opration.Succcedded();
+        }
+        catch
+        {
+
+            return opration.Failed("خطایی رخ داده است");
+        }
+    }
+
+    public OperationResult EditLegal(EditLegalContractingParty command)
+    {
+        var opration = new OperationResult();
+        var legalContractingParty = _personalContractingPartyRepository.Get(command.Id);
+        if (legalContractingParty == null)
+            return opration.Failed("رکورد مورد نظر یافت نشد");
+
+        if (_personalContractingPartyRepository.Exists(x =>
+                x.LName == command.CompanyName && x.RegisterId == command.RegisterId && x.SureName == command.SureName && x.id != command.Id))
+            return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
+        if (command.RepresentativeId < 1)
+            return opration.Failed("لطفا معرف را انتخاب کنید");
+        if (_personalContractingPartyRepository.Exists(x => x.ArchiveCode == command.ArchiveCode && x.id != command.Id))
+            return opration.Failed("کد طرف حساب تکراری است");
+        var representative = _representativeApplication.GetDetails(command.RepresentativeId);
+        legalContractingParty.EditLegal(command.CompanyName, command.RegisterId,
+            command.NationalId,
+            command.PhoneNumber, command.AgentPhone, command.Address, command.RepresentativeId, representative.FullName, command.ArchiveCode,
+            command.State, command.City, command.Zone, command.SureName);
+
+        _personalContractingPartyRepository.SaveChanges();
+        return opration.Succcedded();
+    }
+
+    public async Task<GetRealContractingPartyDetailsViewModel> GetRealDetails(long id)
+    {
+        return await _personalContractingPartyRepository.GetRealDetails(id);
+    }
+
+    public async Task<GetLegalContractingPartyDetailsViewModel> GetLegalDetails(long id)
+    {
+        return await _personalContractingPartyRepository.GetLegalDetails(id);
     }
 
     #endregion

CompanyManagment.Application/TemporaryClientRegistrationApplication.cs

@@ -67,7 +67,7 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
             return op.Failed("شماره همراه نا معتبر است");
 
 
-    
+
         #endregion
 
 
@@ -141,6 +141,8 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
             result.FName = createTemp.FName;
             result.LName = createTemp.LName;
             result.DateOfBirthFa = dateOfBirth;
+            result.FatherName = createTemp.FatherName;
+            result.IdNumberSerial = createTemp.IdNumberSerial;
             result.IdNumber = idNumber;
 
             return op.Succcedded(result);
@@ -188,7 +190,7 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
     /// </summary>
     /// <param name="command"></param>
     /// <returns></returns>
-    public async Task<OperationResult> CreateOrUpdateWorkshopTemp(List<WorkshopTempViewModel> command)
+    public async Task<OperationResult> CreateOrUpdateWorkshopTemp(List<WorkshopTempViewModel> command, long contractingPartyTempId)
     {
         var op = new OperationResult();
         var updateWorkshopList = command.Where(x => x.Id > 0).ToList();
@@ -196,10 +198,17 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
 
         if (updateWorkshopList.Count == 0 && createNewWorkshopList.Count == 0)
             return op.Failed("هیچ مجموعه ای ایجاد نشده است");
+        var oldWorkshops = await _workshopTempRepository.GetWorkshopTemp(contractingPartyTempId);
 
         #region Update
         if (updateWorkshopList.Count > 0)
         {
+            var updateListIds = updateWorkshopList.Select(x => x.Id).ToList();
+            var oldWorkshopsIds = oldWorkshops.Select(x => x.Id).ToList();
+            var exceptWorkshops = oldWorkshopsIds.Except(updateListIds).ToList();
+            if (exceptWorkshops.Any())
+                await _workshopTempRepository.RemoveWorkshopTemps(exceptWorkshops);
+
 
             foreach (var workshop in updateWorkshopList)
             {
@@ -212,6 +221,7 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
                     workshop.RollCall == false && workshop.Insurance == false)
                     op.Failed($"برای مجموعه {workshop.WorkshopName} هیچ سرویسی انتخاب نشده است");
                 var existWorkshops = _workshopTempRepository.Get(workshop.Id);
+
                 if (existWorkshops != null)
                 {
                     if (workshop.ContractAndCheckout)
@@ -256,6 +266,8 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
                         if (workshop.CustomizeCheckout)
                             await _workshopServicesTempRepository.CreateAsync(
                                 new WorkshopServicesTemp("CustomizeCheckout", workshop.CountPerson, workshop.Id));
+
+                        await _workshopServicesTempRepository.SaveChangesAsync();
                     }
 
                 }
@@ -324,6 +336,8 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
                     if (workshop.CustomizeCheckout)
                         await _workshopServicesTempRepository.CreateAsync(
                             new WorkshopServicesTemp("CustomizeCheckout", workshop.CountPerson, createNewWorkshopTemp.id));
+
+                    await _workshopServicesTempRepository.SaveChangesAsync();
                 }
 
             }
@@ -352,8 +366,9 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
     /// </summary>
     /// <param name="contractingPartyTempId"></param>
     /// <returns></returns>
-    public async Task<ReviewAndPaymentViewModel> GetTotalPaymentAndWorkshopList(long contractingPartyTempId, string periodModel = "12", string paymentModel = "OneTime")
+    public async Task<ReviewAndPaymentViewModel> GetTotalPaymentAndWorkshopList(long contractingPartyTempId, string periodModel = "12", string paymentModel = "OneTime", string contractStartType = "currentMonth")
     {
+
         //دریافت کارگاه ها
         var workshops = await _workshopTempRepository.GetWorkshopTemp(contractingPartyTempId);
 
@@ -380,9 +395,10 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
             _ => 12,
         };
         //رند کردن مبالغ کارگاه ها
-        var roundAmount = (int)(totalPayment1MonthDouble / 1000000) * 1000000;
+        var roundAmount = (((Convert.ToInt64(totalPayment1MonthDouble))) / 1000000) * 1000000;
+        double roundAmount2 = roundAmount;
         //بدست آوردن جمع کل مبالغ کارگاه بر اساس مدت قراداد
-        result.SumOfWorkshopsPaymentDouble = roundAmount * months;
+        result.SumOfWorkshopsPaymentDouble = months * roundAmount2;
         result.SumOfWorkshopsPaymentPaymentStr = result.SumOfWorkshopsPaymentDouble.ToMoney();
 
 
@@ -394,31 +410,112 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
         //مالیات
         result.ValueAddedTaxDouble = tenPercent;
         result.ValueAddedTaxSt = tenPercent.ToMoney();
-        if (paymentModel == "OneTime")//تخفیف 10 درصدی درصورت پرداخت یکجا
+        //پرداخت یکجا
+        #region OneTimePaymentResult
+
+        double discountOneTimePeyment = result.SumOfWorkshopsPaymentDouble - tenPercent;
+
+
+        //مبلغ بدون مالیات و با تخفیف
+        result.OneTimeWithoutTaxPaymentDouble = discountOneTimePeyment;
+        result.OneTimeWithoutTaxPaymentStr = discountOneTimePeyment.ToMoney();
+
+        //مبلغ با مالیات
+        result.OneTimeTotalPaymentDouble = discountOneTimePeyment + tenPercent;
+        result.OneTimeTotalPaymentStr = result.OneTimeTotalPaymentDouble.ToMoney();
+
+        #endregion
+
+        //پرداخت ماهیانه
+        #region MonthlyPaymentResult
+
+        //مبلغ بدون مالیات
+        result.MonthlyWithoutTaxPaymentDouble = result.SumOfWorkshopsPaymentDouble;
+        result.MonthlyWithoutTaxPaymentStr = result.SumOfWorkshopsPaymentDouble.ToMoney();
+
+        // مبلغ با مالیات
+        result.MonthlyTotalPaymentDouble = result.SumOfWorkshopsPaymentDouble + tenPercent;
+        result.MonthlyTotalPaymentStr = result.MonthlyTotalPaymentDouble.ToMoney();
+        var installmentList = new List<MonthlyInstallment>();
+
+        var startDate = (DateTime.Now).ToFarsi();
+        result.ContractStartCurrentMonthFa = $"{startDate.Substring(0, 8)}01";
+        result.ContractStartCurrentMonthGr = result.ContractStartCurrentMonthFa.ToGeorgianDateTime();
+        startDate = result.ContractStartCurrentMonthFa;
+
+        result.ContractStartNextMonthGr = ((startDate.FindeEndOfMonth()).ToGeorgianDateTime()).AddDays(1);
+        result.ContractStartNextMonthFa = result.ContractStartNextMonthGr.ToFarsi();
+
+        if (contractStartType == "nextMonth")
+            startDate = result.ContractStartNextMonthFa;
+
+
+
+        var findeEnd = Tools.FindEndOfContract(startDate, periodModel);
+        var contractEndDate = findeEnd.endDateGr;
+        result.ContractEndGr = contractEndDate;
+        result.ContractEndFa = contractEndDate.ToFarsi();
+
+        if (periodModel == "1")
         {
 
-            double discountOneTimePeyment = result.SumOfWorkshopsPaymentDouble - tenPercent;
-            
+            installmentList.Add(new MonthlyInstallment()
+            {
+                InstallmentAmountStr = result.MonthlyTotalPaymentStr,
+                InstallmentCounter = "سررسید پرداخت اول",
+                InstalmentDate = (DateTime.Now).ToFarsi()
 
-            //مبلغ بدون مالیات و با تخفیف
-            result.WithoutTaxPaymentDouble = discountOneTimePeyment;
-            result.WithoutTaxPaymentStr = discountOneTimePeyment.ToMoney();
-
-            //مبلغ با مالیات
-            result.TotalPaymentDouble = discountOneTimePeyment + tenPercent;
-            result.TotalPaymentStr = result.TotalPaymentDouble.ToMoney();
+            });
+            result.MonthlyInstallments = installmentList;
         }
         else
         {
-            //مبلغ بدون مالیات
-            result.WithoutTaxPaymentDouble = result.SumOfWorkshopsPaymentDouble;
-            result.WithoutTaxPaymentStr = result.SumOfWorkshopsPaymentDouble.ToMoney();
+            int instalmentCount = Convert.ToInt32(periodModel);
+            var instalmentAmount = result.MonthlyTotalPaymentDouble / instalmentCount;
+            var findEndOfMonth = startDate.FindeEndOfMonth();
+            for (int i = 1; i <= instalmentCount; i++)
+            {
+                if (i == 1)
+                {
+                    startDate = (DateTime.Now).ToFarsi();
+
+                }
+                else if (i > 1)
+                {
+                    var currentMonthStart = ((findEndOfMonth.ToGeorgianDateTime()).AddDays(1)).ToFarsi();
+                    startDate = currentMonthStart.FindeEndOfMonth();
+                    findEndOfMonth = startDate;
+                }
+
+                installmentList.Add(new MonthlyInstallment()
+                {
+                    InstallmentAmountStr = instalmentAmount.ToMoney(),
+                    InstallmentCounter = i switch
+                    {
+                        1 => "سررسید پرداخت اول",
+                        2 => "سررسید پرداخت دوم",
+                        3 => "سررسید پرداخت سوم",
+                        4 => "سررسید پرداخت چهارم",
+                        5 => "سررسید پرداخت پنجم",
+                        6 => "سررسید پرداخت ششم",
+                        7 => "سررسید پرداخت هفتم",
+                        8 => "سررسید پرداخت هشتم",
+                        9 => "سررسید پرداخت نهم",
+                        10 => "سررسید پرداخت دهم",
+                        11 => "سررسید پرداخت یازدهم",
+                        12 => "سررسید پرداخت دوازدهم",
+                        _ => "سررسید پرداخت دوازدهم",
+                    },
+                    InstalmentDate = startDate
+
+                });
+            }
 
-            // مبلغ با مالیات
-            result.TotalPaymentDouble = result.SumOfWorkshopsPaymentDouble + tenPercent;
-            result.TotalPaymentStr = result.TotalPaymentDouble.ToMoney();
         }
 
+        #endregion
+
+        result.MonthlyInstallments = installmentList;
         result.ContractingPartTempId = contractingPartyTempId;
 
         return result;
@@ -430,19 +527,21 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
     /// </summary>
     /// <param name="contractingPartyTempId"></param>
     /// <returns></returns>
-    public async Task<OperationResult> CreateOrUpdateInstitutionContractTemp(long contractingPartyTempId, string periodModel, string paymentModel, double totalPayment, double valueAddedTax)
+    public async Task<OperationResult> CreateOrUpdateInstitutionContractTemp(long contractingPartyTempId, string periodModel, string paymentModel, double totalPayment, double valueAddedTax, DateTime contractStart)
     {
 
         var op = new OperationResult();
         var institutionContractTemp = await
             _institutionContractTempRepository.GetInstitutionContractTemp(0, contractingPartyTempId);
-
+        var contractStartDate = contractStart;
+        string contractStartFa = contractStart.ToFarsi();
+        var findeEnd = Tools.FindEndOfContract(contractStartFa, periodModel);
+        var contractEndDate = findeEnd.endDateGr;
         if (institutionContractTemp == null)
         {
             var periodModelInt = Convert.ToInt32(periodModel);
-            var contractstart = DateTime.Now;
-            var contractEnd = DateTime.Now.AddMonths(periodModelInt);
-            var create = new InstitutionContractTemp(contractingPartyTempId,paymentModel,periodModel,totalPayment,contractstart,contractEnd,"official", valueAddedTax,"", "BeforeSendVerifyCode", 0,null,null);
+
+            var create = new InstitutionContractTemp(contractingPartyTempId, paymentModel, periodModel, totalPayment, contractStartDate, contractEndDate, "official", valueAddedTax, "", "BeforeSendVerifyCode", 0, null, null);
             _institutionContractTempRepository.Create(create);
             _institutionContractTempRepository.SaveChanges();
             return op.Succcedded();
@@ -451,20 +550,20 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
         {
             if (institutionContractTemp.VerifyCodeEndTime != null)
             {
-                var spaning = (institutionContractTemp.VerifyCodeEndTime.Value - DateTime.Now);
+                var spaning = (DateTime.Now - institutionContractTemp.VerifyCodeEndTime.Value);
                 if (institutionContractTemp.RegistrationStatus == "VerifyCodeSent" && spaning > new TimeSpan(0, 0, 0) && spaning < new TimeSpan(0, 1, 0))
                     return op.Failed("شما به تازگی پیامک دریافت نموده اید دو دقیقه صبر کنید و دوباره تلاش کنید");
             }
-  
+
             if (institutionContractTemp.RegistrationStatus == "Completed")
                 return op.Failed("شما قبلا ثبت نام خود را تکمیل نموده اید");
-          
+
 
             var periodModelInt = Convert.ToInt32(periodModel);
             var contractstart = DateTime.Now;
             var contractEnd = DateTime.Now.AddMonths(periodModelInt);
             var update = _institutionContractTempRepository.Get(institutionContractTemp.Id);
-            update.Edit(contractingPartyTempId, paymentModel, periodModel, totalPayment, contractstart, contractEnd, "official", valueAddedTax, "", "BeforeSendVerifyCode", 0, null, null);
+            update.Edit(contractingPartyTempId, paymentModel, periodModel, totalPayment, contractStartDate, contractEndDate, "official", valueAddedTax, "", "BeforeSendVerifyCode", 0, null, null);
             _institutionContractTempRepository.SaveChanges();
             return op.Succcedded();
         }
@@ -483,14 +582,14 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
     {
 
         var op = new OperationResult();
-        var institutionContractTemp = await 
+        var institutionContractTemp = await
             _institutionContractTempRepository.GetInstitutionContractTemp(0, contractingPartyTempId);
         if (institutionContractTemp == null)
-            return op.Failed("خظا");
+            return op.Failed("خطا");
 
         var update = _institutionContractTempRepository.Get(institutionContractTemp.Id);
 
-        
+
 
 
         if (institutionContractTemp.RegistrationStatus == "BeforeSendVerifyCode")
@@ -516,26 +615,29 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
                 return op.Succcedded(1, "کد برای شما پیامک شد");
             }
 
-           
+
         }
 
         if (institutionContractTemp.RegistrationStatus == "VerifyCodeSent")
 
         {
-            var spaning = (institutionContractTemp.VerifyCodeEndTime.Value - DateTime.Now);
-            if ((spaning >  new TimeSpan(0, 0, 0) && spaning < new TimeSpan(0, 1, 0)))
+
+            if (DateTime.Now < institutionContractTemp.VerifyCodeEndTime.Value)
+                return op.Failed("کد دریافت شده را وارد کنید");
+            var spaning = (DateTime.Now - institutionContractTemp.VerifyCodeEndTime.Value);
+            if ((spaning > new TimeSpan(0, 0, 0) && spaning < new TimeSpan(0, 1, 0)))
                 return op.Failed("شما به تازگی پیامک دریافت نموده اید دو دقیقه صبر کنید و دوباره تلاش کنید");
 
-            if ((spaning > new TimeSpan(0, 0, 0) && spaning > new TimeSpan(0, 1, 0)))
+            if ((spaning > new TimeSpan(0, 1, 0)))
             {
                 //ساخت کد شش رقمی
                 Random generator = new Random();
                 String code = generator.Next(1, 1000000).ToString("D6");
                 //ارسال اس ام اس
                 var getContractingPaty = _contractingPartyTempRepository.GetByContractingPartyTempId(contractingPartyTempId);
-                var sendResult =await _smsService.SendVerifyCodeToClient(getContractingPaty.Phone, code);
+                var sendResult = await _smsService.SendVerifyCodeToClient(getContractingPaty.Phone, code);
 
-                if(!sendResult.IsSuccedded)
+                if (!sendResult.IsSuccedded)
                     return op.Failed($"{sendResult.Message}");
 
 
@@ -544,16 +646,16 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
                 //ذخیره تاریخ ارسال و مهلت پایان
                 //ذخیره آیدی پیامک
                 //تغییر وضعیت به ارسال شده
-              
+
                 if (update != null)
                 {
-                    update.Update(code, "VerifyCodeSent",sendResult.MessageId, DateTime.Now, DateTime.Now.AddMinutes(2));
+                    update.Update(code, "VerifyCodeSent", sendResult.MessageId, DateTime.Now, DateTime.Now.AddMinutes(2));
                     _institutionContractTempRepository.SaveChanges();
                     return op.Succcedded(1, "کد برای شما پیامک شد");
                 }
-               
 
-              
+
+
             }
 
         }
@@ -580,25 +682,25 @@ public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrati
             _institutionContractTempRepository.GetInstitutionContractTemp(0, contractingPartyTempId);
         if (institutionContractTemp == null)
             return op.Failed("خظا");
-        if(institutionContractTemp.RegistrationStatus != "VerifyCodeSent")
+        if (institutionContractTemp.RegistrationStatus != "VerifyCodeSent")
             return op.Failed("خطا");
 
-        if(institutionContractTemp.VerifyCodeEndTime < DateTime.Now)
+        if (institutionContractTemp.VerifyCodeEndTime < DateTime.Now)
             return op.Failed("کد شما منقضی شده است");
 
-        if(institutionContractTemp.SendVerifyCodeTime < DateTime.Now && institutionContractTemp.VerifyCodeEndTime >= DateTime.Now)
+        if (institutionContractTemp.SendVerifyCodeTime < DateTime.Now && institutionContractTemp.VerifyCodeEndTime >= DateTime.Now)
         {
             if (institutionContractTemp.VerifyCode == verifyCode)
             {
 
-               
+
                 return op.Succcedded();
             }
             else
             {
                 return op.Failed("کد وارد شده صحیح نیست");
             }
-              
+
         }
 
 

CompanyManagment.EFCore/CompanyContext.cs

@@ -9,6 +9,7 @@ using Company.Domain.CheckoutAgg;
 using Company.Domain.ClassifiedSalaryAgg;
 using Company.Domain.ClientEmployeeWorkshopAgg;
 using Company.Domain.Contact2Agg;
+using Company.Domain.ContactUsAgg;
 using Company.Domain.ContarctingPartyAgg;
 using Company.Domain.ContractAgg;
 using Company.Domain.ContractingPartyAccountAgg;
@@ -175,6 +176,8 @@ public class CompanyContext : DbContext
 
     public DbSet<EmployeeClientTemp> EmployeeClientTemps { get; set; }
     public DbSet<LeftWorkTemp> LeftWorkTemps { get; set; }
+    public DbSet<ContactUs> ContactUs { get; set; }
+
 
     public DbSet<EmployeeAuthorizeTemp> EmployeeAuthorizeTemps { get; set; }
     public DbSet<AdminMonthlyOverview> AdminMonthlyOverviews { get; set; }

CompanyManagment.EFCore/Mapping/CheckoutMapping.cs

@@ -1,6 +1,5 @@
 using System;
 using _0_Framework.Application;
-using _0_Framework.InfraStructure;
 using Company.Domain.CheckoutAgg;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
@@ -74,28 +73,5 @@ class CheckoutMapping : IEntityTypeConfiguration<Checkout>
             salaryAid.Property(x => x.Amount).HasMaxLength(25);
             salaryAid.Property(x => x.CalculationDateTimeFa).HasMaxLength(15);
         });
-
-        builder.OwnsOne(x => x.CheckoutRollCall, rollCall =>
-        {
-	        rollCall.Property(x => x.TotalPresentTimeSpan).HasTimeSpanConversion();
-	        rollCall.Property(x => x.TotalBreakTimeSpan).HasTimeSpanConversion();
-	        rollCall.Property(x => x.TotalWorkingTimeSpan).HasTimeSpanConversion();
-	        rollCall.Property(x => x.TotalPaidLeaveTmeSpan).HasTimeSpanConversion();
-	        rollCall.Property(x => x.TotalSickLeaveTimeSpan).HasTimeSpanConversion();
-	        rollCall.Property(x => x.TotalMandatoryTimeSpan).HasTimeSpanConversion();
-	        rollCall.OwnsMany(x => x.RollCallDaysCollection, rollCallDay =>
-	        {
-		        rollCallDay.HasKey(x => x.Id);
-		        rollCallDay.WithOwner().HasForeignKey(x => x.CheckoutId);
-
-		        rollCallDay.Property(x => x.WorkingTimeSpan).HasTimeSpanConversion();
-		        rollCallDay.Property(x => x.BreakTimeSpan).HasTimeSpanConversion();
-		        rollCallDay.Property(x => x.FirstStartDate).HasMaxLength(18);
-		        rollCallDay.Property(x => x.FirstEndDate).HasMaxLength(18);
-		        rollCallDay.Property(x => x.SecondStartDate).HasMaxLength(18);
-		        rollCallDay.Property(x => x.SecondEndDate).HasMaxLength(18);
-		        rollCallDay.Property(x => x.LeaveType).HasMaxLength(18);
-	        });
-        });
     }
 }

CompanyManagment.EFCore/Mapping/ContactUsMapping.cs

@@ -0,0 +1,20 @@
+using Company.Domain.ContactUsAgg;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace CompanyManagment.EFCore.Mapping;
+
+public class ContactUsMapping:IEntityTypeConfiguration<ContactUs>
+{
+    public void Configure(EntityTypeBuilder<ContactUs> builder)
+    {
+        builder.HasKey(x => x.id);
+        builder.Property(x => x.FullName).HasMaxLength(200);
+        builder.Property(x => x.Title).HasMaxLength(200);
+        builder.Property(x => x.Email).HasMaxLength(200);
+        builder.Property(x => x.FirstName).HasMaxLength(100);
+        builder.Property(x => x.LastName).HasMaxLength(100);
+        builder.Property(x => x.Message).HasMaxLength(500);
+        builder.Property(x => x.PhoneNumber).HasMaxLength(20);
+    }
+}

CompanyManagment.EFCore/Mapping/PersonalContractingpartyMapping.cs

@@ -39,7 +39,7 @@ public class PersonalContractingpartyMapping : IEntityTypeConfiguration<Personal
         builder.Property(x => x.IdNumberSerial).HasMaxLength(15);
         builder.Property(x => x.FatherName).HasMaxLength(20);
         builder.Property(x => x.DateOfBirth).IsRequired(false);
-                builder.Property(x => x.Gender).HasConversion(
+        builder.Property(x => x.Gender).HasConversion(
             v => v.ToString(),
             v => string.IsNullOrWhiteSpace(v) ? Gender.None : (Gender)Enum.Parse(typeof(Gender), v)).HasMaxLength(6);
 

CompanyManagment.EFCore/Migrations/20250423184716_add contact us .cs

@@ -0,0 +1,42 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class addcontactus : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "ContactUs",
+                columns: table => new
+                {
+                    id = table.Column<long>(type: "bigint", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    FirstName = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: true),
+                    LastName = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: true),
+                    Email = table.Column<string>(type: "nvarchar(200)", maxLength: 200, nullable: true),
+                    PhoneNumber = table.Column<string>(type: "nvarchar(20)", maxLength: 20, nullable: true),
+                    Title = table.Column<string>(type: "nvarchar(200)", maxLength: 200, nullable: true),
+                    Message = table.Column<string>(type: "nvarchar(500)", maxLength: 500, nullable: true),
+                    FullName = table.Column<string>(type: "nvarchar(200)", maxLength: 200, nullable: true),
+                    CreationDate = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ContactUs", x => x.id);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "ContactUs");
+        }
+    }
+}

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.Designer.cs

@@ -1,6 +1,5 @@
 // <auto-generated />
 using System;
-using System.Collections.Generic;
 using CompanyManagment.EFCore;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -13,8 +12,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace CompanyManagment.EFCore.Migrations
 {
     [DbContext(typeof(CompanyContext))]
-    [Migration("20250611105314_add rollcall in checkout")]
-    partial class addrollcallincheckout
+    [Migration("20250427160638_add salaryAid calculation date to customize checkouts")]
+    partial class addsalaryAidcalculationdatetocustomizecheckouts
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -26,36 +25,6 @@ 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")
@@ -1529,14 +1498,6 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(20)
                         .HasColumnType("nvarchar(20)");
 
-                    b.Property<string>("IdNumberSeri")
-                        .HasMaxLength(25)
-                        .HasColumnType("nvarchar(25)");
-
-                    b.Property<string>("IdNumberSerial")
-                        .HasMaxLength(25)
-                        .HasColumnType("nvarchar(25)");
-
                     b.Property<string>("InsuranceCode")
                         .HasMaxLength(10)
                         .HasColumnType("nvarchar(10)");
@@ -1633,62 +1594,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.ToTable("Employees", (string)null);
                 });
 
-            modelBuilder.Entity("Company.Domain.EmployeeAuthorizeTempAgg.EmployeeAuthorizeTemp", b =>
-                {
-                    b.Property<long>("id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("bigint");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
-
-                    b.Property<DateTime>("BirthDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime>("CreationDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("FName")
-                        .HasMaxLength(100)
-                        .HasColumnType("nvarchar(100)");
-
-                    b.Property<string>("FatherName")
-                        .HasMaxLength(100)
-                        .HasColumnType("nvarchar(100)");
-
-                    b.Property<string>("Gender")
-                        .IsRequired()
-                        .HasMaxLength(15)
-                        .HasColumnType("nvarchar(15)");
-
-                    b.Property<string>("IdNumber")
-                        .HasMaxLength(15)
-                        .HasColumnType("nvarchar(15)");
-
-                    b.Property<string>("IdNumberSeri")
-                        .HasMaxLength(25)
-                        .HasColumnType("nvarchar(25)");
-
-                    b.Property<string>("IdNumberSerial")
-                        .HasMaxLength(25)
-                        .HasColumnType("nvarchar(25)");
-
-                    b.Property<string>("LName")
-                        .HasMaxLength(100)
-                        .HasColumnType("nvarchar(100)");
-
-                    b.Property<string>("NationalCode")
-                        .HasMaxLength(15)
-                        .HasColumnType("nvarchar(15)");
-
-                    b.HasKey("id");
-
-                    b.HasIndex("NationalCode")
-                        .IsUnique()
-                        .HasFilter("[NationalCode] IS NOT NULL");
-
-                    b.ToTable("EmployeeAuthorizeTemps", (string)null);
-                });
-
             modelBuilder.Entity("Company.Domain.EmployeeBankInformationAgg.EmployeeBankInformation", b =>
                 {
                     b.Property<long>("id")
@@ -1877,9 +1782,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("UploaderId")
                         .HasColumnType("bigint");
 
-                    b.Property<long>("UploaderRoleId")
-                        .HasColumnType("bigint");
-
                     b.Property<string>("UploaderType")
                         .IsRequired()
                         .HasMaxLength(20)
@@ -1991,9 +1893,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<long>("EmployeeId")
                         .HasColumnType("bigint");
 
-                    b.Property<double>("FamilyAllowance")
-                        .HasColumnType("float");
-
                     b.Property<bool>("IncludeStatus")
                         .HasColumnType("bit");
 
@@ -2021,9 +1920,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<double>("MonthlySalary")
                         .HasColumnType("float");
 
-                    b.Property<double>("OverTimePay")
-                        .HasColumnType("float");
-
                     b.Property<DateTime>("StartWorkDate")
                         .HasColumnType("datetime2");
 
@@ -3253,9 +3149,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<DateTime?>("EndDate")
-                        .HasColumnType("datetime2");
-
                     b.Property<long>("InsuranceJobId")
                         .HasColumnType("bigint");
 
@@ -3271,9 +3164,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<double>("SalaryMoreThan")
                         .HasColumnType("float");
 
-                    b.Property<DateTime?>("StartDate")
-                        .HasColumnType("datetime2");
-
                     b.HasKey("id");
 
                     b.HasIndex("InsuranceJobId");
@@ -3354,64 +3244,6 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(4)
                         .HasColumnType("nvarchar(4)");
 
-                    b.ComplexProperty<Dictionary<string, object>>("Debt", "Company.Domain.InsuranceListAgg.InsuranceList.Debt#InsuranceListDebt", b1 =>
-                        {
-                            b1.IsRequired();
-
-                            b1.Property<double>("Amount")
-                                .HasColumnType("float");
-
-                            b1.Property<DateTime>("DebtDate")
-                                .HasColumnType("datetime2");
-
-                            b1.Property<bool>("IsDone")
-                                .HasColumnType("bit");
-
-                            b1.Property<long>("MediaId")
-                                .HasColumnType("bigint");
-
-                            b1.Property<string>("Type")
-                                .IsRequired()
-                                .HasMaxLength(50)
-                                .HasColumnType("nvarchar(50)");
-                        });
-
-                    b.ComplexProperty<Dictionary<string, object>>("EmployerApproval", "Company.Domain.InsuranceListAgg.InsuranceList.EmployerApproval#InsuranceListEmployerApproval", b1 =>
-                        {
-                            b1.IsRequired();
-
-                            b1.Property<string>("Description")
-                                .HasMaxLength(500)
-                                .HasColumnType("nvarchar(500)");
-
-                            b1.Property<bool>("IsDone")
-                                .HasColumnType("bit");
-
-                            b1.Property<string>("Status")
-                                .IsRequired()
-                                .HasMaxLength(50)
-                                .HasColumnType("nvarchar(50)");
-                        });
-
-                    b.ComplexProperty<Dictionary<string, object>>("Inspection", "Company.Domain.InsuranceListAgg.InsuranceList.Inspection#InsuranceListInspection", b1 =>
-                        {
-                            b1.IsRequired();
-
-                            b1.Property<bool>("IsDone")
-                                .HasColumnType("bit");
-
-                            b1.Property<DateTime>("LastInspectionDateTime")
-                                .HasColumnType("datetime2");
-
-                            b1.Property<long>("MediaId")
-                                .HasColumnType("bigint");
-
-                            b1.Property<string>("Type")
-                                .IsRequired()
-                                .HasMaxLength(50)
-                                .HasColumnType("nvarchar(50)");
-                        });
-
                     b.HasKey("id");
 
                     b.ToTable("InsuranceLists", (string)null);
@@ -4808,7 +4640,7 @@ namespace CompanyManagment.EFCore.Migrations
 
                     b.HasKey("id");
 
-                    b.HasIndex("WorkshopId");
+                    b.HasIndex("AccountId");
 
                     b.ToTable("RollCallServices", (string)null);
                 });
@@ -4827,12 +4659,6 @@ namespace CompanyManagment.EFCore.Migrations
                     b.Property<DateTime>("CalculationDate")
                         .HasColumnType("datetime2");
 
-                    b.Property<int>("CalculationMonth")
-                        .HasColumnType("int");
-
-                    b.Property<int>("CalculationYear")
-                        .HasColumnType("int");
-
                     b.Property<long>("CreatedByAccountId")
                         .HasColumnType("bigint");
 
@@ -5659,12 +5485,6 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(5)
                         .HasColumnType("nvarchar(5)");
 
-                    b.Property<bool>("InsuranceCheckoutFamilyAllowance")
-                        .HasColumnType("bit");
-
-                    b.Property<bool>("InsuranceCheckoutOvertime")
-                        .HasColumnType("bit");
-
                     b.Property<string>("InsuranceCode")
                         .HasMaxLength(100)
                         .HasColumnType("nvarchar(100)");
@@ -6171,210 +5991,6 @@ namespace CompanyManagment.EFCore.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.OwnsOne("Company.Domain.CheckoutAgg.CheckoutRollCall", "CheckoutRollCall", b1 =>
-                        {
-                            b1.Property<long>("Checkoutid")
-                                .HasColumnType("bigint");
-
-                            b1.Property<string>("TotalBreakTimeSpan")
-                                .IsRequired()
-                                .HasMaxLength(30)
-                                .HasColumnType("nvarchar(30)");
-
-                            b1.Property<string>("TotalMandatoryTimeSpan")
-                                .IsRequired()
-                                .HasMaxLength(30)
-                                .HasColumnType("nvarchar(30)");
-
-                            b1.Property<string>("TotalPaidLeaveTmeSpan")
-                                .IsRequired()
-                                .HasMaxLength(30)
-                                .HasColumnType("nvarchar(30)");
-
-                            b1.Property<string>("TotalPresentTimeSpan")
-                                .IsRequired()
-                                .HasMaxLength(30)
-                                .HasColumnType("nvarchar(30)");
-
-                            b1.Property<string>("TotalSickLeaveTimeSpan")
-                                .IsRequired()
-                                .HasMaxLength(30)
-                                .HasColumnType("nvarchar(30)");
-
-                            b1.Property<string>("TotalWorkingTimeSpan")
-                                .IsRequired()
-                                .HasMaxLength(30)
-                                .HasColumnType("nvarchar(30)");
-
-                            b1.HasKey("Checkoutid");
-
-                            b1.ToTable("Checkouts");
-
-                            b1.WithOwner()
-                                .HasForeignKey("Checkoutid");
-
-                            b1.OwnsMany("Company.Domain.CheckoutAgg.CheckoutRollCallDay", "RollCallDaysCollection", b2 =>
-                                {
-                                    b2.Property<long>("Id")
-                                        .ValueGeneratedOnAdd()
-                                        .HasColumnType("bigint");
-
-                                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b2.Property<long>("Id"));
-
-                                    b2.Property<string>("BreakTimeSpan")
-                                        .IsRequired()
-                                        .HasMaxLength(30)
-                                        .HasColumnType("nvarchar(30)");
-
-                                    b2.Property<long>("CheckoutId")
-                                        .HasColumnType("bigint");
-
-                                    b2.Property<DateTime>("Date")
-                                        .HasColumnType("datetime2");
-
-                                    b2.Property<string>("FirstEndDate")
-                                        .HasMaxLength(18)
-                                        .HasColumnType("nvarchar(18)");
-
-                                    b2.Property<string>("FirstStartDate")
-                                        .HasMaxLength(18)
-                                        .HasColumnType("nvarchar(18)");
-
-                                    b2.Property<bool>("IsAbsent")
-                                        .HasColumnType("bit");
-
-                                    b2.Property<bool>("IsFriday")
-                                        .HasColumnType("bit");
-
-                                    b2.Property<bool>("IsHoliday")
-                                        .HasColumnType("bit");
-
-                                    b2.Property<bool>("IsSliced")
-                                        .HasColumnType("bit");
-
-                                    b2.Property<string>("LeaveType")
-                                        .HasMaxLength(18)
-                                        .HasColumnType("nvarchar(18)");
-
-                                    b2.Property<string>("SecondEndDate")
-                                        .HasMaxLength(18)
-                                        .HasColumnType("nvarchar(18)");
-
-                                    b2.Property<string>("SecondStartDate")
-                                        .HasMaxLength(18)
-                                        .HasColumnType("nvarchar(18)");
-
-                                    b2.Property<string>("WorkingTimeSpan")
-                                        .IsRequired()
-                                        .HasMaxLength(30)
-                                        .HasColumnType("nvarchar(30)");
-
-                                    b2.HasKey("Id");
-
-                                    b2.HasIndex("CheckoutId");
-
-                                    b2.ToTable("CheckoutRollCallDay");
-
-                                    b2.WithOwner()
-                                        .HasForeignKey("CheckoutId");
-                                });
-
-                            b1.Navigation("RollCallDaysCollection");
-                        });
-
-                    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("CheckoutRollCall");
-
-                    b.Navigation("LoanInstallments");
-
-                    b.Navigation("SalaryAids");
-
                     b.Navigation("Workshop");
                 });
 
@@ -6612,9 +6228,6 @@ namespace CompanyManagment.EFCore.Migrations
                             b1.Property<DateTime>("CreationDate")
                                 .HasColumnType("datetime2");
 
-                            b1.Property<long>("EntityId")
-                                .HasColumnType("bigint");
-
                             b1.Property<string>("FineDateFa")
                                 .HasMaxLength(12)
                                 .HasColumnType("nvarchar(12)");
@@ -6654,9 +6267,6 @@ namespace CompanyManagment.EFCore.Migrations
                                 .HasMaxLength(25)
                                 .HasColumnType("nvarchar(25)");
 
-                            b1.Property<long>("EntityId")
-                                .HasColumnType("bigint");
-
                             b1.Property<string>("IsActive")
                                 .IsRequired()
                                 .HasMaxLength(5)
@@ -6704,9 +6314,6 @@ namespace CompanyManagment.EFCore.Migrations
                             b1.Property<string>("Description")
                                 .HasColumnType("ntext");
 
-                            b1.Property<long>("EntityId")
-                                .HasColumnType("bigint");
-
                             b1.Property<DateTime>("GrantDate")
                                 .HasColumnType("datetime2");
 
@@ -6753,9 +6360,6 @@ namespace CompanyManagment.EFCore.Migrations
                                 .HasMaxLength(15)
                                 .HasColumnType("nvarchar(15)");
 
-                            b1.Property<long>("EntityId")
-                                .HasColumnType("bigint");
-
                             b1.Property<DateTime>("SalaryAidDateTime")
                                 .HasColumnType("datetime2");
 
@@ -6906,9 +6510,6 @@ namespace CompanyManagment.EFCore.Migrations
                             b1.Property<DateTime>("CreationDate")
                                 .HasColumnType("datetime2");
 
-                            b1.Property<long>("EntityId")
-                                .HasColumnType("bigint");
-
                             b1.Property<string>("FineDateFa")
                                 .HasMaxLength(12)
                                 .HasColumnType("nvarchar(12)");
@@ -6948,9 +6549,6 @@ namespace CompanyManagment.EFCore.Migrations
                                 .HasMaxLength(25)
                                 .HasColumnType("nvarchar(25)");
 
-                            b1.Property<long>("EntityId")
-                                .HasColumnType("bigint");
-
                             b1.Property<string>("IsActive")
                                 .IsRequired()
                                 .HasMaxLength(5)
@@ -6998,9 +6596,6 @@ namespace CompanyManagment.EFCore.Migrations
                             b1.Property<string>("Description")
                                 .HasColumnType("ntext");
 
-                            b1.Property<long>("EntityId")
-                                .HasColumnType("bigint");
-
                             b1.Property<DateTime>("GrantDate")
                                 .HasColumnType("datetime2");
 
@@ -7047,9 +6642,6 @@ namespace CompanyManagment.EFCore.Migrations
                                 .HasMaxLength(15)
                                 .HasColumnType("nvarchar(15)");
 
-                            b1.Property<long>("EntityId")
-                                .HasColumnType("bigint");
-
                             b1.Property<DateTime>("SalaryAidDateTime")
                                 .HasColumnType("datetime2");
 
@@ -9331,7 +8923,7 @@ namespace CompanyManagment.EFCore.Migrations
                 {
                     b.HasOne("Company.Domain.WorkshopAgg.Workshop", "Workshop")
                         .WithMany("RollCallServicesList")
-                        .HasForeignKey("WorkshopId")
+                        .HasForeignKey("AccountId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 

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/20250611105314_add rollcall in checkout.cs

@@ -1,124 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addrollcallincheckout : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "CheckoutRollCall_TotalBreakTimeSpan",
-                table: "Checkouts",
-                type: "nvarchar(30)",
-                maxLength: 30,
-                nullable: true);
-
-            migrationBuilder.AddColumn<string>(
-                name: "CheckoutRollCall_TotalMandatoryTimeSpan",
-                table: "Checkouts",
-                type: "nvarchar(30)",
-                maxLength: 30,
-                nullable: true);
-
-            migrationBuilder.AddColumn<string>(
-                name: "CheckoutRollCall_TotalPaidLeaveTmeSpan",
-                table: "Checkouts",
-                type: "nvarchar(30)",
-                maxLength: 30,
-                nullable: true);
-
-            migrationBuilder.AddColumn<string>(
-                name: "CheckoutRollCall_TotalPresentTimeSpan",
-                table: "Checkouts",
-                type: "nvarchar(30)",
-                maxLength: 30,
-                nullable: true);
-
-            migrationBuilder.AddColumn<string>(
-                name: "CheckoutRollCall_TotalSickLeaveTimeSpan",
-                table: "Checkouts",
-                type: "nvarchar(30)",
-                maxLength: 30,
-                nullable: true);
-
-            migrationBuilder.AddColumn<string>(
-                name: "CheckoutRollCall_TotalWorkingTimeSpan",
-                table: "Checkouts",
-                type: "nvarchar(30)",
-                maxLength: 30,
-                nullable: true);
-
-            migrationBuilder.CreateTable(
-                name: "CheckoutRollCallDay",
-                columns: table => new
-                {
-                    Id = table.Column<long>(type: "bigint", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    Date = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    FirstStartDate = table.Column<string>(type: "nvarchar(18)", maxLength: 18, nullable: true),
-                    FirstEndDate = table.Column<string>(type: "nvarchar(18)", maxLength: 18, nullable: true),
-                    SecondStartDate = table.Column<string>(type: "nvarchar(18)", maxLength: 18, nullable: true),
-                    SecondEndDate = table.Column<string>(type: "nvarchar(18)", maxLength: 18, nullable: true),
-                    BreakTimeSpan = table.Column<string>(type: "nvarchar(30)", maxLength: 30, nullable: false),
-                    WorkingTimeSpan = table.Column<string>(type: "nvarchar(30)", maxLength: 30, nullable: false),
-                    IsSliced = table.Column<bool>(type: "bit", nullable: false),
-                    IsAbsent = table.Column<bool>(type: "bit", nullable: false),
-                    IsFriday = table.Column<bool>(type: "bit", nullable: false),
-                    IsHoliday = table.Column<bool>(type: "bit", nullable: false),
-                    LeaveType = table.Column<string>(type: "nvarchar(18)", maxLength: 18, nullable: true),
-                    CheckoutId = table.Column<long>(type: "bigint", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_CheckoutRollCallDay", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_CheckoutRollCallDay_Checkouts_CheckoutId",
-                        column: x => x.CheckoutId,
-                        principalTable: "Checkouts",
-                        principalColumn: "id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_CheckoutRollCallDay_CheckoutId",
-                table: "CheckoutRollCallDay",
-                column: "CheckoutId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "CheckoutRollCallDay");
-
-            migrationBuilder.DropColumn(
-                name: "CheckoutRollCall_TotalBreakTimeSpan",
-                table: "Checkouts");
-
-            migrationBuilder.DropColumn(
-                name: "CheckoutRollCall_TotalMandatoryTimeSpan",
-                table: "Checkouts");
-
-            migrationBuilder.DropColumn(
-                name: "CheckoutRollCall_TotalPaidLeaveTmeSpan",
-                table: "Checkouts");
-
-            migrationBuilder.DropColumn(
-                name: "CheckoutRollCall_TotalPresentTimeSpan",
-                table: "Checkouts");
-
-            migrationBuilder.DropColumn(
-                name: "CheckoutRollCall_TotalSickLeaveTimeSpan",
-                table: "Checkouts");
-
-            migrationBuilder.DropColumn(
-                name: "CheckoutRollCall_TotalWorkingTimeSpan",
-                table: "Checkouts");
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs

@@ -560,6 +560,50 @@ namespace CompanyManagment.EFCore.Migrations
                     b.ToTable("TextManager_Contact", (string)null);
                 });
 
+            modelBuilder.Entity("Company.Domain.ContactUsAgg.ContactUs", b =>
+                {
+                    b.Property<long>("id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("id"));
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.Property<string>("FirstName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("FullName")
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.Property<string>("LastName")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("Message")
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasMaxLength(20)
+                        .HasColumnType("nvarchar(20)");
+
+                    b.Property<string>("Title")
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.HasKey("id");
+
+                    b.ToTable("ContactUs");
+                });
+
             modelBuilder.Entity("Company.Domain.ContarctingPartyAgg.PersonalContractingParty", b =>
                 {
                     b.Property<long>("id")
@@ -6168,117 +6212,6 @@ namespace CompanyManagment.EFCore.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.OwnsOne("Company.Domain.CheckoutAgg.CheckoutRollCall", "CheckoutRollCall", b1 =>
-                        {
-                            b1.Property<long>("Checkoutid")
-                                .HasColumnType("bigint");
-
-                            b1.Property<string>("TotalBreakTimeSpan")
-                                .IsRequired()
-                                .HasMaxLength(30)
-                                .HasColumnType("nvarchar(30)");
-
-                            b1.Property<string>("TotalMandatoryTimeSpan")
-                                .IsRequired()
-                                .HasMaxLength(30)
-                                .HasColumnType("nvarchar(30)");
-
-                            b1.Property<string>("TotalPaidLeaveTmeSpan")
-                                .IsRequired()
-                                .HasMaxLength(30)
-                                .HasColumnType("nvarchar(30)");
-
-                            b1.Property<string>("TotalPresentTimeSpan")
-                                .IsRequired()
-                                .HasMaxLength(30)
-                                .HasColumnType("nvarchar(30)");
-
-                            b1.Property<string>("TotalSickLeaveTimeSpan")
-                                .IsRequired()
-                                .HasMaxLength(30)
-                                .HasColumnType("nvarchar(30)");
-
-                            b1.Property<string>("TotalWorkingTimeSpan")
-                                .IsRequired()
-                                .HasMaxLength(30)
-                                .HasColumnType("nvarchar(30)");
-
-                            b1.HasKey("Checkoutid");
-
-                            b1.ToTable("Checkouts");
-
-                            b1.WithOwner()
-                                .HasForeignKey("Checkoutid");
-
-                            b1.OwnsMany("Company.Domain.CheckoutAgg.CheckoutRollCallDay", "RollCallDaysCollection", b2 =>
-                                {
-                                    b2.Property<long>("Id")
-                                        .ValueGeneratedOnAdd()
-                                        .HasColumnType("bigint");
-
-                                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b2.Property<long>("Id"));
-
-                                    b2.Property<string>("BreakTimeSpan")
-                                        .IsRequired()
-                                        .HasMaxLength(30)
-                                        .HasColumnType("nvarchar(30)");
-
-                                    b2.Property<long>("CheckoutId")
-                                        .HasColumnType("bigint");
-
-                                    b2.Property<DateTime>("Date")
-                                        .HasColumnType("datetime2");
-
-                                    b2.Property<string>("FirstEndDate")
-                                        .HasMaxLength(18)
-                                        .HasColumnType("nvarchar(18)");
-
-                                    b2.Property<string>("FirstStartDate")
-                                        .HasMaxLength(18)
-                                        .HasColumnType("nvarchar(18)");
-
-                                    b2.Property<bool>("IsAbsent")
-                                        .HasColumnType("bit");
-
-                                    b2.Property<bool>("IsFriday")
-                                        .HasColumnType("bit");
-
-                                    b2.Property<bool>("IsHoliday")
-                                        .HasColumnType("bit");
-
-                                    b2.Property<bool>("IsSliced")
-                                        .HasColumnType("bit");
-
-                                    b2.Property<string>("LeaveType")
-                                        .HasMaxLength(18)
-                                        .HasColumnType("nvarchar(18)");
-
-                                    b2.Property<string>("SecondEndDate")
-                                        .HasMaxLength(18)
-                                        .HasColumnType("nvarchar(18)");
-
-                                    b2.Property<string>("SecondStartDate")
-                                        .HasMaxLength(18)
-                                        .HasColumnType("nvarchar(18)");
-
-                                    b2.Property<string>("WorkingTimeSpan")
-                                        .IsRequired()
-                                        .HasMaxLength(30)
-                                        .HasColumnType("nvarchar(30)");
-
-                                    b2.HasKey("Id");
-
-                                    b2.HasIndex("CheckoutId");
-
-                                    b2.ToTable("CheckoutRollCallDay");
-
-                                    b2.WithOwner()
-                                        .HasForeignKey("CheckoutId");
-                                });
-
-                            b1.Navigation("RollCallDaysCollection");
-                        });
-
                     b.OwnsMany("Company.Domain.CheckoutAgg.ValueObjects.CheckoutLoanInstallment", "LoanInstallments", b1 =>
                         {
                             b1.Property<long>("Checkoutid")
@@ -6366,8 +6299,6 @@ namespace CompanyManagment.EFCore.Migrations
                                 .HasForeignKey("Checkoutid");
                         });
 
-                    b.Navigation("CheckoutRollCall");
-
                     b.Navigation("LoanInstallments");
 
                     b.Navigation("SalaryAids");

CompanyManagment.EFCore/Repository/ContactUsRepository.cs

@@ -0,0 +1,14 @@
+using _0_Framework.InfraStructure;
+using Company.Domain.ContactUsAgg;
+using Microsoft.EntityFrameworkCore;
+
+namespace CompanyManagment.EFCore.Repository;
+
+public class ContactUsRepository:RepositoryBase<long,ContactUs>,IContactUsRepository
+{
+    private readonly CompanyContext _companyContext;
+    public ContactUsRepository(CompanyContext companyContext) : base(companyContext)
+    {
+        _companyContext = companyContext;
+    }
+}

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/InsuranceListRepository.cs

@@ -1492,108 +1492,33 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
         return res.ToList();
     }
 
-	public async Task<InsuranceListTabsCountViewModel> GetTabCounts(InsuranceListSearchModel searchModel)
-	{
-		var acountId = _authHelper.CurrentAccountId();
+    public async Task<InsuranceListTabsCountViewModel> GetTabCounts(long accountId, int month, int year)
+    {
+        var workshopIds = _context.WorkshopAccounts
+            .Where(a => a.AccountId == accountId)
+            .Select(a => a.WorkshopId);
+        var res = await _context.InsuranceListSet
+            .Where(x =>
+                x.Year == year.ToString("0000") &&
+                x.Month == month.ToString("00") &&
+                   workshopIds.Contains(x.WorkshopId)
+            )
+            .GroupBy(x => 1)
+            .Select(g => new InsuranceListTabsCountViewModel
+            {
+                NotStarted = g.Count(x =>
+                    !x.Debt.IsDone && !x.EmployerApproval.IsDone && !x.Inspection.IsDone && !x.ConfirmSentlist),
+                InProgress = g.Count(x =>
+                    (x.Debt.IsDone || x.EmployerApproval.IsDone || x.Inspection.IsDone)&& !(x.Debt.IsDone && x.EmployerApproval.IsDone && x.Inspection.IsDone) && !x.ConfirmSentlist),
+                ReadyToSendList = g.Count(x =>
+                    x.Debt.IsDone && x.EmployerApproval.IsDone && x.Inspection.IsDone && !x.ConfirmSentlist),
+                Done = g.Count(x => x.ConfirmSentlist)
+            })
+            .FirstOrDefaultAsync() ?? new InsuranceListTabsCountViewModel();
 
-		var workshopIds = _context.WorkshopAccounts
-			.Where(a => a.AccountId == acountId)
-			.Select(a => a.WorkshopId);
-		var query = _context.InsuranceListSet
-		  .Where(x => workshopIds.Contains(x.WorkshopId))
-		  .Join(_context.Workshops.Include(x => x.InsuranceWorkshopInfo),
-				insurance => insurance.WorkshopId,
-				workshop => workshop.id,
-				(insurance, workshop) => new { insurance, workshop })
-		  .GroupJoin(_context.WorkshopEmployers,
-				result => result.workshop.id,
-				employer => employer.WorkshopId,
-				(result, employer) => new { result.insurance, result.workshop, employer })
-		  .Select(result => new InsuranceListViewModel
-		  {
-			  Id = result.insurance.id,
-			  Year = result.insurance.Year,
-			  Month = result.insurance.Month,
-			  WorkShopId = result.insurance.WorkshopId,
-			  WorkShopCode = result.workshop.InsuranceWorkshopInfo != null ? result.workshop.InsuranceWorkshopInfo.InsuranceCode : result.workshop.InsuranceCode,
-			  WorkShopName = result.workshop.InsuranceWorkshopInfo != null ? result.workshop.InsuranceWorkshopInfo.WorkshopName : result.workshop.WorkshopFullName,
-			  TypeOfInsuranceSend = result.workshop.TypeOfInsuranceSend == "NormalList" ? "عادی" :
-									result.workshop.TypeOfInsuranceSend == "Govermentlist" ? "کمک دولت" :
-									result.workshop.TypeOfInsuranceSend == "Familylist" ? "خانوادگی" : "",
-			  FixedSalary = result.workshop.FixedSalary,
-			  EmployerName = result.workshop.InsuranceWorkshopInfo != null ? result.workshop.InsuranceWorkshopInfo.EmployerName : result.workshop.WorkshopFullName,
-			  ConfirmSentlist = result.insurance.ConfirmSentlist,
-			  EmployerId = result.employer.First().EmployerId,
-			  DebtDone = result.insurance.Debt.IsDone,
-			  EmployerApproved = result.insurance.EmployerApproval.IsDone,
-			  InspectionDone = result.insurance.Inspection.IsDone
-		  });
+        return res;
 
-		if (!string.IsNullOrEmpty(searchModel.Year) && searchModel.Year != "0" && !string.IsNullOrEmpty(searchModel.Month) && searchModel.Month != "0")
-			query = query.Where(x => x.Year == searchModel.Year && x.Month == searchModel.Month);
-		else
-		{
-			if (!string.IsNullOrEmpty(searchModel.Month) && searchModel.Month != "0")
-				query = query.Where(x => x.Month == searchModel.Month);
-
-			if (!string.IsNullOrEmpty(searchModel.Year) && searchModel.Year != "0")
-				query = query.Where(x => x.Year == searchModel.Year);
-
-		}
-		if (!string.IsNullOrEmpty(searchModel.WorkShopCode))
-			query = query.Where(x => x.WorkShopCode == searchModel.WorkShopCode);
-
-		if (!string.IsNullOrEmpty(searchModel.WorkShopName))
-			query = query.Where(x => x.WorkShopName.Contains(searchModel.WorkShopName));
-
-
-		if (searchModel.WorkshopId > 0)
-		{
-			var workshopName = query.FirstOrDefault(u => u.WorkShopId == searchModel.WorkshopId)?.WorkShopName;
-
-			query = query.Where(x => x.WorkShopName.Contains(workshopName));
-		}
-
-		if (searchModel.EmployerId > 0)
-		{
-			var employerName = query.FirstOrDefault(u => u.EmployerId == searchModel.EmployerId)?.EmployerName;
-			query = query.Where(x => x.EmployerName.Contains(employerName));
-		}
-
-		if (!string.IsNullOrEmpty(searchModel.EmployerName))
-			query = query.Where(x => x.EmployerName.Contains(searchModel.EmployerName));
-
-
-		if (searchModel.FixedSalary != null)
-			query = query.Where(x => x.FixedSalary == searchModel.FixedSalary);
-
-		if (!string.IsNullOrEmpty(searchModel.TypeOfInsuranceSend) && searchModel.TypeOfInsuranceSend != "0")
-			query = query.Where(x => x.TypeOfInsuranceSend == searchModel.TypeOfInsuranceSend);
-
-		if (!string.IsNullOrEmpty(searchModel.City) && searchModel.City != "0")
-			query = query.Where(x => x.City == searchModel.City);
-
-		if (!string.IsNullOrEmpty(searchModel.Branch))
-			query = query.Where(x => x.Branch.Contains(searchModel.Branch));
-
-
-
-		var res = await query.GroupBy(x => 1)
-			.Select(g => new InsuranceListTabsCountViewModel
-			{
-				NotStarted = g.Count(x =>
-					!x.DebtDone && !x.EmployerApproved && !x.InspectionDone && !x.ConfirmSentlist),
-				InProgress = g.Count(x =>
-					(x.DebtDone || x.EmployerApproved || x.InspectionDone) && !(x.DebtDone && x.EmployerApproved && x.InspectionDone) && !x.ConfirmSentlist),
-				ReadyToSendList = g.Count(x =>
-					x.DebtDone && x.EmployerApproved && x.InspectionDone && !x.ConfirmSentlist),
-				Done = g.Count(x => x.ConfirmSentlist)
-			})
-			.FirstOrDefaultAsync() ?? new InsuranceListTabsCountViewModel();
-
-		return res;
-
-	}
+    }
 
 	/// <summary>
 	/// 

CompanyManagment.EFCore/Repository/PersonalContractingPartyRepository.cs

@@ -1,7 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using _0_Framework.Application;
+using _0_Framework.Application.Enums;
+using _0_Framework.Exceptions;
 using _0_Framework.InfraStructure;
 using AccountManagement.Application.Contracts.Account;
 using AccountMangement.Infrastructure.EFCore;
@@ -478,6 +481,248 @@ public class PersonalContractingPartyRepository : RepositoryBase<long, PersonalC
 
     #endregion
 
+
+    #region Api
+    public async Task<ICollection<ContractingPartyGetListViewModel>> GetList(ContractingPartyGetListSearchModel searchModel)
+    {
+        var personalContractingPartiesQuery = _context.PersonalContractingParties
+            .Include(x => x.Representative)
+            .Include(x => x.Employers).AsQueryable();
+
+
+
+        if (!string.IsNullOrWhiteSpace(searchModel.NationalIdOrNationalCode))
+            personalContractingPartiesQuery = personalContractingPartiesQuery
+                .Where(x => x.Nationalcode.Contains(searchModel.NationalIdOrNationalCode) ||
+                            x.NationalId.Contains(searchModel.NationalIdOrNationalCode));
+
+
+        if (searchModel.ContractingPartyType != LegalType.None)
+
+        {
+            string type = searchModel.ContractingPartyType switch
+            {
+                LegalType.Legal => "حقوقی",
+                LegalType.Real => "حقیقی",
+                _ => ""
+            };
+
+            personalContractingPartiesQuery = personalContractingPartiesQuery
+                    .Where(x => x.IsLegal == type);
+
+        }
+
+
+        if (searchModel.ContractingPartyStatus != ActivationStatus.None)
+        {
+            string status = searchModel.ContractingPartyStatus switch
+            {
+                ActivationStatus.Active => "true",
+                ActivationStatus.DeActive => "false",
+                _ => ""
+            };
+            personalContractingPartiesQuery = personalContractingPartiesQuery
+                .Where(x => x.IsActiveString == status);
+        }
+
+
+        if (!string.IsNullOrWhiteSpace(searchModel.RepresentativeName))
+        {
+            personalContractingPartiesQuery = personalContractingPartiesQuery
+                .Where(x => x.Representative.FullName.Contains(searchModel.RepresentativeName));
+        }
+
+        if (!string.IsNullOrWhiteSpace(searchModel.FullNameOrCompanyName))
+        {
+            personalContractingPartiesQuery = personalContractingPartiesQuery.Where(x =>
+                (x.FName + " " + x.LName).Contains(searchModel.FullNameOrCompanyName));
+        }
+        var joinedQuery = personalContractingPartiesQuery
+            .GroupJoin(_context.InstitutionContractSet.Where(x => personalContractingPartiesQuery.Any(p => p.id == x.ContractingPartyId)),
+                contractingParty => contractingParty.id,
+                institution => institution.ContractingPartyId,
+                (contractingParty, institution) => new
+                {
+                    contractingParty,
+                    institution
+                });
+
+        var result = await joinedQuery.Skip(searchModel.PageIndex)
+            .Take(30).Select(x => new ContractingPartyGetListViewModel()
+            {
+                ArchiveCode = x.contractingParty.ArchiveCode,
+                BlockTimes = x.contractingParty.BlockTimes,
+
+                ContractingPartyName = x.contractingParty.IsLegal == "حقیقی" ?
+                    x.contractingParty.SureName == null ? $"{x.contractingParty.FName} {x.contractingParty.LName}"
+                        : $"{x.contractingParty.FName} {x.contractingParty.LName} {x.contractingParty.SureName}"
+                    : x.contractingParty.SureName == null ? $"{x.contractingParty.LName}"
+                        : $"{x.contractingParty.LName} {x.contractingParty.SureName}",
+
+                ContractingPartyType = x.contractingParty.IsLegal == "حقیقی" ? LegalType.Real : LegalType.Legal,
+                Employers = x.contractingParty.Employers.Take(11).Select(e => new ContractingPartyGetListEmployerViewModel(e.id, e.FullName)).ToList(),
+                Id = x.contractingParty.id,
+                IsBlock = x.contractingParty.IsBlock == "true",
+                HasInstitutionContract = x.institution.Any(i => i.IsActiveString == "true"),
+                NationalIdOrNationalCode = x.contractingParty.IsLegal == "حقیقی" ? x.contractingParty.Nationalcode : x.contractingParty.NationalId,
+                Status = x.contractingParty.IsActiveString == "true" ? ActivationStatus.Active : ActivationStatus.DeActive
+            }).ToListAsync();
+        return result;
+    }
+
+    public async Task<List<ContractingPartySelectListViewModel>> GetSelectList()
+    {
+        return await _context.PersonalContractingParties.Select(x => new ContractingPartySelectListViewModel
+        {
+            Id = x.id,
+            Text = x.IsLegal == "حقیقی" ? x.SureName == null
+                    ? $"{x.FName} {x.LName}"
+                    : $"{x.FName} {x.LName} {x.SureName}"
+                : x.SureName == null ? $"{x.LName}"
+                : $"{x.LName} {x.SureName}",
+
+        }).ToListAsync();
+    }
+
+    public async Task<List<GetContractingPartyNationalCodeOrNationalIdViewModel>> GetNationalCodeOrNationalId()
+    {
+        return await _context.PersonalContractingParties.Select(x => new GetContractingPartyNationalCodeOrNationalIdViewModel
+        {
+            NationalCodeOrNationalId = x.IsLegal == "true" ? x.NationalId : x.Nationalcode
+        }).ToListAsync();
+    }
+
+    public async Task<OperationResult<string>> DeactivateWithSubordinates(long id)
+    {
+        var op = new OperationResult<string>();
+        ;
+        using (var transaction = await _context.Database.BeginTransactionAsync())
+        {
+            try
+            {
+                var contractingParty = await _context.PersonalContractingParties
+                    .Include(x => x.Employers)
+                    .ThenInclude(x => x.Contracts)
+                    .Include(x => x.Employers)
+                    .ThenInclude(x => x.WorkshopEmployers)
+                    .ThenInclude(x => x.Workshop)
+                    .ThenInclude(x => x.Checkouts).FirstOrDefaultAsync(x => x.id == id);
+                if (contractingParty == null)
+                {
+                    return op.Failed("چنین آیتمی وجود ندارد");
+                }
+
+                var employers = contractingParty.Employers;
+
+                var workshops = employers.SelectMany(x => x.WorkshopEmployers).Select(x => x.Workshop).ToList();
+
+                var contracts = employers.SelectMany(x => x.Contracts).ToList();
+
+                var checkouts = workshops.SelectMany(x => x.Checkouts).ToList();
+
+
+                contractingParty.DeActive();
+
+                foreach (var employer in employers)
+                {
+                    employer.DeActive();
+                }
+
+                foreach (var workshop in workshops)
+                {
+                    workshop.DeActive(workshop.ArchiveCode);
+                }
+
+                foreach (var contract in contracts)
+                {
+                    contract.DeActive();
+                }
+
+                foreach (var checkout in checkouts)
+                {
+                    checkout.DeActive();
+                }
+
+                await _context.SaveChangesAsync();
+
+                await transaction.CommitAsync();
+                return op.Succcedded("DeActivate");
+            }
+            catch (Exception)
+            {
+                await transaction.RollbackAsync();
+                return op.Failed("غیرفعال کردن طرف حساب با خطا مواجه شد");
+            }
+        }
+    }
+
+    public async Task<GetRealContractingPartyDetailsViewModel> GetRealDetails(long id)
+    {
+        var res = await _context.PersonalContractingParties.Where(x => x.IsLegal == "حقیقی").Select(x =>
+            new GetRealContractingPartyDetailsViewModel()
+            {
+                Id = x.id,
+                IdNumber = x.IdNumber,
+                PhoneNumber = x.Phone,
+                AgentPhone = x.AgentPhone,
+                Address = x.Address,
+                FullName = x.SureName == null
+                    ? $"{x.FName} {x.LName}"
+                    : $"{x.FName} {x.LName} {x.SureName}",
+                NationalCode = x.Nationalcode,
+                RepresentativeName = x.RepresentativeFullName,
+                ArchiveCode = x.ArchiveCode,
+                City = x.City,
+                FName = x.FName,
+                LName = x.LName,
+                SureName = x.SureName,
+                RepresentativeId = x.RepresentativeId,
+                State = x.State,
+                Zone = x.Zone
+            }).FirstOrDefaultAsync(x => x.Id == id);
+
+        if (res == null)
+        {
+            throw new BadRequestException("چنین طرف حسابی وجود ندارد");
+        }
+
+        return res;
+    }
+
+    public async Task<GetLegalContractingPartyDetailsViewModel> GetLegalDetails(long id)
+    {
+        var res = await _context.PersonalContractingParties.Where(x => x.IsLegal == "حقوقی").Select(x =>
+            new GetLegalContractingPartyDetailsViewModel()
+            {
+                Id = x.id,
+                PhoneNumber = x.Phone,
+                AgentPhone = x.AgentPhone,
+                Address = x.Address,
+                CompanyFullName = x.SureName == null
+                    ? $"{x.LName}"
+                    : $"{x.LName} {x.SureName}",
+                NationalId = x.NationalId,
+                RegisterId = x.RegisterId,
+                RepresentativeName = x.RepresentativeFullName,
+                RepresentativeId = x.RepresentativeId,
+                State = x.State,
+                SureName = x.SureName,
+                Zone = x.Zone,
+                ArchiveCode = x.ArchiveCode,
+                City = x.City,
+                CompanyName = x.LName
+            }).FirstOrDefaultAsync(x => x.Id == id);
+
+        if (res == null)
+        {
+            throw new BadRequestException("چنین طرف حسابی وجود ندارد");
+        }
+
+        return res;
+    }
+
+    #endregion
+
 }
 #endregion
 

CompanyManagment.EFCore/Repository/PlanPercentageRepository.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Numerics;
 using _0_Framework.Application;
 using _0_Framework.InfraStructure;
 using Company.Domain.InstitutionPlanAgg;
@@ -170,7 +169,6 @@ public class PlanPercentageRepository : RepositoryBase<long, PlanPercentage>, IP
 
     }
 
-
     public InstitutionPlanViewModel GetInstitutionPlanForWorkshop(WorkshopTempViewModel command)
     {
         var planPercentage = _context.PlanPercentages.FirstOrDefault();
@@ -184,7 +182,10 @@ public class PlanPercentageRepository : RepositoryBase<long, PlanPercentage>, IP
 
         var dailyWage = dailyWageYearlySalery.YearlySalaryItemsList.Where(x => x.ItemName == "مزد روزانه")
             .Select(x => x.ItemValue).FirstOrDefault();
-
+        if (command.ContractAndCheckout)
+	        command.ContractAndCheckoutInPerson = true;
+        if(command.Insurance)
+            command.InsuranceInPerson = true;
 
         if (command.CountPerson > 0)
         {
@@ -193,28 +194,28 @@ public class PlanPercentageRepository : RepositoryBase<long, PlanPercentage>, IP
                 .Select(plan => new InstitutionPlanViewModel
                 {
                     CountPerson = plan.CountPerson,
-               
+
                     ContractAndCheckoutDouble = command.ContractAndCheckout ?
                         ((dailyWage * planPercentage.ContractAndCheckoutPercent / 100) * plan.CountPerson * plan.IncreasePercentage) : 0,
-               
+
                     InsuranceDouble = command.Insurance ? (((dailyWage * planPercentage.InsurancePercent) / 100) * plan.CountPerson *
                                        plan.IncreasePercentage) : 0,
-               
+
                     RollCallDouble = command.RollCall ? (((dailyWage * planPercentage.RollCallPercent) / 100) * plan.CountPerson *
                                       plan.IncreasePercentage) : 0,
-               
-                    CustomizeCheckoutDouble = (((dailyWage * planPercentage.CustomizeCheckoutPercent) / 100) * plan.CountPerson *
-                                               plan.IncreasePercentage),
-               
-                    ContractAndCheckoutInPersonDouble = command.ContractAndCheckoutInPerson ?  (((dailyWage * planPercentage.ContractAndCheckoutInPersonPercent) / 100) * plan.CountPerson *
+
+                    CustomizeCheckoutDouble =command.CustomizeCheckout ? (((dailyWage * planPercentage.CustomizeCheckoutPercent) / 100) * plan.CountPerson *
+                                               plan.IncreasePercentage) : 0,
+
+                    ContractAndCheckoutInPersonDouble = command.ContractAndCheckoutInPerson ? (((dailyWage * planPercentage.ContractAndCheckoutInPersonPercent) / 100) * plan.CountPerson *
                                                          plan.IncreasePercentage) : 0,
-               
+
                     InsuranceInPersonDouble = command.InsuranceInPerson ? (((dailyWage * planPercentage.InsuranceInPersonPercent) / 100) * plan.CountPerson *
                                                plan.IncreasePercentage) : 0,
-               
+
                 }).FirstOrDefault();
 
-            if(planByCountPerson == null)
+            if (planByCountPerson == null)
                 return new InstitutionPlanViewModel();
             //مبلغ کل خدمات حضوری
             var inPersonSumAmount = planByCountPerson.ContractAndCheckoutDouble + planByCountPerson.InsuranceDouble +
@@ -236,7 +237,7 @@ public class PlanPercentageRepository : RepositoryBase<long, PlanPercentage>, IP
             {
                 CountPerson = planByCountPerson.CountPerson,
 
-                ContractAndCheckout = planByCountPerson.ContractAndCheckoutDouble > 0 ?  planByCountPerson.ContractAndCheckoutDouble.ToMoney() : "0",
+                ContractAndCheckout = planByCountPerson.ContractAndCheckoutDouble > 0 ? planByCountPerson.ContractAndCheckoutDouble.ToMoney() : "0",
 
                 Insurance = planByCountPerson.InsuranceDouble > 0 ? planByCountPerson.InsuranceDouble.ToMoney() : "0",
 
@@ -259,7 +260,7 @@ public class PlanPercentageRepository : RepositoryBase<long, PlanPercentage>, IP
             };
 
 
-  
+
         }
         return new InstitutionPlanViewModel();
     }

CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs

@@ -60,8 +60,8 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
 		_leaveRepository = leaveRepository;
 		_holidayItemRepository = holidayItemRepository;
 		_testDbContext = testDbContext;
-
-	}
+    
+    }
 
 	#region OfficialChckout
 	public ComputingViewModel MandatoryCompute(long employeeId, long workshopId, DateTime contractStart,
@@ -108,8 +108,8 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
 			.Include(x => x.CustomizeWorkshopGroupSettings).FirstOrDefault(x =>
 			x.WorkshopId == workshopId && x.EmployeeId == employeeId);
 		//اگر ساعت استراحت پرسنل وجود نداشت صفر است
-		var breakTimeEntity = settings == null ? new BreakTime(false, new TimeOnly()) : settings.BreakTime;
-		var endOfFarvardin = "1404/01/31".ToGeorgianDateTime();
+		var breakTime = settings == null ? new BreakTime(false, new TimeOnly()) : settings.BreakTime;
+
 
 		#endregion
 
@@ -125,11 +125,10 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
 			groupedRollCall = rollCallResult.GroupBy(x => x.ShiftDate.Date).Select(x => new GroupedRollCalls()
 			{
 				CreationDate = x.Key,
-				ShiftList = x.Select(s => new ShiftList() { Start = s.StartDate!.Value, End = s.EndDate!.Value,EndWithOutResTime = s.ShiftEndWithoutRest.Value}).ToList(),
+				ShiftList = x.Select(s => new ShiftList() { Start = s.StartDate!.Value, End = s.EndDate!.Value }).ToList(),
 				HasFriday = x.Any(s => s.StartDate != null && s.EndDate != null && (s.StartDate.Value.DayOfWeek == DayOfWeek.Friday || s.EndDate.Value!.DayOfWeek == DayOfWeek.Friday)),
 
-				SumOneDaySpan = new TimeSpan(x.Sum(shift => shift.ShiftSpan.Ticks)),
-				BreakTime = x.First().BreakTimeSpan
+				SumOneDaySpan = new TimeSpan(x.Sum(shift => shift.ShiftSpan.Ticks))
 
 			}).OrderBy(x => x.CreationDate).ToList();
 		}
@@ -146,31 +145,16 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
 					BreakTimeSpan = x.BreakTimeSpan
 				}).ToList();
 
-			groupedRollCall = rollCallResult.GroupBy(x => x.CreationDate.Date).Select(x =>
+			groupedRollCall = rollCallResult.GroupBy(x => x.CreationDate.Date).Select(x => new GroupedRollCalls()
 			{
-				TimeSpan breakTime;
-				if (contractStart > endOfFarvardin)
-				{
-					breakTime = CalculateBreakTime(
-						x.First().BreakTimeSpan,
-						new TimeSpan(x.Sum(shift => shift.ShiftSpan.Ticks)));
-				}
-				else
-				{
-					breakTime = CalculateBreakTime(breakTimeEntity, new TimeSpan(x.Sum(shift => shift.ShiftSpan.Ticks)));
-				}
-				return new GroupedRollCalls()
-				{
-					CreationDate = x.Key,
-					ShiftList = x.Select(s => new ShiftList() { Start = s.StartDate!.Value, End = s.EndDate!.Value, EndWithOutResTime = s.EndDate.Value })
-						.ToList(),
-					HasFriday = x.Any(s =>
-						s.StartDate != null && s.EndDate != null && (s.StartDate.Value.DayOfWeek == DayOfWeek.Friday ||
-																	 s.EndDate.Value!.DayOfWeek == DayOfWeek.Friday)),
-					SumOneDaySpan = new TimeSpan(x.Sum(shift => shift.ShiftSpan.Ticks)) - breakTime,
+				CreationDate = x.Key,
+				ShiftList = x.Select(s => new ShiftList() { Start = s.StartDate!.Value, End = s.EndDate!.Value }).ToList(),
+				HasFriday = x.Any(s => s.StartDate != null && s.EndDate != null && (s.StartDate.Value.DayOfWeek == DayOfWeek.Friday || s.EndDate.Value!.DayOfWeek == DayOfWeek.Friday)),
+				SumOneDaySpan = new TimeSpan(x.Sum(shift => shift.ShiftSpan.Ticks)) - CalculateBreakTime(x.First().BreakTimeSpan,
+					new TimeSpan(x.Sum(shift => shift.ShiftSpan.Ticks))),
+
+				BreakTime = CalculateBreakTime(x.First().BreakTimeSpan, new TimeSpan(x.Sum(shift => shift.ShiftSpan.Ticks))),
 
-					BreakTime = breakTime,
-				};
 			}).OrderBy(x => x.CreationDate).ToList();
 		}
 
@@ -244,9 +228,9 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
 		double minutesDecimal = (starndardHoursesPerTotalDays - hours) * 60;
 		int minutes = (int)minutesDecimal;
 
-		TimeSpan totalLeaveSpan = TimeSpan.Zero;
+
 		TimeSpan starndardHoursesPerTotalDaysSapn = new TimeSpan(hours, minutes, 0);
-		if (leaveSearchResult.Count > 0 || hoursesleave.Count > 0)
+		if (leaveSearchResult.Count > 0)
 		{
 			if (leaveSearchResult.Any(x => x.HasShiftDuration))
 			{
@@ -277,8 +261,8 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
 				}
 
 
-				totalLeaveSpan = totalLeave;
-            }
+
+			}
 			else
 			{
 				int leavingDayCout = 0;
@@ -327,9 +311,7 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
 				{
 					sumSpans = sumSpans.Add(sumLeave);
 				}
-
-                totalLeaveSpan = sumLeave;
-            }
+			}
 
 
 		}
@@ -361,9 +343,9 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
 
 
 		//***********************************//
-		//var dailyFix = TimeSpan.Parse("07:20");
-		//TimeSpan mandatoryHoursTimeSpan = new TimeSpan(7, 20, 0).Multiply(mandatorDays);
-		//TimeSpan Mandatory = sumSpansWhitOutleaves.Subtract(mandatoryHoursTimeSpan);
+		var dailyFix = TimeSpan.Parse("07:20");
+		TimeSpan mandatoryHoursTimeSpan = new TimeSpan(7, 20, 0).Multiply(mandatorDays);
+		TimeSpan Mandatory = sumSpansWhitOutleaves.Subtract(mandatoryHoursTimeSpan);
 
 		double mandatoryWorkWithOutleaves = (sumSpansWhitOutleaves.TotalMinutes) / 60;
 		double overTimeWork = 0;
@@ -706,30 +688,11 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
 			}
 		}
 
-        #endregion
+		#endregion
 
-        #region Result
-        LeaveSearchModel sickLeaveSearch = new LeaveSearchModel()
-        {
-            EmployeeId = employeeId,
-            WorkshopId = workshopId,
-            LeaveType = "استعلاجی",
-            PaidLeaveType = "روزانه",
-            StartLeaveGr = contractStart,
-            EndLeaveGr = contractEnd,
-            IsAccepted = true,
-        };
-        var sickLeaveSearchResult = _leaveRepository.search(sickLeaveSearch);
+		#region Result
 
-        var sickLeaveTimeSpans = sickLeaveSearchResult.Select(x =>
-        {
-            var startLeave = contractStart > x.StartLeaveGr ? contractStart : x.StartLeaveGr;
-            var endLeave = contractEnd < x.EndLeaveGr ? contractEnd : x.EndLeaveGr;
-
-            return (endLeave - startLeave).Add(TimeSpan.FromDays(1));
-        });
-        var totalBreakTime = new TimeSpan(groupedRollCall.Sum(x => x.BreakTime.Ticks));
-        var res = new ComputingViewModel()
+		var res = new ComputingViewModel()
 		{
 
 			NumberOfWorkingDays = $"{groupedRollCall.Count}",
@@ -757,70 +720,60 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
 			TotalHolidayAndNotM = totalHolidaysAndNotM.ToString(),
 			DayliFeeComplete = dayliFeeComplete,
 			MarriedAllowance = MarriedAllowanceStr,
-			RotatingShiftValue = shiftPayValue,
-
-            #region SaveRollCall
-
-            GroupedRollCalls = groupedRollCall,
-            TotalWorkingTimeSpan = sumSpansWhitOutleaves,
-			TotalBreakTimeSpan = totalBreakTime,
-            TotalPresentTimeSpan = sumSpansWhitOutleaves + totalBreakTime,
-			TotalPaidLeave = totalLeaveSpan,
-			TotalSickLeave = new TimeSpan(sickLeaveTimeSpans.Sum(x=>x.Ticks)),
-            #endregion
-        };
+			RotatingShiftValue = shiftPayValue
+		};
 
 		#endregion
 		return res;
 	}
 
 
-	/// <summary>
-	/// محاسبه ساعات کارکرد پرسنل در صورت داشتن حضور غیاب
-	/// </summary>
-	/// <param name="employeeId"></param>
-	/// <param name="workshopId"></param>
-	/// <param name="contractStart"></param>
-	/// <param name="contractEnd"></param>
-	/// <returns></returns>
-	public (bool hasRollCall, TimeSpan sumOfSpan) GetRollCallWorkingSpan(long employeeId, long workshopId,
-		DateTime contractStart, DateTime contractEnd)
-	{
-		//bool hasRollcall =
-		//    _rollCallEmployeeRepository.HasRollCallRecord(employeeId, workshopId, contractStart, contractEnd);
-		//if (!hasRollcall)
-		//    return (false, new TimeSpan());
-		List<RollCallViewModel> rollCallResult;
-		List<GroupedRollCalls> groupedRollCall;
+    /// <summary>
+    /// محاسبه ساعات کارکرد پرسنل در صورت داشتن حضور غیاب
+    /// </summary>
+    /// <param name="employeeId"></param>
+    /// <param name="workshopId"></param>
+    /// <param name="contractStart"></param>
+    /// <param name="contractEnd"></param>
+    /// <returns></returns>
+    public (bool hasRollCall, TimeSpan sumOfSpan) GetRollCallWorkingSpan(long employeeId, long workshopId,
+        DateTime contractStart, DateTime contractEnd)
+    {
+        //bool hasRollcall =
+        //    _rollCallEmployeeRepository.HasRollCallRecord(employeeId, workshopId, contractStart, contractEnd);
+        //if (!hasRollcall)
+        //    return (false, new TimeSpan());
+        List<RollCallViewModel> rollCallResult;
+        List<GroupedRollCalls> groupedRollCall;
+         
+        
+            rollCallResult = _context.RollCalls.Where(x =>
+                x.EmployeeId == employeeId && x.WorkshopId == workshopId && x.StartDate.Value.Date >= contractStart.Date &&
+                x.StartDate.Value.Date <= contractEnd.Date && x.EndDate != null).Select(x => new RollCallViewModel()
+                {
+                    StartDate = x.StartDate,
+                    EndDate = x.EndDate,
+                    ShiftSpan = (x.EndDate.Value - x.StartDate.Value),
+                    CreationDate = x.ShiftDate,
+                    BreakTimeSpan = x.BreakTimeSpan
+                }).ToList();
+
+            groupedRollCall = rollCallResult.GroupBy(x => x.CreationDate.Date).Select(x => new GroupedRollCalls()
+            {
+                CreationDate = x.Key,
+                ShiftList = x.Select(s => new ShiftList() { Start = s.StartDate!.Value, End = s.EndDate!.Value }).ToList(),
+                HasFriday = x.Any(s => s.StartDate != null && s.EndDate != null && (s.StartDate.Value.DayOfWeek == DayOfWeek.Friday || s.EndDate.Value!.DayOfWeek == DayOfWeek.Friday)),
+                SumOneDaySpan = new TimeSpan(x.Sum(shift => shift.ShiftSpan.Ticks)) - CalculateBreakTime(x.First().BreakTimeSpan,
+                    new TimeSpan(x.Sum(shift => shift.ShiftSpan.Ticks))),
+
+                BreakTime = CalculateBreakTime(x.First().BreakTimeSpan, new TimeSpan(x.Sum(shift => shift.ShiftSpan.Ticks))),
+
+            }).OrderBy(x => x.CreationDate).ToList();
 
 
-		rollCallResult = _context.RollCalls.Where(x =>
-			x.EmployeeId == employeeId && x.WorkshopId == workshopId && x.StartDate.Value.Date >= contractStart.Date &&
-			x.StartDate.Value.Date <= contractEnd.Date && x.EndDate != null).Select(x => new RollCallViewModel()
-			{
-				StartDate = x.StartDate,
-				EndDate = x.EndDate,
-				ShiftSpan = (x.EndDate.Value - x.StartDate.Value),
-				CreationDate = x.ShiftDate,
-				BreakTimeSpan = x.BreakTimeSpan
-			}).ToList();
-
-		groupedRollCall = rollCallResult.GroupBy(x => x.CreationDate.Date).Select(x => new GroupedRollCalls()
-		{
-			CreationDate = x.Key,
-			ShiftList = x.Select(s => new ShiftList() { Start = s.StartDate!.Value, End = s.EndDate!.Value }).ToList(),
-			HasFriday = x.Any(s => s.StartDate != null && s.EndDate != null && (s.StartDate.Value.DayOfWeek == DayOfWeek.Friday || s.EndDate.Value!.DayOfWeek == DayOfWeek.Friday)),
-			SumOneDaySpan = new TimeSpan(x.Sum(shift => shift.ShiftSpan.Ticks)) - CalculateBreakTime(x.First().BreakTimeSpan,
-				new TimeSpan(x.Sum(shift => shift.ShiftSpan.Ticks))),
-
-			BreakTime = CalculateBreakTime(x.First().BreakTimeSpan, new TimeSpan(x.Sum(shift => shift.ShiftSpan.Ticks))),
-
-		}).OrderBy(x => x.CreationDate).ToList();
-
-
-		TimeSpan sumSpans = new TimeSpan(groupedRollCall.Sum(x => x.SumOneDaySpan.Ticks));
-		return (true, sumSpans);
-	}
+            TimeSpan sumSpans = new TimeSpan(groupedRollCall.Sum(x => x.SumOneDaySpan.Ticks));
+        return (true, sumSpans);
+    }
 
 
 	public async Task<ComputingViewModel> RotatingShiftReport(long workshopId, long employeeId, DateTime contractStart, DateTime contractEnd, string shiftwork, bool hasRollCall, CreateWorkingHoursTemp command, bool holidayWorking)
@@ -986,19 +939,19 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
 
 
 
-	public static TimeSpan CalculateBreakTime(BreakTime breakTime, TimeSpan sumOneDaySpan)
-	{
-		if (breakTime.BreakTimeType != BreakTimeType.WithTime)
-			return new TimeSpan();
+	//public static TimeSpan CalculateBreakTime(BreakTime breakTime, TimeSpan sumOneDaySpan)
+	//{
+	//    if (breakTime.BreakTimeType != BreakTimeType.WithTime)
+	//        return new TimeSpan();
 
-		var breakTimeSpan = breakTime.BreakTimeValue.ToTimeSpan();
+	//    var breakTimeSpan = breakTime.BreakTimeValue.ToTimeSpan();
 
-		if (breakTimeSpan * 2 >= sumOneDaySpan)
-			return new TimeSpan();
+	//    if (breakTimeSpan * 2 >= sumOneDaySpan)
+	//        return new TimeSpan();
 
-		return breakTimeSpan; ;
+	//    return breakTimeSpan; ;
 
-	}
+	//}
 	public static TimeSpan CalculateBreakTime(TimeSpan breakTimeSpan, TimeSpan sumOneDaySpan)
 	{
 		if (breakTimeSpan * 2 >= sumOneDaySpan)
@@ -2137,7 +2090,7 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
 				var starTimeSingel1 = Convert.ToDateTime(shift1Start);
 				var endTimeSingel2 = Convert.ToDateTime(shift1End);
 
-				bool hasRestTime = false;
+                bool hasRestTime = false;
 
 
 				shift1StartGr = new DateTime(cuurentDate.Year, cuurentDate.Month, cuurentDate.Day, starTimeSingel1.Hour, starTimeSingel1.Minute, 0);
@@ -2146,92 +2099,92 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
 				if (shift1EndGr.TimeOfDay < shift1StartGr.TimeOfDay)
 					shift1EndGr = shift1EndGr.AddDays(1);
 
-				var shiftEndWithoutRest = shift1EndGr;
+                var shiftEndWithoutRest = shift1EndGr;
 
-				var shiftSpan = (shift1EndGr - shift1StartGr);
-				if (restTime > TimeSpan.Zero && shiftSpan >= restTime)
-				{
-					hasRestTime = true;
-					shift1EndGr = shift1EndGr.Subtract(restTime);
-					shiftSpan = (shift1EndGr - shift1StartGr);
+                var shiftSpan = (shift1EndGr - shift1StartGr);
+                if (restTime > TimeSpan.Zero && shiftSpan >= restTime)
+                {
+                    hasRestTime = true;
+                    shift1EndGr = shift1EndGr.Subtract(restTime);
+                    shiftSpan = (shift1EndGr - shift1StartGr);
+					
+                }
 
-				}
-
-				if (!leaveSearchResult.Any(x => x.StartLeaveGr < shift1EndGr && x.EndLeaveGr > shift1StartGr && x.PaidLeaveType == "روزانه"))
-				{
-					var hourseLeaveTypeResult = leaveSearchResult.FirstOrDefault(x =>
-						x.StartLeaveGr < shift1EndGr && x.EndLeaveGr > shift1StartGr && x.PaidLeaveType == "ساعتی");
-					if (hourseLeaveTypeResult == null)
-					{
-						result.Add(new RollCallViewModel()
-						{
-							BreakTimeSpan = hasRestTime ? restTime : TimeSpan.Zero,
-							StartDate = shift1StartGr,
-							EndDate = shift1EndGr,
-							ShiftSpan = shiftSpan,
-							ShiftDate = shift1StartGr,
+                if (!leaveSearchResult.Any(x => x.StartLeaveGr < shift1EndGr && x.EndLeaveGr > shift1StartGr && x.PaidLeaveType =="روزانه"))
+                {
+                    var hourseLeaveTypeResult = leaveSearchResult.FirstOrDefault(x =>
+                        x.StartLeaveGr < shift1EndGr && x.EndLeaveGr > shift1StartGr && x.PaidLeaveType == "ساعتی");
+                    if (hourseLeaveTypeResult == null)
+                    {
+                        result.Add(new RollCallViewModel()
+                        {
+                            BreakTimeSpan = hasRestTime ? restTime : TimeSpan.Zero,
+                            StartDate = shift1StartGr,
+                            EndDate = shift1EndGr,
+                            ShiftSpan = shiftSpan,
+                            ShiftDate = shift1StartGr,
 							ShiftEndWithoutRest = shiftEndWithoutRest
-						});
-					}
-					else
-					{
+                        });
+                    }
+                    else
+                    {
 
-						if (hourseLeaveTypeResult.StartLeaveGr <= shift1StartGr && hourseLeaveTypeResult.EndLeaveGr < shift1EndGr)
-						{
-							//leave <-------------------->
-							//shift     <---------------------------------->
-							result.Add(new RollCallViewModel()
-							{
-								BreakTimeSpan = hasRestTime ? restTime : TimeSpan.Zero,
-								StartDate = hourseLeaveTypeResult.EndLeaveGr,
-								EndDate = shift1EndGr,
-								ShiftSpan = (shift1EndGr - hourseLeaveTypeResult.EndLeaveGr),
-								ShiftDate = shift1StartGr,
-								ShiftEndWithoutRest = shiftEndWithoutRest
+                        if (hourseLeaveTypeResult.StartLeaveGr <= shift1StartGr && hourseLeaveTypeResult.EndLeaveGr < shift1EndGr)
+                        {
+                            //leave <-------------------->
+                            //shift     <---------------------------------->
+                            result.Add(new RollCallViewModel()
+                            {
+                                BreakTimeSpan = hasRestTime ? restTime : TimeSpan.Zero,
+                                StartDate = hourseLeaveTypeResult.EndLeaveGr,
+                                EndDate = shift1EndGr,
+                                ShiftSpan = (shift1EndGr - hourseLeaveTypeResult.EndLeaveGr),
+                                ShiftDate = shift1StartGr,
+                                ShiftEndWithoutRest = shiftEndWithoutRest
 
-							});
-						}
-						else if (hourseLeaveTypeResult.StartLeaveGr > shift1StartGr && hourseLeaveTypeResult.EndLeaveGr < shift1EndGr)
-						{
-							//leave          <-------------------->
-							//shift <---------------------------------->
-							result.Add(new RollCallViewModel()
-							{
-								BreakTimeSpan = hasRestTime ? restTime : TimeSpan.Zero,
-								StartDate = shift1StartGr,
-								EndDate = hourseLeaveTypeResult.StartLeaveGr,
-								ShiftSpan = (hourseLeaveTypeResult.StartLeaveGr - shift1StartGr),
-								ShiftDate = shift1StartGr,
-								ShiftEndWithoutRest = hourseLeaveTypeResult.StartLeaveGr
+                            });
+                        }
+                        else if (hourseLeaveTypeResult.StartLeaveGr > shift1StartGr && hourseLeaveTypeResult.EndLeaveGr < shift1EndGr)
+                        {
+                            //leave          <-------------------->
+                            //shift <---------------------------------->
+                            result.Add(new RollCallViewModel()
+                            {
+                                BreakTimeSpan = hasRestTime ? restTime : TimeSpan.Zero,
+                                StartDate = shift1StartGr,
+                                EndDate = hourseLeaveTypeResult.StartLeaveGr,
+                                ShiftSpan = (hourseLeaveTypeResult.StartLeaveGr - shift1StartGr),
+                                ShiftDate = shift1StartGr,
+                                ShiftEndWithoutRest = hourseLeaveTypeResult.StartLeaveGr
 
-							});
+                            });
 
-							result.Add(new RollCallViewModel()
-							{
-								BreakTimeSpan = hasRestTime ? restTime : TimeSpan.Zero,
-								StartDate = hourseLeaveTypeResult.EndLeaveGr,
-								EndDate = shift1EndGr,
-								ShiftSpan = (shift1EndGr - hourseLeaveTypeResult.EndLeaveGr),
-								ShiftDate = shift1StartGr,
-								ShiftEndWithoutRest = shiftEndWithoutRest
+                            result.Add(new RollCallViewModel()
+                            {
+                                BreakTimeSpan = hasRestTime ? restTime : TimeSpan.Zero,
+                                StartDate = hourseLeaveTypeResult.EndLeaveGr,
+                                EndDate = shift1EndGr,
+                                ShiftSpan = (shift1EndGr - hourseLeaveTypeResult.EndLeaveGr),
+                                ShiftDate = shift1StartGr,
+                                ShiftEndWithoutRest = shiftEndWithoutRest
 
-							});
-						}
-						else if (hourseLeaveTypeResult.StartLeaveGr > shift1StartGr && hourseLeaveTypeResult.EndLeaveGr >= shift1EndGr)
-						{
-							//leave                      <-------------------->
-							//shift  <---------------------------------->
+                            });
+                        }
+                        else if (hourseLeaveTypeResult.StartLeaveGr > shift1StartGr && hourseLeaveTypeResult.EndLeaveGr >= shift1EndGr)
+                        {
+                            //leave                      <-------------------->
+                            //shift  <---------------------------------->
 
-							result.Add(new RollCallViewModel()
-							{
-								BreakTimeSpan = hasRestTime ? restTime : TimeSpan.Zero,
-								StartDate = shift1StartGr,
-								EndDate = hourseLeaveTypeResult.StartLeaveGr,
-								ShiftSpan = (hourseLeaveTypeResult.StartLeaveGr - shift1StartGr),
-								ShiftDate = shift1StartGr,
-								ShiftEndWithoutRest = hourseLeaveTypeResult.StartLeaveGr
+                            result.Add(new RollCallViewModel()
+                            {
+                                BreakTimeSpan = hasRestTime ? restTime : TimeSpan.Zero,
+                                StartDate = shift1StartGr,
+                                EndDate = hourseLeaveTypeResult.StartLeaveGr,
+                                ShiftSpan = (hourseLeaveTypeResult.StartLeaveGr - shift1StartGr),
+                                ShiftDate = shift1StartGr,
+                                ShiftEndWithoutRest = hourseLeaveTypeResult.StartLeaveGr
 
-							});
+                            });
 
 						}
 
@@ -3068,13 +3021,13 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
 
 
 		var endFarvarding = new DateTime(2025, 4, 20);
-		if (contractStart > endFarvarding)
+		if (contractStart>endFarvarding)
 		{
-			customizeWorkshopEmployeeSettings = _context.CustomizeWorkshopEmployeeSettings
+			customizeWorkshopEmployeeSettings=_context.CustomizeWorkshopEmployeeSettings
 						.AsSplitQuery().AsNoTracking().FirstOrDefault(x =>
 							x.WorkshopId == workshopId && x.EmployeeId == employeeId);
 
-			customizeWorkshopSettings = _context.CustomizeWorkshopSettings.AsNoTracking().FirstOrDefault(x => x.WorkshopId == workshopId);
+			customizeWorkshopSettings =_context.CustomizeWorkshopSettings.AsNoTracking().FirstOrDefault(x => x.WorkshopId == workshopId); 
 		}
 
 		else
@@ -4029,40 +3982,40 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
 			}).ToList();
 	}
 
-	public List<LoanInstallmentViewModel> LoanInstallmentForCheckout(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd)
-	{
-		return _context.Loans
-			.Where(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId)
-			.SelectMany(x => x.LoanInstallments)
-			.Where(i => i.InstallmentDate >= contractStart && i.InstallmentDate <= contractEnd && i.IsActive == IsActive.True)
-			.Select(x => new LoanInstallmentViewModel()
-			{
-				Id = x.Id,
-				Month = x.Month,
-				IsActive = x.IsActive,
-				Amount = x.AmountForMonth.ToMoney(),
-				Year = x.Year,
-				AmountDouble = x.AmountForMonth,
-				RemainingAmount = _context.Loans.SelectMany(l => l.LoanInstallments).Where(i => i.LoanId == x.LoanId && i.IsActive == IsActive.True && i.InstallmentDate > x.InstallmentDate)
-					.Sum(i => i.AmountForMonth).ToMoney(),
-				LoanAmount = _context.Loans.FirstOrDefault(l => l.id == x.LoanId).Amount.ToMoney()
-			}).ToList();
-	}
+    public List<LoanInstallmentViewModel> LoanInstallmentForCheckout(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd)
+    {
+        return _context.Loans
+            .Where(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId)
+            .SelectMany(x => x.LoanInstallments)
+            .Where(i => i.InstallmentDate >= contractStart && i.InstallmentDate <= contractEnd && i.IsActive == IsActive.True)
+            .Select(x => new LoanInstallmentViewModel()
+            {
+                Id = x.Id,
+                Month = x.Month,
+                IsActive = x.IsActive,
+                Amount = x.AmountForMonth.ToMoney(),
+                Year = x.Year,
+                AmountDouble = x.AmountForMonth,
+                RemainingAmount = _context.Loans.SelectMany(l => l.LoanInstallments).Where(i => i.LoanId == x.LoanId && i.IsActive == IsActive.True && i.InstallmentDate > x.InstallmentDate)
+                    .Sum(i => i.AmountForMonth).ToMoney(),
+                LoanAmount = _context.Loans.FirstOrDefault(l => l.id == x.LoanId).Amount.ToMoney()
+            }).ToList();
+    }
 
-	public List<SalaryAidViewModel> SalaryAidsForCheckout(long employeeId, long workshopId, DateTime checkoutStart, DateTime checkoutEnd)
-	{
-		return _context.SalaryAids
-			.Where(x => x.CalculationDate >= checkoutStart && x.CalculationDate <= checkoutEnd && x.EmployeeId == employeeId && x.WorkshopId == workshopId).Select(x => new SalaryAidViewModel()
-			{
-				Amount = x.Amount.ToMoney(),
-				AmountDouble = x.Amount,
-				SalaryAidDateTimeFa = x.SalaryAidDateTime.ToFarsi(),
-				SalaryAidDateTimeGe = x.SalaryAidDateTime,
-				CalculationDateTimeGe = x.CalculationDate,
-				CalculationDateTimeFa = x.CalculationDate.ToFarsi(),
-				Id = x.id
-			}).ToList();
-	}
+    public List<SalaryAidViewModel> SalaryAidsForCheckout(long employeeId, long workshopId, DateTime checkoutStart, DateTime checkoutEnd)
+    {
+        return _context.SalaryAids
+            .Where(x => x.CalculationDate >= checkoutStart && x.CalculationDate <= checkoutEnd && x.EmployeeId == employeeId && x.WorkshopId == workshopId).Select(x => new SalaryAidViewModel()
+            {
+                Amount = x.Amount.ToMoney(),
+                AmountDouble = x.Amount,
+                SalaryAidDateTimeFa = x.SalaryAidDateTime.ToFarsi(),
+                SalaryAidDateTimeGe = x.SalaryAidDateTime,
+                CalculationDateTimeGe = x.CalculationDate,
+                CalculationDateTimeFa = x.CalculationDate.ToFarsi(),
+                Id = x.id
+            }).ToList();
+    }
 
 	private void CreateRewardForBirthDay(long employeeId, long workshopId, double amount, int month, int year,
 		DateTime contractStart)

CompanyManagment.EFCore/Repository/RollCallRepository.cs

@@ -152,16 +152,16 @@ 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();
-        var endFarvardin = "1404/01/31".ToGeorgianDateTime();
+
         //گرفتن ساعت استراحت پرسنل از تنظیمات
         #region breakTime
-        BaseCustomizeEntity settings = _context.CustomizeWorkshopEmployeeSettings.AsSplitQuery().FirstOrDefault(x =>
-            x.WorkshopId == workshopId && x.EmployeeId == employeeId);
-        //اگر ساعت استراحت پرسنل وجود نداشت صفر است
-        var breakTime = settings == null ? new BreakTime(false, new TimeOnly()) : settings.BreakTime;
+        //BaseCustomizeEntity settings = _context.CustomizeWorkshopEmployeeSettings.AsSplitQuery().FirstOrDefault(x =>
+        //    x.WorkshopId == workshopId && x.EmployeeId == employeeId);
+        ////اگر ساعت استراحت پرسنل وجود نداشت صفر است
+        //var breakTime = settings == null ? new BreakTime(false, new TimeOnly()) : settings.BreakTime;
         #endregion
 
-        var rollCalls = _context.RollCalls.Where(x =>
+            var rollCalls = _context.RollCalls.Where(x =>
                 x.EmployeeId == employeeId && x.WorkshopId == workshopId && x.StartDate != null && x.EndDate != null && x.RollCallModifyType != RollCallModifyType.Undefined &&
                 x.ShiftDate.Date >= startMonthDay && x.ShiftDate.Date <= endMonthDay).ToList();
 
@@ -224,30 +224,26 @@ public class RollCallRepository : RepositoryBase<long, RollCall>, IRollCallRepos
 
             var rollCallTimeSpanPerDay =
                 new TimeSpan(x.Where(y => y.EndDate != null).Sum(y => (y.EndDate - y.StartDate)!.Value.Ticks));
-            TimeSpan breakTimePerDay ;
-                if(startMonthDay>endFarvardin)
-                    breakTimePerDay= RollCallMandatoryRepository.CalculateBreakTime(x.First().BreakTimeSpan, rollCallTimeSpanPerDay);
-            else
-                breakTimePerDay = RollCallMandatoryRepository.CalculateBreakTime(breakTime, rollCallTimeSpanPerDay);
+            var breakTimePerDay = RollCallMandatoryRepository.CalculateBreakTime(x.First().BreakTimeSpan, rollCallTimeSpanPerDay);
 
             return new CheckoutDailyRollCallViewModel()
-                {
-                    StartDate1 = orderedRollcalls.FirstOrDefault().StartDate.Value.ToString("HH:mm"),
-                    EndDate1 = orderedRollcalls.FirstOrDefault().EndDate.Value.ToString("HH:mm"),
+            {
+                StartDate1 = orderedRollcalls.FirstOrDefault().StartDate.Value.ToString("HH:mm"),
+                EndDate1 = orderedRollcalls.FirstOrDefault().EndDate.Value.ToString("HH:mm"),
 
-                    StartDate2 = orderedRollcalls.Skip(1).FirstOrDefault()?.StartDate?.ToString("HH:mm") ?? "",
-                    EndDate2 = orderedRollcalls.Skip(1).FirstOrDefault()?.EndDate?.ToString("HH:mm") ?? "",
+                StartDate2 = orderedRollcalls.Skip(1).FirstOrDefault()?.StartDate?.ToString("HH:mm") ?? "",
+                EndDate2 = orderedRollcalls.Skip(1).FirstOrDefault()?.EndDate?.ToString("HH:mm") ?? "",
 
-                    TotalhourseSpan = rollCallTimeSpanPerDay - breakTimePerDay,
+                TotalhourseSpan = rollCallTimeSpanPerDay - breakTimePerDay,
 
-                    BreakTimeTimeSpan = breakTimePerDay,
+                BreakTimeTimeSpan = breakTimePerDay,
 
-                    DayOfWeek = x.Key.DayOfWeek.DayOfWeeKToPersian(),
-                    RollCallDateFa = x.Key.Date.ToFarsi(),
-                    DateTimeGr = x.Key.Date,
-                    IsSliced = x.Count() > 2,
-                    IsAbsent = false
-                };
+                DayOfWeek = x.Key.DayOfWeek.DayOfWeeKToPersian(),
+                RollCallDateFa = x.Key.Date.ToFarsi(),
+                DateTimeGr = x.Key.Date,
+                IsSliced = x.Count() > 2,
+                IsAbsent = false
+            };
         });
 
 

CompanyManagment.EFCore/Repository/WorkshopTempRepository.cs

@@ -40,5 +40,11 @@ public class WorkshopTempRepository : RepositoryBase<long, WorkshopTemp>, IWorks
         return result;
     }
 
+    public async Task RemoveWorkshopTemps(List<long> workshopTempIds)
+    {
+	    var result = _context.WorkshopTemps.Where(x => workshopTempIds.Contains(x.id));
 
+        _context.RemoveRange(result);
+        await _context.SaveChangesAsync();
+    }
 }

DadmehrGostar.sln.DotSettings

@@ -1,3 +1,2 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Govermentlist/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Mcls/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

PersonalContractingParty.Config/PersonalBootstrapper.cs

@@ -205,6 +205,8 @@ using CompanyManagment.App.Contracts.EmployeeClientTemp;
 using CompanyManagment.App.Contracts.InstitutionPlan;
 using CompanyManagment.App.Contracts.LeftWorkTemp;
 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;
@@ -427,8 +429,14 @@ public class PersonalBootstrapper
         services.AddTransient<ILeftWorkTempRepository, LeftWorkTempRepository>();
         services.AddTransient<ILeftWorkTempApplication, LeftWorkTempApplication>();
 
+        services.AddTransient<IContactUsRepository, ContactUsRepository>();
+        services.AddTransient<IContactUsApplication, ContactUsApplication>();
+
         services.AddTransient<IEmployeeAuthorizeTempRepository, EmployeeAuthorizeTempRepository>();
 
+
+        services.AddTransient<IContactUsRepository, ContactUsRepository>();
+        services.AddTransient<IContactUsApplication, ContactUsApplication>();
         services.AddTransient<IAdminMonthlyOverviewRepository, AdminMonthlyOverviewRepository>();
         services.AddTransient<IAdminMonthlyOverviewApplication, AdminMonthlyOverviewApplication>();
         #endregion

ServiceHost/Areas/Admin/Controllers/ContractingPartyController.cs

@@ -0,0 +1,173 @@
+using System.Diagnostics;
+using _0_Framework.Application;
+using CompanyManagment.App.Contracts.PersonalContractingParty;
+using Microsoft.AspNetCore.Mvc;
+using ServiceHost.BaseControllers;
+
+namespace ServiceHost.Areas.Admin.Controllers;
+
+public class ContractingPartyController : AdminController
+{
+    private readonly IPersonalContractingPartyApp _contractingPartyApplication;
+
+    public ContractingPartyController(IPersonalContractingPartyApp contractingPartyApplication)
+    {
+        _contractingPartyApplication = contractingPartyApplication;
+    }
+
+    /// <summary>
+    /// لیست طرف حساب
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <returns></returns>
+    [HttpGet]
+    public async Task<ActionResult<ICollection<ContractingPartyGetListViewModel>>> Get([FromQuery] ContractingPartyGetListSearchModel searchModel)
+    {
+        var watch = new Stopwatch();
+        watch.Start();
+        var result = await _contractingPartyApplication.GetList(searchModel);
+        Console.WriteLine(watch.Elapsed);
+        return result.ToList();
+    }
+    [HttpGet("t/{name}")]
+    public async Task<List<string>> TestApi(string name)
+    {
+        var res = _contractingPartyApplication.SearchByName(name).Where(x=>x.Contains(name)).ToList();
+        return res;
+    }
+
+    /// <summary>
+    /// جزئیات طرف حساب حقیقی
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpGet("real/{id}")]
+    public async Task<ActionResult<GetRealContractingPartyDetailsViewModel>> GetDetailsReal(long id)
+    {
+        var result =  await _contractingPartyApplication.GetRealDetails(id);
+        return result;
+    }
+
+    /// <summary>
+    /// جزئیات طرف حساب حقوقی
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpGet("legal/{id}")]
+    public async Task<ActionResult<GetLegalContractingPartyDetailsViewModel>> GetDetailsLegal(long id)
+    {
+        var result = await _contractingPartyApplication.GetLegalDetails(id);
+        return result;
+
+    }
+
+
+
+
+    /// <summary>
+    /// ایجاد طرف حساب حقیقی
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    [HttpPost("real")]
+    public async Task<ActionResult<OperationResult>> CreateReal([FromBody] CreateRealContractingParty command)
+    {
+        var result = await _contractingPartyApplication.CreateReal(command);
+        return result;
+    }
+
+    /// <summary>
+    /// ایجاد طرف حساب حقوقی
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    [HttpPost("legal")]
+    public async Task<ActionResult<OperationResult>> CreateLegal([FromBody] CreateLegalContractingParty command)
+    {
+        var result = await _contractingPartyApplication.CreateLegal(command);
+        return result;
+    }
+
+    /// <summary>
+    /// ویرایش طرف حساب حقیقی
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    [HttpPut("real")]
+    public ActionResult<OperationResult> EditReal([FromBody] EditRealContractingParty command)
+    {
+        var result = _contractingPartyApplication.EditRealApi(command);
+        return result;
+    }
+
+    /// <summary>
+    /// ویرایش طرف حساب حقوقی
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    [HttpPut("legal")]
+    public ActionResult<OperationResult> EditLegal([FromBody] EditLegalContractingParty command)
+    {
+        var result = _contractingPartyApplication.EditLegal(command);
+        return result;
+    }
+
+    /// <summary>
+    /// چک کردن بلاک بودن طرف حساب با آیدی کارفرما
+    /// </summary>
+    /// <param name="employerId">آیدی کارفرما</param>
+    /// <returns>true - false - NotFound</returns>
+    [HttpGet("is_block/{employerId}")]
+    public ActionResult<string> IsBlockByEmployerId(long employerId)
+    {
+        var result = _contractingPartyApplication.IsBlockByEmployerId(employerId);
+        return result;
+    }
+
+    /// <summary>
+    /// گرفتن آخرین کد بایگانی کارگاه
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("last_archive_code")]
+    public ActionResult<int> GetLastArchiveCodeByContractingPartyId()
+    {
+        var data = _contractingPartyApplication.GetLastArchiveCode();
+        return data;
+    }
+
+    /// <summary>
+    /// سلکت لیست طرف حساب برای جستجو
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("selectList")]
+    public async Task<ActionResult<List<ContractingPartySelectListViewModel>>> GetSelectList()
+    {
+        return await _contractingPartyApplication.GetSelectList();
+    }
+
+    /// <summary>
+    /// لیست شناسه ملی یا شماره ملی برای جستجوی
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("national_Code_Select_list")]
+    public async Task<ActionResult<List<GetContractingPartyNationalCodeOrNationalIdViewModel>>> GetNationalCodeOrNationalId()
+    {
+        return await _contractingPartyApplication.GetNationalCodeOrNationalId();
+    }
+
+    /// <summary>
+    /// حذف طرف حساب. درصورت داشتن قرارداد مالی یا داشتن کارفرما، طرف حساب غیرفعال میشود
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpDelete]
+    public async Task<OperationResult<string>> DeleteContractingParty(long id)
+    {
+        var operationResult = await _contractingPartyApplication.Delete(id);
+
+        return operationResult;
+    }
+
+
+
+}

ServiceHost/Areas/Admin/Controllers/EmployerController.cs

@@ -0,0 +1,123 @@
+using _0_Framework.Application;
+using CompanyManagment.App.Contracts.Employer;
+using Microsoft.AspNetCore.Mvc;
+using ServiceHost.BaseControllers;
+
+namespace ServiceHost.Areas.Admin.Controllers;
+
+public class EmployerController : AdminController
+{
+	private readonly IEmployerApplication _employerApplication;
+
+	public EmployerController(IEmployerApplication employerApplication)
+	{
+		_employerApplication = employerApplication;
+	}
+
+
+	/// <summary>
+	/// لیست کارفرما
+	/// </summary>
+	/// <param name="searchModel"></param>
+	/// <returns></returns>
+	[HttpGet]
+	public async Task<ActionResult<List<GetEmployerListViewModel>>> GetList(GetEmployerSearchModel searchModel)
+	{
+		return await _employerApplication.GetEmployerList(searchModel);
+	}
+
+	/// <summary>
+	/// جزئیات کارفرمای حقوقی
+	/// </summary>
+	/// <param name="id"></param>
+	/// <returns></returns>
+	[HttpGet("legal/{id}")]
+	public async Task<ActionResult<GetLegalEmployerDetailViewModel>> GetLegalEmployer(long id)
+	{
+		var employerDetail = await _employerApplication.GetLegalEmployerDetail(id);
+		return employerDetail;
+	}
+
+	/// <summary>
+	/// جزئیات کارفرمای حقیقی
+	/// </summary>
+	/// <param name="id"></param>
+	/// <returns></returns>
+	[HttpGet("real/{id}")]
+	public async Task<ActionResult<GetRealEmployerDetailViewModel>> GetRealEmployer(long id)
+	{
+		var employerDetail = await _employerApplication.GetRealEmployerDetail(id);
+		return employerDetail;
+	}
+
+	/// <summary>
+	/// ایجاد کارفرمای حقیقی
+	/// </summary>
+	/// <param name="command"></param>
+	/// <returns></returns>
+	[HttpPost("real")]
+	public async Task<ActionResult<OperationResult>> CreateRealEmployer([FromBody] CreateRealEmployer command)
+	{
+		var result = await _employerApplication.CreateReal(command);
+		return result;
+	}
+
+	/// <summary>
+	/// ایجاد کارفرما حقوقی
+	/// </summary>
+	/// <param name="command"></param>
+	/// <returns></returns>
+	[HttpPost("legal")]
+	public async Task<ActionResult<OperationResult>> CreateLegalEmployer([FromBody] CreateLegalEmployer command)
+	{
+		var result = await _employerApplication.CreateLegal(command);
+
+		return result;
+	}
+
+	/// <summary>
+	/// ویرایش کارفرما حقیقی
+	/// </summary>
+	/// <param name="command"></param>
+	/// <returns></returns>
+	[HttpPut("real")]
+	public async Task<ActionResult<OperationResult>> EditRealEmployer([FromBody] EditRealEmployer command)
+	{
+		var result = await _employerApplication.EditReal(command);
+		return result;
+	}
+	/// <summary>
+	/// ویرایش کارفرما حقوقی
+	/// </summary>
+	/// <param name="command"></param>
+	/// <returns></returns>
+	[HttpPut("legal")]
+	public async Task<ActionResult<OperationResult>> EditLegalEmployer([FromBody] EditLegalEmployer command)
+	{
+		var result = await _employerApplication.EditLegal(command);
+		return result;
+	}
+
+	/// <summary>
+	/// حذف کارفرما - درصورت داشتن کارگاه، کارفرما غیرفعال میشود
+	/// </summary>
+	/// <param name="id"></param>
+	/// <returns></returns>
+	[HttpDelete("{id}")]
+	public async Task<ActionResult<OperationResult<string>>> Remove(long id)
+	{
+		var result = await _employerApplication.RemoveApi(id);
+		return result;
+	}
+
+	/// <summary>
+	/// سلکت لیست کارفرما برای جستجو
+	/// </summary>
+	/// <returns></returns>
+	[HttpGet("select_list")]
+	public async Task<List<EmployerSelectListViewModel>> GetSelectList(string search)
+	{
+		return await _employerApplication.GetSelectList(search);
+	}
+
+}

ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml

@@ -770,28 +770,15 @@
 			<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
 		</label>
 		<label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="802" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> صفحه اصلی </span> </label>
-		
-        <div class="child-check level3">
-            <label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="80217" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تب انجام نشده </span> </label>
-        </div>
-        <div class="child-check level3">
-            <label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="80218" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تب در حال انجام  </span> </label>
-        </div>
-        <div class="child-check level3">
-            <label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="80219" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تب آماده ارسال لیست  </span> </label>
-        </div>
-        <div class="child-check level3">
-            <label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="80220" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تب انجام بیمه  </span> </label>
-        </div>
 
-        <div class="child-check level3">
-			<label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="80210" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد لیست بیمه  </span> </label>
+		<div class="child-check level3">
+			<label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="80210" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد  </span> </label>
 		</div>
 		<div class="child-check level3">
 			<label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="80211" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative">  حذف </span> </label>
 		</div>
 		<div class="child-check level3">
-			<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="80212" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative">  مراحل تایید </span> </label>
+			<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="80212" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative">  تایید ارسال </span> </label>
 		</div>
 		<div class="child-check level3">
 			<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="80213" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative">  ویرایش </span> </label>

ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml

@@ -783,26 +783,13 @@
 								<label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="802" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> صفحه اصلی </span> </label>
 
 								<div class="child-check level3">
-									<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="80217" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تب انجام نشده </span> </label>
-								</div>
-								<div class="child-check level3">
-									<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="80218" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تب در حال انجام  </span> </label>
-								</div>
-								<div class="child-check level3">
-									<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="80219" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تب آماده ارسال لیست  </span> </label>
-								</div>
-								<div class="child-check level3">
-									<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="80220" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تب انجام بیمه  </span> </label>
-								</div>
-
-								<div class="child-check level3">
-									<label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="80210" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد لیست بیمه  </span> </label>
+									<label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="80210" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد  </span> </label>
 								</div>
 								<div class="child-check level3">
 									<label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="80211" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative">  حذف </span> </label>
 								</div>
 								<div class="child-check level3">
-									<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="80212" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative">  مراحل تایید </span> </label>
+									<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="80212" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative">  تایید ارسال </span> </label>
 								</div>
 								<div class="child-check level3">
 									<label class="btn btn-inverse waves-effect waves-light m-b-5 children"><input type="checkbox" disabled="disabled" value="80213" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative">  ویرایش </span> </label>

ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml.cs

@@ -56,7 +56,7 @@ public class IndexModel : PageModel
 	private readonly IWorkshopApplication _workshopApplication;
 	private readonly IYearlySalaryApplication _yearlySalaryApplication;
     private readonly IYearlySalaryRepository _yearlySalaryRepository;
-	
+
 
     public List<CheckoutViewModel> chekoutlist;
 	public List<ComputingViewModel> ComputingView;
@@ -485,10 +485,7 @@ public class IndexModel : PageModel
 							TotalHolidaysAndNotH = mandatoryCompute.TotalHolidayAndNotH,
 							TotalHolidaysAndNotM = mandatoryCompute.TotalHolidayAndNotM,
 							DailFeeComplete = mandatoryCompute.DayliFeeComplete,
-							Signature = checkout.Signature,
-						
-
-
+							Signature = checkout.Signature
 						};
 						_checkoutApplication.Create(command);
 						//if (checkout.Signature == "1")
@@ -966,19 +963,7 @@ public class IndexModel : PageModel
 						TotalDayOfBunosesCompute = bunosesPay.Bunoses > 0 ? $"{bunosesPay.TotalDayCompute}" : "0",
 						HolidayWorking = workshop.WorkshopHolidayWorking,
 						ShiftWork = workingHours.ShiftWork,
-
-						TotalWorkingTimeSpan=mandatoryCompute.TotalWorkingTimeSpan,
-
-						TotalBreakTimeSpan=mandatoryCompute.TotalBreakTimeSpan,
-
-						TotalPresentTimeSpan=mandatoryCompute.TotalPresentTimeSpan,
-
-						TotalPaidLeave=mandatoryCompute.TotalPaidLeave,
-
-						TotalSickLeave=mandatoryCompute.TotalSickLeave,
-						GroupedRollCalls = mandatoryCompute.GroupedRollCalls,
-
-					};
+                    };
 					_checkoutApplication.Create(command);
 
 					//var workshopId = $"{contract.WorkshopIds}";
@@ -1028,7 +1013,7 @@ public class IndexModel : PageModel
 
     public IActionResult OnGetPrintOne(long id)
     {
-        var res = _checkoutApplication.PrintAll([id]).FirstOrDefault();
+        var res = _checkoutApplication.PrintOne(id);
 
         //var res = _contractApplication.PrintAll(ids);
         if (res.HasRollCall) return Partial("PrintDetailsRollCall", res);

ServiceHost/Areas/Admin/Pages/Company/Checkouts/PrintDetailsRollCall.cshtml

@@ -1,7 +1,7 @@
 @using _0_Framework.Application
 @model CompanyManagment.App.Contracts.Checkout.CheckoutViewModel
 @{
-    string adminVersion = _0_Framework.Application.Version.AdminVersion;
+	string adminVersion = _0_Framework.Application.Version.AdminVersion;
 }
 
 <link href="~/assetsadmin/page/checkouts/css/printdetailsrollcall.css?ver=@adminVersion" rel="stylesheet" />
@@ -19,18 +19,18 @@
     <div class="modal-body print" id="printThis">
         <div class="row">
             <div class="col-md-12">
-                <fieldset style="border: 1px solid black;
+            <fieldset style="border: 1px solid black;
                              padding: revert;
                              border-radius: 10px;
                              height: 28cm;
                              margin: 3mm 5mm 0 5mm; ">
             <div class="row" dir="rtl">
+	            <div class="col-xs-3 d-inline-block"></div>
+	            <div class="col-xs-6 d-inline-block text-center">
+		            <p style="font-size: 18px; font-family: 'IranNastaliq' !important; margin-top:0 !important;">بسمه تعالی</p>
+		            <p style="font-size: 15px; font-weight: bold; margin: 2px;">فیش حقوقی و رسید پرداخت حقوق</p>
+	            </div>
 	            <div class="col-xs-3 d-inline-block"><fieldset style="border: 1px solid black; border-radius: 15px; padding: 1px 15px 1px 15px; margin-top: 5px; width: 70%; font-size: 12px; text-align: center;"> @Model.ContractNo</fieldset></div>
-                <div class="col-xs-6 d-inline-block text-center">
-                    <p style="font-size: 18px; font-family: 'IranNastaliq' !important; margin-top:0 !important;">بسمه تعالی</p>
-                    <p style="font-size: 15px; font-weight: bold; margin: 2px;">فیش حقوقی و رسید پرداخت حقوق</p>
-                </div>
-                <div class="col-xs-3 d-inline-block"></div>
             </div>
             
             
@@ -54,336 +54,336 @@
 			                        {
 				                        <span>@Model.FathersName</span>
 
-                                        }
-                                    </div>
-                                    <div style="width: 22%; padding: 3px 0 !important; border-right: 1px solid #000000 !important;">
-                                        <span class="cusSpanTitle">به کد ملی<span>:</span></span>
-                                        @if (string.IsNullOrWhiteSpace(@Model.NationalCode))
-                                        {
-                                            <span style="margin-left: 15px; visibility: hidden"></span>
-                                        }
-                                        else
-                                        {
-                                            <span>
-                                                @Model.NationalCode
-                                            </span>
-                                        }
-                                    </div>
-                                    <div style="width: 22%; padding: 3px 0 !important; border-right: 1px solid #000000 !important;">
-                                        <span class="cusSpanTitle">متولد<span>:</span></span>
-                                        @if (string.IsNullOrWhiteSpace(@Model.DateOfBirth))
-                                        {
-                                            <span style="visibility: hidden">1401/01/01</span>
-                                        }
-                                        else
-                                        {
-                                            <span>@Model.DateOfBirth</span>
-                                        }
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-xs-12" style="font-size: 12px; text-align: justify; padding: 0 10px;">
-                                <div style="display: flex;align-items: center;border-bottom: 1px solid #000000 !important;height: 23px; padding: 0;">
-                                    @{
-                                        if (@Model.EmployerList.FirstOrDefault().IsLegal == "حقیقی")
-                                        {
-                                            <div style="width: 50%; padding: 3px 0 !important;">
-                                                <div>
-                                                    <span class="cusSpanTitle">نام کارگاه<span>:</span> </span>
-                                                    <span>@Model.WorkshopName</span>
-                                                </div>
+			                        }
+		                        </div>
+		                        <div style="width: 22%; padding: 3px 0 !important; border-right: 1px solid #000000 !important;">
+			                        <span class="cusSpanTitle">به کد ملی<span>:</span></span>
+			                        @if (string.IsNullOrWhiteSpace(@Model.NationalCode))
+			                        {
+				                        <span style="margin-left: 15px; visibility: hidden"></span>
+			                        }
+			                        else
+			                        {
+				                        <span>
+					                        @Model.NationalCode
+				                        </span>
+			                        }
+		                        </div>
+		                        <div style="width: 22%; padding: 3px 0 !important; border-right: 1px solid #000000 !important;">
+			                        <span class="cusSpanTitle">متولد<span>:</span></span>
+			                        @if (string.IsNullOrWhiteSpace(@Model.DateOfBirth))
+			                        {
+				                        <span style="visibility: hidden">1401/01/01</span>
+			                        }
+			                        else
+			                        {
+				                        <span>@Model.DateOfBirth</span>
+			                        }
+		                        </div>
+	                        </div>
+						</div>
+                        <div class="col-xs-12" style="font-size: 12px; text-align: justify; padding: 0 10px;">
+                            <div style="display: flex;align-items: center;border-bottom: 1px solid #000000 !important;height: 23px; padding: 0;">
+                                @{
+                                    if (@Model.EmployerList.FirstOrDefault().IsLegal == "حقیقی")
+                                    {
+                                        <div style="width: 50%; padding: 3px 0 !important;">
+                                            <div>
+                                                <span class="cusSpanTitle">نام کارگاه<span>:</span> </span>
+                                                <span>@Model.WorkshopName</span>
                                             </div>
+                                        </div>
 
-                                            <div style="width: 50%; padding: 3px 0 !important; border-right: 1px solid #000000 !important;">
-                                                <span class="cusSpanTitle">نام کارفرما<span>:</span> </span>
-                                                @if (Model.EmployerList.Count > 1)
-                                                {
-                                                    <span>
-                                                        @Model.EmployerList[0].EmployerFullName <span>،</span>
-                                                        <span>&nbsp;</span>@Model.EmployerList[1].EmployerFullName
-                                                        @if (@Model.EmployerList.Count > 2)
-                                                        {
-                                                            <span>و غیره</span>
-                                                        }
-                                                    </span>
-                                                }
-                                                else
-                                                {
-                                                    <span>
-                                                        @Model.EmployerList.FirstOrDefault().EmployerFullName
-                                                    </span>
-                                                }
-                                            </div>
-
-                                        }
-                                        else if (@Model.EmployerList.FirstOrDefault().IsLegal == "حقوقی")
-                                        {
-                                            <div style="width: 100%; padding: 3px 0 !important;">
-                                                <span class="cusSpanTitle">پـرسنل شرکت/موسسه<span>:</span> </span>
+                                        <div style="width: 50%; padding: 3px 0 !important; border-right: 1px solid #000000 !important;">
+                                            <span class="cusSpanTitle">نام کارفرما<span>:</span> </span>
+                                            @if (Model.EmployerList.Count > 1)
+                                            {
                                                 <span>
-                                                    @Model.WorkshopName
+                                                    @Model.EmployerList[0].EmployerFullName <span>،</span>
+                                                    <span>&nbsp;</span>@Model.EmployerList[1].EmployerFullName
+                                                    @if (@Model.EmployerList.Count > 2)
+                                                    {
+                                                        <span>و غیره</span>
+                                                    }
                                                 </span>
-                                            </div>
-                                        }
+                                            }
+                                            else
+                                            {
+                                                <span>
+                                                    @Model.EmployerList.FirstOrDefault().EmployerFullName
+                                                </span>
+                                            }
+                                        </div>
+
                                     }
-                                </div>
-                                <div style="text-align: justify; padding: 0 6px;">
-                                    @{
-                                        var items = new List<string>();
-
-                                        if (Model.MonthlySalary != "0") items.Add("حقوق و مزد");
-                                        if (Model.ConsumableItems != "0") items.Add("کمک هزینه اقلام مصرفی خانوار");
-                                        if (Model.HousingAllowance != "0") items.Add("کمک هزینه مسکن");
-                                        if (!string.IsNullOrWhiteSpace(Model.OvertimePay) && Model.OvertimePay != "0") items.Add("فوق العاده اضافه کاری");
-                                        if (!string.IsNullOrWhiteSpace(Model.NightworkPay) && Model.NightworkPay != "0") items.Add("فوق العاده شب کاری");
-                                        if (!string.IsNullOrWhiteSpace(Model.FridayPay) && Model.FridayPay != "0") items.Add("فوق العاده جمعه کاری");
-                                        if (Model.MissionPay != "0") items.Add("فوق العاده ماموریت");
-                                        if (Model.ShiftPay != "0") items.Add("فوق العاده نوبت کاری");
-                                        if (Model.FamilyAllowance != "0") items.Add("کمک هزینه عائله مندی");
-                                        if (Model.MarriedAllowance != "0") items.Add("حق تاهل");
-                                        if (Model.RewardPay != "0") items.Add("پاداش");
-                                        if (Model.BonusesPay != "0") items.Add("عیدی و پاداش");
-                                        if (Model.YearsPay != "0") items.Add("سنوات");
-                                        if (Model.LeavePay != "0") items.Add("مزد مرخصی");
-
-                                        string finalText = "";
-                                        if (items.Count == 1)
-                                        {
-                                            finalText = items[0];
-                                        }
-                                        else if (items.Count > 1)
-                                        {
-                                            finalText = string.Join("<span>،</span> ", items.Take(items.Count - 1)) + " و " + items.Last();
-                                        }
+                                    else if (@Model.EmployerList.FirstOrDefault().IsLegal == "حقوقی")
+                                    {
+	                                    <div style="width: 100%; padding: 3px 0 !important;">
+	                                        <span class="cusSpanTitle">پـرسنل شرکت/موسسه<span>:</span> </span>
+		                                    <span> 
+			                                    @Model.WorkshopName
+		                                    </span>
+	                                    </div>
                                     }
-
-                                    <span>
-                                        کلیه حق السعی خود اعم از @Html.Raw(finalText) @Model.Month ماه سال @Model.Year برابر با قرارداد به شماره فوق را از کارفرما بصورت وجه نقد و واریز به حساب دریافت نموده ام.
-                                    </span>
-                                </div>
+                                }
                             </div>
-                        </div>
-                    </div>
+                            <div style="text-align: justify; padding: 0 6px;">
+                                @{
+                                    var items = new List<string>();
 
+                                    if (Model.MonthlySalary != "0") items.Add("حقوق و مزد");
+                                    if (Model.ConsumableItems != "0") items.Add("کمک هزینه اقلام مصرفی خانوار");
+                                    if (Model.HousingAllowance != "0") items.Add("کمک هزینه مسکن");
+                                    if (!string.IsNullOrWhiteSpace(Model.OvertimePay) && Model.OvertimePay != "0") items.Add("فوق العاده اضافه کاری");
+                                    if (!string.IsNullOrWhiteSpace(Model.NightworkPay) && Model.NightworkPay != "0") items.Add("فوق العاده شب کاری");
+                                    if (!string.IsNullOrWhiteSpace(Model.FridayPay) && Model.FridayPay != "0") items.Add("فوق العاده جمعه کاری");
+                                    if (Model.MissionPay != "0") items.Add("فوق العاده ماموریت");
+                                    if (Model.ShiftPay != "0") items.Add("فوق العاده نوبت کاری");
+                                    if (Model.FamilyAllowance != "0") items.Add("کمک هزینه عائله مندی");
+                                    if (Model.MarriedAllowance != "0") items.Add("حق تاهل");
+                                    if (Model.RewardPay != "0") items.Add("پاداش");
+                                    if (Model.BonusesPay != "0") items.Add("عیدی و پاداش");
+                                    if (Model.YearsPay != "0") items.Add("سنوات");
+                                    if (Model.LeavePay != "0") items.Add("مزد مرخصی");
 
-                    <div class="row m-t-20">
-                        <fieldset style="border: 1px solid black !important;-webkit-print-color-adjust: exact;print-color-adjust: exact; border-radius: 10px 10px 10px 10px;  margin: 0px 10px;overflow:hidden">
-                            <table style="/* table-layout: fixed; */ width: 100%">
+                                    string finalText = "";
+                                    if (items.Count == 1)
+                                    {
+                                        finalText = items[0];
+                                    }
+                                    else if (items.Count > 1)
+                                    {
+                                        finalText = string.Join("<span>،</span> ", items.Take(items.Count - 1)) + " و " + items.Last();
+                                    }
+                                }
 
-                                <tr style="border-bottom: 1px solid; height: 25px; border-collapse: separate; background-color: #cdcdcd !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    @* <th style="text-align: center; width: 8mm; font-size: 12px; padding: 2px; border-collapse: separate; border-radius: 0px 10px 0px 0px;">  </th> *@
-                                    <th colspan="4" style="text-align: center; position: relative ; font-size: 13px;padding-top:4px;border-left: 2px solid #000;"> مطالبات </th>
-                                    @* <th style="text-align: center;"> </th>
+                                <span>
+                                    کلیه حق السعی خود اعم از @Html.Raw(finalText) @Model.Month ماه سال @Model.Year برابر با قرارداد به شماره فوق را از کارفرما بصورت وجه نقد و واریز به حساب دریافت نموده ام.
+                                </span>
+                            </div>
+				        </div>
+		            </div>
+	            </div>
+            
+
+            <div class="row m-t-20">
+                <fieldset style="border: 1px solid black !important;-webkit-print-color-adjust: exact;print-color-adjust: exact; border-radius: 10px 10px 10px 10px;  margin: 0px 10px;overflow:hidden">
+                    <table style="/* table-layout: fixed; */ width: 100%">
+                        
+	                    <tr style="border-bottom: 1px solid; height: 25px; border-collapse: separate; background-color: #cdcdcd !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+		                    @* <th style="text-align: center; width: 8mm; font-size: 12px; padding: 2px; border-collapse: separate; border-radius: 0px 10px 0px 0px;">  </th> *@
+		                    <th colspan="4" style="text-align: center; position: relative ; font-size: 13px;padding-top:4px;border-left: 2px solid #000;"> مطالبات </th>
+		                    @* <th style="text-align: center;"> </th>
 									<th style="text-align: center; border-left: 2px solid #000; font-size: 12px"> </th> *@
-                                    <th colspan="3" style="text-align: center; font-size: 13px; position: relative; padding-top: 4px;"> کسورات </th>
-                                    @* <th style="text-align: center; font-size: 12px; border-collapse: separate; border-radius: 0px 0px 0px 0px;">  </th>
+		                    <th colspan="3" style="text-align: center; font-size: 13px; position: relative; padding-top: 4px;"> کسورات </th>
+		                    @* <th style="text-align: center; font-size: 12px; border-collapse: separate; border-radius: 0px 0px 0px 0px;">  </th>
 									<th style="text-align: center; font-size: 12px; border-collapse: separate; border-radius: 10px 0px 0px 0px;">  </th> *@
-                                </tr>
+	                    </tr>
 
 
-                                <tr style="border-bottom: 1px solid; background-color: #e1e1e1 !important ;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <th style="width: 5%; text-align: center; border-left: 1px solid #000; font-size: 12px;padding: 2px"> ردیف </th>
-                                    <th style="width: 23%; text-align: center; border-left: 1px solid #000; font-size: 12px"> شرح </th>
-                                    <th style="width: 10%; text-align: center; border-left: 1px solid #000; font-size: 9px"> ساعت/روز/تعداد </th>
-                                    <th style="width: 12%; text-align: center; border-left: 2px solid #000; font-size: 12px"> مبلغ(ریال) </th>
-                                    <th style="width: 28%; text-align: center; border-left: 1px solid #000; font-size: 12px"> شرح </th>
-                                    <th style="width: 10%; text-align: center; border-left: 1px solid #000; font-size: 9px"> ساعت/روز/تعداد </th>
-                                    <th style="width: 12%; text-align: center; font-size: 12px"> مبلغ(ریال) </th>
-                                </tr>
+                        <tr style="border-bottom: 1px solid; background-color: #e1e1e1 !important ;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                            <th style="width: 5%; text-align: center; border-left: 1px solid #000; font-size: 12px;padding: 2px"> ردیف </th>
+                            <th style="width: 23%; text-align: center; border-left: 1px solid #000; font-size: 12px"> شرح </th>
+                            <th style="width: 10%; text-align: center; border-left: 1px solid #000; font-size: 9px"> ساعت/روز/تعداد </th>
+                            <th style="width: 12%; text-align: center; border-left: 2px solid #000; font-size: 12px"> مبلغ(ریال) </th>
+                            <th style="width: 28%; text-align: center; border-left: 1px solid #000; font-size: 12px"> شرح </th>
+							<th style="width: 10%; text-align: center; border-left: 1px solid #000; font-size: 9px"> ساعت/روز/تعداد </th>
+                            <th style="width: 12%; text-align: center; font-size: 12px"> مبلغ(ریال) </th>
+                        </tr>
 
 
-                                <tr style="font-size: 12px; ">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">1</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> حقوق و مزد </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @Model.SumOfWorkingDays </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.MonthlySalary == "0" ? "-" : Model.MonthlySalary) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> حق بیمه سهم کارگر </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center;"> @(Model.InsuranceDeduction == "0" ? "-" : Model.InsuranceDeduction) </td>
-                                </tr>
+                        <tr style="font-size: 12px; ">
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">1</td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> حقوق و مزد </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> @Model.SumOfWorkingDays </td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.MonthlySalary == "0" ? "-" : Model.MonthlySalary) </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> حق بیمه سهم کارگر </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center;"> @(Model.InsuranceDeduction == "0" ? "-" : Model.InsuranceDeduction) </td>
+                        </tr>
 
-                                <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">2</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> پایه سنوات </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @(Model.BaseYearsPay == "0" ? "-" : Model.SumOfWorkingDays) </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.BaseYearsPay == "0" ? "-" : Model.BaseYearsPay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> مالیات بر حقوق </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center;"> @(Model.TaxDeducation == "0" ? "-" : Model.TaxDeducation) </td>
-                                </tr>
+                        <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">2</td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> پایه سنوات </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> @(Model.BaseYearsPay == "0" ? "-" : Model.SumOfWorkingDays) </td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.BaseYearsPay == "0" ? "-" : Model.BaseYearsPay) </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> مالیات بر حقوق </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center;"> @(Model.TaxDeducation == "0" ? "-" : Model.TaxDeducation) </td>
+                        </tr>
 
-                                <tr style="font-size: 12px;">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">3</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000; white-space: nowrap;"> کمک هزینه اقلام مصرفی خانوار </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @(Model.ConsumableItems == "0" ? "-" : Model.SumOfWorkingDays) </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.ConsumableItems == "0" ? "-" : Model.ConsumableItems) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> قسط تسهیلات </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center;"> @(Model.InstallmentDeduction == "0" ? "-" : Model.InstallmentDeduction) </td>
-                                </tr>
+                        <tr style="font-size: 12px;">
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">3</td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000; white-space: nowrap;"> کمک هزینه اقلام مصرفی خانوار </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> @(Model.ConsumableItems == "0" ? "-" : Model.SumOfWorkingDays) </td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.ConsumableItems == "0" ? "-" : Model.ConsumableItems) </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> قسط تسهیلات </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center;"> @(Model.InstallmentDeduction == "0" ? "-" : Model.InstallmentDeduction) </td>
+                        </tr>
 
-                                <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">4</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> کمک هزینه مسکن </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @(Model.HousingAllowance == "0" ? "-" : Model.SumOfWorkingDays) </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.HousingAllowance == "0" ? "-" : Model.HousingAllowance) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> مساعده  </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center;"> @(Model.SalaryAidDeduction == "0" ? "-" : Model.SalaryAidDeduction) </td>
-                                </tr>
-                                <tr style="font-size: 12px;">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">5</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده اضافه کاری </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @((Model.OverTimeWorkValue == "00:00" || string.IsNullOrWhiteSpace(Model.OverTimeWorkValue)) ? "-" : Model.OverTimeWorkValue) </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @((Model.OvertimePay == "0" || string.IsNullOrWhiteSpace(Model.OvertimePay)) ? "-" : Model.OvertimePay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> غیبت  </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center;"> @(Model.AbsenceDeduction == "0" ? "-" : Model.AbsenceDeduction) </td>
-                                </tr>
-                                <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">6</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده شب کاری </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @((Model.OverNightWorkValue == "00:00" || string.IsNullOrWhiteSpace(Model.OverNightWorkValue)) ? "-" : Model.OverNightWorkValue) </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @((Model.NightworkPay == "0" || string.IsNullOrWhiteSpace(Model.NightworkPay)) ? "-" : Model.NightworkPay) </td>
+                        <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">4</td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> کمک هزینه مسکن </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> @(Model.HousingAllowance == "0" ? "-" : Model.SumOfWorkingDays) </td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.HousingAllowance == "0" ? "-" : Model.HousingAllowance) </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> مساعده  </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center;"> @(Model.SalaryAidDeduction == "0" ? "-" : Model.SalaryAidDeduction) </td>
+                        </tr>
+                        <tr style="font-size: 12px;">
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">5</td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده اضافه کاری </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> @((Model.OverTimeWorkValue == "00:00" || string.IsNullOrWhiteSpace(Model.OverTimeWorkValue)) ? "-" : Model.OverTimeWorkValue) </td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @((Model.OvertimePay == "0" || string.IsNullOrWhiteSpace(Model.OvertimePay)) ? "-" : Model.OvertimePay) </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> غیبت  </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center;"> @(Model.AbsenceDeduction == "0" ? "-" : Model.AbsenceDeduction) </td>
+                        </tr>
+                        <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">6</td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده شب کاری </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> @((Model.OverNightWorkValue == "00:00" || string.IsNullOrWhiteSpace(Model.OverNightWorkValue)) ? "-" : Model.OverNightWorkValue) </td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @((Model.NightworkPay == "0" || string.IsNullOrWhiteSpace(Model.NightworkPay)) ? "-" : Model.NightworkPay) </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
+                            <td style="text-align: center; border-left: 1px solid #000;">   </td>
+                            <td style="text-align: center;"> </td>
+                        </tr>
+                        <tr style="font-size: 12px;">
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">7</td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده جمعه کاری </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> @((Model.FridayWorkValue == "0" || string.IsNullOrWhiteSpace(Model.FridayWorkValue)) ? "-" : Model.FridayWorkValue) </td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @((Model.FridayPay == "0" || string.IsNullOrWhiteSpace(Model.FridayPay)) ? "-" : Model.FridayPay) </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
+                            <td style="text-align: center; border-left: 1px solid #000;">   </td>
+                            <td style="text-align: center;"> </td>
+                        </tr>
+                            <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact; print-color-adjust: exact;">
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">8</td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده ماموریت </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.MissionPay == "0" ? "-" : Model.MissionPay) </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
+                            <td style="text-align: center; border-left: 1px solid #000;">   </td>
+                            <td style="text-align: center;"> </td>
+                        </tr>
+                        <tr style="font-size: 12px;">
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">9</td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده نوبت کاری </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> @((Model.RotatingShiftValue == "0" || string.IsNullOrWhiteSpace(Model.RotatingShiftValue)) ? "-" : "%" + Model.RotatingShiftValue) </td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.ShiftPay == "0" ? "-" : Model.ShiftPay) </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
+                            <td style="text-align: center; border-left: 1px solid #000;">   </td>
+                            <td style="text-align: center;"> </td>
+                        </tr>
+                        <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">10</td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> کمک هزینه عائله مندی </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.FamilyAllowance == "0" ? "-" : Model.FamilyAllowance) </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
+                            <td style="text-align: center; border-left: 1px solid #000;">   </td>
+                            <td style="text-align: center;"> </td>
+                        </tr>
+                        <tr style="font-size: 12px;">
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">11</td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> حق تاهل </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> @Model.MaritalStatus </td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.MarriedAllowance == "0" ? "-" : Model.MarriedAllowance) </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
+                            <td style="text-align: center; border-left: 1px solid #000;">  </td>
+                            <td style="text-align: center;"> </td>
+                        </tr>
+                        <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">12</td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> پاداش </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.RewardPay == "0" ? "-" : Model.RewardPay) </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
+                            <td style="text-align: center; border-left: 1px solid #000;">   </td>
+                            <td style="text-align: center;"> </td>
+                        </tr>
+                        <tr style="font-size: 12px;">
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">13</td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> عیدی و پاداش </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> @(Model.BonusesPay == "0" ? "-" : Model.SumOfWorkingDays) </td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.BonusesPay == "0" ? "-" : Model.BonusesPay) </td>
+
+                            @{
+                                if (Model.IsLeft)
+                                {
+	                                <td style="text-align: center; background-color: #ffffff !important;" colspan="3" rowspan="3">
+		                                <div style="border-top: 1px solid #000;border-top-left-radius: 15px;border-top-right-radius: 15px; height: 65px;">
+			                                <div style="padding: 0 6px; text-align: start;display: block;align-items: center;height: 64px;margin: 6px;">
+				                                <span>طبق تصفیه حساب نهایی تنظیمی فوق، آخرین روز اشتغال بکار اینجانب</span>
+				                                <span>@Model.LastDayOfWork</span>
+				                                <span>بوده و قطع همکاری با کارفرما و کارگاه از تاریخ</span>
+				                                <span>@Model.LeftWorkDate</span>
+				                                <span>می باشد</span>
+			                                </div>
+		                                </div>
+	                                </td>
+                                }
+                                else
+                                {
                                     <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
                                     <td style="text-align: center; border-left: 1px solid #000;">   </td>
                                     <td style="text-align: center;"> </td>
-                                </tr>
-                                <tr style="font-size: 12px;">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">7</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده جمعه کاری </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @((Model.FridayWorkValue == "0" || string.IsNullOrWhiteSpace(Model.FridayWorkValue)) ? "-" : Model.FridayWorkValue) </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @((Model.FridayPay == "0" || string.IsNullOrWhiteSpace(Model.FridayPay)) ? "-" : Model.FridayPay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center;"> </td>
-                                </tr>
-                                <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact; print-color-adjust: exact;">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">8</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده ماموریت </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.MissionPay == "0" ? "-" : Model.MissionPay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center;"> </td>
-                                </tr>
-                                <tr style="font-size: 12px;">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">9</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده نوبت کاری </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @((Model.RotatingShiftValue == "0" || string.IsNullOrWhiteSpace(Model.RotatingShiftValue)) ? "-" : "%" + Model.RotatingShiftValue) </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.ShiftPay == "0" ? "-" : Model.ShiftPay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center;"> </td>
-                                </tr>
-                                <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">10</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> کمک هزینه عائله مندی </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.FamilyAllowance == "0" ? "-" : Model.FamilyAllowance) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center;"> </td>
-                                </tr>
-                                <tr style="font-size: 12px;">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">11</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> حق تاهل </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @Model.MaritalStatus </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.MarriedAllowance == "0" ? "-" : Model.MarriedAllowance) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;">  </td>
-                                    <td style="text-align: center;"> </td>
-                                </tr>
-                                <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">12</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> پاداش </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.RewardPay == "0" ? "-" : Model.RewardPay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center;"> </td>
-                                </tr>
-                                <tr style="font-size: 12px;">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">13</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> عیدی و پاداش </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @(Model.BonusesPay == "0" ? "-" : Model.SumOfWorkingDays) </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.BonusesPay == "0" ? "-" : Model.BonusesPay) </td>
+                                }
+                            }
 
-                                    @{
-                                        if (Model.IsLeft)
-                                        {
-                                            <td style="text-align: center; background-color: #ffffff !important;" colspan="3" rowspan="3">
-                                                <div style="border-top: 1px solid #000;border-top-left-radius: 15px;border-top-right-radius: 15px; height: 65px;">
-                                                    <div style="padding: 0 6px; text-align: start;display: block;align-items: center;height: 64px;margin: 6px;">
-                                                        <span>طبق تصفیه حساب نهایی تنظیمی فوق، آخرین روز اشتغال بکار اینجانب</span>
-                                                        <span>@Model.LastDayOfWork</span>
-                                                        <span>بوده و قطع همکاری با کارفرما و کارگاه از تاریخ</span>
-                                                        <span>@Model.LeftWorkDate</span>
-                                                        <span>می باشد</span>
-                                                    </div>
-                                                </div>
-                                            </td>
-                                        }
-                                        else
-                                        {
-                                            <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                            <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                            <td style="text-align: center;"> </td>
-                                        }
-                                    }
+                        </tr>
+                        <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">14</td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> سنوات </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> @(Model.YearsPay == "0" ? "-" : Model.SumOfWorkingDays)</td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.YearsPay == "0" ? "-" : Model.YearsPay) </td>
 
-                                </tr>
-                                <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">14</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> سنوات </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @(Model.YearsPay == "0" ? "-" : Model.SumOfWorkingDays)</td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.YearsPay == "0" ? "-" : Model.YearsPay) </td>
-
-                                    @{
-                                        if (!Model.IsLeft)
-                                        {
-                                            <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                            <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                            <td style="text-align: center;"> </td>
-                                        }
-                                    }
-                                </tr>
-                                <tr style="font-size: 12px;">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">15</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> مزد مرخصی </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @(Model.LeavePay == "0" ? "-" : Model.SumOfWorkingDays) </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.LeavePay == "0" ? "-" : Model.LeavePay) </td>
-
-                                    @{
-                                        if (!Model.IsLeft)
-                                        {
-                                            <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                            <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                            <td style="text-align: center;"> </td>
-                                        }
-                                    }
-                                </tr>
-                                <tr style="font-size: 12px; height: 20px; background-color: #dddcdc !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; border-bottom: 1px solid #000; border-top: 1px solid #000; ">
-                                    <td style="text-align: center; padding: 2px "></td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> جمع مطالبات </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.TotalClaims == "0" ? "-" : Model.TotalClaims) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> جمع کسورات </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;">  -  </td>
-                                    <td style="text-align: center;"> @(Model.TotalDeductions == "0" ? "-" : Model.TotalDeductions) </td>
-                                </tr>
-                                <tr style="font-size: 12px; border-radius: 0px 0px 10px 10px !important; height: 20px; background-color: #efefef !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <td style="text-align: center; padding: 2px; border-radius: 0px 0px 10px 0px "></td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000; "> مبلغ قابل پرداخت </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;">  </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.TotalPayment == "0" ? "-" : Model.TotalPayment) </td>
-                                    <td style="padding-right: 8px;">   </td>
+                            @{
+                                if (!Model.IsLeft)
+                                {
+                                    <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
                                     <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-radius:0px 0px 0px 10px"> </td>
-                                </tr>
-                            </table>
-                        </fieldset>
-                    </div>
+                                    <td style="text-align: center;"> </td>
+                                }
+                            }
+                        </tr>
+                        <tr style="font-size: 12px;">
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">15</td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> مزد مرخصی </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> @(Model.LeavePay == "0" ? "-" : Model.SumOfWorkingDays) </td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.LeavePay == "0" ? "-" : Model.LeavePay) </td>
+
+                            @{
+                                if (!Model.IsLeft)
+                                {
+                                    <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
+                                    <td style="text-align: center; border-left: 1px solid #000;">   </td>
+                                    <td style="text-align: center;"> </td>
+                                }
+                            }
+                        </tr>
+                        <tr style="font-size: 12px; height: 20px; background-color: #dddcdc !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; border-bottom: 1px solid #000; border-top: 1px solid #000; ">
+                            <td style="text-align: center; padding: 2px "></td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> جمع مطالبات </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.TotalClaims == "0" ? "-" : Model.TotalClaims) </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> جمع کسورات </td>
+                            <td style="text-align: center; border-left: 1px solid #000;">  -  </td>
+                            <td style="text-align: center;"> @(Model.TotalDeductions == "0" ? "-" : Model.TotalDeductions) </td>
+                        </tr>
+                        <tr style="font-size: 12px; border-radius: 0px 0px 10px 10px !important; height: 20px; background-color: #efefef !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                            <td style="text-align: center; padding: 2px; border-radius: 0px 0px 10px 0px "></td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000; "> مبلغ قابل پرداخت </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;">  </td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.TotalPayment == "0" ? "-" : Model.TotalPayment) </td>
+                            <td style="padding-right: 8px;">   </td>
+                            <td style="text-align: center; border-left: 1px solid #000;">   </td>
+                            <td style="text-align: center; border-radius:0px 0px 0px 10px"> </td>
+                        </tr>
+                    </table>
+                </fieldset>
+            </div>
 
                     <div style="">
                         <div class="" style="margin-top: 8px;background-color: #F6F6F6 !important;border: 1px solid #000;border-radius: 10px;display: grid;gap: 8px;padding: 8px 0;-webkit-print-color-adjust: exact;print-color-adjust: exact;padding: 6px;grid-template-columns: repeat(2, minmax(0, 1fr));width: 100%;">
@@ -580,47 +580,47 @@
 
                     <div class="" style="margin: 10px 0 0 0;display: flex;gap: 0px;">
                         <div style="width: 65%;">
-                            <div style="display: flex; gap: 10px;">
-                                <fieldset style="border: 1px solid black !important; -webkit-print-color-adjust: exact; print-color-adjust: exact; border-radius: 10px 10px 10px 10px; margin: 0px 0px; overflow: hidden; padding: 0; display: flex; width: 50%;">
+	                        <div style="display: flex; gap: 10px;">
+	                            <fieldset style="border: 1px solid black !important; -webkit-print-color-adjust: exact; print-color-adjust: exact; border-radius: 10px 10px 10px 10px; margin: 0px 0px; overflow: hidden; padding: 0; display: flex; width: 50%;">
 
-                                    <div class="table-container">
-                                        <table style="width: 100%;">
-                                            <colgroup>
-                                                <col style="width: 50%;">
-                                                <col style="width: 50%;">
-                                            </colgroup>
+		                            <div class="table-container">
+			                            <table style="width: 100%;">
+				                            <colgroup>
+					                            <col style="width: 50%;">
+					                            <col style="width: 50%;">
+				                            </colgroup>
 
-                                            <tr style="text-align: center; font-size: 10px; padding: 1px 4px; height: 15px; border-bottom: 1px solid; border-collapse: separate; background-color: #cdcdcd !important; -webkit-print-color-adjust: exact; print-color-adjust: exact;">
-                                                <th colspan="3" style="text-align: center; font-size: 11px;">مساعده</th>
-                                            </tr>
+				                            <tr style="text-align: center; font-size: 10px; padding: 1px 4px; height: 15px; border-bottom: 1px solid; border-collapse: separate; background-color: #cdcdcd !important; -webkit-print-color-adjust: exact; print-color-adjust: exact;">
+					                            <th colspan="3" style="text-align: center; font-size: 11px;">مساعده</th>
+				                            </tr>
 
-                                            <tr style="border-bottom: 1px solid; background-color: #e1e1e1 !important; -webkit-print-color-adjust: exact; print-color-adjust: exact; font-size: 9px; height: 15px;">
-                                                <th style="padding: 1px 4px; text-align: center; border-left: 1px solid black; min-width: 3rem; font-size: 11px;">تاریخ</th>
-                                                <th style="padding: 1px 4px; text-align: center; min-width: 4rem; font-size: 11px;">مبلغ</th>
-                                            </tr>
+				                            <tr style="border-bottom: 1px solid; background-color: #e1e1e1 !important; -webkit-print-color-adjust: exact; print-color-adjust: exact; font-size: 9px; height: 15px;">
+					                            <th style="padding: 1px 4px; text-align: center; border-left: 1px solid black; min-width: 3rem; font-size: 11px;">تاریخ</th>
+					                            <th style="padding: 1px 4px; text-align: center; min-width: 4rem; font-size: 11px;">مبلغ</th>
+				                            </tr>
 
-                                            @for (int i = 0; i < 5; i++)
-                                            {
-                                                <tr class="trTable" style="text-align: right; font-size: 10px; height: 15px;">
-                                                    <td style="font-size: 8px; text-align: center;border-left: 1px solid black">
-                                                        @(Model.SalaryAidViewModels != null && i < Model.SalaryAidViewModels.Count
-                                                            ? Model.SalaryAidViewModels[i]?.SalaryAidDateTimeFa ?? ""
-                                                            : "")
-                                                    </td>
-                                                    <td style="font-size: 8px; text-align: center;">
-                                                        @(Model.SalaryAidViewModels != null && i < Model.SalaryAidViewModels.Count
-                                                            ? Model.SalaryAidViewModels[i]?.Amount ?? ""
-                                                            : "")
-                                                    </td>
-                                                </tr>
-                                            }
+				                            @for (int i = 0; i < 5; i++)
+				                            {
+					                            <tr class="trTable" style="text-align: right; font-size: 10px; height: 15px;">
+						                            <td style="font-size: 8px; text-align: center;border-left: 1px solid black">
+							                            @(Model.SalaryAidViewModels != null && i < Model.SalaryAidViewModels.Count
+								                            ? Model.SalaryAidViewModels[i]?.SalaryAidDateTimeFa ?? ""
+								                            : "")
+						                            </td>
+						                            <td style="font-size: 8px; text-align: center;">
+							                            @(Model.SalaryAidViewModels != null && i < Model.SalaryAidViewModels.Count
+								                            ? Model.SalaryAidViewModels[i]?.Amount ?? ""
+								                            : "")
+						                            </td>
+					                            </tr>
+				                            }
 
-                                        </table>
+			                            </table>
 
-                                    </div>
-
-                                </fieldset>
+		                            </div>
 
+	                            </fieldset>
+                                
                                 <fieldset style="border: 1px solid black !important; -webkit-print-color-adjust: exact; print-color-adjust: exact; border-radius: 10px 10px 10px 10px; margin: 0px 0px; overflow: hidden; padding: 0; display: flex; width: 50%;">
 
                                     <div class="table-container">
@@ -680,7 +680,7 @@
                         </div>
                     </div>
 
-                </fieldset>
+				</fieldset>
             </div>
         </div>
     </div>
@@ -690,7 +690,7 @@
     <input type="hidden" asp-for="Id" value="@Model.Id" />
 
 
-    <input type="hidden" id="shiftWorkval" name="shiftWorkval" value="@Model.CreateWorkingHoursTemp.ShiftWork">
+<input type="hidden" id="shiftWorkval" name="shiftWorkval" value="@Model.CreateWorkingHoursTemp.ShiftWork">
 
 
 

ServiceHost/Areas/Admin/Pages/Company/Checkouts/_Partials/PrintDetailsRollCallRawOld.cshtml

@@ -1,606 +0,0 @@
-@using _0_Framework.Application
-@model CompanyManagment.App.Contracts.Checkout.CheckoutViewModel
-
-
-
-<div class="container container2" id="printThis">
-<div class="row">
-<div class="row">
-            <div class="col-md-12">
-                <fieldset style="border: 1px solid black;
-                             padding: revert;
-                             border-radius: 10px;
-                             height: 28cm;
-                             margin: 3mm 5mm 0 5mm; ">
-                    <div class="row" dir="rtl">
-                        <div class="col-xs-3 d-inline-block"><fieldset style="border: 1px solid black; border-radius: 15px; padding: 1px 15px 1px 15px; margin-top: 5px; width: 60%; font-size: 12px; text-align: center;"> @Model.ContractNo</fieldset></div>
-                        <div class="col-xs-6 d-inline-block text-center">
-                            <p style="margin-top:10px !important;font-size: 18px; font-family: 'IranNastaliq' !important; ">بسمه تعالی</p>
-                            <p style="font-size: 15px; font-weight: bold">فیش حقوقی و رسید پرداخت حقوق</p>
-                        </div>
-                        <div class="col-xs-3 d-inline-block"></div>
-                    </div>
-                    <div class="row" style="padding: 0px 12px;font-size: 14px; margin-bottom: 10px; ">
-                        <div class="row">
-                            <span style="width: 280px;padding: 0px 10px 0px 0px !important; float:right"><span>اینجانب <span>&nbsp;</span> <span style="font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">@Model.EmployeeFullName</span> </span></span>
-                            <span style="margin-right: 5px; float:right">
-                                <span> نام پدر: </span>
-                                @if (string.IsNullOrWhiteSpace(@Model.FathersName))
-                                {
-                                    <span style="visibility: hidden">"1111111111"</span>
-                                }
-                                else
-                                {
-                                    <span style="font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">@Model.FathersName</span>
-
-                                }
-                            </span>
-                            <span style="padding: 0px !important; float: left">
-
-                                <span>به کد ملی:</span> <span>&nbsp;</span>
-                                @if (string.IsNullOrWhiteSpace(@Model.NationalCode))
-                                {
-                                    <span style="margin-left: 15px; visibility: hidden">222333111</span>
-                                }
-                                else
-                                {
-                                    <span style="margin-left: 15px; font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">@Model.NationalCode</span>
-                                }
-
-                                <span>متولد:</span> <span>&nbsp;</span>
-                                @if (string.IsNullOrWhiteSpace(@Model.DateOfBirth))
-                                {
-                                    <span style="margin-left: 10px; visibility: hidden">1401/01/01</span>
-                                }
-                                else
-                                {
-                                    <span style="margin-left: 10px; font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">@Model.DateOfBirth</span>
-                                }
-                            </span>
-
-
-                        </div>
-                        <div class="row">
-                            <div class="col-xs-12" style="font-size: 14px; text-align: justify">
-
-                                @{
-                                    if (@Model.EmployerList.FirstOrDefault().IsLegal == "حقیقی")
-                                    {
-                                        <span> پـرسنل کارگاه<span>&nbsp;</span><span>&nbsp;</span><span style="font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">@Model.WorkshopName</span> </span>
-                                        <span>&nbsp;</span>
-                                        <span>به کارفرمایی <span>&nbsp;</span> آقای/خانم</span>
-                                        <span>&nbsp;</span>
-                                        <span>&nbsp;</span>
-                                        if (@Model.EmployerList.Count > 1)
-                                        {
-                                            <span style="font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">
-                                                @Model.EmployerList[0].EmployerFullName <span>،</span>
-                                                <span>&nbsp;</span>@Model.EmployerList[1].EmployerFullName
-                                                @if (@Model.EmployerList.Count > 2)
-                                                {
-                                                    <span>و غیره</span>
-                                                }
-                                            </span>
-                                            <br />
-                                        }
-                                        else
-                                        {
-                                            <span style="font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">
-                                                @Model.EmployerList.FirstOrDefault().EmployerFullName
-                                            </span>
-                                            <br />
-                                        }
-
-                                    }
-                                    else if (@Model.EmployerList.FirstOrDefault().IsLegal == "حقوقی")
-                                    {
-                                        <span> پـرسنل شرکت/موسسه<span>&nbsp;</span><span>&nbsp;</span><span style="font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">@Model.WorkshopName</span> </span>
-                                        <br />
-                                    }
-
-                                }
-
-                                <span>کلیه حق السعی خود اعم از حقوق، کمک هزینه اقلام مصرفی خانوار، کمک هزینه مسکن </span>
-
-                                <span>و همچنین عیدی و پاداش، سنوات و...</span>
-                                <span style="background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;"> <span style="font-weight: bold">@Model.Month</span> ماه </span>
-                                <span style="background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;"> سال <span style="font-weight: bold">@Model.Year</span> </span>
-                                <span> برابر با قرارداد به شماره فوق را از کارفرما بصورت وجه نقد و واریز به حساب دریافت نموده ام. </span>
-
-                            </div>
-
-                        </div>
-
-
-                    </div>
-                    <div class="row m-t-20">
-                        <fieldset style="border: 1px solid black !important;-webkit-print-color-adjust: exact;print-color-adjust: exact; border-radius: 10px 10px 10px 10px;  margin: 0px 10px;overflow:hidden">
-                            <table style="/* table-layout: fixed; */ width: 100%">
-
-
-                                <tr style="border-bottom: 1px solid; height: 25px; border-collapse: separate; background-color: #cdcdcd !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <th style="text-align: center; width: 8mm; font-size: 12px; padding: 2px; border-collapse: separate; border-radius: 0px 10px 0px 0px;"> </th>
-                                    <th style="text-align: center; position: absolute ; right: 55mm; font-size: 13px;padding-top:4px"> مطالبات </th>
-                                    <th style="text-align: center;"> </th>
-                                    <th style="text-align: center; border-left: 2px solid #000; font-size: 12px"> </th>
-                                    <th style="text-align: center; font-size: 13px; position: absolute; left: 50mm; padding-top: 4px;"> کسورات </th>
-                                    <th style="text-align: center; font-size: 12px; border-collapse: separate; border-radius: 0px 0px 0px 0px;"> </th>
-                                    <th style="text-align: center; font-size: 12px; border-collapse: separate; border-radius: 10px 0px 0px 0px;"> </th>
-                                </tr>
-
-                                <tr style="border-bottom: 1px solid; background-color: #e1e1e1 !important ;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <th style="width: 5%; text-align: center; border-left: 1px solid #000; font-size: 12px;padding: 2px"> ردیف </th>
-                                    <th style="width: 23%; text-align: center; border-left: 1px solid #000; font-size: 12px"> شرح </th>
-                                    <th style="width: 10%; text-align: center; border-left: 1px solid #000; font-size: 9px"> ساعت/روز/تعداد </th>
-                                    <th style="width: 12%; text-align: center; border-left: 2px solid #000; font-size: 12px"> مبلغ(ریال) </th>
-                                    <th style="width: 28%; text-align: center; border-left: 1px solid #000; font-size: 12px"> شرح </th>
-                                    <th style="width: 10%; text-align: center; border-left: 1px solid #000; font-size: 9px"> ساعت/روز/تعداد </th>
-                                    <th style="width: 12%; text-align: center; font-size: 12px"> مبلغ(ریال) </th>
-                                </tr>
-
-
-                                <tr style="font-size: 12px; ">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">1</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> حقوق و مزد </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @Model.SumOfWorkingDays </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.MonthlySalary == "0" ? "-" : Model.MonthlySalary) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> حق بیمه سهم کارگر </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center;"> @(Model.InsuranceDeduction == "0" ? "-" : Model.InsuranceDeduction) </td>
-                                </tr>
-
-                                <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">2</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> پایه سنوات </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @(Model.BaseYearsPay == "0" ? "-" : Model.SumOfWorkingDays) </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.BaseYearsPay == "0" ? "-" : Model.BaseYearsPay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> مالیات بر حقوق </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center;"> @(Model.TaxDeducation == "0" ? "-" : Model.TaxDeducation) </td>
-                                </tr>
-
-                                <tr style="font-size: 12px;">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">3</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> کمک هزینه اقلام مصرفی خانوار </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @(Model.ConsumableItems == "0" ? "-" : Model.SumOfWorkingDays) </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.ConsumableItems == "0" ? "-" : Model.ConsumableItems) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> قسط تسهیلات </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center;"> @(Model.InstallmentDeduction == "0" ? "-" : Model.InstallmentDeduction) </td>
-                                </tr>
-
-                                <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">4</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> کمک هزینه مسکن </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @(Model.HousingAllowance == "0" ? "-" : Model.SumOfWorkingDays) </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.HousingAllowance == "0" ? "-" : Model.HousingAllowance) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> مساعده </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center;"> @(Model.SalaryAidDeduction == "0" ? "-" : Model.SalaryAidDeduction) </td>
-                                </tr>
-                                <tr style="font-size: 12px;">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">5</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده اضافه کاری </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @((Model.OverTimeWorkValue == "00:00" || string.IsNullOrWhiteSpace(Model.OverTimeWorkValue)) ? "-" : Model.OverTimeWorkValue) </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @((Model.OvertimePay == "0" || string.IsNullOrWhiteSpace(Model.OvertimePay)) ? "-" : Model.OvertimePay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> غیبت  </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center;"> @(Model.AbsenceDeduction == "0" ? "-" : Model.AbsenceDeduction) </td>
-                                </tr>
-                                <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">6</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده شب کاری </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @((Model.OverNightWorkValue == "00:00" || string.IsNullOrWhiteSpace(Model.OverNightWorkValue)) ? "-" : Model.OverNightWorkValue) </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @((Model.NightworkPay == "0" || string.IsNullOrWhiteSpace(Model.NightworkPay)) ? "-" : Model.NightworkPay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center;"> </td>
-                                </tr>
-                                <tr style="font-size: 12px;">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">7</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده جمعه کاری </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @((Model.FridayWorkValue == "0" || string.IsNullOrWhiteSpace(Model.FridayWorkValue)) ? "-" : Model.FridayWorkValue) </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @((Model.FridayPay == "0" || string.IsNullOrWhiteSpace(Model.FridayPay)) ? "-" : Model.FridayPay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center;"> </td>
-                                </tr>
-                                <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact; print-color-adjust: exact;">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">8</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده ماموریت </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.MissionPay == "0" ? "-" : Model.MissionPay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center;"> </td>
-                                </tr>
-                                <tr style="font-size: 12px;">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">9</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده نوبت کاری </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @((Model.RotatingShiftValue == "0" || string.IsNullOrWhiteSpace(Model.RotatingShiftValue)) ? "-" : "%" + Model.RotatingShiftValue) </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.ShiftPay == "0" ? "-" : Model.ShiftPay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center;"> </td>
-                                </tr>
-                                <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">10</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> کمک هزینه عائله مندی </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.FamilyAllowance == "0" ? "-" : Model.FamilyAllowance) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> </td>
-                                    <td style="text-align: center;"> </td>
-                                </tr>
-                                <tr style="font-size: 12px;">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">11</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> حق تاهل </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @Model.MaritalStatus </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.MarriedAllowance == "0" ? "-" : Model.MarriedAllowance) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> </td>
-                                    <td style="text-align: center;"> </td>
-                                </tr>
-                                <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">12</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> پاداش </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.RewardPay == "0" ? "-" : Model.RewardPay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> </td>
-                                    <td style="text-align: center;"> </td>
-                                </tr>
-                                <tr style="font-size: 12px;">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">13</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> عیدی و پاداش </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @(Model.BonusesPay == "0" ? "-" : Model.SumOfWorkingDays) </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.BonusesPay == "0" ? "-" : Model.BonusesPay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> </td>
-                                    <td style="text-align: center;"> </td>
-                                </tr>
-                                <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">14</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> سنوات </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @(Model.YearsPay == "0" ? "-" : Model.SumOfWorkingDays) </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.YearsPay == "0" ? "-" : Model.YearsPay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> </td>
-                                    <td style="text-align: center;"> </td>
-                                </tr>
-                                <tr style="font-size: 12px;">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">15</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> مزد مرخصی </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> @(Model.LeavePay == "0" ? "-" : Model.SumOfWorkingDays) </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.LeavePay == "0" ? "-" : Model.LeavePay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> </td>
-                                    <td style="text-align: center;"> </td>
-                                </tr>
-                                <tr style="font-size: 12px; height: 20px; background-color: #dddcdc !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; border-bottom: 1px solid #000; border-top: 1px solid #000; ">
-                                    <td style="text-align: center; padding: 2px "></td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> جمع مطالبات </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.TotalClaims == "0" ? "-" : Model.TotalClaims) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> جمع کسورات </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center;"> @(Model.TotalDeductions == "0" ? "-" : Model.TotalDeductions) </td>
-                                </tr>
-                                <tr style="font-size: 12px; border-radius: 0px 0px 10px 10px !important; height: 20px; background-color: #efefef !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <td style="text-align: center; padding: 2px; border-radius: 0px 0px 10px 0px "></td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000; "> مبلغ قابل پرداخت </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.TotalPayment == "0" ? "-" : Model.TotalPayment) </td>
-                                    <td style="padding-right: 8px;"> </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> </td>
-                                    <td style="text-align: center; border-radius:0px 0px 0px 10px"> </td>
-                                </tr>
-                            </table>
-                        </fieldset>
-                    </div>
-
-                    <div style="">
-                        <div class="" style="margin-top: 8px;background-color: #F6F6F6 !important;border: 1px solid #000;border-radius: 10px;display: grid;gap: 8px;padding: 8px 0;-webkit-print-color-adjust: exact;print-color-adjust: exact;padding: 6px;grid-template-columns: repeat(2, minmax(0, 1fr));width: 100%;">
-                            <div class="" style="background-color: #DDDCDC !important; border: 1px solid #CCCCCC;border-radius: 7px;padding: 7px; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                <table style="width: 100%">
-                                    <thead style="background-color: #AFAFAF;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                        <tr style="font-size: 8px;border-collapse: separate;background-color: #AFAFAF !important;-webkit-print-color-adjust: exact;print-color-adjust: exact;">
-                                            <th style="font-size: 8px !important;width: 28%;padding: 2px 10px !important;border-left: 0;border-radius: 0 5px 5px 0 !important;-webkit-print-color-adjust: exact;print-color-adjust: exact;">تاریخ</th>
-                                            <th style="font-size: 8px;text-align: center;width: 9%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">ورود</th>
-                                            <th style="font-size: 8px;text-align: center;width: 9%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">خروج</th>
-                                            <th style="font-size: 8px;text-align: center;width: 9%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">ورود</th>
-                                            <th style="font-size: 8px;text-align: center;width: 9%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">خروج</th>
-                                            <th style="font-size: 8px;text-align: center;width: 11%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">استراحت</th>
-                                            <th style="font-size: 8px;text-align: center;width: 10%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">منقطع</th>
-                                            <th style="font-size: 8px;text-align: center;width: 15%;padding: 0 0 0 0px !important;border-radius: 5px 0 0 5px !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">ساعت کارکرد</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        @for (int i = 0; i < 15; i++)
-                                        {
-                                            <tr style="@((@Model.MonthlyRollCall[i].IsHoliday || @Model.MonthlyRollCall[i].IsFriday) ? "background-color: #BBBBBB !important;" : "background-color: #FFFFFF !important;") font-size: 8px;border-collapse: separate;-webkit-print-color-adjust: exact;print-color-adjust: exact;">
-                                                <td style="font-size: 8px; padding: 1px 3px;border-width: 2px 0 2px 2px;border-color: #DDDCDC;border-style: solid; border-radius: 0 5px 5px 0; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">@Model.MonthlyRollCall[i].DateTimeGr.ToFarsi() - @Model.MonthlyRollCall[i].DateTimeGr.DayOfWeek.DayOfWeeKToPersian()</td>
-
-
-                                                @if (@Model.MonthlyRollCall[i].IsAbsent)
-                                                {
-                                                    <td colspan="2" style="font-size: 8px; text-align: center; border-width: 2px 0 2px 2px; border-color: #DDDCDC; border-style: solid; -webkit-print-color-adjust: exact; print-color-adjust: exact;">
-                                                        <div style="display: flex;justify-content: center;">
-                                                            <span style="width: 40px;display: block;border-radius: 50px;background-color: #737373;color: #fff;">غیبت</span>
-                                                        </div>
-                                                    </td>
-                                                    <td colspan="2" style="font-size: 8px; text-align: center; border-width: 2px 0 2px 2px; border-color: #DDDCDC; border-style: solid; -webkit-print-color-adjust: exact; print-color-adjust: exact;">
-                                                        <div style="display: flex;justify-content: center;">
-                                                            @* <span style="width: 40px;display: block;border-radius: 50px;background-color: #737373;color: #fff;">غیبت</span> *@
-                                                        </div>
-                                                    </td>
-                                                }
-                                                else
-                                                {
-                                                    @if (string.IsNullOrWhiteSpace(Model.MonthlyRollCall[i].LeaveType))
-                                                    {
-                                                        <td style="font-size: 8px; text-align: center;border-width: 2px 0 2px 0;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">@Model.MonthlyRollCall[i].StartDate1</td>
-                                                        <td style="font-size: 8px; text-align: center;border-width: 2px 0 2px 2px;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">@Model.MonthlyRollCall[i].EndDate1</td>
-                                                        <td style="font-size: 8px; text-align: center;border-width: 2px 0 2px 0;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">@Model.MonthlyRollCall[i].StartDate2</td>
-                                                        <td style="font-size: 8px; text-align: center;border-width: 2px 0 2px 2px;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">@Model.MonthlyRollCall[i].EndDate2</td>
-                                                    }
-                                                    else
-                                                    {
-                                                        <td colspan="2" style="font-size: 8px; text-align: center; border-width: 2px 0 2px 2px; border-color: #DDDCDC; border-style: solid; -webkit-print-color-adjust: exact; print-color-adjust: exact;">
-                                                            <div style="display: flex;justify-content: center;">
-                                                                <span style="width: 41px; display: block; border-radius: 50px; background-color: #fff; color: #737373;border: 1px solid #737373;">
-                                                                    @Model.MonthlyRollCall[i].LeaveType
-                                                                </span>
-                                                            </div>
-                                                        </td>
-                                                        <td colspan="2" style="font-size: 8px; text-align: center; border-width: 2px 0 2px 2px; border-color: #DDDCDC; border-style: solid; -webkit-print-color-adjust: exact; print-color-adjust: exact;">
-                                                            <div style="display: flex;justify-content: center;">
-                                                                @* <span style="width: 40px; display: block; border-radius: 50px; background-color: #fff; color: #737373;border: 1px solid #737373;">
-                                                                    @Model.MonthlyRollCall[i].LeaveType
-                                                                </span> *@
-                                                            </div>
-                                                        </td>
-                                                    }
-                                                }
-
-
-
-                                                <td style="font-size: 8px; text-align: center;border-width: 2px 0 2px 2px;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">@Model.MonthlyRollCall[i].BreakTimeString</td>
-                                                <td style="font-size: 8px; text-align: center; border-width: 2px 0 2px 2px; border-color: #DDDCDC; border-style: solid;vertical-align: center;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                                    @if (@Model.MonthlyRollCall[i].IsSliced)
-                                                    {
-                                                        <svg width="12" height="12" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" style="display: block; margin: auto;">
-                                                            <circle stroke-width="2" cx="12" cy="12" r="9" stroke="#222222" />
-                                                            <path stroke-width="2" d="M8 12L11 15L16 9" stroke="#222222" stroke-linecap="round" />
-                                                        </svg>
-                                                    }
-                                                    else
-                                                    {
-                                                        <span>-</span>
-                                                    }
-                                                </td>
-                                                <td style="font-size: 8px;text-align: center;border-width: 2px 0 2px 0;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact;border-radius: 5px 0 0 5px;">@Model.MonthlyRollCall[i].TotalWorkingHours</td>
-                                            </tr>
-                                        }
-                                    </tbody>
-                                </table>
-                            </div>
-                            <div class="" style="background-color: #DDDCDC !important; border: 1px solid #CCCCCC;border-radius: 7px;padding: 7px; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                <table style="width: 100%">
-                                    <thead style="background-color: #AFAFAF;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                        <tr style="font-size: 8px;border-collapse: separate;background-color: #AFAFAF !important;-webkit-print-color-adjust: exact;print-color-adjust: exact;">
-                                            <th style="font-size: 8px !important;width: 28%;padding: 2px 10px !important;border-left: 0;border-radius: 0 5px 5px 0 !important;-webkit-print-color-adjust: exact;print-color-adjust: exact;">تاریخ</th>
-                                            <th style="font-size: 8px;text-align: center;width: 9%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">ورود</th>
-                                            <th style="font-size: 8px;text-align: center;width: 9%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">خروج</th>
-                                            <th style="font-size: 8px;text-align: center;width: 9%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">ورود</th>
-                                            <th style="font-size: 8px;text-align: center;width: 9%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">خروج</th>
-                                            <th style="font-size: 8px;text-align: center;width: 11%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">استراحت</th>
-                                            <th style="font-size: 8px;text-align: center;width: 10%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">منقطع</th>
-                                            <th style="font-size: 8px;text-align: center;width: 15%;padding: 0 0 0 0px !important;border-radius: 5px 0 0 5px !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">ساعت کارکرد</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        @{
-                                            Model.MonthlyRollCall = Model.MonthlyRollCall.Skip(15).ToList();
-                                        }
-                                        @foreach (var day in Model.MonthlyRollCall)
-                                        {
-                                            <tr style="@((day.IsHoliday || day.IsFriday) ? "background-color: #BBBBBB !important;" : "background-color: #FFFFFF !important;") font-size: 8px;border-collapse: separate;-webkit-print-color-adjust: exact;print-color-adjust: exact;">
-                                                <td style="font-size: 8px; padding: 1px 3px;border-width: 2px 0 2px 2px;border-color: #DDDCDC;border-style: solid; border-radius: 0 5px 5px 0; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">@day.DateTimeGr.ToFarsi() - @day.DateTimeGr.DayOfWeek.DayOfWeeKToPersian()</td>
-
-
-                                                @if (day.IsAbsent)
-                                                {
-                                                    <td colspan="2" style="font-size: 8px; text-align: center; border-width: 2px 0 2px 2px; border-color: #DDDCDC; border-style: solid; -webkit-print-color-adjust: exact; print-color-adjust: exact;">
-                                                        <div style="display: flex;justify-content: center;">
-                                                            <span style="width: 38px;display: block;border-radius: 50px;background-color: #737373;color: #fff;">غیبت</span>
-                                                        </div>
-                                                    </td>
-                                                    <td colspan="2" style="font-size: 8px; text-align: center; border-width: 2px 0 2px 2px; border-color: #DDDCDC; border-style: solid; -webkit-print-color-adjust: exact; print-color-adjust: exact;">
-                                                        <div style="display: flex;justify-content: center;">
-                                                            @* <span style="width: 40px;display: block;border-radius: 50px;background-color: #737373;color: #fff;">غیبت</span> *@
-                                                        </div>
-                                                    </td>
-                                                }
-                                                else
-                                                {
-                                                    @if (string.IsNullOrWhiteSpace(day.LeaveType))
-                                                    {
-                                                        <td style="font-size: 8px !important; text-align: center;border-width: 2px 0 2px 0;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">@day.StartDate1</td>
-                                                        <td style="font-size: 8px !important; text-align: center;border-width: 2px 0 2px 2px;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">@day.EndDate1</td>
-                                                        <td style="font-size: 8px !important; text-align: center;border-width: 2px 0 2px 0;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">@day.StartDate2</td>
-                                                        <td style="font-size: 8px !important; text-align: center;border-width: 2px 0 2px 2px;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">@day.EndDate2</td>
-                                                    }
-                                                    else
-                                                    {
-                                                        <td colspan="2" style="font-size: 8px; text-align: center; border-width: 2px 0 2px 2px; border-color: #DDDCDC; border-style: solid; -webkit-print-color-adjust: exact; print-color-adjust: exact;">
-                                                            <div style="display: flex;justify-content: center;">
-                                                                <span style="width: 41px; display: block; border-radius: 50px; background-color: #fff; color: #737373;border: 1px solid #737373;">
-                                                                    @day.LeaveType
-                                                                </span>
-                                                            </div>
-                                                        </td>
-                                                        <td colspan="2" style="font-size: 8px; text-align: center; border-width: 2px 0 2px 2px; border-color: #DDDCDC; border-style: solid; -webkit-print-color-adjust: exact; print-color-adjust: exact;">
-                                                            <div style="display: flex;justify-content: center;">
-                                                                @*             <span style="width: 80px; display: block; border-radius: 50px; background-color: #fff; color: #737373;border: 1px solid #737373;">
-                                                                    مرخصی @day.LeaveType
-                                                                </span> *@
-                                                            </div>
-                                                        </td>
-                                                    }
-                                                }
-
-                                                <td style="font-size: 8px !important; text-align: center;border-width: 2px 0 2px 2px;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">@day.BreakTimeString</td>
-                                                <td style="font-size: 8px !important; text-align: center; border-width: 2px 0 2px 2px; border-color: #DDDCDC; border-style: solid;vertical-align: center;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                                    @if (day.IsSliced)
-                                                    {
-                                                        <svg width="12" height="12" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" style="display: block; margin: auto;">
-                                                            <circle stroke-width="2" cx="12" cy="12" r="9" stroke="#222222" />
-                                                            <path stroke-width="2" d="M8 12L11 15L16 9" stroke="#222222" stroke-linecap="round" />
-                                                        </svg>
-                                                    }
-                                                    else
-                                                    {
-                                                        <span>-</span>
-                                                    }
-                                                </td>
-                                                <td style="font-size: 8px;text-align: center;border-width: 2px 0 2px 0;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact;border-radius: 5px 0 0 5px;">@day.TotalWorkingHours</td>
-                                            </tr>
-                                        }
-                                    </tbody>
-                                </table>
-                            </div>
-
-                            <div style="grid-column: span 2 / span 2;padding: 0;">
-                                <div style="background-color: #FFFFFF !important; border: 1px solid #CCCCCC;border-radius: 7px; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <table style="width: 100%;">
-                                        <tbody>
-
-                                            <tr style="font-size: 12px; border-collapse: separate; -webkit-print-color-adjust: exact; print-color-adjust: exact;">
-                                                <td style="font-size: 8px; padding: 5px 3px;border-width: 0 0 0 1px;border-color: #D9D9D9;border-style: solid; border-radius: 0 6px 6px 0; -webkit-print-color-adjust: exact;print-color-adjust: exact; text-align: center;width: 25%;background: #FFFFFF;">موظفی @Model.Month @Model.Year : @Model.TotalMandatoryTimeStr</td>
-                                                <td style="font-size: 8px; padding: 5px 3px;border-width: 0 0 0 1px;border-color: #D9D9D9;border-style: solid; border-radius: 0 0px 0px 0; -webkit-print-color-adjust: exact;print-color-adjust: exact; text-align: center;width: 25%;background: #FFFFFF;">ساعات حضور : @Model.TotalPresentTimeStr</td>
-                                                <td style="font-size: 8px; padding: 5px 3px;border-width: 0 0 0 1px;border-color: #D9D9D9;border-style: solid; border-radius: 0 0px 0px 0; -webkit-print-color-adjust: exact;print-color-adjust: exact; text-align: center;width: 25%;background: #FFFFFF;">ساعات استراحت : @Model.TotalBreakTimeStr</td>
-                                                <td style="font-size: 8px; padding: 5px 3px;border-width: 0 0 0 0px;border-color: #D9D9D9;border-style: solid; border-radius: 6px 0 0 6px; -webkit-print-color-adjust: exact;print-color-adjust: exact; text-align: center;width: 25%;background: #FFFFFF;">ساعات کارکرد : @Model.TotalWorkingTimeStr</td>
-                                            </tr>
-
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="row" style="padding: 0 12px;">
-                        <table style="width: 100%;margin: 12px 0 0 0;">
-                            <tbody>
-
-                                <tr>
-                                    <td style="width: 60%;">
-                                        @{
-                                            if (Model.IsLeft)
-                                            {
-                                                <span style="float: right; margin-right: 15px; font-size: 11.2px;height: 36px;">
-                                                    <span>طبق تصفیه حساب نهایی تنظیمی فوق، آخرین روز اشتغال بکار اینجانب</span><span>&nbsp;</span>
-                                                    <span>@Model.LastDayOfWork</span><span>&nbsp;</span>
-                                                    <span>بوده و قطع همکاری با کارفرما و کارگاه از تاریخ</span><span>&nbsp;</span>
-                                                    <span>@Model.LeftWorkDate</span><span>&nbsp;</span>
-                                                    <span>می باشد</span>
-                                                </span>
-                                            }
-                                        }
-                                    </td>
-                                    <td style="width: 40%;">
-                                        <div style="display: flex;   justify-content: end;" class="signSection">
-                                            <div style="margin-left: 15px; position: relative; width: 80px; border: 1px solid #000; height: 78px; border-radius: 10px;">
-                                                <span style="border-collapse: separate;background-color: #FFFFFF !important;-webkit-print-color-adjust: exact;print-color-adjust: exact;font-size: 12px;margin: -10px 8px 0 0;display: table-caption;padding: 0 4px;white-space: nowrap;">اثر انگشت</span>
-                                            </div>
-                                            <div style="position: relative; width: 160px; border: 1px solid #000; height: 78px; border-radius: 10px;">
-                                                <span style="border-collapse: separate;background-color: #FFFFFF !important;-webkit-print-color-adjust: exact;print-color-adjust: exact;font-size: 12px;margin: -10px 54px 0 0;display: table-caption;padding: 0 4px;">امضاء</span>
-                                            </div>
-                                        </div>
-                                    </td>
-                                </tr>
-
-                            </tbody>
-                        </table>
-                    </div>
-
-
-					@* <div class="row">
-                        <fieldset style="border-radius: 10px 10px 10px 10px; margin: 0px 10px;">
-	                        <div class="row" style="padding: 10px 0 0px 0;">
-		                        @{
-			                        if (Model.IsLeft)
-			                        {
-				                        <span style="float: right; margin-right: 15px; font-size: 11.2px;height: 36px;">
-					                        <span>طبق تصفیه حساب نهایی تنظیمی فوق، آخرین روز اشتغال بکار اینجانب</span><span>&nbsp;</span>
-					                        <span>@Model.LastDayOfWork</span><span>&nbsp;</span>
-					                        <span>بوده و قطع همکاری با کارفرما و کارگاه از تاریخ</span><span>&nbsp;</span>
-					                        <span>@Model.LeftWorkDate</span><span>&nbsp;</span>
-					                        <span>می باشد</span>
-				                        </span>
-			                        }
-		                        }
-
-	                        </div> *@
-
-                            @* <div class="row" style="padding: 0px 14px; font-size: 14px;">
-                                <div class="row"> *@
-                                    @*<div class="col-xs-3"><span>اینجانب <span>&nbsp;</span> <span>&nbsp;</span><span>&nbsp;</span><span style="font-weight: bold">@Model.EmployeeFullName</span> </span></div>
-                                    <div class="col-xs-3"><span> نام پدر: <span>&nbsp;</span><span>&nbsp;</span> <span>&nbsp;</span><span style="font-weight: bold">@Model.FathersName</span></span></div>
-                                    <div class="col-xs-3"><span>به کد ملی:<span>&nbsp;</span><span>&nbsp;</span><span style="font-weight: bold">@Model.NationalCode</span> </span></div>
-                                    <div class="col-xs-3" style="direction: ltr"> متولد: <span>&nbsp;</span><span>&nbsp;</span><span>&nbsp;</span><span>&nbsp;</span><span style="font-weight: bold">@Model.DateOfBirth</span></div>*@
-                                @* </div>
-                                <div class="row">
-                                    <div class="col-xs-12" style="font-size: 14px; text-align: justify"> *@
-                                        @*<span> پـرسنل شـرکت<span>&nbsp;</span><span>&nbsp;</span><span style="font-weight: bold">@Model.WorkshopName</span> </span>
-                                        <span>&nbsp;</span>
-                                        <span>به کارفرمایی  <span>&nbsp;</span> آقای/خانم/شرکت</span> <span>&nbsp;</span><span>&nbsp;</span>
-                                        @{
-                                        foreach (var item in @Model.EmployerList)
-                                        {
-                                        <span style="font-weight: bold">@item.EmployerFullName </span> <span>،</span>
-                                        }
-                                        }
-                                        <span>&nbsp;</span><span>&nbsp;</span>
-                                        <span>مبلغ ............. ریال را بصورت نقدی از کارفرما دریافت نمودم. </span>*@
-
-
-
-                                   @*  </div>
-
-                                </div>
-
-                                <div class="row">
-
-                                    <div classs="col-xs-12">
-                                        <div style="float: left;display: flex;position: absolute;left: 26px;bottom: 12px;">
-                                            <div style="margin-left: 15px; position: relative; width: 80px; border: 1px solid #000; height: 98px; border-radius: 10px;">
-                                                <span style="position: absolute; top: -9px; right: 50%; transform: translate(50%, 0px); border-collapse: separate;background-color: #FFFFFF !important;-webkit-print-color-adjust: exact;print-color-adjust: exact; font-size: 12px;width: 55px;">اثر انگشت</span>
-                                            </div>
-                                            <div style="margin-left: 15px; position: relative; width: 160px; border: 1px solid #000; height: 98px; border-radius: 10px;">
-                                                <span style="position: absolute; top: -9px; right: 50%; transform: translate(50%, 0px); border-collapse: separate;background-color: #FFFFFF !important;-webkit-print-color-adjust: exact;print-color-adjust: exact; font-size: 12px;">امضاء</span>
-                                            </div>
-                                        </div>
-                                    </div>
-
-                                </div>
-
-                            </div>
-                        </fieldset>
-                    </div> *@
-
-                </fieldset>
-            </div>
-
-</div>
-</div>
-</div>
-
-
-
-<input type="hidden" asp-for="Id" value="@Model.Id" />
-
-<input type="hidden" id="shiftWorkval" name="shiftWorkval" value="@Model.CreateWorkingHoursTemp.ShiftWork">
-
-

ServiceHost/Areas/Admin/Pages/Company/FilePage/CreateFile.cshtml

@@ -297,22 +297,7 @@
 
 
 <script>
-	$(document).ready(function () {
-		$('#workshops').on('submit', function (e) {
-			var $submitBtn = $(this).find('button[type="submit"]');
 
-			if ($submitBtn.prop('disabled')) {
-				e.preventDefault();
-				return;
-			}
-
-			$submitBtn.prop('disabled', true);
-
-			setTimeout(function () {
-				$submitBtn.prop('disabled', false);
-			}, 3000);
-		});
-	});
 	$(".select2-tag").select2({
 		language: "fa",
 		dir: "rtl"

ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Index.cshtml

@@ -156,7 +156,7 @@
 
 					<div class="">
 						<select class="form-control" asp-for="searchModel.Year">
-							<option value="0">سال</option>
+							<option value="0" disabled="disabled">سال</option>
 							@foreach (string year in @Model.YearlyList)
 							{
 								if (Model.CurrentYear_ == year)
@@ -173,7 +173,7 @@
 
 					<div class="">
 						<select class="form-control form-select" asp-for="searchModel.Month">
-							<option value="0">ماه</option>
+							<option value="0" disabled="disabled">ماه</option>
 							<option value="01">فروردین</option>
 							<option value="02">اردیبهشت</option>
 							<option value="03">خرداد</option>
@@ -224,17 +224,17 @@
 						</select>
 					</div>
 
-@* 					<div class="tw-col-span-2">
+					<div class="tw-col-span-2">
 						<input class="form-control form-control-custom" asp-for="searchModel.Branch" placeholder="شعبه تامین اجتماعی" style="width: 100%">
-					</div> *@
+					</div>
 
-@* 					<div class="">
+					<div class="">
 						<div class="belowRow tw-mt-0">
 							<select class="form-control form-control-custom" style="width: 100%" asp-for="searchModel.City">
 								<option value="0" selected>شهرستان</option>
 							</select>
 						</div>
-					</div> *@
+					</div>
 
 					<div class="">
 						<div class="belowRow tw-mt-0">
@@ -247,7 +247,7 @@
 					</div>
 
 					<div class="tw-col-span-2 tw-flex tw-items-center tw-gap-4">
-						<button class="btn-search-click tw-flex tw-w-[50%] tw-items-center tw-justify-center tw-gap-2 tw-rounded-[5px] tw-bg-[#84CC16] tw-p-[4px] tw-text-white tw-transition tw-ease-in-out hover:tw-bg-[#7DC215]" id="searchBtn" type="submit">
+						<button class="btn-search-click tw-flex tw-w-[50%] tw-items-center tw-justify-center tw-gap-2 tw-rounded-[5px] tw-bg-[#84CC16] tw-p-[4px] tw-text-white" id="searchBtn" type="submit">
 							<span>جستجو</span>
 							<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none">
 								<circle cx="11" cy="11" r="6" stroke="white" stroke-width="2"/>
@@ -274,7 +274,7 @@
 					<div class="tw-mb-2 tw-mb-4 tw-flex tw-items-center tw-justify-between tw-gap-2">
 						<div class="tw-w-full">
 							<select class="form-control" asp-for="searchModel.Year">
-								<option value="0">سال</option>
+								<option value="0" disabled="disabled">سال</option>
 								@foreach (var year in Model.YearlyList)
 								{
 									<option value=@year>@year</option>
@@ -283,7 +283,7 @@
 						</div>
 						<div class="tw-w-full">
 							<select class="form-control" asp-for="searchModel.Month">
-								<option value="0">ماه</option>
+								<option value="0" disabled="disabled">ماه</option>
 								<option value="01">فروردین</option>
 								<option value="02">اردیبهشت</option>
 								<option value="03">خرداد</option>
@@ -320,19 +320,19 @@
 	<div class="mb-2 tw-flex tw-flex-col">
 		<div class="custom-scrollbar-x tw-w-full tw-overflow-x-auto">
 			<div class="tab-bar tw-flex tw-w-max tw-gap-3 tw-whitespace-nowrap">
-				<button permission="80217" data-permission="80217" type="button" class="tab-bar__tab u-tactile tab-bar__tab--active js-document-click" value="0">
+				<button type="button" class="tab-bar__tab u-tactile tab-bar__tab--active js-document-click" value="0">
 					<span class="tab-bar__tab-label"> انجام نشده</span>
 					<span class="tab-bar__tab-badge" id="notStarted"></span>
 				</button>
-				<button permission="80218" data-permission="80218" type="button" class="tab-bar__tab u-tactile js-document-click" value="1">
+				<button type="button" class="tab-bar__tab u-tactile js-document-click" value="1">
 					<span class="tab-bar__tab-label">در حال انجام امور</span>
 					<span class="tab-bar__tab-badge" id="inProgress"></span>
 				</button>
-				<button permission="80219" data-permission="80219" type="button" class="tab-bar__tab u-tactile js-document-click" value="2">
+				<button type="button" class="tab-bar__tab u-tactile js-document-click" value="2">
 					<span class="tab-bar__tab-label">آماده ارسال لیست</span>
 					<span class="tab-bar__tab-badge" id="readyToSendList"></span>
 				</button>
-				<button permission="80220" data-permission="80220" type="button" class="tab-bar__tab u-tactile js-document-click" value="3">
+				<button type="button" class="tab-bar__tab u-tactile js-document-click" value="3">
 					<span class="tab-bar__tab-label">انجام بیمه</span>
 					<span class="tab-bar__tab-badge" id="done"></span>
 				</button>
@@ -399,7 +399,6 @@
 
 				<div class="tw-flex tw-h-[35px] tw-items-center tw-justify-center tw-text-[16px]">
 				</div>
-
 				<div>
 				</div>
 			</div>
@@ -479,19 +478,19 @@
 				</div>
 			</div>
 
-@* 			<div class="tw-col-span-2 md:tw-col-span-2">
+			<div class="tw-col-span-2 md:tw-col-span-2">
 				<div class="form-group">
 					<input class="form-control form-control-custom" asp-for="searchModel.Branch" placeholder="شعبه تامین اجتماعی" style="width: 100%">
 				</div>
-			</div> *@
+			</div>
 
-@* 			<div class="tw-col-span-2 md:tw-col-span-2">
+			<div class="tw-col-span-2 md:tw-col-span-2">
 				<div class="form-group">
 					<select class="form-control form-control-custom" style="width: 100%" asp-for="searchModel.City">
 						<option value="0" selected>شهرستان</option>
 					</select>
 				</div>
-			</div> *@
+			</div>
 
 			<div class="tw-col-span-2 md:tw-col-span-2">
 				<div class="form-group">
@@ -556,14 +555,9 @@
 		var hasPermission_80214 = @(permissionList.Contains(80214) ? "true" : "false");
 		var hasPermission_80215 = @(permissionList.Contains(80215) ? "true" : "false");
 		var hasPermission_80216 = @(permissionList.Contains(80216) ? "true" : "false");
+		//new Permission
+		var hasPermission_80217 = true;
 
-
-	    var permissions = {
-		    80217: @permissionList.Contains(80217).ToString().ToLower(),
-		    80218: @permissionList.Contains(80218).ToString().ToLower(),
-		    80219: @permissionList.Contains(80219).ToString().ToLower(),
-		    80220: @permissionList.Contains(80220).ToString().ToLower()
-	    };
     </script>
     <script src="~/assetsadmin/page/insurancelist/js/index.js?ver=@adminVersion"></script>
 }

ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Index.cshtml.cs

@@ -178,7 +178,7 @@ public class IndexModel : PageModel
 		double included = 0; //مشمول
 		double sumOfWorkingDays = 0;
 		double benefitsIncludedNonContinuous = 0; //مزایای ماهانه غیر مشمول
-		double sumOfSalaries = 0;
+        double sumOfSalaries = 0;
 		double sumOfDailyWage = 0;
 		double insuredShare = 0;
 		double employerShare = 0; //سهم بیمه کارفرما
@@ -192,12 +192,12 @@ public class IndexModel : PageModel
 		double countWithoutLeft = 0;
 		double sumOfBaseYears = 0;
 		double sumOfMarriedAllowance = 0;
-		double sumOfDailyWagePlusBaseYear = 0;
+        double sumOfDailyWagePlusBaseYear = 0;
+       
+        double sumOfBenefitIncludedAndNotIncluded = 0; //مشمول و غیر مشمول
 
-		double sumOfBenefitIncludedAndNotIncluded = 0; //مشمول و غیر مشمول
-		double sumOfMonthlySalaryWithoutBaseYears = 0; //جمع حقوق ماهیانه بدون پایه سنوات
 
-		for (var i = 0; i < employeeDetailsForInsuranceList.Count; i++)
+        for (var i = 0; i < employeeDetailsForInsuranceList.Count; i++)
 		{
 			var leftWorkDay = "";
 			if (!string.IsNullOrWhiteSpace(employeeDetailsForInsuranceList[i].LeftWorkDate))
@@ -214,16 +214,16 @@ public class IndexModel : PageModel
 			}
 
 			//بدست آوردن جمع پایه سنواتی
-			var baseYear = employeeDetailsForInsuranceList[i].BaseYears *
-						   employeeDetailsForInsuranceList[i].WorkingDays;
-			sumOfBaseYears += baseYear;
+            var baseYear = employeeDetailsForInsuranceList[i].BaseYears *
+                           employeeDetailsForInsuranceList[i].WorkingDays;
+            sumOfBaseYears += baseYear;
 
-			//بدست آوردن جمع حق تاهل
-			sumOfMarriedAllowance += employeeDetailsForInsuranceList[i].MarriedAllowance;
+            //بدست آوردن جمع حق تاهل
+            sumOfMarriedAllowance += employeeDetailsForInsuranceList[i].MarriedAllowance;
 
 
-			// if (employeeDetailsForInsuranceList[i].IncludeStatus && (employeeDetailsForInsuranceList[i].JobId == 10 || employeeDetailsForInsuranceList[i].JobId == 17 || employeeDetailsForInsuranceList[i].JobId == 18 || employeeDetailsForInsuranceList[i].JobId == 16))// 10 --> karfarma
-			if (!employeeDetailsForInsuranceList[i].IncludeStatus &&
+            // if (employeeDetailsForInsuranceList[i].IncludeStatus && (employeeDetailsForInsuranceList[i].JobId == 10 || employeeDetailsForInsuranceList[i].JobId == 17 || employeeDetailsForInsuranceList[i].JobId == 18 || employeeDetailsForInsuranceList[i].JobId == 16))// 10 --> karfarma
+            if (!employeeDetailsForInsuranceList[i].IncludeStatus &&
 				(employeeDetailsForInsuranceList[i].JobCode == "027079" ||
 				 employeeDetailsForInsuranceList[i].JobCode == "024398" ||
 				 employeeDetailsForInsuranceList[i].JobCode == "011015" ||
@@ -251,18 +251,14 @@ public class IndexModel : PageModel
 			monthlyBenefits = monthlyBenefits + +employeeDetailsForInsuranceList[i].MonthlyBenefits;
 			sumOfIncluded = sumOfIncluded + employeeDetailsForInsuranceList[i].BenefitsIncludedContinuous;
 
-			sumOfDailyWagePlusBaseYear += employeeDetailsForInsuranceList[i].DailyWagePlusBaseYears;
+            sumOfDailyWagePlusBaseYear += employeeDetailsForInsuranceList[i].DailyWagePlusBaseYears;
 
-			//Mahan Changes
-			//مجموع حقوق ماهیانه خالص
-			sumOfMonthlySalaryWithoutBaseYears += 
-				GetRoundValueWhitGovermentlist(employeeDetailsForInsuranceList[i].DailyWage * employeeDetailsForInsuranceList[i].WorkingDays, typeOfInsuranceSendWorkshop);
 
-			if (leftWorkDay != "01") //اگر ترک کار آن یکم ماه نبود
+            if (leftWorkDay != "01") //اگر ترک کار آن یکم ماه نبود
 				sumOfBenefitIncludedAndNotIncluded += employeeDetailsForInsuranceList[i].IncludedAndNotIncluded;
 
-			benefitsIncludedNonContinuous += employeeDetailsForInsuranceList[i].BenefitsIncludedNonContinuous;
-			insuredShare = insuredShare + employeeDetailsForInsuranceList[i].InsuranceShare;
+            benefitsIncludedNonContinuous += employeeDetailsForInsuranceList[i].BenefitsIncludedNonContinuous;
+            insuredShare = insuredShare + employeeDetailsForInsuranceList[i].InsuranceShare;
 		}
 
 		employerShare = GetRoundValueWhitGovermentlist(sumOfIncluded * 20 / 100, typeOfInsuranceSendWorkshop);
@@ -305,13 +301,6 @@ public class IndexModel : PageModel
 			employerShare = GetRoundValueWhitGovermentlist(result, typeOfInsuranceSendWorkshop);
 		}
 
-		//اگر گارگاه کمک دولت بود بعد از اجرای فرمول ها 
-		//بیست درصد از اختلاف ( مجموع حقوق خالص با مجموع مزایای مشمول ) به سهم کارفرما اضافه میشود
-		if (typeOfInsuranceSendWorkshop == "Govermentlist")
-		{
-			var result = ((sumOfIncluded - sumOfMonthlySalaryWithoutBaseYears) * 20 / 100);
-			employerShare += GetRoundValueWhitGovermentlist(result, typeOfInsuranceSendWorkshop);
-		}
 		#endregion
 
 		//sumOfIncluded  مجموع حقوق و مزایای ماهیانه مشمول 
@@ -410,18 +399,18 @@ public class IndexModel : PageModel
 			//جمع پایه سنواتی
 			SumOfBaseYears = sumOfBaseYears.ToMoney(),
 			//جمع حق تاهل
-			SumOfMarriedAllowance = sumOfMarriedAllowance.ToMoney(),
+            SumOfMarriedAllowance = sumOfMarriedAllowance.ToMoney(),
 
-			//جمع دستمزد روزانه + پایه سنوات روزانه
-			SumOfDailyWagePlusBaseYears = sumOfDailyWagePlusBaseYear.ToMoney(),
+            //جمع دستمزد روزانه + پایه سنوات روزانه
+            SumOfDailyWagePlusBaseYears = sumOfDailyWagePlusBaseYear.ToMoney(),
 
 			//جمع مزایای غیر مشمول
-			SumOfBenefitsIncludedNonContinuous = benefitsIncludedNonContinuous.ToMoney(),
+            SumOfBenefitsIncludedNonContinuous = benefitsIncludedNonContinuous.ToMoney(),
 
-		});
+        });
 	}
-
-
+	
+	
 	public IActionResult OnPostCreate(CreateInsuranceList command)
 	{
 		//var result =new OperationResult();
@@ -573,14 +562,14 @@ public class IndexModel : PageModel
 				odbf.Header.AddColumn(new DbfColumn("DSK_DISC", DbfColumn.DbfColumnType.Character, 100, 0));
 				//تعداد کارکنان
 				odbf.Header.AddColumn(new DbfColumn("DSK_NUM", DbfColumn.DbfColumnType.Number, 5, 0));
-				//مجموع روزهای کارکرد کارکنان
-				odbf.Header.AddColumn(new DbfColumn("DSK_TDD", DbfColumn.DbfColumnType.Number, 6, 0));
+                //مجموع روزهای کارکرد کارکنان
+                odbf.Header.AddColumn(new DbfColumn("DSK_TDD", DbfColumn.DbfColumnType.Number, 6, 0));
 				//مجموع دستمزد روزانه کارکنان
 				odbf.Header.AddColumn(new DbfColumn("DSK_TROOZ", DbfColumn.DbfColumnType.Number, 12, 0));
 				//مجموع دستمزد ماهانه کارکنان
 				odbf.Header.AddColumn(new DbfColumn("DSK_TMAH", DbfColumn.DbfColumnType.Number, 12, 0));
-				//مجموع مزایای ماهانه مشمول
-				odbf.Header.AddColumn(new DbfColumn("DSK_TMAZ", DbfColumn.DbfColumnType.Number, 12, 0));
+                //مجموع مزایای ماهانه مشمول
+                odbf.Header.AddColumn(new DbfColumn("DSK_TMAZ", DbfColumn.DbfColumnType.Number, 12, 0));
 				//مجموع دستمزد و مزایای ماهانه مشمول
 				odbf.Header.AddColumn(new DbfColumn("DSK_TMASH", DbfColumn.DbfColumnType.Number, 12, 0));
 				// مجموع کل دستمزد و مزایای ماهانه مشمول و غیر مشمول
@@ -600,11 +589,11 @@ public class IndexModel : PageModel
 				//ردیف پیمان 
 				odbf.Header.AddColumn(new DbfColumn("MON_PYM", DbfColumn.DbfColumnType.Character, 3, 0));
 
-				//مجموع پایه سنواتی ها
-				odbf.Header.AddColumn(new DbfColumn("DSK_INC", DbfColumn.DbfColumnType.Character, 12, 0));
-				//مجموع حق تاهل ها
-				odbf.Header.AddColumn(new DbfColumn("DSK_SPOUSE", DbfColumn.DbfColumnType.Character, 12, 0));
-				var orec = new DbfRecord(odbf.Header);
+                //مجموع پایه سنواتی ها
+                odbf.Header.AddColumn(new DbfColumn("DSK_INC", DbfColumn.DbfColumnType.Character, 12, 0));
+                //مجموع حق تاهل ها
+                odbf.Header.AddColumn(new DbfColumn("DSK_SPOUSE", DbfColumn.DbfColumnType.Character, 12, 0));
+                var orec = new DbfRecord(odbf.Header);
 
 				//کد کارگاه
 				orec[0] = GetSpecifiedCharactes(createInsuranceList.InsuranceWorkshopInfo.InsuranceCode, 10);
@@ -626,12 +615,12 @@ public class IndexModel : PageModel
 				orec[8] = GetSpecifiedCharactes("", 100).ToIranSystem();
 				//تعداد کرکنان
 				orec[9] = createInsuranceList.SumOfEmployees.ToString();
-				//مجموع روزهای کارکرد کارکنان
-				orec[10] = createInsuranceList.SumOfWorkingDays.ToString();
+                //مجموع روزهای کارکرد کارکنان
+                orec[10] = createInsuranceList.SumOfWorkingDays.ToString();
 				//مجموع دستمزد روزانه کارکنان
 				orec[11] = createInsuranceList.SumOfDailyWage.ToString();
-				//مجموع دستمزد ماهانه کارکنان
-				orec[12] = createInsuranceList.SumOfSalaries.ToString();
+                //مجموع دستمزد ماهانه کارکنان
+                orec[12] = createInsuranceList.SumOfSalaries.ToString();
 				//مجموع مزایای ماهانه مشمول
 				orec[13] = createInsuranceList.SumOfBenefitsIncluded.ToString();
 				//مجموع دستمزد و مزایای ماهانه مشمول
@@ -642,7 +631,7 @@ public class IndexModel : PageModel
 				orec[16] = createInsuranceList.InsuredShare.ToString();
 				//مجموع حق بیمه سهم کارفرما
 				orec[17] = createInsuranceList.EmployerShare.ToString(); //"44911361";
-																		 //مجموع حق بیمه بیکاری
+				//مجموع حق بیمه بیکاری
 				orec[18] = createInsuranceList.UnEmploymentInsurance.ToString();
 				//نرخ حق بیمه 
 				orec[19] = "23";
@@ -653,18 +642,18 @@ public class IndexModel : PageModel
 				//ردیف پیمان
 				orec[22] = GetSpecifiedCharactes(createInsuranceList.InsuranceWorkshopInfo.AgreementNumber, 12);
 
-				//مجموع پایه سنواتی ها
-				orec[23] = createInsuranceList.SumOfBaseYears.ToString();
+                //مجموع پایه سنواتی ها
+                orec[23] = createInsuranceList.SumOfBaseYears.ToString();
 
-				//مجموع حق تاهل ها
-				orec[24] = createInsuranceList.SumOfMarriedAllowance.ToString();
+                //مجموع حق تاهل ها
+                orec[24] = createInsuranceList.SumOfMarriedAllowance.ToString();
 
-				odbf.Write(orec);
+                odbf.Write(orec);
 				//odbf.Header.RecordCount = 50;
 				odbf.WriteHeader();
 				odbf.Close();
 			}
-
+			
 			//ایجاد فایل پرسنل - DSW
 			if (createInsuranceList.EmployeeInsurancListDataList != null)
 			{
@@ -726,12 +715,12 @@ public class IndexModel : PageModel
 				// کد ملی
 				dsw.Header.AddColumn(new DbfColumn("PER_NATCOD", DbfColumn.DbfColumnType.Character, 10, 0));
 
-				// پایه سنوات
-				dsw.Header.AddColumn(new DbfColumn("DSW_INC", DbfColumn.DbfColumnType.Number, 12, 0));
-				// حق تاهل
-				dsw.Header.AddColumn(new DbfColumn("DSW_SPOUSE", DbfColumn.DbfColumnType.Number, 12, 0));
+                // پایه سنوات
+                dsw.Header.AddColumn(new DbfColumn("DSW_INC", DbfColumn.DbfColumnType.Number, 12, 0));
+                // حق تاهل
+                dsw.Header.AddColumn(new DbfColumn("DSW_SPOUSE", DbfColumn.DbfColumnType.Number, 12, 0));
 
-				foreach (var item in createInsuranceList.EmployeeInsurancListDataList)
+                foreach (var item in createInsuranceList.EmployeeInsurancListDataList)
 				{
 					var employee = createInsuranceList.EmployeeDetailsForInsuranceList.FirstOrDefault(p => p.EmployeeId == item.EmployeeId);
 
@@ -809,12 +798,12 @@ public class IndexModel : PageModel
 					//کد ملی
 					dswrec[26] = employee.NationalCode;
 
-					//پایه سنوات
-					dswrec[27] = item.BaseYears.ToString();
-					//حق تاهل
-					dswrec[28] = item.MarriedAllowance.ToString();
+                    //پایه سنوات
+                    dswrec[27] = item.BaseYears.ToString();
+                    //حق تاهل
+                    dswrec[28] = item.MarriedAllowance.ToString();
 
-					dsw.Write(dswrec);
+                    dsw.Write(dswrec);
 				}
 
 
@@ -856,18 +845,18 @@ public class IndexModel : PageModel
 		return Partial("Edit", insurance);
 	}
 
-	//-2
-	/// <summary>
-	/// لود اطلاعات پرسنل در مودال ویرایش بیمه -- DSKWOR
-	/// محاسبه تب پرسنل
-	/// </summary>
-	/// <param name="searchModel"></param>
-	/// <returns></returns>
-	public IActionResult OnGetEmployeeListForEdit(EmployeeForEditInsuranceListSearchModel searchModel)
+    //-2
+    /// <summary>
+    /// لود اطلاعات پرسنل در مودال ویرایش بیمه -- DSKWOR
+    /// محاسبه تب پرسنل
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <returns></returns>
+    public IActionResult OnGetEmployeeListForEdit(EmployeeForEditInsuranceListSearchModel searchModel)
 	{
-		// var result = _insuranceListApplication.SearchEmployeeListForEditByInsuranceListId(searchModel);
-		var result = _insuranceListApplication.GetEmployeeListForEditByInsuranceListId(searchModel);
-		return Partial("./EmployeeListForEdit", result);
+       // var result = _insuranceListApplication.SearchEmployeeListForEditByInsuranceListId(searchModel);
+        var result = _insuranceListApplication.GetEmployeeListForEditByInsuranceListId(searchModel);
+        return Partial("./EmployeeListForEdit", result);
 	}
 
 	//-3
@@ -910,7 +899,7 @@ public class IndexModel : PageModel
 		}
 
 		return new JsonResult(result);
-	}
+	} 
 	#endregion
 
 	public IActionResult OnGetInsuranceSummary(long id)
@@ -936,7 +925,7 @@ public class IndexModel : PageModel
 		string benefitsIncludedContinuous, string jobId, string housingAllowance, string includeStatus,
 		string consumableItems, string endMonthCurrentDay, long employeeId, double maritalStatus, double baseYear)
 	{
-		if (workingDays == "0")
+		if(workingDays == "0")
 			return new JsonResult(new
 			{
 				monthlySalaryPlusBaseYear = "0",
@@ -950,15 +939,15 @@ public class IndexModel : PageModel
 				baseYears = "0",
 			});
 
-
+		
 
 		var benefitsIncludedContinuousL = benefitsIncludedContinuous.MoneyToDouble();
-		bool isManager = jobId is "10" or "16" or "17" or "18" or "3498";
+        bool isManager = jobId is "10" or "16" or "17" or "18" or "3498";
 		//if (isManager && includeStatus !="1") شنبه
 		if (isManager)
 			maritalStatus = 0;
 
-		double sum = 0;
+        double sum = 0;
 		var employeeMaritalStatus = _employeeApplication.GetDetails(employeeId);
 		if (employeeMaritalStatus.MaritalStatus == "متاهل")
 			sum = consumableItems.MoneyToDouble() + housingAllowance.MoneyToDouble() + maritalStatus;
@@ -971,10 +960,10 @@ public class IndexModel : PageModel
 		var jobIdL = Convert.ToInt64(jobId);
 		var includeStatusL = Convert.ToInt64(includeStatus);
 		var dailyWageL = (dailyWage.MoneyToDouble()) + baseYear;
-		var dailyWageWithOutBaseYear = dailyWage.MoneyToDouble();
+        var dailyWageWithOutBaseYear = dailyWage.MoneyToDouble();
 
 
-		if (workingDaysL == endMonthCurrentDayL) benefitsIncludedContinuousL = sum;
+        if (workingDaysL == endMonthCurrentDayL) benefitsIncludedContinuousL = sum;
 		//farokhiChanges
 		if (employeeId == 42783)
 			benefitsIncludedContinuousL = 53082855;
@@ -997,24 +986,24 @@ public class IndexModel : PageModel
 		//    benefitsIncludedContinuousL = 0;
 		//}
 		if (isManager && includeStatus != "1")
-			benefitsIncludedContinuousL = 0;
+		    benefitsIncludedContinuousL = 0;
 		var monthlySalaryL = workingDaysL * dailyWageL;
 		var insuranceShareL = (benefitsIncludedContinuousL + monthlySalaryL) * 7 / 100;
 		insuranceShareL = _insuranceListApplication.GetRoundValue(insuranceShareL);
 
-		var monthlySalaryWithOutBaseYear = workingDaysL * dailyWageWithOutBaseYear;
-		//var persianBefore = "";
-		//var year = Convert.ToInt32(date.Substring(0, 4));
-		//var month = Convert.ToInt32(date.Substring(5, 2));
-		//var day = Convert.ToInt32(date.Substring(8, 2));
-		//var persianDate = new PersianDateTime(year, month, day);
-		//var persianBeforeDate = persianDate.AddDays(-1);
-		//persianBefore = persianBeforeDate.ToString("yyyy/MM/dd");
+        var monthlySalaryWithOutBaseYear = workingDaysL * dailyWageWithOutBaseYear;
+        //var persianBefore = "";
+        //var year = Convert.ToInt32(date.Substring(0, 4));
+        //var month = Convert.ToInt32(date.Substring(5, 2));
+        //var day = Convert.ToInt32(date.Substring(8, 2));
+        //var persianDate = new PersianDateTime(year, month, day);
+        //var persianBeforeDate = persianDate.AddDays(-1);
+        //persianBefore = persianBeforeDate.ToString("yyyy/MM/dd");
 
-		if (benefitsIncludedContinuousL == 0 && monthlySalaryL == 0 && insuranceShareL == 0 && dailyWageL == 0)
+        if (benefitsIncludedContinuousL == 0 && monthlySalaryL == 0 && insuranceShareL == 0 && dailyWageL == 0)
 			workingDaysL = 0;
 		if (benefitsIncludedContinuousL == 0 && monthlySalaryL == 0 && insuranceShareL == 0 &&
-			workingDaysL == 0) dailyWageL = 0;
+		    workingDaysL == 0) dailyWageL = 0;
 
 		var includeStatusBool = includeStatus == "1";
 		double marridAllowance = 0;
@@ -1024,23 +1013,23 @@ public class IndexModel : PageModel
 				includeStatusBool, Convert.ToInt32(workingDays), maritalStatus, Convert.ToInt32(endMonthCurrentDay));
 		}
 
-		var baseYears = baseYear;
+        var baseYears = baseYear;
 		Console.WriteLine(baseYears);
 		return new JsonResult(new
 		{
-			monthlySalaryPlusBaseYear = monthlySalaryL.ToMoney(),
-			monthlySalary = monthlySalaryWithOutBaseYear.ToMoney(),
+            monthlySalaryPlusBaseYear = monthlySalaryL.ToMoney(),
+            monthlySalary = monthlySalaryWithOutBaseYear.ToMoney(),
 			benefitsIncludedContinuous = benefitsIncludedContinuousL.ToMoney(),
 			insuranceShare = insuranceShareL.ToMoney(),
 			workingDay = workingDaysL,
 			dailyWag = dailyWageWithOutBaseYear.ToMoney(),
-			dailyWagePlusBaseYear = dailyWageL,
+            dailyWagePlusBaseYear = dailyWageL,
 			marriedAllowance = marridAllowance.ToMoney(),
 			baseYears = baseYears.ToMoney(),
-		});
+        });
 	}
 
-
+	
 
 	public double GetRoundValueWhitGovermentlist(double value, string type)
 	{
@@ -1084,7 +1073,7 @@ public class IndexModel : PageModel
 	{
 		var result = _employerApplication.GetEmployerWithFNameOrLName(searchText);
 		result = result.OrderBy(x => x.LName.Length).ToList();
-		return new JsonResult(new
+		 return new JsonResult(new
 		{
 			IsSuccedded = true,
 			mylist = result
@@ -1109,12 +1098,8 @@ public class IndexModel : PageModel
 
 	public async Task<IActionResult> OnGetTabCounts(int month, int year)
 	{
-		var searchModel = new InsuranceListSearchModel()
-		{
-			Year = year.ToString("0000"),
-			Month = month.ToString("00")
-		};
-		var resultData = await _insuranceListApplication.GetTabCounts(searchModel);
+		var accountId = _authHelper.CurrentAccountId();
+		var resultData = await _insuranceListApplication.GetTabCounts(accountId, month, year);
 
 		return new JsonResult(new
 		{
@@ -1126,8 +1111,8 @@ public class IndexModel : PageModel
 	}
 
 	public async Task<IActionResult> OnGetOperationsModal(long id)
-	{
-		var command = await _insuranceListApplication.GetInsuranceOperationDetails(id);
+    {
+        var command = await _insuranceListApplication.GetInsuranceOperationDetails(id);
 		return Partial("_Partials/OperationsModal", command);
 	}
 

ServiceHost/Areas/Admin/Pages/Shared/_Menu.cshtml

@@ -96,7 +96,8 @@
                         </span>
                     </a>
                     <ul class="sdf1">
-                        <li permission="101"><a class="clik" asp-page="/Company/ContractingParties/Index">
+                        <li permission="101">
+                            <a class="clik" href="https://admin.dad-mehr.ir/">
 		                        <svg width="13" height="13" viewBox="0 0 13 13" fill="none" xmlns="http://www.w3.org/2000/svg" style="width: 7px;margin: 0 6px;">
 			                        <circle cx="6.5" cy="6.5" r="6.5" fill="white"/>
 		                        </svg>

ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml

@@ -5,13 +5,13 @@
 }
 
 <h1>Upload File</h1>
-<form asp-page-handler="Upload" id="1" method="post" enctype="multipart/form-data">
+@* <form asp-page-handler="Upload" id="1" method="post" enctype="multipart/form-data">
     <div>
         <label asp-for="File">Choose a file:</label>
         <input asp-for="File" type="file" required>
     </div>
     <button type="submit">Upload</button>
-</form>
+</form> *@
 
 <form asp-page-handler="ShiftDate" id="8" method="post">
 

ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml.cs

@@ -130,7 +130,8 @@ namespace ServiceHost.Areas.Client.Pages.Company.Checkouts
                 workingHours.WorkshopId = contract.WorkshopIds;
                 workingHours.EmployeeId = contract.EmployeeId;
 
-                result = MandatoryHours(workingHours, workshop.WorkshopHolidayWorking, 0);
+                //result = MandatoryHours(workingHours, workshop.WorkshopHolidayWorking, 0);
+                result = await _rollCallMandatoryApplication.RotatingShiftReport(checkout.WorkshopId, checkout.EmployeeId, checkout.ContractStartGr, checkout.ContractEndGr, workingHours.ShiftWork, false, workingHours, workshop.WorkshopHolidayWorking);
 
 
 
@@ -233,7 +234,7 @@ namespace ServiceHost.Areas.Client.Pages.Company.Checkouts
         public IActionResult OnGetPrintOne(long id)
         {
 
-            var res = _checkoutApplication.PrintAll([id]).FirstOrDefault();
+            var res = _checkoutApplication.PrintOne(id);
             if (res.HasRollCall)
                 return Partial("PrintOneRollCall", res);
 
@@ -246,7 +247,7 @@ namespace ServiceHost.Areas.Client.Pages.Company.Checkouts
         public IActionResult OnGetPrintOneMobile(long id)
         {
 
-            var res = _checkoutApplication.PrintAll([id]).FirstOrDefault();
+            var res = _checkoutApplication.PrintOne(id);
             if (res.HasRollCall)
                 return Partial("PrintOneRollCall", res);
 

ServiceHost/Areas/Client/Pages/Company/Employees/CreateEmployeeModal.cshtml

@@ -44,14 +44,20 @@
 				<div>
 					<button class="stepStatus @(Model.HasRollCallService ? "" : "disable")" id="step-3">گروه‌بندی حضور و غیاب</button>
 				</div>
+				@if (Model.HasCustomizeCheckoutService)
+				{
+					<div>
+						<button class="stepStatus" id="step-4">فیش حقوقی غیر رسمی</button>
+					</div>
+				}
 				<div>
-					<button class="stepStatus @(Model.HasRollCallService ? "" : "disable")" id="step-4">آپلود عکس حضور و غیاب</button>
+					<button class="stepStatus @(Model.HasRollCallService ? "" : "disable")" id="step-5">آپلود عکس حضور و غیاب</button>
 				</div>
 				<div class="employeePart">
-					<button class="stepStatus" id="step-5">حساب بانکی پرسنل</button>
+					<button class="stepStatus" id="step-6">حساب بانکی پرسنل</button>
 				</div>
 				<div class="employeePart">
-					<button class="stepStatus" id="step-6">آپلود مدارک</button>
+					<button class="stepStatus" id="step-7">آپلود مدارک</button>
 				</div>
 			</div>
 		</div>
@@ -146,20 +152,53 @@
 					</div>
 				</div>
 
-				<div id="step4" class="step m-auto">
-					<div class="container p-0 m-0 @(Model.HasRollCallService ? "" : "disable")" id="step-form4">
+
+				@if (Model.HasCustomizeCheckoutService)
+				{
+					<div id="step4" class="step w-100 overflow-y-auto">
+						<div class="container p-0 m-0" id="step-form4">
+							<div class="row">
+								<div class="col-12">
+									<div id="tempCheckoutEmployeeSetting">
+										<partial name="Company/Employees/_Partials/TempCheckout" model="@Model" />
+									</div>
+								</div>
+							</div>
+						</div>
+						<div class="stepBtnHolder2">
+							<div class="stepBtnFirst d-flex gap-2 justify-content-center">
+								<button type="button" class="stepBtn" id="prevStep4">مرحله قبل</button>
+								<button type="button" class="stepBtn" id="nextStep4">مرحله بعد</button>
+							</div>
+							<div class="w-100 d-flex gap-2 mt-2 justify-content-center">
+								<button type="button" class="stepBtn cancelButton">انصراف</button>
+								<button type="button" class="stepBtn saveData SaveFullData" id="saveFullData4">
+									<span>ذخیره</span>
+									<div class="spinner-loading loading" style="display: none;">
+										<span class="spinner-border spinner-border-sm loading text-white" role="status" aria-hidden="true"></span>
+									</div>
+								</button>
+							</div>
+						</div>
+					</div>
+				}
+				
+				
+
+				<div id="step5" class="step m-auto">
+					<div class="container p-0 m-0 @(Model.HasRollCallService ? "" : "disable")" id="step-form5">
 						<partial name="Company/Employees/_Partials/ModalUploadImagePersonnel" model="@Model"/>
 					</div>
 					<div class="stepBtnHolder3">
 						<div class="stepBtnFirst d-flex gap-2 justify-content-center">
-							<button type="button" class="stepBtn" id="prevStep4">مرحله قبل</button>
+							<button type="button" class="stepBtn" id="prevStep5">مرحله قبل</button>
 							@if (rollCallPath == "/Client/Company/RollCall/EmployeeUploadPicture")
 							{
 								<button type="button" class="stepBtn disable">مرحله بعد</button>
 							}
 							else
 							{
-								<button type="button" class="stepBtn" id="nextStep4">مرحله بعد</button>
+								<button type="button" class="stepBtn" id="nextStep5">مرحله بعد</button>
 							}
 						</div>
 						<div class="w-100 d-flex gap-2 mt-2 justify-content-center">
@@ -176,7 +215,7 @@
 
 				@if (rollCallPath != "/Client/Company/RollCall/EmployeeUploadPicture")
 				{
-						<div id="step5" class="step w-100 overflow-y-auto">
+					<div id="step6" class="step w-100 overflow-y-auto overflow-x-hidden">
 							<div class="container p-0 m-0" id="step-form5">
 								<div class="row">
 									<div class="col-12">
@@ -188,8 +227,8 @@
 							</div>
 							<div class="stepBtnHolder2">
 								<div class="stepBtnFirst d-flex gap-2 justify-content-center">
-									<button type="button" class="stepBtn" id="prevStep5">مرحله قبل</button>
-									<button type="button" class="stepBtn" id="nextStep5">مرحله بعد</button>
+									<button type="button" class="stepBtn" id="prevStep6">مرحله قبل</button>
+									<button type="button" class="stepBtn" id="nextStep6">مرحله بعد</button>
 								</div>
 								<div class="w-100 d-flex gap-2 mt-2 justify-content-center">
 									<button type="button" class="stepBtn cancelButton">انصراف</button>
@@ -203,8 +242,8 @@
 							</div>
 						</div>
 
-						<div id="step6" class="step w-100 overflow-y-auto">
-							<div class="container p-0 m-0" id="step-form6">
+						<div id="step7" class="step w-100 overflow-y-auto">
+							<div class="container p-0 m-0" id="step-form7">
 								<div class="row">
 									<div class="col-12">
 										<div id="uploadDocument">
@@ -215,8 +254,8 @@
 							</div>
 							<div class="stepBtnHolder2">
 								<div class="stepBtnFirst d-flex gap-2 justify-content-center">
-									<button type="button" class="stepBtn" id="prevStep6">مرحله قبل</button>
-									<button type="button" class="stepBtn disable" id="nextStep6">پایان</button>
+									<button type="button" class="stepBtn" id="prevStep7">مرحله قبل</button>
+									<button type="button" class="stepBtn disable" id="nextStep7">پایان</button>
 								</div>
 								<div class="w-100 d-flex gap-2 mt-2 justify-content-center">
 									<button type="button" class="stepBtn cancelButton">انصراف</button>
@@ -284,6 +323,8 @@
 	var workshopSettingListAjax = `@Url.Page("/Company/Employees/EmployeeList", "WorkshopSettingList")`; // EmployeeList Handler
 	var workshopSettingListAjaxRollCall = `@Url.Page("/Company/RollCall/EmployeeUploadPicture", "WorkshopSettingList")`; // RollCall Handler
 	var workshopSettingListAjaxHome = `@Url.Page("/Index", "WorkshopSettingList")`; // Home Handler
+	
+	var hasCustomizeCheckoutService = `@Model.HasCustomizeCheckoutService`;
 
 	// @* var workshopSettingEmployeeSelecting = @Html.Raw(Json.Serialize(Model.EmployeeSettings)); *@
 </script>

ServiceHost/Areas/Client/Pages/Company/Employees/EmployeeList.cshtml.cs

@@ -24,257 +24,260 @@ namespace ServiceHost.Areas.Client.Pages.Company.Employees
 	[Authorize]
 	[NeedsPermission(SubAccountPermissionHelper.PersonnelListPermissionCode)]
 	public class EmployeeListModel : PageModel
-    {
-	    private readonly IPasswordHasher _passwordHasher;
-	    private readonly IWorkshopApplication _workshopApplication;
-	    private readonly IEmployeeApplication _employeeApplication;
-	    private readonly ICustomizeWorkshopSettingsApplication _customizeWorkshopSettingsApplication;
-	    private readonly IPersonnelCodeApplication _personnelCodeApplication;
-	    private readonly IHttpContextAccessor _contextAccessor;
-        private readonly IBankApplication _bankApplication;
-        private readonly IEmployeeBankInformationApplication _employeeBankInformationApplication;
-        private readonly IEmployeeDocumentsApplication _employeeDocumentsApplication;
-        private readonly IAuthHelper _authHelper;
-        private readonly IJobApplication _jobApplication;
+	{
+		private readonly IPasswordHasher _passwordHasher;
+		private readonly IWorkshopApplication _workshopApplication;
+		private readonly IEmployeeApplication _employeeApplication;
+		private readonly ICustomizeWorkshopSettingsApplication _customizeWorkshopSettingsApplication;
+		private readonly IPersonnelCodeApplication _personnelCodeApplication;
+		private readonly IHttpContextAccessor _contextAccessor;
+		private readonly IBankApplication _bankApplication;
+		private readonly IEmployeeBankInformationApplication _employeeBankInformationApplication;
+		private readonly IEmployeeDocumentsApplication _employeeDocumentsApplication;
+		private readonly IAuthHelper _authHelper;
+		private readonly IJobApplication _jobApplication;
 		private readonly ILeftWorkTempApplication _leftWorkTempApplication;
 		private readonly IRollCallServiceApplication _rollCallServiceApplication;
 		private readonly long _workshopId;
 
 		public PersonnelInfoViewModel Employees;
-	    public bool HasEmployees;
-	    public long WorkshopId;
-	    public string WorkshopFullName;
-	    public EmployeeSearchModel SearchModel;
+		public bool HasEmployees;
+		public long WorkshopId;
+		public string WorkshopFullName;
+		public EmployeeSearchModel SearchModel;
 
-		public EmployeeListModel(IBankApplication bankApplication,IEmployeeBankInformationApplication employeeBankInformationApplication,IEmployeeDocumentsApplication employeeDocumentsApplication,IAuthHelper authHelper,IPasswordHasher passwordHasher, IWorkshopApplication workshopApplication, IEmployeeApplication employeeApplication, IHttpContextAccessor contextAccessor, ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication, IPersonnelCodeApplication personnelCodeApplication, IJobApplication jobApplication, ILeftWorkTempApplication leftWorkTempApplication, IRollCallServiceApplication rollCallServiceApplication)
-	    {
-		    _passwordHasher = passwordHasher;
-		    _workshopApplication = workshopApplication;
-		    _employeeApplication = employeeApplication;
-		    _contextAccessor = contextAccessor;
-		    _customizeWorkshopSettingsApplication = customizeWorkshopSettingsApplication;
-		    _personnelCodeApplication = personnelCodeApplication;
-            _jobApplication = jobApplication;
-            _leftWorkTempApplication = leftWorkTempApplication;
-            _rollCallServiceApplication = rollCallServiceApplication;
-            _authHelper = authHelper;
-            _employeeDocumentsApplication = employeeDocumentsApplication;
-            _employeeBankInformationApplication = employeeBankInformationApplication;
-            _bankApplication = bankApplication;
+		public EmployeeListModel(IBankApplication bankApplication, IEmployeeBankInformationApplication employeeBankInformationApplication, IEmployeeDocumentsApplication employeeDocumentsApplication, IAuthHelper authHelper, IPasswordHasher passwordHasher, IWorkshopApplication workshopApplication, IEmployeeApplication employeeApplication, IHttpContextAccessor contextAccessor, ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication, IPersonnelCodeApplication personnelCodeApplication, IJobApplication jobApplication, ILeftWorkTempApplication leftWorkTempApplication, IRollCallServiceApplication rollCallServiceApplication)
+		{
+			_passwordHasher = passwordHasher;
+			_workshopApplication = workshopApplication;
+			_employeeApplication = employeeApplication;
+			_contextAccessor = contextAccessor;
+			_customizeWorkshopSettingsApplication = customizeWorkshopSettingsApplication;
+			_personnelCodeApplication = personnelCodeApplication;
+			_jobApplication = jobApplication;
+			_leftWorkTempApplication = leftWorkTempApplication;
+			_rollCallServiceApplication = rollCallServiceApplication;
+			_authHelper = authHelper;
+			_employeeDocumentsApplication = employeeDocumentsApplication;
+			_employeeBankInformationApplication = employeeBankInformationApplication;
+			_bankApplication = bankApplication;
 
 
 
-            var workshopHash = _contextAccessor.HttpContext?.User.FindFirstValue("WorkshopSlug");
-		    _workshopId = _passwordHasher.SlugDecrypt(workshopHash);
+			var workshopHash = _contextAccessor.HttpContext?.User.FindFirstValue("WorkshopSlug");
+			_workshopId = _passwordHasher.SlugDecrypt(workshopHash);
 
-		    if (_workshopId < 1)
-			    throw new InvalidDataException("اختلال در کارگاه");
+			if (_workshopId < 1)
+				throw new InvalidDataException("اختلال در کارگاه");
 		}
 
-	    public void OnGet()
-        {
-	        var workshop = _workshopApplication.GetWorkshopInfo(_workshopId);
-	        WorkshopFullName = workshop.WorkshopFullName;
-	        WorkshopId = workshop.Id;
+		public void OnGet()
+		{
+			var workshop = _workshopApplication.GetWorkshopInfo(_workshopId);
+			WorkshopFullName = workshop.WorkshopFullName;
+			WorkshopId = workshop.Id;
 		}
 
-	    public IActionResult OnGetEmployeeListAjax(EmployeeSearchModel searchModel)
-	    {
-		    var personnelSearchModel = new PersonnelInfoSearchModel()
-		    {
-			    WorkshopId = _workshopId,
-		    };
+		public IActionResult OnGetEmployeeListAjax(EmployeeSearchModel searchModel)
+		{
+			var personnelSearchModel = new PersonnelInfoSearchModel()
+			{
+				WorkshopId = _workshopId,
+			};
 
-		    var result = _workshopApplication.GetPersonnelInfoRemastered(personnelSearchModel);
+			var result = _workshopApplication.GetPersonnelInfoRemastered(personnelSearchModel);
 
-		    if (!string.IsNullOrWhiteSpace(searchModel.EmployeeFullName))
-			    result = result.Where(x => x.FullName.Contains(searchModel.EmployeeFullName)).ToList();
+			if (!string.IsNullOrWhiteSpace(searchModel.EmployeeFullName))
+				result = result.Where(x => x.FullName.Contains(searchModel.EmployeeFullName)).ToList();
 
-		    if (!string.IsNullOrWhiteSpace(searchModel.NationalCode))
-			    result = result.Where(x => x.NationalCode.Contains(searchModel.NationalCode)).ToList();
+			if (!string.IsNullOrWhiteSpace(searchModel.NationalCode))
+				result = result.Where(x => x.NationalCode.Contains(searchModel.NationalCode)).ToList();
 
-		    var resultData = new PersonnelInfoViewModel()
-		    {
-			    PersonnelInfoViewModels = result.OrderByDescending(x => x.CreatedByClient).ThenByDescending(x => x.LefWorkTemp).ThenBy(x => x.Black ? 1 : 0).ThenBy(x => x.PersonnelCode).ToList(),
-		    };
+			var resultData = new PersonnelInfoViewModel()
+			{
+				PersonnelInfoViewModels = result.OrderByDescending(x => x.CreatedByClient).ThenByDescending(x => x.LefWorkTemp).ThenBy(x => x.Black ? 1 : 0).ThenBy(x => x.PersonnelCode).ToList(),
+			};
 
-		    return new JsonResult(new
-		    {
-			    success = true,
-			    data = resultData,
-		    });
-	    }
+			return new JsonResult(new
+			{
+				success = true,
+				data = resultData,
+			});
+		}
 
-	    public IActionResult OnGetPrintOnePersonnelInfo(long employeeId)
-	    {
-		    var result = _employeeApplication.GetDetails(employeeId);
-		    return Partial("PrintOnePersonnelInfo", result);
-	    }
+		public IActionResult OnGetPrintOnePersonnelInfo(long employeeId)
+		{
+			var result = _employeeApplication.GetDetails(employeeId);
+			return Partial("PrintOnePersonnelInfo", result);
+		}
 
-	    public IActionResult OnGetEmployeeDataByNationalCode(string nationalCode)
-	    {
-		    var workshopIds = _workshopApplication.GetWorkshopAccount().Select(workshop => workshop.Id).ToList();
+		public IActionResult OnGetEmployeeDataByNationalCode(string nationalCode)
+		{
+			var workshopIds = _workshopApplication.GetWorkshopAccount().Select(workshop => workshop.Id).ToList();
 
 			var resultData = _employeeApplication.GetEmployeeByNationalCodeIfHasLeftWork(nationalCode, workshopIds);
-		    return new JsonResult(new
-		    {
-			    success = true,
-			    data = resultData,
-		    });
+			return new JsonResult(new
+			{
+				success = true,
+				data = resultData,
+			});
 		}
 
-	    public IActionResult OnGetWorkshopSettingList()
-	    {
-		    var resultData = _customizeWorkshopSettingsApplication.GetWorkshopIncludeGroupsByWorkshopId(_workshopId);
-		    if (resultData != null)
-		    {
-			    resultData.GroupSettings = resultData?.GroupSettings.Where(x => !x.MainGroup).ToList();
+		public IActionResult OnGetWorkshopSettingList()
+		{
+			var resultData = _customizeWorkshopSettingsApplication.GetWorkshopIncludeGroupsByWorkshopId(_workshopId);
+			if (resultData != null)
+			{
+				resultData.GroupSettings = resultData?.GroupSettings.Where(x => !x.MainGroup).ToList();
 			}
 
 			return new JsonResult(new
-		    {
-			    success = true,
-			    data = resultData,
-		    });
-	    }
+			{
+				success = true,
+				data = resultData,
+			});
+		}
 
 		public IActionResult OnGetCreateEmployee()
 		{
 			var command = new CreateEmployeeByClient();
 			command.PersonnelCode = (_personnelCodeApplication.GetLastPersonnelCodeByWorkshop(_workshopId) + 1).ToString();
-			command.HasRollCallService = _rollCallServiceApplication.IsExistActiveServiceByWorkshopId(_workshopId);
+			var activeServiceByWorkshopId = _rollCallServiceApplication.GetActiveServiceByWorkshopId(_workshopId);
+			command.HasRollCallService = activeServiceByWorkshopId is { Id: > 0 };
+			if (command.HasRollCallService)
+				command.HasCustomizeCheckoutService = activeServiceByWorkshopId.HasCustomizeCheckoutService == "true";
 			return Partial("CreateEmployeeModal", command);
 		}
 
 		public IActionResult OnPostCreateEmployee(CreateEmployeeByClient command)
-	    {
-		    command.WorkshopId = _workshopId;
+		{
+			command.WorkshopId = _workshopId;
 			var result = _employeeApplication.CreateEmployeeByClient(command);
-		    return new JsonResult(new
-		    {
-			    success = result.IsSuccedded,
-			    message = result.Message,
-		    });
-	    }
+			return new JsonResult(new
+			{
+				success = result.IsSuccedded,
+				message = result.Message,
+			});
+		}
 
-	    public async Task<IActionResult> OnGetEmployeeDetailsWithNationalCode(string nationalCode,string birthDate)
-	    {
+		public async Task<IActionResult> OnGetEmployeeDetailsWithNationalCode(string nationalCode, string birthDate)
+		{
 			var result = await _employeeApplication.ValidateCreateEmployeeClientByNationalCodeAndWorkshopId(nationalCode, birthDate, _workshopId);
 			return new JsonResult(result);
-	    }
+		}
 
-        public IActionResult OnGetJobSearch(string jobName)
-        {
-            var jobViewModels = _jobApplication.GetJobListByText(jobName);
+		public IActionResult OnGetJobSearch(string jobName)
+		{
+			var jobViewModels = _jobApplication.GetJobListByText(jobName);
 
-            return new JsonResult(jobViewModels);
-        }
+			return new JsonResult(jobViewModels);
+		}
 
-        //step 4 
-        public IActionResult OnGetDetailsAjax(long employeeId)
-        {
-            var resultData = _employeeBankInformationApplication.GetByEmployeeId(_workshopId, employeeId);
-            return new JsonResult(new
-            {
-                success = true,
-                data = resultData
-            });
-        }
-        //public IActionResult OnPostCreate(CreateEmployeeInformation command)
-        //{
-        //    command.WorkshopId = _workshopId;
-        //    if (!string.IsNullOrWhiteSpace(command.CardNumber))
-        //        command.CardNumber = command.CardNumber.Replace("-", "");
+		//step 4 
+		public IActionResult OnGetDetailsAjax(long employeeId)
+		{
+			var resultData = _employeeBankInformationApplication.GetByEmployeeId(_workshopId, employeeId);
+			return new JsonResult(new
+			{
+				success = true,
+				data = resultData
+			});
+		}
+		//public IActionResult OnPostCreate(CreateEmployeeInformation command)
+		//{
+		//    command.WorkshopId = _workshopId;
+		//    if (!string.IsNullOrWhiteSpace(command.CardNumber))
+		//        command.CardNumber = command.CardNumber.Replace("-", "");
 
-        //    if (!string.IsNullOrWhiteSpace(command.ShebaNumber))
-        //        command.ShebaNumber = command.ShebaNumber.Replace("-", "");
+		//    if (!string.IsNullOrWhiteSpace(command.ShebaNumber))
+		//        command.ShebaNumber = command.ShebaNumber.Replace("-", "");
 
-        //    var result = _employeeBankInformationApplication.Create(command);
-        //    return new JsonResult(new
-        //    {
-        //        success = result.IsSuccedded,
-        //        message = result.Message,
-        //        id = result.SendId
-        //    });
-        //}
-        //public IActionResult OnPostDelete(long id)
-        //{
-        //    var result = _employeeBankInformationApplication.Remove(id);
-        //    return new JsonResult(new
-        //    {
-        //        success = result.IsSuccedded,
-        //        message = result.Message,
-        //    });
-        //}
+		//    var result = _employeeBankInformationApplication.Create(command);
+		//    return new JsonResult(new
+		//    {
+		//        success = result.IsSuccedded,
+		//        message = result.Message,
+		//        id = result.SendId
+		//    });
+		//}
+		//public IActionResult OnPostDelete(long id)
+		//{
+		//    var result = _employeeBankInformationApplication.Remove(id);
+		//    return new JsonResult(new
+		//    {
+		//        success = result.IsSuccedded,
+		//        message = result.Message,
+		//    });
+		//}
 
-        public IActionResult OnGetBankListAjax()
-        {
-            var resultData = _bankApplication.Search("");
-            return new JsonResult(new
-            {
-                success = true,
-                data = resultData,
-            });
-        }
+		public IActionResult OnGetBankListAjax()
+		{
+			var resultData = _bankApplication.Search("");
+			return new JsonResult(new
+			{
+				success = true,
+				data = resultData,
+			});
+		}
 
-        //public IActionResult OnPostGroupCreate(List<CreateEmployeeInformation> command)
-        //{
-        //    var result = _employeeBankInformationApplication.GroupCreate(_workshopId, command);
-        //    return new JsonResult(new
-        //    {
-        //        success = result.IsSuccedded,
-        //        message = result.Message,
-        //        id = result.SendId
-        //    });
-        //}
+		//public IActionResult OnPostGroupCreate(List<CreateEmployeeInformation> command)
+		//{
+		//    var result = _employeeBankInformationApplication.GroupCreate(_workshopId, command);
+		//    return new JsonResult(new
+		//    {
+		//        success = result.IsSuccedded,
+		//        message = result.Message,
+		//        id = result.SendId
+		//    });
+		//}
 
-        //step 5
-        public IActionResult OnPostCreateUploadDocument(AddEmployeeDocumentItem command)
-        {
-            var workshopHash = User.FindFirstValue("WorkshopSlug");
-            var workshopId = _passwordHasher.SlugDecrypt(workshopHash);
-            if (workshopId <= 0)
-                return new JsonResult(new
-                {
-                    IsSuccedded = false,
-                    message = "کارگاهی یافت نشد",
-                });
-            command.WorkshopId = workshopId;
+		//step 5
+		public IActionResult OnPostCreateUploadDocument(AddEmployeeDocumentItem command)
+		{
+			var workshopHash = User.FindFirstValue("WorkshopSlug");
+			var workshopId = _passwordHasher.SlugDecrypt(workshopHash);
+			if (workshopId <= 0)
+				return new JsonResult(new
+				{
+					IsSuccedded = false,
+					message = "کارگاهی یافت نشد",
+				});
+			command.WorkshopId = workshopId;
 
 
-            var result = _employeeDocumentsApplication.AddEmployeeDocumentItemForClient(command);
-            var employeeDocument = _employeeDocumentsApplication.GetDetailsForClient(command.EmployeeId, workshopId);
-            return new JsonResult(new
-            {
-                isSuccedded = result.IsSuccedded,
-                message = result.Message,
-                imageSrc = employeeDocument
-            });
-        }
-        
-        //public IActionResult OnPostSaveSubmit(SubmitEmployeeDocuments cmd)
-        //{
-        //    var result = _employeeDocumentsApplication.SubmitDocumentItemsByClient(cmd);
+			var result = _employeeDocumentsApplication.AddEmployeeDocumentItemForClient(command);
+			var employeeDocument = _employeeDocumentsApplication.GetDetailsForClient(command.EmployeeId, workshopId);
+			return new JsonResult(new
+			{
+				isSuccedded = result.IsSuccedded,
+				message = result.Message,
+				imageSrc = employeeDocument
+			});
+		}
 
-        //    return new JsonResult(new
-        //    {
-        //        isSuccedded = result.IsSuccedded,
-        //        message = result.Message,
-        //    });
-        //}
+		//public IActionResult OnPostSaveSubmit(SubmitEmployeeDocuments cmd)
+		//{
+		//    var result = _employeeDocumentsApplication.SubmitDocumentItemsByClient(cmd);
 
-        //public IActionResult OnPostRemoveEmployeeDocumentByLabel(long employeeId, DocumentItemLabel label)
-        //{
-        //    var workshopId = _passwordHasher.SlugDecrypt(_authHelper.GetWorkshopSlug());
+		//    return new JsonResult(new
+		//    {
+		//        isSuccedded = result.IsSuccedded,
+		//        message = result.Message,
+		//    });
+		//}
 
-        //    var result = _employeeDocumentsApplication.DeleteEmployeeMultipleUnsubmittedDocumentsByLabel(workshopId, employeeId,
-        //        label);
-        //    return new JsonResult(new
-        //    {
-        //        isSuccedded = result.IsSuccedded,
-        //        message = result.Message
-        //    });
-        //}
+		//public IActionResult OnPostRemoveEmployeeDocumentByLabel(long employeeId, DocumentItemLabel label)
+		//{
+		//    var workshopId = _passwordHasher.SlugDecrypt(_authHelper.GetWorkshopSlug());
+
+		//    var result = _employeeDocumentsApplication.DeleteEmployeeMultipleUnsubmittedDocumentsByLabel(workshopId, employeeId,
+		//        label);
+		//    return new JsonResult(new
+		//    {
+		//        isSuccedded = result.IsSuccedded,
+		//        message = result.Message
+		//    });
+		//}
 
 		#region Left Work
 		public IActionResult OnGetCreateLeftWorkEmployee()
@@ -282,7 +285,7 @@ namespace ServiceHost.Areas.Client.Pages.Company.Employees
 			var command = new CreateLeftWorkTemp();
 			return Partial("ModalCreateLeftWorkEmployee", command);
 		}
-        
+
 		public async Task<IActionResult> OnGetEmployeeList()
 		{
 			var employees = await _employeeApplication.WorkedEmployeesInWorkshopSelectList(_workshopId);
@@ -293,13 +296,12 @@ namespace ServiceHost.Areas.Client.Pages.Company.Employees
 				data = employees
 			});
 		}
-
 		public async Task<IActionResult> OnGetEmployeeListLeftWorkTemp()
 		{
 			var exists = _leftWorkTempApplication.GetLeftWorksByWorkshopId(_workshopId);
 
 			var employees = (await _employeeApplication.WorkedEmployeesInWorkshopSelectList(_workshopId))
-				.Where(x=> exists.All(a => a.EmployeeId != x.Id)).ToList();
+				.Where(x => exists.All(a => a.EmployeeId != x.Id)).ToList();
 
 			return new JsonResult(new
 			{

ServiceHost/Areas/Client/Pages/Company/Employees/_Partials/TempCheckout.cshtml

@@ -0,0 +1,69 @@
+@model CompanyManagment.App.Contracts.Employee.CreateEmployeeByClient
+
+
+@{
+	string clientVersion = _0_Framework.Application.Version.StyleVersion;
+	<link href="~/AssetsClient/css/select2.css?ver=@clientVersion" rel="stylesheet" />
+	<link href="~/assetsclient/pages/employees/css/createbankinfomodal.css?ver=@clientVersion" rel="stylesheet" />
+
+	<style>
+		.disableColor {
+			border: 1px solid #C6C6C6 !important;
+			background-color: #F0F0F0 !important;
+		}
+
+		.msgStepTempCheckout {
+			border: 1px solid #C6C6C6;
+			border-radius: 9px;
+			width: 60%;
+			margin: 35px auto;
+		}
+		 
+	</style>
+}
+@* 
+<div class="text-center">
+	<div>
+		<p class="m-0 pdHeaderTitle1">ایجاد شماره حساب پرسنل</p>
+	</div>
+</div> *@
+
+<div class="container-fluid">
+	<div class="row">
+		
+		<div class="col-12 my-1">
+			<span class="spanTitleText">نام گروه</span>
+			<input type="text" class="form-control text-center disable disableColor" id="groupNameTemp" placeholder="-" style="direction: ltr;">
+		</div>
+
+		<div class="col-12 my-1">
+			<span class="spanTitleText">حقوق تعیین شده در این گروه</span>
+			<input type="text" class="form-control text-center disable disableColor" id="priceTemp" placeholder="-" style="direction: ltr;">
+		</div>
+
+		<div class="col-12 my-1 position-relative">
+			<span class="spanTitleText">مرخصی مجاز  تعیین شده در این گروه</span>
+			<input class="form-control text-center disable disableColor" id="leavePermitted" placeholder="-" style="direction: ltr;" />
+		</div>
+		
+		<div class="col-12 my-1 position-relative">
+			<span class="spanTitleText">حقوق پرسنل</span>
+			<input class="form-control text-center disable disableColor" id="personnelSalary" name="Command.CreateCustomizeEmployeeSettings.Salary" placeholder="-" style="direction: ltr" />
+		</div>
+		<div class="col-12 my-1 position-relative">
+			<span class="spanTitleText">مجاز مرخصی</span>
+			<input class="form-control text-center disable disableColor" id="leavePermittedDays" name="Command.CreateCustomizeEmployeeSettings.LeavePermittedDays" placeholder="-" style="direction: ltr" />
+		</div>
+
+		<div class="col-12 my-1 position-relative" id="has-group" style="display: block;">
+			<div class="text-center p-4 msgStepTempCheckout">
+				<span class="spanTitleText">به دلیل عدم انتخاب گروهبندی حضور و غیاب، امکان ثبت حقوق برای پرسنل وجود ندارد.</span>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	// var getDetailsAjaxUrl = `@Url.Page("/Company/Employees/EmployeeList", "DetailsAjax")`;
+</script>
+<script src="~/assetsclient/pages/employees/js/TempCheckout.js?ver=@clientVersion"></script>

ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml.cs

@@ -734,6 +734,10 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall
             var command = new CreateEmployeeByClient();
             command.PersonnelCode = (_personnelCodeApplication.GetLastPersonnelCodeByWorkshop(_workshopId) + 1).ToString();
             command.HasRollCallService = _rollCallServiceApplication.IsExistActiveServiceByWorkshopId(_workshopId);
+            var activeServiceByWorkshopId = _rollCallServiceApplication.GetActiveServiceByWorkshopId(_workshopId);
+            command.HasRollCallService = activeServiceByWorkshopId is { Id: > 0 };
+            if (command.HasRollCallService)
+                command.HasCustomizeCheckoutService = activeServiceByWorkshopId.HasCustomizeCheckoutService == "true";
             return Partial("../Employees/CreateEmployeeModal", command);
         }
 

ServiceHost/Areas/Client/Pages/Index.cshtml

@@ -100,7 +100,7 @@
                     <div class="card p-0">
                         <div class="card-section-btn bg-white">
                             <div class="content btn-group">
-								<a href="/apk/android?@Guid.NewGuid()" type="button" class="btn-download-android d-flex align-items-center justify-content-center">
+                                <a href="/apk/android" type="button" class="btn-download-android d-flex align-items-center justify-content-center">
                                     <svg width="30" height="30" fill="#ffffff" viewBox="-1 0 24 24" xmlns="http://www.w3.org/2000/svg">
                                         <g id="SVGRepo_bgCarrier" stroke-width="0"></g>
                                         <g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g>