feat: enhance Excel export for institution contracts by removing row number and adding dynamic physical contract status

add route for excel download
add excel download
2025-12-29 17:20:07 +03:30 · 2025-12-28 19:20:25 +03:30 · 2025-12-28 19:17:50 +03:30 · 2025-12-28 13:01:40 +03:30
31 changed files with 620 additions and 2395 deletions
--- a/Company.Domain/EmployeeAgg/IEmployeeRepository.cs
+++ b/Company.Domain/EmployeeAgg/IEmployeeRepository.cs
@@ -54,7 +54,6 @@ public interface IEmployeeRepository : IRepository<long, Employee>

    Employee GetIgnoreQueryFilter(long id);

-    [Obsolete("این متد منسوخ شده است و از متد WorkedEmployeesInWorkshopSelectList استفاده کنید")]
    Task<List<EmployeeSelectListViewModel>> WorkedEmployeesInWorkshopSelectList(long workshopId);


@@ -78,32 +77,7 @@ public interface IEmployeeRepository : IRepository<long, Employee>
 	Task<List<EmployeeSelectListViewModel>> GetSelectList(string searchText,long id);
 	Task<List<GetEmployeeListViewModel>> GetList(GetEmployeeListSearchModel searchModel);
 	Task<List<GetClientEmployeeListViewModel>> GetClientEmployeeList(GetClientEmployeeListSearchModel searchModel, long workshopId);
-
-    /// <summary>
-    /// دریافت لیست پرسنل کلاینت
-    /// api
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <param name="workshopId"></param>
-    /// <returns></returns>
-    Task<List<EmployeeListDto>> ListOfAllEmployeesClient(EmployeeSearchModelDto searchModel, long workshopId);
-
-    /// <summary>
-    /// پرینت تجمیعی پرسنل کلاینت
-    /// api
-    /// </summary>
-    /// <param name="workshopId"></param>
-    /// <returns></returns>
-    Task<List<PrintAllEmployeesInfoDtoClient>> PrintAllEmployeesInfoClient(long workshopId);
-
-    /// <summary>
-    /// سلکت لیست پرسنل های کارگاه کلاینت 
-    /// </summary>
-    /// <param name="workshopId"></param>
-    /// <returns></returns>
-    Task<List<EmployeeSelectListViewModel>> GetWorkingEmployeesSelectList(long workshopId);
-
-    #endregion
+	#endregion


 }
--- a/Company.Domain/LeaveAgg/ILeaveRepository.cs
+++ b/Company.Domain/LeaveAgg/ILeaveRepository.cs
@@ -1,10 +1,8 @@
-using _0_Framework.Application;
-using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.InstitutionPlan;
-using CompanyManagment.App.Contracts.Leave;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
+using _0_Framework.Application;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.Leave;

 namespace Company.Domain.LeaveAgg;

@@ -12,7 +10,7 @@ public interface ILeaveRepository : IRepository<long, Leave>
 {
    EditLeave GetDetails(long id);
    List<LeaveViewModel> search(LeaveSearchModel searchModel);
-    Task<OperationResult> RemoveLeave(long id);
+    OperationResult RemoveLeave(long id);

    #region Pooya
    List<LeaveViewModel> GetByWorkshopIdEmployeeIdInDates(long workshopId, long employeeId, DateTime start, DateTime end);
@@ -29,8 +27,6 @@ public interface ILeaveRepository : IRepository<long, Leave>
    List<LeaveMainViewModel> searchClient(LeaveSearchModel searchModel);
    LeavePrintViewModel PrintOne(long id);
    List<LeavePrintViewModel> PrintAll(List<long> id);
-    
-    Task<List<LeavePrintResponseViewModel>> PrintAllAsync(List<long> ids, long workshopId);

    #region Vafa

@@ -38,27 +34,4 @@ public interface ILeaveRepository : IRepository<long, Leave>

    #endregion
    bool CheckIfValidToEdit(long id);
-
-    /// <summary>
-    /// دریافت لیست مرخصی ها در کلاینت
-    /// Api
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<PagedResult<leaveListDto>> GetList(
-        LeaveListSearchModel searchModel);
-
-    /// <summary>
-    /// دریافت لیست گروه بندی شده
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<List<GroupLeaveListDto>> GetGroupList(LeaveListSearchModel searchModel);
-
-    /// <summary>
-    /// پرینت لیستی
-    /// </summary>
-    /// <param name="ids"></param>
-    /// <returns></returns>
-    Task<LeaveListPrintDto> ListPrint(List<long> ids);
 }
--- a/CompanyManagement.Infrastructure.Excel/InstitutionContract/InstitutionContractExcelGenerator.cs
+++ b/CompanyManagement.Infrastructure.Excel/InstitutionContract/InstitutionContractExcelGenerator.cs
@@ -8,86 +8,129 @@ using System.Text.RegularExpressions;

 namespace CompanyManagement.Infrastructure.Excel.InstitutionContract;

+// Enum برای تعریف ستون‌های موجود
+public enum ExcelColumnType
+{
+    RowNumber,                  // ردیف
+    PhysicalContract,          // قرارداد فیزیکی
+    ContractNo,                 // شماره قرارداد
+    Representative,             // معرف
+    ContractingPartyName,       // طرف حساب
+    ArchiveCode,                // شماره کارفرما
+    EmployerName,               // کارفرما
+    WorkshopName,               // کارگاه‌ها (چندخطی)
+    WorkshopCount,              // تعداد کارگاه
+    EmployeeCount,              // مجموع پرسنل
+    ContractStartDate,          // شروع قرارداد
+    ContractEndDate,            // پایان قرارداد
+    InstallmentAmount,          // مبلغ قسط
+    ContractAmount,             // مبلغ قرارداد
+    FinancialStatus             // وضعیت مالی
+}
+
+// کلاس کانفیگ برای تنظیم ستون‌های نمایشی
+public class ExcelColumnConfig
+{
+    public List<ExcelColumnType> VisibleColumns { get; set; }
+    
+    public ExcelColumnConfig()
+    {
+        // فعلاً تمام ستون‌ها فعال هستند
+        VisibleColumns = new List<ExcelColumnType>
+        {
+            ExcelColumnType.PhysicalContract,
+            ExcelColumnType.ContractNo,
+            ExcelColumnType.Representative,
+            ExcelColumnType.ContractingPartyName,
+            ExcelColumnType.ArchiveCode,
+            ExcelColumnType.EmployerName,
+            ExcelColumnType.WorkshopName,
+            ExcelColumnType.WorkshopCount,
+            ExcelColumnType.EmployeeCount,
+            ExcelColumnType.ContractStartDate,
+            ExcelColumnType.ContractEndDate,
+            ExcelColumnType.InstallmentAmount,
+            ExcelColumnType.ContractAmount,
+            ExcelColumnType.FinancialStatus
+        };
+    }
+}
+
 public class InstitutionContractExcelGenerator
 {
+    private static ExcelColumnConfig _columnConfig = new ExcelColumnConfig();

-    public static byte[] GenerateExcel(List<InstitutionContractViewModel> institutionContractViewModels)
+    public static byte[] GenerateExcel(List<InstitutionContractExcelViewModel> contractViewModels)
    {
        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
        using var package = new ExcelPackage();
-        var allWorksheet = package.Workbook.Worksheets.Add("همه");
-
-        var blueWorksheet = package.Workbook.Worksheets.Add("آبی");
-        blueWorksheet.TabColor = Color.LightBlue;
-
-        var grayWorksheet = package.Workbook.Worksheets.Add("خاکستری");
-        grayWorksheet.TabColor = Color.LightGray;
-
-        var redWorksheet = package.Workbook.Worksheets.Add("قرمز");
-        redWorksheet.TabColor = Color.LightCoral;
-
-        var purpleWorksheet = package.Workbook.Worksheets.Add("بنفش");
-        purpleWorksheet.TabColor = Color.MediumPurple;
-
-        var blackWorksheet = package.Workbook.Worksheets.Add("مشکی");
-        blackWorksheet.TabColor = Color.DimGray;
-
-        var yellowWorksheet = package.Workbook.Worksheets.Add("زرد");
-        yellowWorksheet.TabColor = Color.Yellow;
-            
-        var whiteWorksheet = package.Workbook.Worksheets.Add("سفید");
-        whiteWorksheet.TabColor = Color.White;
-
-
-        CreateExcelSheet(institutionContractViewModels, allWorksheet);
-
-        var blueContracts = institutionContractViewModels.Where(x=>x.ExpireColor == "blue").ToList();
-        CreateExcelSheet(blueContracts, blueWorksheet);
-        institutionContractViewModels = institutionContractViewModels.Except(blueContracts).ToList();
-
-        var grayContracts = institutionContractViewModels.Where(x => x.IsContractingPartyBlock == "true").ToList();
-        CreateExcelSheet(grayContracts, grayWorksheet);
-        institutionContractViewModels = institutionContractViewModels.Except(grayContracts).ToList();
-
-        var redContracts = institutionContractViewModels.Where(x=>x.ExpireColor == "red").ToList();
-        CreateExcelSheet(redContracts, redWorksheet);
-        institutionContractViewModels = institutionContractViewModels.Except(redContracts).ToList();
-
-        var purpleContracts = institutionContractViewModels.Where(x=>x.ExpireColor == "purple").ToList();
-        CreateExcelSheet(purpleContracts, purpleWorksheet);
-        institutionContractViewModels = institutionContractViewModels.Except(purpleContracts).ToList();
        
-        var blackContracts = institutionContractViewModels.Where(x=>x.ExpireColor == "black").ToList();
-        CreateExcelSheet(blackContracts, blackWorksheet);
-        institutionContractViewModels = institutionContractViewModels.Except(blackContracts).ToList();
-
-        var yellowContracts = institutionContractViewModels
-            .Where(x => string.IsNullOrWhiteSpace(x.ExpireColor) && x.WorkshopCount == "0").ToList();
-        CreateExcelSheet(yellowContracts, yellowWorksheet);
-        institutionContractViewModels = institutionContractViewModels.Except(yellowContracts).ToList();
-
-        var otherContracts = institutionContractViewModels;
-        CreateExcelSheet(otherContracts, whiteWorksheet);
+        // ایجاد شیت برای هر تب با داده‌های مربوطه
+        foreach (var viewModel in contractViewModels)
+        {
+            var worksheet = CreateWorksheet(package, viewModel.Tab);
+            CreateExcelSheet(viewModel.GetInstitutionContractListItemsViewModels ?? new List<GetInstitutionContractListItemsViewModel>(), worksheet);
+        }

        return package.GetAsByteArray();
    }

-    private static void CreateExcelSheet(List<InstitutionContractViewModel> institutionContractViewModels, ExcelWorksheet worksheet)
+    /// <summary>
+    /// ایجاد شیت بر اساس نوع تب
+    /// </summary>
+    private static ExcelWorksheet CreateWorksheet(ExcelPackage package, InstitutionContractListStatus? status)
    {
-        // Headers
-        worksheet.Cells[1, 1].Value = "شماره قرارداد";
-        worksheet.Cells[1, 2].Value = "طرف حساب";
-        worksheet.Cells[1, 3].Value = "شماره کارفرما";
-        worksheet.Cells[1, 4].Value = "کارفرما ها";
-        worksheet.Cells[1, 5].Value = "کارگاه ها";
-        worksheet.Cells[1, 6].Value = "مجبوع پرسنل";
-        worksheet.Cells[1, 7].Value = "شروع قرارداد";
-        worksheet.Cells[1, 8].Value = "پایان قرارداد";
-        worksheet.Cells[1, 9].Value = "مبلغ قرارداد (بدون کارگاه)";
-        worksheet.Cells[1, 10].Value = "مبلغ قرارداد";
-        worksheet.Cells[1, 11].Value = "وضعیت مالی";
+        return status switch
+        {
+            InstitutionContractListStatus.DeactiveWithDebt =>
+                CreateColoredWorksheet(package, "غیرفعال دارای بدهی", Color.LightBlue),
+            
+            InstitutionContractListStatus.Deactive =>
+                CreateColoredWorksheet(package, "غیرفعال", Color.LightGray),
+            
+            InstitutionContractListStatus.PendingForRenewal =>
+                CreateColoredWorksheet(package, "در انتظار تمدید", Color.LightCoral),
+            
+            InstitutionContractListStatus.Free =>
+                CreateColoredWorksheet(package, "بنفش", Color.MediumPurple),
+            
+            InstitutionContractListStatus.Block =>
+                CreateColoredWorksheet(package, "بلاک", Color.DimGray),
+            
+            InstitutionContractListStatus.WithoutWorkshop =>
+                CreateColoredWorksheet(package, "بدون کارگاه", Color.Yellow),
+            
+            InstitutionContractListStatus.Active =>
+                CreateColoredWorksheet(package, "فعال", Color.White),
+            
+            InstitutionContractListStatus.PendingForVerify => 
+            CreateColoredWorksheet(package, "در انتظار تایید", Color.OrangeRed),
+            
+            null => CreateColoredWorksheet(package, "کل قرارداد ها", Color.White),
+            _ => throw new ArgumentOutOfRangeException(nameof(status), status, null)
+        };
+    }

-        using (var range = worksheet.Cells[1, 1, 1, 11])
+    /// <summary>
+    /// ایجاد شیت با رنگ تب
+    /// </summary>
+    private static ExcelWorksheet CreateColoredWorksheet(ExcelPackage package, string sheetName, Color tabColor)
+    {
+        var worksheet = package.Workbook.Worksheets.Add(sheetName);
+        worksheet.TabColor = tabColor;
+        return worksheet;
+    }
+
+    private static void CreateExcelSheet(List<GetInstitutionContractListItemsViewModel> contractItems, ExcelWorksheet worksheet)
+    {
+        // دریافت نقشه ستون‌های مرئی
+        var visibleColumnIndices = GetVisibleColumnIndices();
+        int columnCount = visibleColumnIndices.Count;
+
+        // تنظیم Headers
+        SetupHeaders(worksheet, visibleColumnIndices, columnCount);
+
+        using (var range = worksheet.Cells[1, 1, 1, columnCount])
        {
            range.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
            range.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
@@ -110,30 +153,35 @@ public class InstitutionContractExcelGenerator

        int row = 2;

-        for (int i = 0; i < institutionContractViewModels.Count; i++)
+        for (int i = 0; i < contractItems.Count; i++)
        {
-            var contract = institutionContractViewModels[i];
-            var employers = contract.EmployerViewModels?.ToList() ?? new();
-            var workshops = contract.WorkshopViewModels?.ToList() ?? new();
+            var contract = contractItems[i];
+            var employers = contract.EmployerNames?.ToList() ?? new();
+            var workshops = contract.WorkshopNames?.ToList() ?? new();

-            int maxRows = Math.Max(employers.Count, workshops.Count);
-            maxRows = Math.Max(1, maxRows);
+            int maxRows = 1; // هر قرارداد فقط یک ردیف؛ نیازی به مرج عمودی نیست

            int startRow = row;
            int endRow = row + maxRows - 1;

-            // 🎨 دریافت رنگ پس‌زمینه از مقدار رنگ موجود در داده
-            string colorName = contract.ExpireColor.ToLower();
-            var fillColor = GetColorByName(colorName, contract.WorkshopCount, contract.IsContractingPartyBlock);
+            // 🎨 دریافت رنگ پس‌زمینه بر اساس وضعیت قرارداد
+            var fillColor = GetColorByStatus(contract.ListStatus, contract.WorkshopsCount);

            for (int j = 0; j < maxRows; j++)
            {
                int currentRow = row + j;

-                worksheet.Cells[currentRow, 4].Value = j < employers.Count ? employers[j].FullName : null;
-                worksheet.Cells[currentRow, 5].Value = j < workshops.Count ? workshops[j].WorkshopFullName : null;
+                // پر کردن ستون‌های employer و workshop
+                var employerColIndex = GetColumnIndexForType(ExcelColumnType.EmployerName, visibleColumnIndices);
+                var workshopColIndex = GetColumnIndexForType(ExcelColumnType.WorkshopName, visibleColumnIndices);

-                for (int col = 1; col <= 11; col++)
+                if (employerColIndex > 0)
+                    worksheet.Cells[currentRow, employerColIndex].Value = j < employers.Count ? employers[j] : null;
+
+                if (workshopColIndex > 0)
+                    worksheet.Cells[currentRow, workshopColIndex].Value = j < workshops.Count ? workshops[j] : null;
+
+                for (int col = 1; col <= columnCount; col++)
                {
                    var cell = worksheet.Cells[currentRow, col];

@@ -154,109 +202,235 @@ public class InstitutionContractExcelGenerator
            }

            // 🧱 مرج و مقداردهی ستون‌های اصلی
-            worksheet.Cells[startRow, 1, endRow, 1].Merge = true;
-            worksheet.Cells[startRow, 1].Value = contract.ContractNo;
-
-            worksheet.Cells[startRow, 2, endRow, 2].Merge = true;
-            worksheet.Cells[startRow, 2].Value = contract.ContractingPartyName;
-
-            worksheet.Cells[startRow, 3, endRow, 3].Merge = true;
-            worksheet.Cells[startRow, 3].Value = contract.ArchiveCode;
-
-            worksheet.Cells[startRow, 6, endRow, 6].Merge = true;
-            worksheet.Cells[startRow, 6].Value = contract.EmployeeCount;
-
-            worksheet.Cells[startRow, 7, endRow, 7].Merge = true;
-            worksheet.Cells[startRow, 7].Value = contract.ContractStartFa;
-
-            worksheet.Cells[startRow, 8, endRow, 8].Merge = true;
-            worksheet.Cells[startRow, 8].Value = contract.ContractEndFa;
-
-            worksheet.Cells[startRow, 9, endRow, 9].Merge = true;
-            var contractWithoutWorkshopAmountCell = worksheet.Cells[startRow, 9];
-            contractWithoutWorkshopAmountCell.Value = contract.WorkshopCount == "0" ? MoneyToDouble(contract.ContractAmount) : "";
-            contractWithoutWorkshopAmountCell.Style.Numberformat.Format = "#,##0";
-
-
-            worksheet.Cells[startRow, 10, endRow, 10].Merge = true;
-            var contractAmountCell = worksheet.Cells[startRow, 10];
-            contractAmountCell.Value = contract.WorkshopCount != "0" ? MoneyToDouble(contract.ContractAmount) : "";
-            contractAmountCell.Style.Numberformat.Format = "#,##0";
-
-
-            worksheet.Cells[startRow, 11, endRow, 11].Merge = true;
-            var balance = MoneyToDouble(contract.BalanceStr);
-            var balanceCell = worksheet.Cells[startRow, 11];
-            balanceCell.Value = balance;
-            balanceCell.Style.Numberformat.Format = "#,##0";
-
-            if (balance > 0)
-                balanceCell.Style.Font.Color.SetColor(Color.Red);
-            else if (balance < 0)
-                balanceCell.Style.Font.Color.SetColor(Color.Green);
+            FillColumnData(worksheet, contract, startRow, endRow, visibleColumnIndices);

            // 📦 بوردر ضخیم خارجی برای هر سطر
-            var boldRange = worksheet.Cells[startRow, 1, endRow, 11];
+            var boldRange = worksheet.Cells[startRow, 1, endRow, columnCount];
            boldRange.Style.Border.BorderAround(ExcelBorderStyle.Medium);

            row += maxRows;
        }

+        SetupPrintSettings(worksheet, visibleColumnIndices, columnCount);
+    }

+    /// <summary>
+    /// دریافت فهرست ستون‌های مرئی بر اساس کانفیگ
+    /// </summary>
+    private static List<ExcelColumnType> GetVisibleColumnIndices()
+    {
+        return _columnConfig.VisibleColumns;
+    }

+    /// <summary>
+    /// دریافت شماره ستون برای یک نوع ستون خاص
+    /// </summary>
+    private static int GetColumnIndexForType(ExcelColumnType columnType, List<ExcelColumnType> visibleColumns)
+    {
+        var index = visibleColumns.IndexOf(columnType);
+        return index >= 0 ? index + 1 : 0; // 1-based indexing
+    }
+
+    /// <summary>
+    /// دریافت متن header برای یک نوع ستون
+    /// </summary>
+    private static string GetColumnHeader(ExcelColumnType columnType)
+    {
+        return columnType switch
+        {
+            ExcelColumnType.RowNumber => "ردیف",
+            ExcelColumnType.PhysicalContract => "قرارداد فیزیکی",
+            ExcelColumnType.ContractNo => "شماره قرارداد",
+            ExcelColumnType.Representative => "معرف",
+            ExcelColumnType.ContractingPartyName => "طرف حساب",
+            ExcelColumnType.ArchiveCode => "شماره کارفرما",
+            ExcelColumnType.EmployerName => "کارفرما",
+            ExcelColumnType.WorkshopName => "کارگاه‌ها",
+            ExcelColumnType.WorkshopCount => "تعداد کارگاه",
+            ExcelColumnType.EmployeeCount => "مجموع پرسنل",
+            ExcelColumnType.ContractStartDate => "شروع قرارداد",
+            ExcelColumnType.ContractEndDate => "پایان قرارداد",
+            ExcelColumnType.InstallmentAmount => "مبلغ قسط",
+            ExcelColumnType.ContractAmount => "مبلغ قرارداد",
+            ExcelColumnType.FinancialStatus => "وضعیت مالی",
+            _ => ""
+        };
+    }
+
+    /// <summary>
+    /// تنظیم Header‌های ستون‌ها
+    /// </summary>
+    private static void SetupHeaders(ExcelWorksheet worksheet, List<ExcelColumnType> visibleColumns, int columnCount)
+    {
+        for (int i = 0; i < visibleColumns.Count; i++)
+        {
+            worksheet.Cells[1, i + 1].Value = GetColumnHeader(visibleColumns[i]);
+        }
+    }
+
+    /// <summary>
+    /// پر کردن داده‌های ستون‌ها برای یک قرارداد
+    /// </summary>
+    private static void FillColumnData(ExcelWorksheet worksheet, GetInstitutionContractListItemsViewModel contract, int startRow, int endRow, List<ExcelColumnType> visibleColumns)
+    {
+        for (int i = 0; i < visibleColumns.Count; i++)
+        {
+            int columnIndex = i + 1; // 1-based indexing
+            var columnType = visibleColumns[i];
+
+            // Merge cells for non-repeating columns
+            worksheet.Cells[startRow, columnIndex, endRow, columnIndex].Merge = true;
+
+            var cell = worksheet.Cells[startRow, columnIndex];
+
+            switch (columnType)
+            {
+                case ExcelColumnType.PhysicalContract:
+                    var physicalText = contract.IsOldContract
+                        ? (contract.HasSigniture ? "موجود" : "ناموجود")
+                        : (contract.IsInPersonContract ? "الکترونیکی حضوری" : "الکترونیکی غیر حضوری");
+
+                    cell.Value = physicalText;
+                    cell.Style.Font.Bold = true;
+                    cell.Style.Font.Color.SetColor(physicalText switch
+                    {
+                        "موجود" => Color.Green,
+                        "ناموجود" => Color.Red,
+                        "الکترونیکی حضوری" => Color.Purple,
+                        _ => Color.Blue
+                    });
+                    break;
+                case ExcelColumnType.ContractNo:
+                    cell.Value = contract.ContractNo;
+                    break;
+                case ExcelColumnType.Representative:
+                    cell.Value = contract.RepresentativeName;
+                    break;
+                case ExcelColumnType.ContractingPartyName:
+                    cell.Value = contract.ContractingPartyName;
+                    break;
+                case ExcelColumnType.ArchiveCode:
+                    cell.Value = contract.ArchiveNo;
+                    break;
+                case ExcelColumnType.EmployerName:
+                    // این ستون چندخطی است و داخل loop پر می‌شود
+                    break;
+                case ExcelColumnType.WorkshopName:
+                    // این ستون چندخطی است و داخل loop پر می‌شود
+                    break;
+                case ExcelColumnType.WorkshopCount:
+                    cell.Value = contract.WorkshopsCount;
+                    break;
+                case ExcelColumnType.EmployeeCount:
+                    cell.Value = contract.EmployeesCount;
+                    break;
+                case ExcelColumnType.ContractStartDate:
+                    cell.Value = contract.ContractStartFa;
+                    break;
+                case ExcelColumnType.ContractEndDate:
+                    cell.Value = contract.ContractEndFa;
+                    break;
+                case ExcelColumnType.InstallmentAmount:
+                    cell.Value = contract.InstallmentAmount;
+                    cell.Style.Numberformat.Format = "#,##0";
+                    break;
+                case ExcelColumnType.ContractAmount:
+                    cell.Value = contract.ContractAmount;
+                    cell.Style.Numberformat.Format = "#,##0";
+                    break;
+                case ExcelColumnType.FinancialStatus:
+                    cell.Value = contract.Balance;
+                    cell.Style.Numberformat.Format = "#,##0";
+
+                    if (contract.Balance > 0)
+                        cell.Style.Font.Color.SetColor(Color.Red);
+                    else if (contract.Balance < 0)
+                        cell.Style.Font.Color.SetColor(Color.Green);
+                    break;
+            }
+        }
+    }
+
+    /// <summary>
+    /// تنظیم تنظیمات چاپ و عرض ستون‌ها
+    /// </summary>
+    private static void SetupPrintSettings(ExcelWorksheet worksheet, List<ExcelColumnType> visibleColumns, int columnCount)
+    {
        worksheet.PrinterSettings.PaperSize = ePaperSize.A4;
        worksheet.PrinterSettings.Orientation = eOrientation.Landscape;
        worksheet.PrinterSettings.FitToPage = true;
        worksheet.PrinterSettings.FitToWidth = 1;
        worksheet.PrinterSettings.FitToHeight = 0;
        worksheet.PrinterSettings.Scale = 85;
-        int contractNoCol = 1;
-        int contractingPartyNameCol = 2;
-        int archiveNoCol = 3;
-        int employersCol = 4;
-        int workshopsCol = 5;
-        int employeeCountCol = 6;
-        int startContractCol = 7;
-        int endContractCol = 8;
-        int contractWithoutWorkshopAmountCol = 9;
-        int contractAmountCol = 10;
-        int balanceCol = 11;
-        worksheet.Columns[contractNoCol].Width = 17;
-        worksheet.Columns[contractingPartyNameCol].Width = 40;
-        worksheet.Columns[archiveNoCol].Width = 10;
-        worksheet.Columns[employersCol].Width = 40;
-        worksheet.Columns[workshopsCol].Width = 45;
-        worksheet.Columns[employeeCountCol].Width = 12;
-        worksheet.Columns[startContractCol].Width = 12;
-        worksheet.Columns[endContractCol].Width = 12;
-        worksheet.Columns[contractWithoutWorkshopAmountCol].Width = 18;
-        worksheet.Columns[contractAmountCol].Width = 12;
-        worksheet.Columns[balanceCol].Width = 12;
+
+        // تنظیم عرض ستون‌ها بر اساس نوع ستون
+        for (int i = 0; i < visibleColumns.Count; i++)
+        {
+            int columnIndex = i + 1;
+            worksheet.Columns[columnIndex].Width = GetColumnWidth(visibleColumns[i]);
+        }
+
        worksheet.View.RightToLeft = true; // فارسی
-        //worksheet.Cells[worksheet.Dimension.Address].AutoFitColumns();
+    }
+
+    /// <summary>
+    /// دریافت عرض ستون پیش‌فرض برای هر نوع ستون
+    /// </summary>
+    private static double GetColumnWidth(ExcelColumnType columnType)
+    {
+        return columnType switch
+        {
+            ExcelColumnType.RowNumber => 8,
+            ExcelColumnType.PhysicalContract => 15,
+            ExcelColumnType.ContractNo => 17,
+            ExcelColumnType.Representative => 15,
+            ExcelColumnType.ContractingPartyName => 40,
+            ExcelColumnType.ArchiveCode => 10,
+            ExcelColumnType.EmployerName => 40,
+            ExcelColumnType.WorkshopName => 45,
+            ExcelColumnType.WorkshopCount => 12,
+            ExcelColumnType.EmployeeCount => 12,
+            ExcelColumnType.ContractStartDate => 12,
+            ExcelColumnType.ContractEndDate => 12,
+            ExcelColumnType.InstallmentAmount => 15,
+            ExcelColumnType.ContractAmount => 15,
+            ExcelColumnType.FinancialStatus => 12,
+            _ => 12
+        };
    }

    private static double MoneyToDouble(string value)
    {
-        Console.WriteLine(value);
+        if (string.IsNullOrEmpty(value))
+            return 0;
+
        var min = value.Length > 1 ? value.Substring(0, 2) : "";
        var test = min == "\u200e\u2212" ? value.MoneyToDouble() * -1 : value.MoneyToDouble();
-
-        Console.WriteLine(test);
        return test;
    }
-    private static Color GetColorByName(string name, string workshopCount, string IsContractingPartyBlock)
+
+    /// <summary>
+    /// دریافت رنگ بر اساس وضعیت قرارداد
+    /// </summary>
+    private static Color GetColorByStatus(InstitutionContractListStatus status, int workshopsCount)
    {
-        return name switch
+        return status switch
        {
-            "blue" => Color.LightBlue,
-            _ when IsContractingPartyBlock == "true" => Color.LightGray,
-            "red" => Color.LightCoral,
-            "purple" => Color.MediumPurple,
-            "black" => Color.DimGray,
-            var n when string.IsNullOrWhiteSpace(n) && workshopCount == "0" => Color.Yellow,
+            InstitutionContractListStatus.DeactiveWithDebt => Color.LightBlue,
+            InstitutionContractListStatus.Deactive => Color.LightGray,
+            InstitutionContractListStatus.PendingForRenewal => Color.LightCoral,
+            InstitutionContractListStatus.Free => Color.MediumPurple,
+            InstitutionContractListStatus.Block => Color.DimGray,
+            InstitutionContractListStatus.WithoutWorkshop => Color.Yellow,
+            InstitutionContractListStatus.Active => Color.White,
            _ => Color.White
        };
    }

-}
+}
+
+public class InstitutionContractExcelViewModel
+{
+    public InstitutionContractListStatus? Tab { get; set; }
+    public List<GetInstitutionContractListItemsViewModel> GetInstitutionContractListItemsViewModels { get; set; }
+}
--- a/CompanyManagment.App.Contracts/Employee/DTO/EmployeeListDto.cs
+++ b/CompanyManagment.App.Contracts/Employee/DTO/EmployeeListDto.cs
@@ -1,92 +0,0 @@
-using System.Diagnostics.Contracts;
-
-namespace CompanyManagment.App.Contracts.Employee.DTO;
-
-/// <summary>
-/// لیست پرسنل کلاینت
-/// api
-/// </summary>
-public class EmployeeListDto
-{
-    /// <summary>
-    /// آی دی پرسنل
-    /// </summary>
-    public long Id { get; set; }
-
-    /// <summary>
-    /// نام کامل پرسنل
-    /// </summary>
-    public string EmployeeFullName { get; set; }
-
-    /// <summary>
-    /// کد پرسنلی
-    /// </summary>
-    public int PersonnelCode { get; set; }
-
-    /// <summary>
-    /// وضعیت تاهل
-    /// </summary>
-    public string MaritalStatus { 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 FatherName { get; set; }
-
-    /// <summary>
-    /// تعداد فرزندان
-    /// </summary>
-    public string NumberOfChildren { get; set; }
-
-    /// <summary>
-    /// آخرین تاریخ شروع بکار قرارداد
-    /// </summary>
-    public string LatestContractStartDate { get; set; }
-
-    /// <summary>
-    /// تاریخ ترک کار قرارداد
-    /// </summary>
-    public string ContractLeftDate { get; set; }
-
-
-    /// <summary>
-    /// آخرین تاریخ شروع بکار بیمه
-    /// </summary>
-    public string LatestInsuranceStartDate { get; set; }
-
-    /// <summary>
-    /// تاریخ ترک کار بیمه
-    /// </summary>
-    public string InsuranceLeftDate { get; set; }
-
-
-    /// <summary>
-    /// دارای قرارداد است؟
-    /// </summary>
-    public bool HasContract { get; set; }
-
-    /// <summary>
-    /// دارای بیمه است؟
-    /// </summary>
-    public bool HasInsurance { get; set; }
-
-    /// <summary>
-    /// وضعیت پرسنل در کارگاه
-    /// </summary>
-    public EmployeeStatusInWorkshop EmployeeStatusInWorkshop { get; set; }
-}
--- a/CompanyManagment.App.Contracts/Employee/DTO/EmployeeSearchModelDto.cs
+++ b/CompanyManagment.App.Contracts/Employee/DTO/EmployeeSearchModelDto.cs
@@ -1,18 +0,0 @@
-namespace CompanyManagment.App.Contracts.Employee.DTO;
-
-/// <summary>
-/// سرچ مدل پرسنل
-/// api
-/// </summary>
-public class EmployeeSearchModelDto
-{
-    /// <summary>
-    /// نام پرسنل
-    /// </summary>
-    public string EmployeeFullName { get; set; }
-
-    /// <summary>
-    /// کد ملی
-    /// </summary>
-    public string NationalCode { get; set; }
-}
--- a/CompanyManagment.App.Contracts/Employee/DTO/EmployeeStatusInWorkshop.cs
+++ b/CompanyManagment.App.Contracts/Employee/DTO/EmployeeStatusInWorkshop.cs
@@ -1,29 +0,0 @@
-namespace CompanyManagment.App.Contracts.Employee.DTO;
-
-/// <summary>
-/// وضعیت پرسنل در کارگاه
-/// api
-/// </summary>
-public enum EmployeeStatusInWorkshop
-{
-    /// <summary>
-    /// ایجاد شده توسط کارفرما
-    /// </summary>
-    CreatedByClient,
-
-    /// <summary>
-    /// ترک کار موقت
-    /// </summary>
-    LefWorkTemp,
-
-    /// <summary>
-    /// در حال کار در کارگاه
-    /// </summary>
-    Working,
-
-    /// <summary>
-    /// قطع ارتباط و ترک کار کامب
-    /// </summary>
-    HasLeft,
-
-}
--- a/CompanyManagment.App.Contracts/Employee/DTO/PrintAllEmployeesInfoDtoClient.cs
+++ b/CompanyManagment.App.Contracts/Employee/DTO/PrintAllEmployeesInfoDtoClient.cs
@@ -1,96 +0,0 @@
-namespace CompanyManagment.App.Contracts.Employee.DTO;
-
-/// <summary>
-/// پرینت تجمیعی پرسنل
-/// </summary>
-public class PrintAllEmployeesInfoDtoClient
-{
-    public PrintAllEmployeesInfoDtoClient(EmployeeListDto source)
-    {
-        Id = source.Id;
-        EmployeeFullName = source.EmployeeFullName;
-        PersonnelCode = source.PersonnelCode;
-        MaritalStatus = source.MaritalStatus;
-        NationalCode = source.NationalCode;
-        IdNumber = source.IdNumber;
-        DateOfBirth = source.DateOfBirth;
-        FatherName = source.FatherName;
-        NumberOfChildren = source.NumberOfChildren;
-        LatestContractStartDate = source.LatestContractStartDate;
-        ContractLeftDate = source.ContractLeftDate;
-        LatestInsuranceStartDate = source.LatestInsuranceStartDate;
-        InsuranceLeftDate = source.InsuranceLeftDate;
-        EmployeeStatusInWorkshop = source.EmployeeStatusInWorkshop;
-    }
-    /// <summary>
-    /// آی دی پرسنل
-    /// </summary>
-    public long Id { get; set; }
-
-    /// <summary>
-    /// نام کامل پرسنل
-    /// </summary>
-    public string EmployeeFullName { get; set; }
-
-    /// <summary>
-    /// کد پرسنلی
-    /// </summary>
-    public int PersonnelCode { get; set; }
-
-    /// <summary>
-    /// وضعیت تاهل
-    /// </summary>
-    public string MaritalStatus { 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 FatherName { get; set; }
-
-    /// <summary>
-    /// تعداد فرزندان
-    /// </summary>
-    public string NumberOfChildren { get; set; }
-
-    /// <summary>
-    /// آخرین تاریخ شروع بکار قرارداد
-    /// </summary>
-    public string LatestContractStartDate { get; set; }
-
-    /// <summary>
-    /// تاریخ ترک کار قرارداد
-    /// </summary>
-    public string ContractLeftDate { get; set; }
-
-
-    /// <summary>
-    /// آخرین تاریخ شروع بکار بیمه
-    /// </summary>
-    public string LatestInsuranceStartDate { get; set; }
-
-    /// <summary>
-    /// تاریخ ترک کار بیمه
-    /// </summary>
-    public string InsuranceLeftDate { get; set; }
-
-
-    /// <summary>
-    /// وضعیت پرسنل در کارگاه
-    /// </summary>
-    public EmployeeStatusInWorkshop EmployeeStatusInWorkshop { get; set; }
-}
--- a/CompanyManagment.App.Contracts/Employee/IEmployeeApplication.cs
+++ b/CompanyManagment.App.Contracts/Employee/IEmployeeApplication.cs
@@ -1,10 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using CompanyManagment.App.Contracts.Employee.DTO;
 using CompanyManagment.App.Contracts.EmployeeInsuranceRecord;
-using Microsoft.AspNetCore.Mvc;

 namespace CompanyManagment.App.Contracts.Employee;

@@ -75,7 +73,6 @@ public interface IEmployeeApplication
        long workshopId);
    Task<OperationResult> EditEmployeeInEmployeeDocumentWorkFlow(EditEmployeeInEmployeeDocument command);

-    [Obsolete("این متد منسوخ شده است و از متد WorkedEmployeesInWorkshopSelectList استفاده کنید")]
    Task<List<EmployeeSelectListViewModel>> WorkedEmployeesInWorkshopSelectList(long workshopId);

    Task<OperationResult<EmployeeDataFromApiViewModel>> GetEmployeeDataFromApi(string nationalCode, string birthDate);
@@ -106,26 +103,8 @@ public interface IEmployeeApplication
 	/// <returns></returns>
 	Task<List<GetClientEmployeeListViewModel>> GetClientEmployeeList(GetClientEmployeeListSearchModel searchModel, long workshopId);

+	#endregion

-    /// <summary>
-    /// دریافت لیست پرسنل کلاینت
-    /// api
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <param name="workshopId"></param>
-    /// <returns></returns>
-    Task<List<EmployeeListDto>> ListOfAllEmployeesClient(EmployeeSearchModelDto searchModel, long workshopId);
-
-    /// <summary>
-    /// پرینت تجمیعی پرسنل کلاینت
-    /// api
-    /// </summary>
-    /// <param name="workshopId"></param>
-    /// <returns></returns>
-    Task<List<PrintAllEmployeesInfoDtoClient>> PrintAllEmployeesInfoClient(long workshopId);
-    #endregion
-
-    Task<List<EmployeeSelectListViewModel>> GetWorkingEmployeesSelectList(long workshopId);
 }

 public class GetClientEmployeeListSearchModel
--- a/CompanyManagment.App.Contracts/Leave/CheckIsInvalidLeaveDto.cs
+++ b/CompanyManagment.App.Contracts/Leave/CheckIsInvalidLeaveDto.cs
@@ -1,15 +0,0 @@
-namespace CompanyManagment.App.Contracts.Leave;
-
-public class CheckIsInvalidLeaveDto
-{
-    /// <summary>
-    /// آیا تعطیل است
-    /// </summary>
-    public bool IsHoliday { get; set; }
-
-    /// <summary>
-    /// فاقد/دارای اعتبار فیش غیر رسمی
-    /// </summary>
-    public bool CanCreateInvalid { get; set; }
-
-}
--- a/CompanyManagment.App.Contracts/Leave/CreateLeaveDto.cs
+++ b/CompanyManagment.App.Contracts/Leave/CreateLeaveDto.cs
@@ -1,78 +0,0 @@
-using CompanyManagment.App.Contracts.CustomizeWorkshopSettings;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
-
-namespace CompanyManagment.App.Contracts.Leave;
-
-public class CreateLeaveDto
-{
-    /// <summary>
-    /// تاریخ شروع مرخصی
-    /// </summary>
-    [Required(ErrorMessage = "این مقدار نمی تواند خالی باشد")]
-    public string StartLeave { get; set; }
-
-
-    /// <summary>
-    /// تاریخ پایان مرخصی
-    /// </summary>
-    [Required(ErrorMessage = "این مقدار نمی تواند خالی باشد")]
-    public string EndLeave { get; set; }
-
-    /// <summary>
-    /// آی دی کارگاه
-    /// </summary>
-    public long WorkshopId { get; set; }
-
-    /// <summary>
-    /// آی دی پرسنل
-    /// </summary>
-    public long EmployeeId { get; set; }
-
-    /// <summary>
-    /// نوع مدت مرخص روزانه/ ساعتی
-    /// </summary>
-    public PaidLeaveType PaidLeaveType { get; set; }
-
-    /// <summary>
-    /// نوع مرخصی استحقاقی/استعلاجی
-    /// </summary>
-    public LeaveType LeaveType { get; set; }
-
-    /// <summary>
-    /// نام کامل کارگاه
-    /// </summary>
-    public string WorkshopName { get; set; }
-
-    /// <summary>
-    /// ساعت شروع مرخصی
-    /// </summary>
-    public string StartHoures { get; set; }
-
-    /// <summary>
-    /// ساعت پایان مرخصی
-    /// </summary>
-    public string EndHours { get; set; }
-
-    /// <summary>
-    /// موافقت / عدم موافقت کارفرما
-    /// </summary>
-    public bool IsAccepted { get; set; }
-
-    /// <summary>
-    /// توضیحات
-    /// </summary>
-    public string Decription { get; set; }
-
-
-    public List<CustomizeRotatingShiftsViewModel> RotatingShifts { get; set; }
-
-    /// <summary>
-    /// دارای اعتبار / فاقد اعتبار  فیش غیررسمی
-    /// </summary>
-    public bool IsInvallid { get; set; }
-    public CustomizeRotatingShiftsViewModel SelectedShift { get; set; }
-
-}
--- a/CompanyManagment.App.Contracts/Leave/GroupLeaveListDto.cs
+++ b/CompanyManagment.App.Contracts/Leave/GroupLeaveListDto.cs
@@ -1,88 +0,0 @@
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.Leave;
-
-public class GroupLeaveListDto
-{
-    /// <summary>
-    /// سال مرخصی
-    /// </summary>
-    public string YearStr { get; set; }
-
-    /// <summary>
-    /// ماه مرخصی
-    /// </summary>
-    public string MonthStr { get; set; }
-    /// <summary>
-    /// آیتم های هر گروه
-    /// </summary>
-    public List<LeaveListItemsDto> LeaveListItemsDto { get; set; }
-}
-
-/// <summary>
-/// آیتم های هر گروه
-/// </summary>
-public class LeaveListItemsDto
-{
-    /// <summary>
-    /// نوع مرخصی، استحقاقی/استعلاجی
-    /// </summary>
-    public string LeaveType { get; set; }
-
-
-    /// <summary>
-    /// تاریخ شروع مرخصی
-    /// </summary>
-    public string StartLeave { get; set; }
-
-    /// <summary>
-    /// تاریخ پایان مرخصی
-    /// </summary>
-    public string EndLeave { get; set; }
-
-
-    /// <summary>
-    /// زمان مرخصی
-    /// بازه مرخصی ساعتی
-    /// </summary>
-    public string HourlyInterval { get; set; }
-
-
-    /// <summary>
-    /// مدت مرخصی
-    /// </summary>
-    public string LeaveDuration { get; set; }
-
-    /// <summary>
-    /// موافقت/عدم موافقت  کارفرما
-    /// </summary>
-    public bool IsAccepted { get; set; }
-
-
-
-
-
-    /// <summary>
-    /// آی دی
-    /// </summary>
-    public long Id { get; set; }
-
-
-
-    /// <summary>
-    /// آی دی گارگاه
-    /// </summary>
-    public long WorkshopId { get; set; }
-
-    /// <summary>
-    /// آی دی پرسنل
-    /// </summary>
-    public long EmployeeId { get; set; }
-
-
-
-    /// <summary>
-    ///آیا فاقد اعتبار است. فاقد اعتبار ها فقط برای فیش های غیررسمی مورد استفاده قرار میگیرند 
-    /// </summary>
-    public bool IsInvalid { get; set; }
-}
--- a/CompanyManagment.App.Contracts/Leave/ILeaveApplication.cs
+++ b/CompanyManagment.App.Contracts/Leave/ILeaveApplication.cs
@@ -19,7 +19,6 @@ public interface ILeaveApplication
    GroupLeavePrintViewModel PrintPersonnelLeaveList(List<long> id);

 	OperationResult RemoveLeave(long id);
-    Task<OperationResult> RemoveLeaveAsync(long id);
    LeaveViewModel LeavOnChekout(DateTime starContract, DateTime endContract, long employeeId, long workshopId);
    List<LeaveMainViewModel> searchClient(LeaveSearchModel search);

@@ -37,117 +36,5 @@ public interface ILeaveApplication
    TimeSpan GetEmployeeLeaveTimeSpanInDates(long workshopId, long employeeId, string startFa, string endFa,
        string type);

-    #endregion
-
-
-    /// <summary>
-    /// دریافت لیست مرخصی ها در کلاینت
-    /// Api
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<PagedResult<leaveListDto>> GetList(
-        LeaveListSearchModel searchModel);
-
-    /// <summary>
-    /// دریافت لیست گروه بندی شده
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<List<GroupLeaveListDto>> GetGroupList(LeaveListSearchModel searchModel);
-
-    /// <summary>
-    /// دریافت مجکوع مرخصی پرسنل
-    /// اگر آی دی پرسنل، سال و ماه خالی نباشد
-    /// </summary>
-    /// <param name="workshopId"></param>
-    /// <param name="employeeId"></param>
-    /// <param name="yearStr"></param>
-    /// <param name="monthStr"></param>
-    /// <param name="leaveType"></param>
-    /// <returns></returns>
-    TimeSpan SumOfEmployeeLeaveTimeSpanInDates(long workshopId, long employeeId, string yearStr, string monthStr,
-        LeaveType leaveType);
-
-    Task<List<LeavePrintResponseViewModel>> PrintAllAsync(List<long> ids, long workshopId);
-    Task<LeavePrintResponseViewModel> PrintOneAsync(long id, long workshopId);
-
-    /// <summary>
-    /// چک میکند که تاریخ وارد شده در شروع مرخصی تعطیل است یا خیر
-    /// دارای/فاقد اعتبار فیش غیررسمی را چک میکند
-    /// </summary>
-    /// <param name="startLeaveDate"></param>
-    /// <param name="workshopId"></param>
-    /// <returns></returns>
-    Task<OperationResult<CheckIsInvalidLeaveDto>> CheckIsInvalidLeave(string startLeaveDate, long workshopId);
-
-    /// <summary>
-    /// ایجاد مرخصی از ای پی آی
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    Task<OperationResult> CreateLeave(CreateLeaveDto command);
-
-    /// <summary>
-    /// چک میکند که آیا  پرسنل حضور غیاب دارای شیفت گردشی دارد یا خیر
-    /// اگر داشت دریافت شیف گردشی   
-    /// </summary>
-    /// <param name="workshopId"></param>
-    /// <param name="employeeId"></param>
-    /// <param name="startLeaveDate"></param>
-    /// <returns></returns>
-    Task<OperationResult<RotatingShiftDto>> HasRotatingShift(long workshopId, long employeeId, string startLeaveDate);
-
-    /// <summary>
-    /// پرینت لیستی
-    /// </summary>
-    /// <param name="ids"></param>
-    /// <returns></returns>
-    Task<LeaveListPrintDto> ListPrint(List<long> ids);
-
-
-    /// <summary>
-    /// محاسبه مدت مرخصی ساعتی
-    /// </summary>
-    /// <param name="startHours"></param>
-    /// <param name="endHours"></param>
-    /// <returns></returns>
-    Task<string> GetHourlyLeaveDuration(string startHours, string endHours);
-
-    /// <summary>
-    /// محاسبه مدت مرخصی روزانه
-    /// </summary>
-    /// <param name="startDate"></param>
-    /// <param name="endDate"></param>
-    /// <returns></returns>
-    Task<string> GetDailyLeaveDuration(string startDate, string endDate);
-
-}
-
-public class LeavePrintResponseViewModel
-{
-    public string FullName { get; set; }
-    public string NationalCode { get; set; }
-    public string WorkshopName { get; set; }
-    public List<string> EmployerNames { get; set; }
-    public string PaidLeaveType { get; set; }
-    public string ContractNo { get; set; }
-    public LeavePrintHourlyResponseViewModel HourlyLeave { get; set; }
-    public LeavePrintDailyResponseViewModel DailyLeave { get; set; }
-    
-}
-
-public class LeavePrintDailyResponseViewModel
-{
-    public string StartLeave { get; set; }
-    public string EndLeave { get; set; }
-    public string TotalDay { get; set; }
-}
-
-public class LeavePrintHourlyResponseViewModel
-{
-    public string LeaveDate { get; set; }
-    public string StartHour { get; set; }
-    public string EndHour { get; set; }
-    public string TotalHour { get; set; }
+	#endregion
 }
--- a/CompanyManagment.App.Contracts/Leave/LeaveListMultipleDto.cs
+++ b/CompanyManagment.App.Contracts/Leave/LeaveListMultipleDto.cs
@@ -1,24 +0,0 @@
-using _0_Framework.Application;
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.Leave;
-
-public class LeaveListMultipleDto
-{
-    /// <summary>
-    /// لیست گروهبندی شده بر اساس سال و ماه
-    /// اگر در جستجو پرسنل انتخاب شود
-    /// </summary>
-    public List<GroupLeaveListDto>? GroupLeaveListDto { get; set; }
-
-    /// <summary>
-    /// لیست نرمال PageResult
-    /// </summary>
-    public PagedResult<leaveListDto>? leaveListDto { get; set; }
-
-    /// <summary>
-    /// مجموع مرخصی پرسنل
-    /// اگر پرسنل انتخاب شده باشد
-    /// </summary>
-    public string? SumOfEmployeeleaves { get; set; }
-}
--- a/CompanyManagment.App.Contracts/Leave/LeaveListPrintDto.cs
+++ b/CompanyManagment.App.Contracts/Leave/LeaveListPrintDto.cs
@@ -1,77 +0,0 @@
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.Leave;
-
-/// <summary>
-/// پرینت لیستی
-/// api
-/// </summary>
-public class LeaveListPrintDto
-{
-
-    /// <summary>
-    /// نام کامل پرسنل
-    /// </summary>
-    public string EmployeeFullName { get; set; }
-
-    /// <summary>
-    /// مجموع مرخصی پرسنل
-    /// </summary>
-    public string? SumOfEmployeeleaves { get; set; }
-
-    /// <summary>
-    /// لیست مرخصی
-    /// </summary>
-    public List<LeavePrintListItemsDto> LeavePrintListItemsDto { get; set; }
-
-
-}
-
-public class LeavePrintListItemsDto
-{
-    /// <summary>
-    /// سال مرخصی
-    /// </summary>
-    public string YearStr { get; set; }
-
-    /// <summary>
-    /// ماه مرخصی
-    /// </summary>
-    public string MonthStr { get; set; }
-
-
-    /// <summary>
-    /// نوع مرخصی، استحقاقی/استعلاجی
-    /// </summary>
-    public string LeaveType { get; set; }
-
-
-    /// <summary>
-    /// تاریخ شروع مرخصی
-    /// </summary>
-    public string StartLeave { get; set; }
-
-    /// <summary>
-    /// تاریخ پایان مرخصی
-    /// </summary>
-    public string EndLeave { get; set; }
-
-
-    /// <summary>
-    /// زمان مرخصی
-    /// بازه مرخصی ساعتی
-    /// </summary>
-    public string HourlyInterval { get; set; }
-
-
-    /// <summary>
-    /// مدت مرخصی
-    /// </summary>
-    public string LeaveDuration { get; set; }
-
-    /// <summary>
-    /// موافقت/عدم موافقت  کارفرما
-    /// </summary>
-    public bool IsAccepted { get; set; }
-
-}
--- a/CompanyManagment.App.Contracts/Leave/LeaveListSearchModel.cs
+++ b/CompanyManagment.App.Contracts/Leave/LeaveListSearchModel.cs
@@ -1,45 +0,0 @@
-using _0_Framework.Application;
-
-namespace CompanyManagment.App.Contracts.Leave;
-
-public class LeaveListSearchModel : PaginationRequest
-{
-    /// <summary>
-    /// آی دی کارگاه
-    /// </summary>
-    public long WorkshopId { get; set; }
-    /// <summary>
-    /// نوع مرخصی، استحقاقی/استعلاجی
-    /// </summary>
-    public LeaveType LeaveType { get; set; }
-
-    /// <summary>
-    /// سال مرخصی
-    /// </summary>
-    public string YearStr { get; set; }
-
-    /// <summary>
-    /// ماه مرخصی
-    /// </summary>
-    public string MonthStr { get; set; }
-
-    /// <summary>
-    ///آیا فاقد اعتبار است. فاقد اعتبار ها فقط برای فیش های غیررسمی مورد استفاده قرار میگیرند 
-    /// </summary>
-    public bool IsInvalid { get; private set; }
-
-    /// <summary>
-    /// تاریخ شروع مرخصی
-    /// </summary>
-    public string StartLeave { get; set; }
-
-    /// <summary>
-    /// تاریخ پایان مرخصی
-    /// </summary>
-    public string EndLeave { get; set; }
-
-    /// <summary>
-    /// آی دی پرسنل
-    /// </summary>
-    public long EmployeeId { get; set; }
-}
--- a/CompanyManagment.App.Contracts/Leave/LeaveType.cs
+++ b/CompanyManagment.App.Contracts/Leave/LeaveType.cs
@@ -1,18 +0,0 @@
-namespace CompanyManagment.App.Contracts.Leave;
-
-public enum LeaveType
-{
-    /// <summary>
-    /// هر دو
-    /// </summary>
-    Both,
-    /// <summary>
-    /// مرخصی استعلاجی
-    /// </summary>
-    SickLeave,
-
-    /// <summary>
-    /// مرخصی استحقاقی
-    /// </summary>
-    PaidLeave
-}
--- a/CompanyManagment.App.Contracts/Leave/PaidLeaveType.cs
+++ b/CompanyManagment.App.Contracts/Leave/PaidLeaveType.cs
@@ -1,17 +0,0 @@
-namespace CompanyManagment.App.Contracts.Leave;
-
-/// <summary>
-/// نوع مدت مرخصی
-/// </summary>
-public enum PaidLeaveType
-{
-    /// <summary>
-    /// روزانه
-    /// </summary>
-    Daily,
-
-    /// <summary>
-    /// ساعتی
-    /// </summary>
-    Hourly,
-}
--- a/CompanyManagment.App.Contracts/Leave/RotatingShiftDto.cs
+++ b/CompanyManagment.App.Contracts/Leave/RotatingShiftDto.cs
@@ -1,17 +0,0 @@
-using CompanyManagment.App.Contracts.CustomizeWorkshopSettings;
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.Leave;
-
-public class RotatingShiftDto
-{
-    /// <summary>
-    /// آیا حضورغیاب به همراه گروهبندی گردشی دارد
-    /// </summary>
-    public bool HasRollCall {get; set;}
-
-    /// <summary>
-    /// لیست شیفت های گردشی پرسنل
-    /// </summary>
-    public List<CustomizeRotatingShiftsViewModel> RotatingShifts { get; set; }
-}
--- a/CompanyManagment.App.Contracts/Leave/leaveListDto.cs
+++ b/CompanyManagment.App.Contracts/Leave/leaveListDto.cs
@@ -1,84 +0,0 @@
-namespace CompanyManagment.App.Contracts.Leave;
-
-public class leaveListDto
-{
-
-    /// <summary>
-    /// نام کامل پرسنل
-    /// </summary>
-    public string EmployeeFullName { get; set; }
-
-
-    /// <summary>
-    /// سال مرخصی
-    /// </summary>
-    public string YearStr { get; set; }
-
-    /// <summary>
-    /// ماه مرخصی
-    /// </summary>
-    public string MonthStr { get; set; }
-
-
-    /// <summary>
-    /// نوع مرخصی، استحقاقی/استعلاجی
-    /// </summary>
-    public string LeaveType { get; set; }
-
-
-    /// <summary>
-    /// تاریخ شروع مرخصی
-    /// </summary>
-    public string StartLeave { get; set; }
-
-    /// <summary>
-    /// تاریخ پایان مرخصی
-    /// </summary>
-    public string EndLeave { get; set; }
-
-
-    /// <summary>
-    /// زمان مرخصی
-    /// بازه مرخصی ساعتی
-    /// </summary>
-    public string HourlyInterval { get; set; }
-
-
-    /// <summary>
-    /// مدت مرخصی
-    /// </summary>
-    public string LeaveDuration { get; set; }
-
-    /// <summary>
-    /// موافقت/عدم موافقت  کارفرما
-    /// </summary>
-    public bool IsAccepted { get; set; }
-
-
-
-
-
-    /// <summary>
-    /// آی دی
-    /// </summary>
-    public long Id { get; set; }
-
-
-
-    /// <summary>
-    /// آی دی گارگاه
-    /// </summary>
-    public long WorkshopId { get; set; }
-
-    /// <summary>
-    /// آی دی پرسنل
-    /// </summary>
-    public long EmployeeId { get; set; }
-
-
-
-    /// <summary>
-    ///آیا فاقد اعتبار است. فاقد اعتبار ها فقط برای فیش های غیررسمی مورد استفاده قرار میگیرند 
-    /// </summary>
-    public bool IsInvalid { get; set; }
-}
--- a/CompanyManagment.App.Contracts/Workshop/IWorkshopApplication.cs
+++ b/CompanyManagment.App.Contracts/Workshop/IWorkshopApplication.cs
@@ -1,11 +1,10 @@
-using _0_Framework.Application;
-using AccountManagement.Application.Contracts.Account;
-using CompanyManagment.App.Contracts.Employee.DTO;
-using CompanyManagment.App.Contracts.Workshop.DTOs;
-using Microsoft.AspNetCore.Mvc;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
+using _0_Framework.Application;
+using AccountManagement.Application.Contracts.Account;
+using CompanyManagment.App.Contracts.Workshop.DTOs;
+using Microsoft.AspNetCore.Mvc;

 namespace CompanyManagment.App.Contracts.Workshop;

@@ -93,8 +92,6 @@ public interface IWorkshopApplication
    #endregion

    Task<ActionResult<OperationResult>> CreateWorkshopWorkflowRegistration(CreateWorkshopWorkflowRegistration command);
-
-
 }

 public class CreateWorkshopWorkflowRegistration
--- a/CompanyManagment.Application/EmployeeAplication.cs
+++ b/CompanyManagment.Application/EmployeeAplication.cs
@@ -1734,20 +1734,5 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
        return await _EmployeeRepository.GetClientEmployeeList(searchModel, workshopId);
    }

-    public async Task<List<EmployeeListDto>> ListOfAllEmployeesClient(EmployeeSearchModelDto searchModel, long workshopId)
-    {
-        return await _EmployeeRepository.ListOfAllEmployeesClient(searchModel, workshopId);
-    }
-
-    public  async Task<List<PrintAllEmployeesInfoDtoClient>> PrintAllEmployeesInfoClient(long workshopId)
-    {
-        return await _EmployeeRepository.PrintAllEmployeesInfoClient(workshopId);
-    }
-
-    public async Task<List<EmployeeSelectListViewModel>> GetWorkingEmployeesSelectList(long workshopId)
-    {
-        return await _EmployeeRepository.GetWorkingEmployeesSelectList(workshopId);
-    }
-
    #endregion
 }
--- a/CompanyManagment.Application/LeaveApplication.cs
+++ b/CompanyManagment.Application/LeaveApplication.cs
@@ -1,25 +1,17 @@
-using _0_Framework.Application;
-using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
-using Company.Domain.CustomizeWorkshopEmployeeSettingsAgg;
-using Company.Domain.EmployeeAgg;
-using Company.Domain.HolidayItemAgg;
-using Company.Domain.LeaveAgg;
-using Company.Domain.RollCallAgg;
-using Company.Domain.RollCallServiceAgg;
-using Company.Domain.WorkshopAgg;
-using CompanyManagment.App.Contracts.CustomizeWorkshopSettings;
-using CompanyManagment.App.Contracts.HolidayItem;
-using CompanyManagment.App.Contracts.Leave;
-using CompanyManagment.App.Contracts.RollCallEmployeeStatus;
-using CompanyManagment.App.Contracts.RollCallService;
-using CompanyManagment.EFCore.Migrations;
-using Microsoft.AspNetCore.Mvc;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
+using _0_Framework.Application;
+using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
+using Company.Domain.CustomizeWorkshopEmployeeSettingsAgg;
+using Company.Domain.EmployeeAgg;
+using Company.Domain.LeaveAgg;
+using Company.Domain.RollCallAgg;
+using Company.Domain.WorkshopAgg;
+using CompanyManagment.App.Contracts.Leave;
+using CompanyManagment.App.Contracts.RollCallEmployeeStatus;

 namespace CompanyManagment.Application;

@@ -31,12 +23,9 @@ public class LeaveApplication : ILeaveApplication
    private readonly IRollCallRepository _rollCallRepository;
    private readonly ICustomizeWorkshopEmployeeSettingsRepository _employeeSettingsRepository;
    private readonly IRollCallEmployeeStatusApplication _rollCallEmployeeStatusApplication;
-    private readonly IHolidayItemRepository _holidayItemRepository;
-    private readonly IRollCallServiceRepository _rollCallServiceRepository;
-    


-    public LeaveApplication(ILeaveRepository leaveRepository, IEmployeeRepository employeeRepository, IWorkshopRepository workshopRepository, IRollCallRepository rollCallRepository, ICustomizeWorkshopEmployeeSettingsRepository employeeSettingsRepository, IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication, IHolidayItemRepository holidayItemRepository, IRollCallServiceRepository rollCallServiceRepository)
+    public LeaveApplication(ILeaveRepository leaveRepository, IEmployeeRepository employeeRepository, IWorkshopRepository workshopRepository, IRollCallRepository rollCallRepository, ICustomizeWorkshopEmployeeSettingsRepository employeeSettingsRepository, IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication)
    {
        _leaveRepository = leaveRepository;
        _employeeRepository = employeeRepository;
@@ -44,8 +33,6 @@ public class LeaveApplication : ILeaveApplication
        _rollCallRepository = rollCallRepository;
        _employeeSettingsRepository = employeeSettingsRepository;
        _rollCallEmployeeStatusApplication = rollCallEmployeeStatusApplication;
-        _holidayItemRepository = holidayItemRepository;
-        _rollCallServiceRepository = rollCallServiceRepository;
    }

    public OperationResult Create(CreateLeave command)
@@ -250,7 +237,7 @@ public class LeaveApplication : ILeaveApplication

        var employeeFullName = _employeeRepository.GetDetails(command.EmployeeId).EmployeeFullName;
        var workshopName = _workshopRepository.GetDetails(command.WorkshopId).WorkshopName;
-        var leave = new Company.Domain.LeaveAgg.Leave(start, end, totalhourses, command.WorkshopId, command.EmployeeId
+        var leave = new Leave(start, end, totalhourses, command.WorkshopId, command.EmployeeId
            , command.PaidLeaveType, command.LeaveType, employeeFullName, workshopName, command.IsAccepted, command.Decription,
            year, month, shiftDuration, hasShiftDuration,command.IsInvallid);
        _leaveRepository.Create(leave);
@@ -522,12 +509,7 @@ public class LeaveApplication : ILeaveApplication

    public OperationResult RemoveLeave(long id)
    {
-        return _leaveRepository.RemoveLeave(id).GetAwaiter().GetResult();
-    }
-
-    public async Task<OperationResult> RemoveLeaveAsync(long id)
-    {
-        return await _leaveRepository.RemoveLeave(id);
+        return _leaveRepository.RemoveLeave(id);
    }

    public LeaveViewModel LeavOnChekout(DateTime starContract, DateTime endContract, long employeeId, long workshopId)
@@ -608,435 +590,11 @@ public class LeaveApplication : ILeaveApplication
        return leaveTotalTimeSpan;
    }

-
-
-    private TimeSpan CalculateTotalLeaveTimeSpan(List<LeavePrintViewModel> leaves)
+	private TimeSpan CalculateTotalLeaveTimeSpan(List<LeavePrintViewModel> leaves)
 	{
 		var timeSpanHourlyLeave = new TimeSpan(leaves.Where(x => x.PaidLeaveType != "روزانه").Sum(x => (x.EndLeaveGr - x.StartLeaveGr).Ticks));
 		var dailyLeaveCount = leaves.Count(x => x.PaidLeaveType == "روزانه") * new TimeSpan(1, 0, 0, 0);
 		return timeSpanHourlyLeave + dailyLeaveCount;
 	}
-    #endregion
-
-
-    #region ForApi
-
-    public async Task<PagedResult<leaveListDto>> GetList(LeaveListSearchModel searchModel)
-    {
-        return await _leaveRepository.GetList(searchModel);
-    }
-
-    public async Task<List<GroupLeaveListDto>> GetGroupList(LeaveListSearchModel searchModel)
-    {
-        return await _leaveRepository.GetGroupList(searchModel);
-    }
-
-    public TimeSpan SumOfEmployeeLeaveTimeSpanInDates(long workshopId, long employeeId, string yearStr, string monthStr, LeaveType leaveType)
-    {
-  
-    
-        var startFa = $"{yearStr}/{monthStr:00}/01";
-        var endFa = startFa.FindeEndOfMonth();
-   
-        if (startFa.TryToGeorgianDateTime(out var start) == false || endFa.TryToGeorgianDateTime(out var end) == false)
-            return TimeSpan.Zero;
-
-        var leaveTotalTimeSpan = TimeSpan.Zero;
-
-        var leaves = _leaveRepository.GetByWorkshopIdEmployeeIdInDates(workshopId, employeeId, start, end);
-        //var timeSpanHourlyLeave = new TimeSpan(leaves.Where(x => x.PaidLeaveType != "روزانه").Sum(x => (x.EndLeaveGr - x.StartLeaveGr).Ticks));
-        //var dailyLeaveCount = leaves.Count(x => x.PaidLeaveType == "روزانه") * new TimeSpan(1, 0, 0, 0);
-
-        if (leaveType == LeaveType.PaidLeave)
-        {
-            var timeSpanHourlyLeave = new TimeSpan(leaves.Where(x => x.PaidLeaveType == "ساعتی" && x.LeaveType == "استحقاقی")
-                .Sum(x => TimeOnly.Parse(x.LeaveHourses).Ticks));
-            var dailyLeaveTime = leaves.Where(x => x.PaidLeaveType == "روزانه" && x.LeaveType == "استحقاقی")
-                .Sum(x => Convert.ToInt32(x.LeaveHourses)) * TimeSpan.FromDays(1);
-
-            leaveTotalTimeSpan = timeSpanHourlyLeave + dailyLeaveTime;
-        }
-        else if (leaveType == LeaveType.SickLeave)
-        {
-            var timeSpanHourlyLeave = new TimeSpan(leaves.Where(x => x.PaidLeaveType == "ساعتی" && x.LeaveType == "استعلاجی")
-                .Sum(x => TimeOnly.Parse(x.LeaveHourses).Ticks));
-
-            var dailyLeaveTime = leaves.Where(x => x.PaidLeaveType == "روزانه" && x.LeaveType == "استعلاجی")
-                .Sum(x => Convert.ToInt32(x.LeaveHourses)) * TimeSpan.FromDays(1);
-
-            leaveTotalTimeSpan = timeSpanHourlyLeave + dailyLeaveTime;
-        }
-        else
-        {
-            var timeSpanHourlyLeave = new TimeSpan(leaves.Where(x => x.PaidLeaveType == "ساعتی").Sum(x => TimeOnly.Parse(x.LeaveHourses).Ticks));
-            var dailyLeaveTime = leaves.Where(x => x.PaidLeaveType == "روزانه").Sum(x => Convert.ToInt32(x.LeaveHourses)) * TimeSpan.FromDays(1);
-            leaveTotalTimeSpan = timeSpanHourlyLeave + dailyLeaveTime;
-        }
-
-
-
-
-        return leaveTotalTimeSpan;
-    }
-
-    public async Task<List<LeavePrintResponseViewModel>> PrintAllAsync(List<long> ids,long workshopId)
-    {
-        return await _leaveRepository.PrintAllAsync(ids,workshopId);
-    }
-
-    public async Task<LeavePrintResponseViewModel> PrintOneAsync(long id, long workshopId)
-    {
-        return (await _leaveRepository.PrintAllAsync([id],workshopId)).FirstOrDefault();
-    }
-
-
-    public async Task<OperationResult<CheckIsInvalidLeaveDto>> CheckIsInvalidLeave(string startLeaveDate, long workshopId)
-    {
-        var op =  new OperationResult<CheckIsInvalidLeaveDto>();
-        var result = new CheckIsInvalidLeaveDto();
-        if (startLeaveDate.TryToGeorgianDateTime(out var startLeaveDateGr) == false)
-        {
-            return op.Failed("تاریخ وارد شده صحیح نیست");
-        }
-
-        if (startLeaveDateGr.DayOfWeek == DayOfWeek.Friday || _holidayItemRepository.GetHoliday(startLeaveDateGr))
-        {
-            result.IsHoliday = true;
-        }
-
-        if (result.IsHoliday)
-        {
-            var rollCallService = _rollCallServiceRepository.GetActiveServiceByWorkshopId(workshopId);
-            if (rollCallService != null)
-            {
-                result.CanCreateInvalid = rollCallService.HasCustomizeCheckoutService == "true";
-            }
-        }
-
-        return op.Succcedded(result);
-    }
-
-
-    public async Task<OperationResult> CreateLeave(CreateLeaveDto command)
-    {
-        TimeSpan shiftDuration = TimeSpan.Zero;
-        bool hasShiftDuration = false;
-        var startH = new TimeSpan();
-        var endH = new TimeSpan();
-        var op = new OperationResult();
-        if ((command.PaidLeaveType == PaidLeaveType.Daily && command.LeaveType == LeaveType.PaidLeave) || command.LeaveType == LeaveType.SickLeave)
-        {
-            if (string.IsNullOrWhiteSpace(command.StartLeave))
-            {
-                return op.Failed("لطفا تاریخ شروع را وارد کنید");
-            }
-            if (string.IsNullOrWhiteSpace(command.EndLeave))
-            {
-                return op.Failed("لطفا تاریخ پایان را وارد کنید");
-            }
-        }
-        else if (command.PaidLeaveType == PaidLeaveType.Hourly)
-        {
-            if (string.IsNullOrWhiteSpace(command.StartLeave))
-                return op.Failed("لطفا تاریخ شروع را وارد کنید");
-            if (string.IsNullOrWhiteSpace(command.StartHoures) || string.IsNullOrWhiteSpace(command.EndHours))
-                return op.Failed("ساعت شروع و پایان نمیتواند خالی باشد");
-
-            string pattern = @"^([01]\d|2[0-3]):[0-5]\d$";
-
-            if (!Regex.IsMatch(command.StartHoures, pattern))
-                return op.Failed("لطفا ساعت شروع را به درستی وارد کنید");
-
-            if (!Regex.IsMatch(command.EndHours, pattern))
-                return op.Failed("لطفا ساعت پایان را به درستی وارد کنید");
-
-            startH = TimeSpan.Parse(command.StartHoures);
-            endH = TimeSpan.Parse(command.EndHours);
-            if (startH == endH)
-                return op.Failed("ساعت شروع و پایان نباید برابر باشد");
-        }
-
-
-        //if (command.LeaveType == LeaveType.SickLeave && string.IsNullOrWhiteSpace(command.StartLeave))
-        //    return op.Failed("لطفا تاریخ شروع را وارد کنید");
-        //if (command.LeaveType == LeaveType.SickLeave && string.IsNullOrWhiteSpace(command.EndLeave))
-        //    return op.Failed("لطفا تاریخ پایان را وارد کنید");
-
-
-        if (command.StartLeave.TryToGeorgianDateTime(out var start) == false)
-        {
-            return op.Failed("تاریخ شروع صحیح نیست");
-        }
-
-        var end = new DateTime();
-        if (command.PaidLeaveType == PaidLeaveType.Daily)
-        {
-            if (command.EndLeave.TryToGeorgianDateTime(out end) == false)
-            {
-                return op.Failed("تاریخ پایان صحیح نیست");
-            }
-        }
-        end = start;
-
-
-        var checkErr = _leaveRepository.CheckErrors(start, end, command.EmployeeId, command.WorkshopId, command.IsInvallid);
-
-  
-        if (checkErr.HasChekout)
-            return op.Failed(checkErr.CheckoutErrMessage);
-        if (checkErr.HasNotContract)
-            return op.Failed(checkErr.ContractErrMessage);
-        if (checkErr.HasLeftWork)
-            return op.Failed(checkErr.LeftWorlErrMessage);
-
-        if (start > end)
-            return op.Failed("تارخ شروع از پایان بزرگتر است");
-
-
-        var totalhourses = "-";
-        if (command.LeaveType == LeaveType.PaidLeave && command.PaidLeaveType == PaidLeaveType.Hourly)
-        {
-
-            start = new DateTime(start.Year, start.Month, start.Day, startH.Hours, startH.Minutes, startH.Seconds);
-            end = new DateTime(start.Year, start.Month, start.Day, endH.Hours, endH.Minutes, endH.Seconds);
-            if (start > end)
-                end = end.AddDays(1);
-
-            var totalLeavHourses = (end - start);
-            var h = totalLeavHourses.Hours < 10 ? $"0{totalLeavHourses.Hours}" : $"{totalLeavHourses.Hours}";
-            var m = totalLeavHourses.Minutes < 10 ? $"0{totalLeavHourses.Minutes}" : $"{totalLeavHourses.Minutes}";
-            totalhourses = $"{h}:{m}";
-
-            if (_leaveRepository.Exists(x =>
-                    x.StartLeave <= start && x.EndLeave >= start && x.EmployeeId == command.EmployeeId && x.WorkshopId == command.WorkshopId && x.PaidLeaveType == "ساعتی"))
-                return op.Failed("برای ساعت شروع سابقه مرخصی وجود دارد");
-            if (_leaveRepository.Exists(x =>
-                    x.StartLeave <= end && x.EndLeave >= end && x.EmployeeId == command.EmployeeId && x.WorkshopId == command.WorkshopId && x.PaidLeaveType == "ساعتی"))
-                return op.Failed("برای ساعت پایان سابقه مرخصی وجود دارد");
-            if (_leaveRepository.Exists(x =>
-                    x.StartLeave >= start && x.EndLeave <= end && x.EmployeeId == command.EmployeeId && x.WorkshopId == command.WorkshopId && x.PaidLeaveType == "ساعتی"))
-                return op.Failed("در بازه زمانی وارد شده مرخصی ثبت شده است");
-
-            var end24 = endH.Hours == 0 && endH.Minutes == 0 ? end.AddDays(-1) : end;
-            if (_leaveRepository.Exists(x =>
-                    (x.StartLeave.Date == start.Date || x.EndLeave.Date == end24.Date) && (x.EmployeeId == command.EmployeeId && x.WorkshopId == command.WorkshopId && x.PaidLeaveType == "روزانه")))
-                return op.Failed("در بازه زمانی وارد شده مرخصی ثبت شده است");
-        }
-        else if (command.LeaveType == LeaveType.PaidLeave && command.PaidLeaveType == PaidLeaveType.Daily)
-        {
-            var totalLeavHourses = (end - start).TotalDays + 1;
-            totalhourses = $"{(int)totalLeavHourses}";
-            if (_leaveRepository.Exists(x =>
-                    x.StartLeave <= start && x.EndLeave >= start && x.EmployeeId == command.EmployeeId && x.WorkshopId == command.WorkshopId && x.PaidLeaveType == "روزانه"))
-                return op.Failed("برای تاریخ شروع سابقه مرخصی وجود دارد");
-            if (_leaveRepository.Exists(x =>
-                    x.StartLeave <= end && x.EndLeave >= end && x.EmployeeId == command.EmployeeId && x.WorkshopId == command.WorkshopId && x.PaidLeaveType == "روزانه"))
-                return op.Failed("برای تاریخ پایان سابقه مرخصی وجود دارد");
-            if (_leaveRepository.Exists(x =>
-                    x.StartLeave >= start && x.EndLeave <= end && x.EmployeeId == command.EmployeeId && x.WorkshopId == command.WorkshopId && x.PaidLeaveType == "روزانه"))
-                return op.Failed("در بازه زمانی وارد شده مرخصی ثبت شده است");
-            if (_leaveRepository.Exists(x =>
-                    x.StartLeave.Date >= start.Date && x.StartLeave.Date <= end.Date && x.EmployeeId == command.EmployeeId && x.WorkshopId == command.WorkshopId && x.PaidLeaveType == "ساعتی"))
-                return op.Failed("دربازه تاریخ وارد شده مرخصی ساعتی ثبت شده است");
-
-            var employeeSettings = _employeeSettingsRepository.GetByEmployeeIdAndWorkshopIdIncludeGroupSettings(command.WorkshopId, command.EmployeeId);
-
-            var isActive = _rollCallEmployeeStatusApplication.IsActiveInPeriod(command.EmployeeId, command.WorkshopId, start, end);
-            var hasRollCall = isActive && employeeSettings.WorkshopShiftStatus == WorkshopShiftStatus.Rotating;
-            if (hasRollCall)
-            {
-
-                if ((end - start).TotalDays > 1 && employeeSettings.WorkshopShiftStatus != WorkshopShiftStatus.Regular)
-                {
-                    return op.Failed("شما نمیتوانید بیشتر از یک روز مرخصی روزانه ثبت کنید");
-                }
-
-                if (employeeSettings.WorkshopShiftStatus == WorkshopShiftStatus.Rotating &&
-                    command.SelectedShift == null)
-                {
-                    return op.Failed("لطفا شیفت پرسنل را انتخاب کنید");
-                }
-
-                if (command.SelectedShift != null)
-                {
-                    var validShiftStart = TimeOnly.TryParse(command.SelectedShift.StartTime, out var shiftStart);
-                    var validShiftEnd = TimeOnly.TryParse(command.SelectedShift.EndTime, out var shiftEnd);
-
-                    if (validShiftStart == false && validShiftEnd == false)
-                    {
-                        return op.Failed("شیفت های انتخاب شده معتبر نمیباشد");
-                    }
-
-                    var shiftStartDateTime = new DateTime(new DateOnly(), shiftStart);
-                    var shiftEndDateTime = new DateTime(new DateOnly(), shiftEnd);
-                    if (shiftEndDateTime <= shiftStartDateTime)
-                        shiftEndDateTime = shiftEndDateTime.AddDays(1);
-                    shiftDuration = shiftEndDateTime - shiftStartDateTime;
-                    hasShiftDuration = true;
-                }
-                else if (employeeSettings is { WorkshopShiftStatus: WorkshopShiftStatus.Irregular })
-                {
-                    if ((end - start).TotalDays > 1)
-                    {
-                        return op.Failed("شما نمیتوانید بیشتر از یک روز مرخصی روزانه ثبت کنید");
-                    }
-
-        
-                    if (isActive)
-                    {
-                        shiftDuration = employeeSettings.IrregularShift.WorkshopIrregularShifts switch
-                        {
-                            WorkshopIrregularShifts.TwelveThirtySix => TimeSpan.FromHours(12),
-                            WorkshopIrregularShifts.TwelveTwentyFour => TimeSpan.FromHours(12),
-                            WorkshopIrregularShifts.TwentyFourFortyEight => TimeSpan.FromHours(24),
-                            WorkshopIrregularShifts.TwentyFourTwentyFour => TimeSpan.FromHours(24),
-                            _ => new TimeSpan()
-                        };
-                        hasShiftDuration = true;
-                    }
-
-                }
-            }
-
-
-        }
-
-        if (command.LeaveType == LeaveType.SickLeave)
-        {
-            var totalLeavHourses = (end - start).TotalDays + 1;
-            totalhourses = $"{(int)totalLeavHourses}";
-            command.PaidLeaveType = PaidLeaveType.Daily;
-            if (_leaveRepository.Exists(x =>
-                    x.StartLeave <= start && x.EndLeave >= start && x.EmployeeId == command.EmployeeId && x.WorkshopId == command.WorkshopId && x.PaidLeaveType == "روزانه"))
-                return op.Failed("برای تاریخ شروع سابقه مرخصی وجود دارد");
-            if (_leaveRepository.Exists(x =>
-                    x.StartLeave <= end && x.EndLeave >= end && x.EmployeeId == command.EmployeeId && x.WorkshopId == command.WorkshopId && x.PaidLeaveType == "روزانه"))
-                return op.Failed("برای تاریخ پایان سابقه مرخصی وجود دارد");
-            if (_leaveRepository.Exists(x =>
-                    x.StartLeave >= start && x.EndLeave <= end && x.EmployeeId == command.EmployeeId && x.WorkshopId == command.WorkshopId && x.PaidLeaveType == "روزانه"))
-                return op.Failed("در بازه زمانی وارد شده مرخصی ثبت شده است");
-            if (_leaveRepository.Exists(x =>
-                    x.StartLeave.Date >= start.Date && x.StartLeave.Date <= end.Date && x.EmployeeId == command.EmployeeId && x.WorkshopId == command.WorkshopId && x.PaidLeaveType == "ساعتی"))
-                return op.Failed("دربازه تاریخ وارد شده مرخصی ساعتی ثبت شده است");
-        }
-        var year = Convert.ToInt32(command.StartLeave.Substring(0, 4));
-        var month = Convert.ToInt32(command.StartLeave.Substring(5, 2));
-        var paidLeaveType = command.PaidLeaveType == PaidLeaveType.Daily ? "روزانه" : "ساعتی";
-        var leaveType = command.LeaveType == LeaveType.PaidLeave ? "استحقاقی" : "استعلاجی";
-        var validation = ValidateNewLeaveWithExistingRollCalls(command.WorkshopId, command.EmployeeId, paidLeaveType, start, end);
-        if (validation.IsSuccedded == false)
-            return validation;
-       
-        var employeeFullName = _employeeRepository.GetDetails(command.EmployeeId).EmployeeFullName;
-        var workshopName = _workshopRepository.GetDetails(command.WorkshopId).WorkshopName;
-        var leave = new Company.Domain.LeaveAgg.Leave(start, end, totalhourses, command.WorkshopId, command.EmployeeId
-            , paidLeaveType, leaveType, employeeFullName, workshopName, command.IsAccepted, command.Decription,
-            year, month, shiftDuration, hasShiftDuration, command.IsInvallid);
-        await _leaveRepository.CreateAsync(leave);
-        await _leaveRepository.SaveChangesAsync();
-        return op.Succcedded();
-    }
-
-
-    public async Task<OperationResult<RotatingShiftDto>> HasRotatingShift(long workshopId,long employeeId, string startLeaveDate)
-    {
-        var op = new OperationResult<RotatingShiftDto>();
-        var result = new RotatingShiftDto();
-        if (startLeaveDate.TryToGeorgianDateTime(out var startDateTimeGr) == false)
-        {
-            return op.Failed("تاریخ شروع صحیح نیست");
-        }
-        var employeeSettings = _employeeSettingsRepository.GetByEmployeeIdAndWorkshopIdIncludeGroupSettings(workshopId, employeeId);
-        //اگر گروه بندی نداشت
-        if (employeeSettings == null)
-        {
-            return op.Succcedded(result);
-        }
-
-        var isActive = _rollCallEmployeeStatusApplication.IsActiveInPeriod(employeeId, workshopId, startDateTimeGr, startDateTimeGr);
-
-        result.HasRollCall = isActive && employeeSettings.WorkshopShiftStatus == WorkshopShiftStatus.Rotating;
-        result.RotatingShifts = employeeSettings.CustomizeRotatingShifts.Select(x =>
-            new CustomizeRotatingShiftsViewModel()
-            {
-                EndTime = x.EndTime.ToString("HH:mm"),
-                StartTime = x.StartTime.ToString("HH:mm")
-            }).ToList();
-        return op.Succcedded(result);
-    }
-    #endregion
-
-
-    public async Task<LeaveListPrintDto> ListPrint(List<long> ids)
-    {
-      return await _leaveRepository.ListPrint(ids);
-    }
-
-
-    public async Task<string> GetHourlyLeaveDuration(string startHours, string endHours)
-    {
-        if (string.IsNullOrWhiteSpace(startHours) || string.IsNullOrWhiteSpace(endHours))
-            return "";
-
-        var start = new DateTime();
-        var end = new DateTime();
-        try
-        {
-
-           start = Convert.ToDateTime(startHours);
-           end = Convert.ToDateTime(endHours);
-        }
-        catch (Exception)
-        {
-
-            return "";
-        }
-        if (start > end || start == end)
-        {
-            end = end.AddDays(1);
-        }
-
-        var HourlyDate = (end - start);
-        var hours = (int)HourlyDate.TotalHours;
-        var minutes = HourlyDate.TotalMinutes % 60;
-
-        if (hours > 0 && minutes > 0)
-        {
-            return (hours + " " + "ساعت و" + " " + minutes + " " + "دقیقه");
-        }
-        else if (hours > 0 && minutes == 0)
-        {
-            return (hours + " " + "ساعت ");
-      
-        }
-        else if (hours == 0 && minutes > 0)
-        {
-            return (minutes + " " + "دقیقه");
-           
-        }
-
-        return ($"{hours}");
-    
-    }
-
-    public async Task<string> GetDailyLeaveDuration(string startDate, string endDate)
-    {
-        if (string.IsNullOrWhiteSpace(startDate) || string.IsNullOrWhiteSpace(endDate))
-            return "";
-
-        if (startDate.TryToGeorgianDateTime(out var start) == false || endDate.TryToGeorgianDateTime(out var end) == false)
-            return "";
-
-
-
-        if (end >= start)
-        {
-            var daysSpan = (end - start).TotalDays + 1;
-            return $"{(int)daysSpan} روز";
-        }
-        else
-        {
-            return "تاریخ پایان از تاریخ شروع کوچکتر است.";
-        }
-    }
+	#endregion
 }
--- a/CompanyManagment.Application/WorkshopAppliction.cs
+++ b/CompanyManagment.Application/WorkshopAppliction.cs
@@ -12,7 +12,6 @@ using Company.Domain.LeftWorkAgg;
 using Company.Domain.LeftWorkInsuranceAgg;
 using Company.Domain.WorkshopAgg;
 using CompanyManagment.App.Contracts.Employee;
-using CompanyManagment.App.Contracts.Employee.DTO;
 using CompanyManagment.App.Contracts.EmployeeChildren;
 using CompanyManagment.App.Contracts.LeftWork;
 using CompanyManagment.App.Contracts.RollCallService;
@@ -1127,6 +1126,5 @@ public class WorkshopAppliction : IWorkshopApplication
        return operation.Succcedded();
    }

-
    #endregion
 }
--- a/CompanyManagment.EFCore/Repository/EmployeeRepository
+++ b/CompanyManagment.EFCore/Repository/EmployeeRepository
@@ -1,24 +1,23 @@
-using _0_Framework.Application;
-using _0_Framework.Application.Enums;
-using _0_Framework.Exceptions;
-using _0_Framework.InfraStructure;
-using Company.Domain.ClientEmployeeWorkshopAgg;
-using Company.Domain.EmployeeAccountAgg;
-using Company.Domain.EmployeeAgg;
-using Company.Domain.EmployeeInsuranceRecordAgg;
-using Company.Domain.InsuranceListAgg;
-using CompanyManagment.App.Contracts.Employee;
-using CompanyManagment.App.Contracts.Employee.DTO;
-using CompanyManagment.App.Contracts.EmployeeInsuranceRecord;
-using CompanyManagment.App.Contracts.LeftWorkTemp;
-using Microsoft.Data.SqlClient;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
 using System.Threading.Tasks;
+using _0_Framework.Application;
+using _0_Framework.InfraStructure;
+using Company.Domain.ClientEmployeeWorkshopAgg;
+using Company.Domain.EmployeeAccountAgg;
+using Company.Domain.EmployeeAgg;
+using CompanyManagment.App.Contracts.Employee;
+using Company.Domain.EmployeeInsuranceRecordAgg;
+using CompanyManagment.App.Contracts.EmployeeInsuranceRecord;
+using Microsoft.Data.SqlClient;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using CompanyManagment.App.Contracts.Employee.DTO;
+using CompanyManagment.App.Contracts.LeftWorkTemp;
+using _0_Framework.Application.Enums;
+using _0_Framework.Exceptions;

 namespace CompanyManagment.EFCore.Repository;

@@ -34,7 +33,7 @@ public class EmployeeRepository : RepositoryBase<long, Employee>, IEmployeeRepos
    public bool city = true;
    public DateTime initial = new DateTime(1922, 01, 01, 00, 00, 00, 0000000);
    private readonly IAuthHelper _authHelper;
-    public EmployeeRepository(CompanyContext context, IConfiguration configuration, IAuthHelper authHelper) : base(context)
+    public EmployeeRepository(CompanyContext context, IConfiguration configuration, IAuthHelper authHelper) :base(context)
    {
        _context = context;
        _configuration = configuration;
@@ -43,13 +42,13 @@ public class EmployeeRepository : RepositoryBase<long, Employee>, IEmployeeRepos

    public List<EmployeeViewModel> GetEmployee()
    {
-        return _context.Employees.Where(x => x.IsActive).Select(x => new EmployeeViewModel
+        return _context.Employees.Where(x=>x.IsActive).Select(x => new EmployeeViewModel
        {
            Id = x.id,
            FName = x.FName,
-
+                
            LName = x.LName,
-            EmployeeFullName = x.FName + " " + x.LName,
+            EmployeeFullName = x.FName +" "+x.LName,
            FatherName = x.FatherName,
            NationalCode = x.NationalCode,
            IdNumber = x.IdNumber,
@@ -62,48 +61,48 @@ public class EmployeeRepository : RepositoryBase<long, Employee>, IEmployeeRepos
    public EditEmployee GetDetails(long id)
    {
        return _context.Employees.Select(x => new EditEmployee
-        {
-            Id = x.id,
-            FName = x.FName,
-            LName = x.LName,
-            Gender = x.Gender,
-            NationalCode = x.NationalCode,
-            IdNumber = x.IdNumber,
-            Nationality = x.Nationality,
-            FatherName = x.FatherName,
-            DateOfBirth = x.DateOfBirth == initial ? "" : x.DateOfBirth.ToFarsi(),
-            DateOfIssue = x.DateOfIssue == initial ? "" : x.DateOfIssue.ToFarsi(),
-            PlaceOfIssue = x.PlaceOfIssue,
-            Phone = x.Phone,
-            Address = x.Address,
-            State = x.State,
-            City = x.City,
-            MaritalStatus = x.MaritalStatus,
-            MilitaryService = x.MilitaryService,
-            LevelOfEducation = x.LevelOfEducation,
-            FieldOfStudy = x.FieldOfStudy,
-            BankCardNumber = x.BankCardNumber,
-            BankBranch = x.BankBranch,
-            InsuranceCode = x.InsuranceCode,
-            InsuranceHistoryByYear = x.InsuranceHistoryByYear,
-            InsuranceHistoryByMonth = x.InsuranceHistoryByMonth,
-            NumberOfChildren = x.NumberOfChildren,
-            OfficePhone = x.OfficePhone,
-            EmployeeFullName = x.FName + " " + x.LName,
-            MclsUserName = x.MclsUserName,
-            MclsPassword = x.MclsPassword,
-            EserviceUserName = x.EserviceUserName,
-            EservicePassword = x.EservicePassword,
-            TaxOfficeUserName = x.TaxOfficeUserName,
-            TaxOfficepassword = x.TaxOfficepassword,
-            SanaUserName = x.SanaUserName,
-            SanaPassword = x.SanaPassword,
+            {
+                Id = x.id,
+                FName = x.FName,
+                LName = x.LName,
+                Gender = x.Gender,
+                NationalCode = x.NationalCode,
+                IdNumber = x.IdNumber,
+                Nationality = x.Nationality,
+                FatherName = x.FatherName,
+                DateOfBirth = x.DateOfBirth == initial ? "" : x.DateOfBirth.ToFarsi(),
+                DateOfIssue = x.DateOfIssue == initial ? "" : x.DateOfIssue.ToFarsi(),
+                PlaceOfIssue = x.PlaceOfIssue,
+                Phone = x.Phone,
+                Address = x.Address,
+                State = x.State,
+                City = x.City,
+                MaritalStatus = x.MaritalStatus,
+                MilitaryService = x.MilitaryService,
+                LevelOfEducation = x.LevelOfEducation,
+                FieldOfStudy = x.FieldOfStudy,
+                BankCardNumber = x.BankCardNumber,
+                BankBranch = x.BankBranch,
+                InsuranceCode = x.InsuranceCode,
+                InsuranceHistoryByYear = x.InsuranceHistoryByYear,
+                InsuranceHistoryByMonth = x.InsuranceHistoryByMonth,
+                NumberOfChildren = x.NumberOfChildren,
+                OfficePhone = x.OfficePhone,
+                EmployeeFullName = x.FName + " " + x.LName,
+                MclsUserName =x.MclsUserName,
+                MclsPassword = x.MclsPassword,
+                EserviceUserName = x.EserviceUserName,
+                EservicePassword = x.EservicePassword,
+                TaxOfficeUserName = x.TaxOfficeUserName,
+                TaxOfficepassword = x.TaxOfficepassword,
+                SanaUserName = x.SanaUserName,
+                SanaPassword = x.SanaPassword,



-        })
+            })
            .FirstOrDefault(x => x.Id == id);
-
+            
    }

    public async Task<List<EmployeeViewModel>> Search(EmployeeSearchModel searchModel)
@@ -183,10 +182,10 @@ public class EmployeeRepository : RepositoryBase<long, Employee>, IEmployeeRepos
        return query.OrderByDescending(x => x.Id).Take(100).ToList();
    }

-    public async Task<List<EmployeeSelectListViewModel>> GetEmployeeToList()
+    public async Task<List<EmployeeSelectListViewModel>>  GetEmployeeToList()
    {
        var watch = System.Diagnostics.Stopwatch.StartNew();
-
+  
        List<EmployeeSelectListViewModel> result = null;
        var connection = _configuration.GetConnectionString("MesbahDb");
        using (var conn = new SqlConnection(connection))
@@ -196,7 +195,7 @@ public class EmployeeRepository : RepositoryBase<long, Employee>, IEmployeeRepos
            var command = new SqlCommand("EmployeeFullNameId", conn);
            command.CommandType = CommandType.StoredProcedure;

-
+              

            using (var reader = await command.ExecuteReaderAsync())
            {
@@ -274,45 +273,45 @@ public class EmployeeRepository : RepositoryBase<long, Employee>, IEmployeeRepos
    public EditEmployee GetDetailsByADDate(long id)
    {
        return _context.Employees.Select(x => new EditEmployee
-        {
-            Id = x.id,
-            FName = x.FName,
-            LName = x.LName,
-            Gender = x.Gender,
-            NationalCode = x.NationalCode,
-            IdNumber = x.IdNumber,
-            Nationality = x.Nationality,
-            FatherName = x.FatherName,
-            DateOfBirthGr = x.DateOfBirth,
-            DateOfIssueGr = x.DateOfIssue,
-            DateOfBirth = x.DateOfBirth.ToFarsi(),
-            DateOfIssue = x.DateOfIssue.ToFarsi(),
-            PlaceOfIssue = x.PlaceOfIssue,
-            Phone = x.Phone,
-            Address = x.Address,
-            State = x.State,
-            City = x.City,
-            MaritalStatus = x.MaritalStatus,
-            MilitaryService = x.MilitaryService,
-            LevelOfEducation = x.LevelOfEducation,
-            FieldOfStudy = x.FieldOfStudy,
-            BankCardNumber = x.BankCardNumber,
-            BankBranch = x.BankBranch,
-            InsuranceCode = x.InsuranceCode,
-            InsuranceHistoryByYear = x.InsuranceHistoryByYear,
-            InsuranceHistoryByMonth = x.InsuranceHistoryByMonth,
-            NumberOfChildren = x.NumberOfChildren,
-            OfficePhone = x.OfficePhone,
-            EmployeeFullName = x.FName + " " + x.LName,
-            MclsUserName = x.MclsUserName,
-            MclsPassword = x.MclsPassword,
-            EserviceUserName = x.EserviceUserName,
-            EservicePassword = x.EservicePassword,
-            TaxOfficeUserName = x.TaxOfficeUserName,
-            TaxOfficepassword = x.TaxOfficepassword,
-            SanaUserName = x.SanaUserName,
-            SanaPassword = x.SanaPassword,
-        })
+            {
+                Id = x.id,
+                FName = x.FName,
+                LName = x.LName,
+                Gender = x.Gender,
+                NationalCode = x.NationalCode,
+                IdNumber = x.IdNumber,
+                Nationality = x.Nationality,
+                FatherName = x.FatherName,
+                DateOfBirthGr = x.DateOfBirth ,
+                DateOfIssueGr = x.DateOfIssue ,
+                DateOfBirth = x.DateOfBirth.ToFarsi(),
+                DateOfIssue = x.DateOfIssue.ToFarsi(),
+                PlaceOfIssue = x.PlaceOfIssue,
+                Phone = x.Phone,
+                Address = x.Address,
+                State = x.State,
+                City = x.City,
+                MaritalStatus = x.MaritalStatus,
+                MilitaryService = x.MilitaryService,
+                LevelOfEducation = x.LevelOfEducation,
+                FieldOfStudy = x.FieldOfStudy,
+                BankCardNumber = x.BankCardNumber,
+                BankBranch = x.BankBranch,
+                InsuranceCode = x.InsuranceCode,
+                InsuranceHistoryByYear = x.InsuranceHistoryByYear,
+                InsuranceHistoryByMonth = x.InsuranceHistoryByMonth,
+                NumberOfChildren = x.NumberOfChildren,
+                OfficePhone = x.OfficePhone,
+                EmployeeFullName = x.FName + " " + x.LName,
+                MclsUserName = x.MclsUserName,
+                MclsPassword = x.MclsPassword,
+                EserviceUserName = x.EserviceUserName,
+                EservicePassword = x.EservicePassword,
+                TaxOfficeUserName = x.TaxOfficeUserName,
+                TaxOfficepassword = x.TaxOfficepassword,
+                SanaUserName = x.SanaUserName,
+                SanaPassword = x.SanaPassword,
+            })
            .FirstOrDefault(x => x.Id == id);
    }

@@ -325,7 +324,7 @@ public class EmployeeRepository : RepositoryBase<long, Employee>, IEmployeeRepos
            EmployeeFullName = x.FName + " " + x.LName,
            IsActive = x.IsActive

-        }).Where(x => x.IsActive).ToList();
+        }).Where(x=>x.IsActive).ToList();
    }

    #region Client
@@ -453,7 +452,7 @@ public class EmployeeRepository : RepositoryBase<long, Employee>, IEmployeeRepos

                var employeeData = new Employee(command.FName, command.LName, command.FatherName, dateOfBirth,
                    dateOfIssue,
-                    command.PlaceOfIssue, command.NationalCode, command.IdNumber, command.Gender, command.Nationality, command.IdNumberSerial, command.IdNumberSeri,
+                    command.PlaceOfIssue, command.NationalCode, command.IdNumber, command.Gender, command.Nationality,command.IdNumberSerial,command.IdNumberSeri,
                    command.Phone, command.Address,
                    command.State, command.City, command.MaritalStatus, command.MilitaryService, command.LevelOfEducation,
                    command.FieldOfStudy, command.BankCardNumber,
@@ -707,20 +706,20 @@ public class EmployeeRepository : RepositoryBase<long, Employee>, IEmployeeRepos
        {
            case null:
            case "":
-                query = query.Where(x => x.IsActive == true).ToList();
-                break;
+	            query = query.Where(x => x.IsActive == true).ToList();
+				break;
            case "false":
-                query = query.Where(x => x.IsActive == false).ToList();
-                hasSearch = true;
-                break;
+	            query = query.Where(x => x.IsActive == false).ToList();
+	            hasSearch = true;
+				break;
            case "both":
-                query = query.Where(x => x.IsActive == true || x.IsActive == false).ToList();
-                hasSearch = true;
-                break;
-
-        }
-
+	            query = query.Where(x => x.IsActive == true || x.IsActive == false).ToList();
+	            hasSearch = true;
+				break;

+		}
+       
+     
        if (hasSearch)
        {
            return query.OrderByDescending(x => x.Id).ToList();
@@ -817,11 +816,11 @@ public class EmployeeRepository : RepositoryBase<long, Employee>, IEmployeeRepos
        var employeesQuery = _context.Employees.Where(x =>
            workshopActiveLeftWorksQuery.Any(y => y.EmployeeId == x.id) ||
            workshopActiveInsuranceLeftWorksQuery.Any(y => y.EmployeeId == x.id)).Select(x => new
-            {
-                leftWork = workshopActiveLeftWorksQuery.Where(l => l.EmployeeId == x.id).OrderByDescending(i => i.StartWorkDate).FirstOrDefault(),
-                insuranceLeftWork = workshopActiveInsuranceLeftWorksQuery.Where(i => i.EmployeeId == x.id).OrderByDescending(i => i.StartWorkDate).FirstOrDefault(),
-                Employee = x
-            });
+        {
+            leftWork = workshopActiveLeftWorksQuery.Where(l => l.EmployeeId == x.id).OrderByDescending(i => i.StartWorkDate).FirstOrDefault(),
+            insuranceLeftWork = workshopActiveInsuranceLeftWorksQuery.Where(i => i.EmployeeId == x.id).OrderByDescending(i => i.StartWorkDate).FirstOrDefault(),
+            Employee = x
+        });



@@ -879,7 +878,7 @@ public class EmployeeRepository : RepositoryBase<long, Employee>, IEmployeeRepos
        }).ToList();
    }

-
+ 
    public async Task<GetEditEmployeeInEmployeeDocumentViewModel> GetEmployeeEditInEmployeeDocumentWorkFlow(long employeeId, long workshopId)
    {
        var employee = await _context.Employees.Where(x => x.id == employeeId).Select(x => new GetEditEmployeeInEmployeeDocumentViewModel()
@@ -947,13 +946,13 @@ public class EmployeeRepository : RepositoryBase<long, Employee>, IEmployeeRepos
            }).ToList();
    }

-    #endregion
+	#endregion

-    #region Api
+	#region Api

-    public async Task<List<EmployeeSelectListViewModel>> GetSelectList(string searchText, long id)
-    {
-        var query = _context.Employees.AsQueryable();
+	public async Task<List<EmployeeSelectListViewModel>> GetSelectList(string searchText,long id)
+	{
+		var query = _context.Employees.AsQueryable();
        EmployeeSelectListViewModel idSelected = null;
        if (id > 0)
        {
@@ -964,104 +963,104 @@ public class EmployeeRepository : RepositoryBase<long, Employee>, IEmployeeRepos
            }).FirstOrDefaultAsync(x => x.Id == id);
        }
        if (!string.IsNullOrWhiteSpace(searchText))
-        {
-            query = query.Where(x => (x.FName + " " + x.LName).Contains(searchText));
-        }
+		{
+			query = query.Where(x => (x.FName + " " + x.LName).Contains(searchText));
+		}

-        var list = await query.Take(100).Select(x => new EmployeeSelectListViewModel()
-        {
-            Id = x.id,
-            EmployeeFullName = x.FName + " " + x.LName
-        }).ToListAsync();
+		var list = await query.Take(100).Select(x => new EmployeeSelectListViewModel()
+		{
+			Id = x.id,
+			EmployeeFullName = x.FName + " " + x.LName
+		}).ToListAsync();

        if (idSelected != null)
            list.Add(idSelected);

-        return list.DistinctBy(x => x.Id).ToList();
+        return list.DistinctBy(x=>x.Id).ToList();

    }

-    public async Task<List<GetEmployeeListViewModel>> GetList(GetEmployeeListSearchModel searchModel)
-    {
-        var query = _context.Employees.Include(x => x.LeftWorks).Include(x => x.LeftWorkInsurances).AsQueryable();
+	public async Task<List<GetEmployeeListViewModel>> GetList(GetEmployeeListSearchModel searchModel)
+	{
+		var query = _context.Employees.Include(x => x.LeftWorks).Include(x => x.LeftWorkInsurances).AsQueryable();

-        if (!string.IsNullOrWhiteSpace(searchModel.NationalCode))
-        {
-            query = query.Where(x => x.NationalCode.Contains(searchModel.NationalCode));
-        }
+		if (!string.IsNullOrWhiteSpace(searchModel.NationalCode))
+		{
+			query = query.Where(x => x.NationalCode.Contains(searchModel.NationalCode));
+		}

-        if (searchModel.EmployeeId > 0)
-        {
-            query = query.Where(x => x.id == searchModel.EmployeeId);
-        }
+		if (searchModel.EmployeeId > 0)
+		{
+			query = query.Where(x => x.id == searchModel.EmployeeId);
+		}

-        if (searchModel.WorkshopId > 0)
-        {
-            query = query.Where(x => x.LeftWorks.Any(l => l.WorkshopId == searchModel.WorkshopId) || x.LeftWorkInsurances.Any(l => l.WorkshopId == searchModel.WorkshopId));
-        }
+		if (searchModel.WorkshopId > 0)
+		{
+			query = query.Where(x => x.LeftWorks.Any(l => l.WorkshopId == searchModel.WorkshopId) || x.LeftWorkInsurances.Any(l => l.WorkshopId == searchModel.WorkshopId));
+		}


-        #region employer
+		#region employer

-        if (searchModel.EmployerId > 0)
-        {
+		if (searchModel.EmployerId > 0)
+		{

-            var workshopIdsByEmployer = _context.WorkshopEmployers.Where(x => x.EmployerId == searchModel.EmployerId)
-                .Include(x => x.Workshop).Select(x => x.Workshop.id).AsQueryable();
+			var workshopIdsByEmployer = _context.WorkshopEmployers.Where(x => x.EmployerId == searchModel.EmployerId)
+				.Include(x => x.Workshop).Select(x => x.Workshop.id).AsQueryable();

-            query = query.Where(x =>
-                x.LeftWorks.Any(l => workshopIdsByEmployer.Contains(l.WorkshopId)) ||
-                x.LeftWorkInsurances.Any(l => workshopIdsByEmployer.Contains(l.WorkshopId)));
+			query = query.Where(x =>
+				x.LeftWorks.Any(l => workshopIdsByEmployer.Contains(l.WorkshopId)) ||
+				x.LeftWorkInsurances.Any(l => workshopIdsByEmployer.Contains(l.WorkshopId)));

-        }
-        #endregion
+		}
+		#endregion

-        if (!string.IsNullOrEmpty(searchModel.InsuranceCode))
-        {
-            query = query.Where(x => x.InsuranceCode.Contains(searchModel.InsuranceCode));
-        }
+		if (!string.IsNullOrEmpty(searchModel.InsuranceCode))
+		{
+			query = query.Where(x => x.InsuranceCode.Contains(searchModel.InsuranceCode));
+		}

-        if (searchModel.EmployeeStatus != ActivationStatus.None)
-        {
-            var status = searchModel.EmployeeStatus switch
-            {
-                ActivationStatus.Active => true,
-                ActivationStatus.DeActive => false,
-                _ => throw new BadRequestException("پارامتر جستجو نامعتبر است")
-            };
-            query = query.Where(x => x.IsActiveString == status.ToString() || x.IsActive == status);
-        }
+		if (searchModel.EmployeeStatus != ActivationStatus.None)
+		{
+			var status = searchModel.EmployeeStatus switch
+			{
+				ActivationStatus.Active => true,
+				ActivationStatus.DeActive => false,
+				_ => throw new BadRequestException("پارامتر جستجو نامعتبر است")
+			};
+			query = query.Where(x => x.IsActiveString == status.ToString() || x.IsActive == status);
+		}

-        var list = await query.Skip(searchModel.PageIndex).Take(30).ToListAsync();
+		var list = await query.Skip(searchModel.PageIndex).Take(30).ToListAsync();

-        var employeeIds = list.Select(x => x.id);
+		var employeeIds = list.Select(x => x.id);

-        var children = await _context.EmployeeChildrenSet.Where(x => employeeIds.Contains(x.EmployeeId)).ToListAsync();
+		var children = await _context.EmployeeChildrenSet.Where(x => employeeIds.Contains(x.EmployeeId)).ToListAsync();

-        var result = list.Select(x => new GetEmployeeListViewModel()
-        {
-            BirthDate = x.DateOfBirth.ToFarsi(),
-            ChildrenCount = children.Count(c => c.EmployeeId == x.id).ToString(),
-            EmployeeFullName = x.FullName,
-            EmployeeStatus = x.IsActive switch
-            {
-                true => ActivationStatus.Active,
-                false => ActivationStatus.DeActive
-            },
-            Gender = x.Gender switch
-            {
-                "مرد" => Gender.Male,
-                "زن" => Gender.Female,
-                _ => Gender.None
-            },
-            Id = x.id,
-            InsuranceCode = x.InsuranceCode,
-            NationalCode = x.NationalCode
-        }).ToList();
+		var result = list.Select(x => new GetEmployeeListViewModel()
+		{
+			BirthDate = x.DateOfBirth.ToFarsi(),
+			ChildrenCount = children.Count(c => c.EmployeeId == x.id).ToString(),
+			EmployeeFullName = x.FullName,
+			EmployeeStatus = x.IsActive switch
+			{
+				true => ActivationStatus.Active,
+				false => ActivationStatus.DeActive
+			},
+			Gender = x.Gender switch
+			{
+				"مرد" => Gender.Male,
+				"زن" => Gender.Female,
+				_ => Gender.None
+			},
+			Id = x.id,
+			InsuranceCode = x.InsuranceCode,
+			NationalCode = x.NationalCode
+		}).ToList();

-        return result;
+		return result;

-    }
+	}

    public Task<List<GetClientEmployeeListViewModel>> GetClientEmployeeList(GetClientEmployeeListSearchModel searchModel, long workshopId)
    {
@@ -1171,144 +1170,7 @@ public class EmployeeRepository : RepositoryBase<long, Employee>, IEmployeeRepos
        //
        //     };
        // }).OrderByDescending(x => x.StartWork).ToList();
-        throw new NotImplementedException();
-    }
-
-
-    public async Task<List<EmployeeListDto>> ListOfAllEmployeesClient(EmployeeSearchModelDto searchModel, long workshopId)
-    {
-        var hasNotStoppedWorkingYet = Tools.GetUndefinedDateTime();
-
-        var baseQuery = await
-        (
-            from personnelCode in _context.PersonnelCodeSet
-            join employee in _context.Employees
-                on personnelCode.EmployeeId equals employee.id
-            where personnelCode.WorkshopId == workshopId
-            select new
-            {
-                Employee = employee,
-                PersonnelCode = personnelCode
-            }
-        ).ToListAsync();
-
-        if (!string.IsNullOrWhiteSpace(searchModel.EmployeeFullName))
-            baseQuery = baseQuery.Where(x => x.Employee.FullName.Contains(searchModel.EmployeeFullName)).ToList();
-        if (!string.IsNullOrWhiteSpace(searchModel.NationalCode))
-            baseQuery = baseQuery.Where(x => x.Employee.NationalCode.Contains(searchModel.NationalCode)).ToList();
-
-        var employeeIds = baseQuery.Select(x => x.Employee.id).ToList();
-
-        var leftWorks = await _context.LeftWorkList
-            .Where(x => x.WorkshopId == workshopId && employeeIds.Contains(x.EmployeeId))
-            .ToListAsync();
-
-        var insuranceLeftWorks = await _context.LeftWorkInsuranceList
-            .Where(x => x.WorkshopId == workshopId && employeeIds.Contains(x.EmployeeId))
-            .ToListAsync();
-
-        var children = await _context.EmployeeChildrenSet.Where(x => employeeIds.Contains(x.EmployeeId)).ToListAsync();
-
-        var clientTemp = await _context.EmployeeClientTemps.Where(x => x.WorkshopId == workshopId)
-            .Select(x => x.EmployeeId).ToListAsync();
-        var leftWorkTempData = await _context.LeftWorkTemps.Where(x => x.WorkshopId == workshopId).ToListAsync();
-        var startWorkTemp = leftWorkTempData.Where(x => x.LeftWorkType == LeftWorkTempType.StartWork).ToList();
-        var leftWorkTemp = leftWorkTempData.Where(x => x.LeftWorkType == LeftWorkTempType.LeftWork).ToList();
-
-
-
-        var result = baseQuery.Select(x =>
-        {
-            var left = leftWorks
-                .Where(l => l.EmployeeId == x.Employee.id)
-                .MaxBy(l => l.StartWorkDate);
-
-            var insuranceLeftWork = insuranceLeftWorks
-                .Where(l => l.EmployeeId == x.Employee.id).MaxBy(l => l.StartWorkDate);
-
-            var contractStart = left != null ? left.StartWorkDate.ToFarsi() : "";
-            var contractLeft = left != null
-                ? left.LeftWorkDate != hasNotStoppedWorkingYet ? left.LeftWorkDate.ToFarsi() : ""
-                : "";
-
-            var insuranceStart = insuranceLeftWork != null ? insuranceLeftWork.StartWorkDate.ToFarsi() : "";
-            var insuranceLeft = insuranceLeftWork != null
-                ? insuranceLeftWork.LeftWorkDate != null ? insuranceLeftWork.LeftWorkDate.ToFarsi() : ""
-                : "";
-            int personnelCode = Convert.ToInt32($"{x.PersonnelCode.PersonnelCode}");
-
-            int numberOfChildren = children.Count(ch => ch.EmployeeId == x.Employee.id);
-
-            bool employeeHasLeft =
-                (!string.IsNullOrWhiteSpace(insuranceLeft) && !string.IsNullOrWhiteSpace(contractLeft))
-                || (left == null && !string.IsNullOrWhiteSpace(insuranceLeft))
-                || (insuranceLeftWork == null && !string.IsNullOrWhiteSpace(contractLeft));
-            bool hasClientTemp = clientTemp.Any(c => c == x.Employee.id);
-            bool hasStartWorkTemp = startWorkTemp.Any(st => st.EmployeeId == x.Employee.id);
-            bool hasLeftWorkTemp = leftWorkTemp.Any(lf => lf.EmployeeId == x.Employee.id);
-            return new EmployeeListDto
-            {
-                Id = x.Employee.id,
-                EmployeeFullName = x.Employee.FullName,
-                PersonnelCode = personnelCode,
-                MaritalStatus = x.Employee.MaritalStatus,
-                NationalCode = x.Employee.NationalCode,
-                IdNumber = x.Employee.IdNumber,
-                DateOfBirth = x.Employee.DateOfBirth.ToFarsi(),
-                FatherName = x.Employee.FatherName,
-                NumberOfChildren = $"{numberOfChildren}",
-                LatestContractStartDate = contractStart,
-                ContractLeftDate = contractLeft,
-                LatestInsuranceStartDate = insuranceStart,
-                InsuranceLeftDate = insuranceLeft,
-                HasContract = !string.IsNullOrWhiteSpace(contractStart),
-                HasInsurance = !string.IsNullOrWhiteSpace(insuranceStart),
-                EmployeeStatusInWorkshop =
-                    hasClientTemp || hasStartWorkTemp ? EmployeeStatusInWorkshop.CreatedByClient :
-                    hasLeftWorkTemp ? EmployeeStatusInWorkshop.LefWorkTemp :
-                    employeeHasLeft ? EmployeeStatusInWorkshop.HasLeft : EmployeeStatusInWorkshop.Working,
-
-            };
-        }).OrderBy(x => x.EmployeeStatusInWorkshop).ThenBy(x => x.PersonnelCode).ToList();
-
-
-
-        return result;
-    }
-
-
-    public async Task<List<PrintAllEmployeesInfoDtoClient>> PrintAllEmployeesInfoClient(long workshopId)
-    {
-        var res = await ListOfAllEmployeesClient(new EmployeeSearchModelDto(), workshopId);
-   
-        return res
-            .Where(x=>x.EmployeeStatusInWorkshop != EmployeeStatusInWorkshop.CreatedByClient
-                   && x.EmployeeStatusInWorkshop != EmployeeStatusInWorkshop.LefWorkTemp)
-            .Select(x => new PrintAllEmployeesInfoDtoClient(x)).ToList();
-    }
-    
-    public async Task<List<EmployeeSelectListViewModel>> GetWorkingEmployeesSelectList(long workshopId)
-    {
-        var dateNow = DateTime.Now.Date;
-
-
-        var workshopActiveLeftWorksQuery = _context.LeftWorkList.Where(x => x.WorkshopId == workshopId &&
-                                                                            x.StartWorkDate <= dateNow && x.LeftWorkDate > dateNow);
-
-
-        var workshopActiveInsuranceLeftWorksQuery = _context.LeftWorkInsuranceList.Where(x => x.WorkshopId == workshopId &&
-            x.StartWorkDate <= dateNow && (x.LeftWorkDate > dateNow || x.LeftWorkDate == null));
-
-
-        var employeesQuery = _context.Employees.Where(x => workshopActiveLeftWorksQuery.Any(y => y.EmployeeId == x.id) ||
-                                                           workshopActiveInsuranceLeftWorksQuery.Any(y => y.EmployeeId == x.id));
-
-
-        return await employeesQuery.Select(x => new EmployeeSelectListViewModel()
-        {
-            Id = x.id,
-            EmployeeFullName = x.FullName
-        }).ToListAsync();
+throw new NotImplementedException();
    }

    #endregion
--- a/CompanyManagment.EFCore/Repository/LeaveRepository.cs
+++ b/CompanyManagment.EFCore/Repository/LeaveRepository.cs
@@ -1,14 +1,12 @@
-using _0_Framework.Application;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using _0_Framework.Application;
 using _0_Framework.InfraStructure;
 using Company.Domain.LeaveAgg;
 using CompanyManagment.App.Contracts.Checkout;
 using CompanyManagment.App.Contracts.Leave;
 using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-

 namespace CompanyManagment.EFCore.Repository;

@@ -19,7 +17,6 @@ public class LeaveRepository : RepositoryBase<long, Leave>, ILeaveRepository
    public LeaveRepository(CompanyContext context) : base(context)
    {
        _context = context;
-   
    }

    public EditLeave GetDetails(long id)
@@ -293,65 +290,6 @@ public class LeaveRepository : RepositoryBase<long, Leave>, ILeaveRepository
        return query;
    }

-    public async Task<List<LeavePrintResponseViewModel>> PrintAllAsync(List<long> ids, long workshopId)
-    {
-        var leaves =await _context
-            .LeaveList.Where(x => ids.Contains(x.id) && x.WorkshopId == workshopId).ToListAsync();
-
-        var minLeave = leaves.Min(x => x.StartLeave);
-        var maxLeave = leaves.Max(x => x.EndLeave);
-        
-        var employeeIds = leaves.Select(x => x.EmployeeId).Distinct().ToList();
-        
-        var contracts = await _context.Contracts
-            .Where(x => x.WorkshopIds == workshopId && employeeIds.Contains(x.EmployeeId)
-            && x.ContarctStart<= maxLeave && x.ContractEnd>= minLeave)
-            .ToListAsync();
-        
-        var employees = await _context
-            .Employees.Where(x=> employeeIds.Contains(x.id)).ToListAsync();
-        
-        var employerNames = _context.WorkshopEmployers.Include(x=>x.Employer)
-            .Where(x=>x.WorkshopId == workshopId).Select(x=>x.Employer.FName+" "+x.Employer.LName).ToList();
-        
-        var workshopName = _context.Workshops.FirstOrDefault(x => x.id == workshopId)?.WorkshopName;
-        
-        var res = leaves.Select(leave =>
-        {
-            var employee = employees.FirstOrDefault(x => x.id == leave.EmployeeId);
-            return new LeavePrintResponseViewModel
-            {
-                FullName = employee?.FName + " " +
-                           employee?.LName,
-                NationalCode = employee?.NationalCode,
-                WorkshopName = workshopName,
-                EmployerNames = employerNames,
-                PaidLeaveType = leave.PaidLeaveType,
-                ContractNo = contracts.FirstOrDefault(x =>
-                    x.EmployeeId == leave.EmployeeId &&
-                    x.ContarctStart <= leave.StartLeave &&
-                    x.ContractEnd >= leave.EndLeave)?.ContractNo,
-                DailyLeave = leave.PaidLeaveType == "روزانه" ? new LeavePrintDailyResponseViewModel
-                {
-                    StartLeave = leave.StartLeave.ToFarsi(),
-                    EndLeave = leave.EndLeave.ToFarsi(),
-                    TotalDay = leave.LeaveHourses
-                } : null,
-                
-                HourlyLeave = leave.PaidLeaveType == "ساعتی" ?
-                    new LeavePrintHourlyResponseViewModel
-                {
-                    LeaveDate = leave.StartLeave.ToFarsi(),
-                    StartHour = leave.StartLeave.ToString("HH:mm"),
-                    EndHour = leave.EndLeave.ToString("HH:mm"),
-                    TotalHour = TimeSpan.Parse(leave.LeaveHourses)
-                        .TotalHours.ToString("F0")
-                } : null
-            };
-        }).ToList();
-        return res;
-    }
-
    #region Vafa

    public List<LeaveViewModel> LastLeaveMain(LeaveSearchModel searchModel)
@@ -433,17 +371,15 @@ public class LeaveRepository : RepositoryBase<long, Leave>, ILeaveRepository
        }
    }

-
-
-    public async Task<OperationResult> RemoveLeave(long id)
+    public OperationResult RemoveLeave(long id)
    {
        var op = new OperationResult();
        var item = _context.LeaveList.FirstOrDefault(x => x.id == id);
        if (item != null)
        {
-            var checkoutExist =await _context.CheckoutSet
+            var checkoutExist = _context.CheckoutSet
                .Where(x => x.WorkshopId == item.WorkshopId && x.EmployeeId == item.EmployeeId)
-                .Where(x => item.StartLeave <= x.ContractEnd).ToListAsync();
+                .Where(x => item.StartLeave <= x.ContractEnd).ToList();
            if (checkoutExist.Count > 0)
            {
                return op.Failed("در بازه زمانی این مرخصی و یا بعد از آن فیش حقوقی وجود دارد");
@@ -600,250 +536,4 @@ public class LeaveRepository : RepositoryBase<long, Leave>, ILeaveRepository
            (starContract >= x.StartLeaveGr && starContract <= x.EndLeaveGr) ||
            (endContract >= x.StartLeaveGr && endContract <= x.EndLeaveGr));
    }
-
-
-    #region ForApi
-
-    public async Task<PagedResult<leaveListDto>> GetList(LeaveListSearchModel searchModel)
-    {
-        var query = _context.LeaveList.Where(x => x.WorkshopId == searchModel.WorkshopId);
-
-        if (searchModel.EmployeeId != 0)
-            query = query.Where(x => x.EmployeeId == searchModel.EmployeeId);
-
-        if (searchModel.LeaveType == LeaveType.PaidLeave)
-            query = query.Where(x => x.LeaveType == "استحقاقی");
-
-        if (searchModel.LeaveType == LeaveType.SickLeave)
-            query = query.Where(x => x.LeaveType == "استعلاجی");
-
-        if (searchModel.IsInvalid)
-        {
-            query = query.IgnoreQueryFilters().Where(x => x.IsInvalid);
-        }
-
-        if (!string.IsNullOrWhiteSpace(searchModel.StartLeave) && !string.IsNullOrWhiteSpace(searchModel.EndLeave))
-        {
-            var start = new DateTime();
-            var end = new DateTime();
-            try
-            {
-                start = searchModel.StartLeave.ToGeorgianDateTime();
-                end = searchModel.EndLeave.ToGeorgianDateTime();
-            }
-            catch (Exception e)
-            {
-                return new PagedResult<leaveListDto>();
-            }
-      
-            query = query.Where(x => x.StartLeave >= start && x.EndLeave <= end);
-        }
-        else if (!string.IsNullOrWhiteSpace(searchModel.YearStr) || !string.IsNullOrWhiteSpace(searchModel.MonthStr))
-        {
-            if (!string.IsNullOrWhiteSpace(searchModel.YearStr))
-            {
-                try
-                {
-                    int year = Convert.ToInt32(searchModel.YearStr);
-                    query = query.Where(x => x.Year == year);
-                }
-                catch (Exception)
-                {
-
-                    return new PagedResult<leaveListDto>();
-                }
-
-            }
-
-            if (!string.IsNullOrWhiteSpace(searchModel.MonthStr))
-            {
-                try
-                {
-                    int month = Convert.ToInt32(searchModel.MonthStr);
-                    query = query.Where(x => x.Month == month);
-                }
-                catch (Exception)
-                {
-
-                    return new PagedResult<leaveListDto>();
-                }
-
-            }
-
-
-         
-        }
-        var count = await query.CountAsync();
-        query = query.OrderByDescending(x => x.CreationDate);
-        var queryPaginationFilter = await query.ApplyPagination(searchModel.PageIndex, searchModel.PageSize).ToListAsync();
-
-
-   
-        var leaveResult = queryPaginationFilter.Select(item => new leaveListDto()
-        {
-            Id = item.id,
-            EmployeeFullName = item.EmployeeFullName,
-            YearStr = $"{item.Year}",
-            MonthStr = item.Month.ToFarsiMonthByIntNumber(),
-            IsInvalid = item.IsInvalid,
-            LeaveType = item.LeaveType,
-            StartLeave = item.StartLeave.ToFarsi(),
-            EndLeave = item.EndLeave.ToFarsi(),
-            HourlyInterval = item.PaidLeaveType == "ساعتی" ? $"{item.StartLeave.TimeOfDay:hh\\:mm} الی {item.EndLeave.TimeOfDay:hh\\:mm}" : "-",
-            LeaveDuration = Tools.CalculateLeaveHoursAndDays(item.PaidLeaveType, item.LeaveHourses),
-            IsAccepted = item.IsAccepted,
-            WorkshopId = item.WorkshopId,
-            EmployeeId = item.EmployeeId,
-         
-        }).ToList();
-        return new PagedResult<leaveListDto>()
-        {
-            TotalCount = count,
-            List = leaveResult
-        };
-    }
-
-
-    public async Task<List<GroupLeaveListDto>> GetGroupList(LeaveListSearchModel searchModel)
-    {
-        var query = _context.LeaveList.Where(x => x.WorkshopId == searchModel.WorkshopId && x.EmployeeId == searchModel.EmployeeId);
-
-
-
-        if (searchModel.LeaveType == LeaveType.PaidLeave)
-            query = query.Where(x => x.LeaveType == "استحقاقی");
-
-        if (searchModel.LeaveType == LeaveType.SickLeave)
-            query = query.Where(x => x.LeaveType == "استعلاجی");
-
-        if (searchModel.IsInvalid)
-        {
-            query = query.IgnoreQueryFilters().Where(x => x.IsInvalid);
-        }
-
-        if (!string.IsNullOrWhiteSpace(searchModel.StartLeave) && !string.IsNullOrWhiteSpace(searchModel.EndLeave))
-        {
-            var start = new DateTime();
-            var end = new DateTime();
-            try
-            {
-                start = searchModel.StartLeave.ToGeorgianDateTime();
-                end = searchModel.EndLeave.ToGeorgianDateTime();
-            }
-            catch (Exception e)
-            {
-                return new List<GroupLeaveListDto>();
-            }
-
-            query = query.Where(x => x.StartLeave >= start && x.EndLeave <= end);
-        }
-        else if (!string.IsNullOrWhiteSpace(searchModel.YearStr) || !string.IsNullOrWhiteSpace(searchModel.MonthStr))
-        {
-            if (!string.IsNullOrWhiteSpace(searchModel.YearStr))
-            {
-                try
-                {
-                    int year = Convert.ToInt32(searchModel.YearStr);
-                    query = query.Where(x => x.Year == year);
-                }
-                catch (Exception)
-                {
-
-                    return new List<GroupLeaveListDto>();
-                }
-
-            }
-
-            if (!string.IsNullOrWhiteSpace(searchModel.MonthStr))
-            {
-                try
-                {
-                    int month = Convert.ToInt32(searchModel.MonthStr);
-                    query = query.Where(x => x.Month == month);
-                }
-                catch (Exception)
-                {
-
-                    return new List<GroupLeaveListDto>();
-                }
-
-            }
-
-
-        }
-
-        var leaveList = await query.GroupBy(x => new { x.Year, x.Month })
-            .OrderByDescending(group => group.Key.Year)
-            .ThenByDescending(group => group.Key.Month)
-            .Select(group => new GroupLeaveListDto
-            {
-                YearStr = $"{group.Key.Year}",
-                MonthStr = group.Key.Month.ToFarsiMonthByIntNumber(),
-                LeaveListItemsDto = group.OrderByDescending(x=>x.StartLeave).Select(item => new LeaveListItemsDto
-                {
-                    Id = item.id,
-                    IsInvalid = item.IsInvalid,
-                    LeaveType = item.LeaveType,
-                    StartLeave = item.StartLeave.ToFarsi(),
-                    EndLeave = item.EndLeave.ToFarsi(),
-                    HourlyInterval = item.PaidLeaveType == "ساعتی" ? $"{item.StartLeave.TimeOfDay:hh\\:mm} الی {item.EndLeave.TimeOfDay:hh\\:mm}" : "-",
-                    LeaveDuration = Tools.CalculateLeaveHoursAndDays(item.PaidLeaveType, item.LeaveHourses),
-                    IsAccepted = item.IsAccepted,
-                    WorkshopId = item.WorkshopId,
-                    EmployeeId = item.EmployeeId,
-                }).ToList()
-            }).ToListAsync();
-
-        return leaveList;
-    }
-
-
-    public async Task<LeaveListPrintDto> ListPrint(List<long> ids)
-    {
-        var result = new LeaveListPrintDto();
-        var timeSpanHourlyLeave = new TimeSpan();
-        var dailyLeaveTime = new TimeSpan();
-        if (ids.Any())
-        {
-            var query = _context.LeaveList.Where(x => ids.Contains(x.id)).OrderByDescending(x=>x.StartLeave).AsQueryable();
-
-            #region sumOfLeaves
-
-            var hourly = await query.Where(x => x.PaidLeaveType == "ساعتی").Select(x => x.LeaveHourses).ToListAsync();
-            var daily = await query.Where(x => x.PaidLeaveType == "روزانه").Select(x => x.LeaveHourses).ToListAsync();
-
-
-            if (hourly.Any())
-                timeSpanHourlyLeave = new TimeSpan(hourly.Sum(x => TimeOnly.Parse(x).Ticks));
-            if (daily.Any())
-                dailyLeaveTime = daily.Sum(x => Convert.ToInt32(x)) * TimeSpan.FromDays(1);
-
-            var sumOfLeaves = timeSpanHourlyLeave.Add(dailyLeaveTime);
-
-            result.SumOfEmployeeleaves = sumOfLeaves.ToFarsiDaysAndHoursAndMinutes();
-
-            #endregion
-
-
-            result.LeavePrintListItemsDto = await query.Select(item => new LeavePrintListItemsDto
-            {
-                YearStr = $"{item.Year}",
-                MonthStr = item.Month.ToFarsiMonthByIntNumber(),
-                StartLeave = item.StartLeave.ToFarsi(),
-                EndLeave = item.EndLeave.ToFarsi(),
-                LeaveType = item.LeaveType,
-                HourlyInterval = item.PaidLeaveType == "ساعتی" ? $"{item.StartLeave.TimeOfDay:hh\\:mm} الی {item.EndLeave.TimeOfDay:hh\\:mm}" : "-",
-                LeaveDuration = Tools.CalculateLeaveHoursAndDays(item.PaidLeaveType, item.LeaveHourses),
-                IsAccepted = item.IsAccepted,
-            }).ToListAsync();
-
-
-            result.EmployeeFullName = query.FirstOrDefault()!.EmployeeFullName;
-        }
-      
-
-        return result;
-    }
-
-    #endregion
 }
--- a/ServiceHost/Areas/Admin/Controllers/institutionContractController.cs
+++ b/ServiceHost/Areas/Admin/Controllers/institutionContractController.cs
@@ -341,7 +341,7 @@ public class institutionContractController : AdminBaseController
    {
        var institutionContractViewModels =
            _institutionContractApplication.NewSearch(new() { IsActiveString = "both", TypeOfContract = "both" });
-        var bytes = InstitutionContractExcelGenerator.GenerateExcel(institutionContractViewModels);
+        var bytes = InstitutionContractExcelGenerator.GenerateExcel(new List<InstitutionContractExcelViewModel>());
        return File(bytes,
            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
            $"قرارداد های مالی.xlsx");
@@ -814,6 +814,34 @@ public class institutionContractController : AdminBaseController
        var res= await _institutionContractApplication.VerifyInstitutionContractManually(id);
        return res;
    }
+
+    [HttpGet("excel-download")]
+    public async Task<IActionResult> ExcelDownload()
+    {
+        
+        var searchModel = new InstitutionContractListSearchModel();
+	    
+        var dataVm=new List<InstitutionContractExcelViewModel>();
+	    
+        foreach (var name in typeof(InstitutionContractListStatus).GetEnumNames())
+        {
+            var @enum = Enum.Parse<InstitutionContractListStatus>(name);
+            searchModel.Status = @enum;
+            searchModel.PageSize = 99999;
+            var data =( await(_institutionContractApplication.GetList(searchModel))).List;
+            dataVm.Add(new InstitutionContractExcelViewModel(){Tab = @enum, GetInstitutionContractListItemsViewModels = data});
+        }
+
+        searchModel.Status = null;
+	    
+        var nullData = ( await(_institutionContractApplication.GetList(searchModel))).List;
+        dataVm.Add(new InstitutionContractExcelViewModel(){Tab = null, GetInstitutionContractListItemsViewModels = nullData});
+	    
+        var bytes = InstitutionContractExcelGenerator.GenerateExcel(dataVm);
+        return File(bytes,
+            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+            $"قرارداد های مالی.xlsx");
+    }
 }


--- a/ServiceHost/Areas/Admin/Pages/Company/InstitutionContracts/Index.cshtml.cs
+++ b/ServiceHost/Areas/Admin/Pages/Company/InstitutionContracts/Index.cshtml.cs
@@ -2,6 +2,7 @@
 using System.Drawing;
 using _0_Framework.Application;
 using AccountManagement.Application.Contracts.Account;
+using Company.Domain.InstitutionContractAgg;
 using CompanyManagement.Infrastructure.Excel.InstitutionContract;
 using CompanyManagment.App.Contracts.Employer;
 using CompanyManagment.App.Contracts.InstitutionContract;
@@ -38,6 +39,7 @@ public class IndexModel : PageModel
 	private readonly IInstitutionContractApplication _institutionContract;
 	private readonly ILeftWorkApplication _leftWorkApplication;
 	private readonly IRepresentativeApplication _representativeApplication;
+	private readonly IInstitutionContractRepository _institutionContractRepository;


 	private readonly string _viewName;
@@ -60,7 +62,7 @@ public class IndexModel : PageModel
 		IPersonalContractingPartyApp contractingPartyApplication,
 		IRepresentativeApplication representativeApplication, IInstitutionContractApplication institutionContract,
 		ILeftWorkApplication leftWorkApplication
-		, IContactInfoApplication contactInfoApplication, IAccountApplication accountApplication)
+		, IContactInfoApplication contactInfoApplication, IAccountApplication accountApplication, IInstitutionContractRepository institutionContractRepository)

 	{
 		_workshopApplication = workshopApplication;
@@ -71,6 +73,7 @@ public class IndexModel : PageModel
 		_leftWorkApplication = leftWorkApplication;
 		_contactInfoApplication = contactInfoApplication;
 		_accountApplication = accountApplication;
+		_institutionContractRepository = institutionContractRepository;
 	}

 	public string Message { get; set; }
@@ -920,12 +923,27 @@ public class IndexModel : PageModel
 		});
 	}

-    public IActionResult OnGetDownloadExcel()
+    public async Task<IActionResult> OnGetDownloadExcel()
    {
-        var institutionContractViewModels = _institutionContract.NewSearch(new() {IsActiveString = "both", TypeOfContract = "both" });
-        
-        institutionContractViewModels= institutionContractViewModels.GroupBy(x=>x.ContractingPartyId).Select(g=>g.MaxBy(x=>x.ContractStartGr)).ToList();
-        var bytes = InstitutionContractExcelGenerator.GenerateExcel(institutionContractViewModels);
+	    var searchModel = new InstitutionContractListSearchModel();
+	    
+	    var dataVm=new List<InstitutionContractExcelViewModel>();
+	    
+	    foreach (var name in typeof(InstitutionContractListStatus).GetEnumNames())
+	    {
+		    var @enum = Enum.Parse<InstitutionContractListStatus>(name);
+		    searchModel.Status = @enum;
+		    searchModel.PageSize = 99999;
+		    var data =( await(_institutionContractRepository.GetList(searchModel))).List;
+		    dataVm.Add(new InstitutionContractExcelViewModel(){Tab = @enum, GetInstitutionContractListItemsViewModels = data});
+	    }
+
+	    searchModel.Status = null;
+	    
+	    var nullData = ( await(_institutionContractRepository.GetList(searchModel))).List;
+	    dataVm.Add(new InstitutionContractExcelViewModel(){Tab = null, GetInstitutionContractListItemsViewModels = nullData});
+	    
+        var bytes = InstitutionContractExcelGenerator.GenerateExcel(dataVm);
        return File(bytes,
            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
            $"قرارداد های مالی.xlsx");
--- a/ServiceHost/Areas/Client/Controllers/EmployeeController.cs
+++ b/ServiceHost/Areas/Client/Controllers/EmployeeController.cs
@@ -1,6 +1,5 @@
-using _0_Framework.Application;
+using _0_Framework.Application;
 using CompanyManagment.App.Contracts.Employee;
-using CompanyManagment.App.Contracts.Employee.DTO;
 using Microsoft.AspNetCore.Mvc;
 using ServiceHost.BaseControllers;

@@ -17,38 +16,10 @@ public class EmployeeController:ClientBaseController
        _workshopId = authHelper.GetWorkshopId();
    }
    
-    
    [HttpGet("select-list")]
    public async Task<ActionResult<List<EmployeeSelectListViewModel>>> GetEmployeeSelectList()
    {
-        var result = await _employeeApplication.GetWorkingEmployeesSelectList(_workshopId);
+        var result = await _employeeApplication.WorkedEmployeesInWorkshopSelectList(_workshopId);
        return result;
    }
-
-
-
-    /// <summary>
-    /// دریافت لیست پرسنل 
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    [HttpGet]
-    public async Task<ActionResult<List<EmployeeListDto>>> GetList(EmployeeSearchModelDto searchModel)
-    {
-        var result = await _employeeApplication.ListOfAllEmployeesClient(searchModel, _workshopId);
-        return result;
-    }
-
-    /// <summary>
-    /// پرینت تجمیعی پرسنل
-    /// </summary>
-    /// <returns></returns>
-    [HttpGet("PrintAllEmployeesInfo")]
-    public async Task<ActionResult<List<PrintAllEmployeesInfoDtoClient>>> PrintAllEmployeesInfo()
-    {
-        var result = await _employeeApplication.PrintAllEmployeesInfoClient(_workshopId);
-        return result;
-    }
- 
-
 }
--- a/ServiceHost/Areas/Client/Controllers/LeaveController.cs
+++ b/ServiceHost/Areas/Client/Controllers/LeaveController.cs
@@ -1,172 +0,0 @@
-using _0_Framework.Application;
-using Company.Domain.EmployeeAgg;
-using CompanyManagment.App.Contracts.InstitutionPlan;
-using CompanyManagment.App.Contracts.InsuranceList;
-using CompanyManagment.App.Contracts.Leave;
-using Microsoft.AspNetCore.Mvc;
-using ServiceHost.BaseControllers;
-using System.Security.Cryptography;
-
-namespace ServiceHost.Areas.Client.Controllers;
-
-public class LeaveController : ClientBaseController
-{
-    private readonly ILeaveApplication _leaveApplication;
-    private long _workshopId;
-    public LeaveController(ILeaveApplication leaveApplication, IAuthHelper authHelper)
-    {
-        _leaveApplication = leaveApplication;
-        _workshopId = authHelper.GetWorkshopId();
-    }
-
-    /// <summary>
-    /// دریافت لیست مرخصی ها
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    [HttpGet("GetLeaveList")]
-    public async Task<ActionResult<LeaveListMultipleDto>> GetLeaveList(LeaveListSearchModel searchModel)
-    {
-        var result = new LeaveListMultipleDto();
-        searchModel.WorkshopId = _workshopId;
-        if (searchModel.EmployeeId > 0)
-        {
-            //لیست گروه بندی شده
-            result.GroupLeaveListDto = await _leaveApplication.GetGroupList(searchModel);
-
-            if (!string.IsNullOrWhiteSpace(searchModel.YearStr) && !string.IsNullOrWhiteSpace(searchModel.MonthStr))
-            {
-                TimeSpan timeSpan = _leaveApplication.SumOfEmployeeLeaveTimeSpanInDates(_workshopId, searchModel.EmployeeId, searchModel.YearStr, searchModel.MonthStr, searchModel.LeaveType);
-                //مجموع مرخصی پرسنل
-                result.SumOfEmployeeleaves = timeSpan.ToFarsiDaysAndHoursAndMinutes();
-            }
-
-            return Ok(result);
-        }
-        //لیست نرمال PageResult
-        result.leaveListDto = await _leaveApplication.GetList(searchModel);
-        return Ok(result);
-    }
-
-    ///// <summary>
-    ///// چک کردن تاریخ شروع مرخصی
-    ///// </summary>
-    ///// <param name="startLeaveDate"></param>
-    ///// <returns></returns>
-    //[HttpGet("CheckIsInvalidLeave")]
-    //public async Task<OperationResult<CheckIsInvalidLeaveDto>> CheckIsInvalidLeave(string startLeaveDate)
-    //{
-    //    return await _leaveApplication.CheckIsInvalidLeave(startLeaveDate, _workshopId);
-    //}
-
-    /// <summary>
-    /// ایجاد مرخصی
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    [HttpPost("CreateLeave")]
-    public async Task<ActionResult<OperationResult>> CreateLeave([FromBody] CreateLeaveDto command)
-    {
-        command.WorkshopId = _workshopId;
-
-        var result = await _leaveApplication.CreateLeave(command);
-
-        return result;
-    }
-
-    /// <summary>
-    /// دریافت شیفت گردشی اگر داشت
-    /// در مودال ایجاد
-    /// </summary>
-    /// <param name="startLeaveDate"></param>
-    /// <returns></returns>
-    [HttpGet("GetRotatingShift")]
-    public async Task<OperationResult<RotatingShiftDto>> GetRotatingShift(long employeeId, string startLeaveDate)
-    {
-
-        return await _leaveApplication.HasRotatingShift(_workshopId, employeeId, startLeaveDate);
-    }
-
-
-    /// <summary>
-    /// محاسبه مدت مرخصی ساعتی
-    /// در مودال ایجاد
-    /// </summary>
-    /// <param name="startHours"></param>
-    /// <param name="endHours"></param>
-    /// <returns></returns>
-    [HttpGet("GetHourlyLeaveDuration")]
-    public async Task<ActionResult<string>> GetHourlyLeaveDuration(string startHours, string endHours)
-    {
-        var result =await _leaveApplication.GetHourlyLeaveDuration(startHours, endHours);
-        return Ok(new { LeaveDuration = result });
-    }
-
-    /// <summary>
-    /// محاسبه مدت مرخصی روزانه
-    /// در مودال ایجاد
-    /// </summary>
-    /// <param name="startDate"></param>
-    /// <param name="endDate"></param>
-    /// <returns></returns>
-    [HttpGet("GetDailyLeaveDuration")]
-    public async Task<ActionResult<string>> GetDailyLeaveDuration(string startDate, string endDate)
-    {
-        var result = await _leaveApplication.GetDailyLeaveDuration(startDate, endDate);
-        return Ok(new { LeaveDuration = result });
-    }
-
-    /// <summary>
-    /// پرینت تکی
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    [HttpGet("print/{id}")]
-    public async Task<ActionResult<LeavePrintResponseViewModel>> PrintOneAsync(long id)
-    {
-        var leavePrint = await _leaveApplication.PrintOneAsync(id, _workshopId);
-        return leavePrint;
-    }
-
-    /// <summary>
-    /// پرینت گروهی
-    /// </summary>
-    /// <param name="ids"></param>
-    /// <returns></returns>
-    [HttpGet("print")]
-    public async Task<ActionResult<List<LeavePrintResponseViewModel>>> PrintAllAsync([FromQuery] List<long> ids, LeaveListSearchModel searchModel)
-    {
-        var leavePrints = await _leaveApplication.PrintAllAsync(ids, _workshopId);
-        return Ok(leavePrints);
-    }
-
-    /// <summary>
-    /// پرینت لیستی
-    /// </summary>
-    /// <param name="ids"></param>
-    /// <returns></returns>
-    [HttpGet("ListPrint")]
-    public async Task<ActionResult<LeaveListPrintDto>> ListPrint([FromQuery] List<long> ids)
-    {
-        var leavePrints = await _leaveApplication.ListPrint(ids);
-        return Ok(leavePrints);
-    }
-
-    /// <summary>
-    /// حذف مرخصی
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    [HttpDelete("RemoveLeave/{id}")]
-    public async Task<ActionResult<object>> RemoveLeaveAsync(long id)
-    {
-        var op =await _leaveApplication.RemoveLeaveAsync(id);
-        return Ok(new
-        {
-            isSuccedded = op.IsSuccedded,
-            message = op.Message,
-        });
-
-    }
-
-}
--- a/ServiceHost/Program.cs
+++ b/ServiceHost/Program.cs
@@ -289,6 +289,7 @@ builder.Services.AddCors(options =>
                "http://localhost:3000",
                "http://localhost:4000",
                "http://localhost:4001",
+                "http://localhost:4002",
                "http://localhost:3001",
                "https://gozareshgir.ir",
                "https://dad-mehr.ir",
--- a/ServiceHost/Properties/launchSettings.json
+++ b/ServiceHost/Properties/launchSettings.json
@@ -11,7 +11,7 @@
    },
    "ServiceHost": {
      "commandName": "Project",
-      "launchBrowser": true,
+      "launchBrowser": false,
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development",
        "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"
Author	SHA1	Message	Date
mahan	adf297455f	feat: enhance Excel export for institution contracts by removing row number and adding dynamic physical contract status	2025-12-29 17:20:07 +03:30
mahan	8b6786c09a	add route for excel download	2025-12-28 19:20:25 +03:30
mahan	45c5d20323	add excel download	2025-12-28 19:17:50 +03:30
mahan	aa0eae6c83	feat: implement Excel export for institution contracts with categorized tabs	2025-12-28 13:01:40 +03:30