add: implement AsghaeeAzarWorkshopsExcelGenerator and view model for generating Excel reports

.github/workflows/dotnet-developPublish.yml

@@ -5,6 +5,8 @@ on:
     branches:
       - Main
 
+env:
+  DOTNET_ENVIRONMENT: Development
 
 jobs:
   build-and-deploy:
@@ -35,11 +37,12 @@ jobs:
         & "C:\Program Files\IIS\Microsoft Web Deploy V3\msdeploy.exe" `
           -verb:sync `
           -source:contentPath="$publishFolder" `
-          -dest:contentPath="dadmehrg",computerName="https://$env:SERVER_HOST:8172/msdeploy.axd?site=gozareshgir",userName="$env:DEPLOY_USER",password="$env:DEPLOY_PASSWORD",authType="Basic" `
+          -dest:contentPath="dadmehrg",computerName="https://171.22.24.15:8172/msdeploy.axd?site=dadmehrg",userName="Administrator",password="R2rNpdnetP3j>q5b18",authType="Basic" `
           -allowUntrusted `
           -enableRule:AppOffline
-          
+
+
       env:
-        SERVER_HOST: 171.22.24.15
+        SERVER_HOST: your-server-ip-or-domain
         DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
         DEPLOY_PASSWORD: ${{ secrets.DEPLOY_PASSWORD }}

0_Framework/Application/StaticWorkshopAccounts.cs

@@ -39,15 +39,4 @@ public static class StaticWorkshopAccounts
     /// که کاربر همچنان به کارگاه دسترسی دارد
     /// </summary>
     public static DateTime ContinuesWorkingDate = new DateTime(2150, 1, 1);
-
-
-    /// <summary>
-    /// لیستی آی دی نقش هایی که مسئول بیمه کارگاه هستند
-    /// 7 : بیمه ارشد
-    /// 8 : بیمه ساده
-    /// </summary>
-    public static List<long> InsuranceAccountsRoleIds = [7, 8];
-
-
-
 }

0_Framework/Exceptions/Handler/CustomExceptionHandler.cs

@@ -24,13 +24,9 @@ public class CustomExceptionHandler : IExceptionHandler
 
     public async ValueTask<bool> TryHandleAsync(HttpContext context, Exception exception, CancellationToken cancellationToken)
     {
-        _logger.LogError(exception,
-            "Error Message: {exceptionMessage}, Type: {exceptionType}, Time: {time}, Path: {path}, TraceId: {traceId}",
-            exception.Message, 
-            exception.GetType().FullName, 
-            DateTime.UtcNow,
-            context.Request.Path,
-            context.TraceIdentifier);
+        _logger.LogError(
+            "Error Message: {exceptionMessage}, Time of occurrence {time}",
+            exception.Message, DateTime.UtcNow);
 
         (string Detail, string Title, int StatusCode, Dictionary<string, object>? Extra) details = exception switch
         {

AccountManagement.Application.Contracts/Account/IAccountApplication.cs

@@ -75,6 +75,7 @@ public interface IAccountApplication
     void CameraLogin(CameraLoginRequest request);
 
     Task<GetPmUserDto> GetPmUserAsync(long accountId);
+
 }
 
 public class CameraLoginRequest

AccountManagement.Application/AccountApplication.cs

@@ -1024,5 +1024,4 @@ public class AccountApplication : IAccountApplication
     {
         return await _pmUserQueryService.GetPmUserDataByAccountId(accountId);
     }
-    
 }

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/BackgroundInstitutionContract.Task.csproj

@@ -17,9 +17,4 @@
       <ProjectReference Include="..\..\WorkFlow\Infrastructure\WorkFlow.Infrastructure.Config\WorkFlow.Infrastructure.Config.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-      <PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
-      <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
-    </ItemGroup>
-
 </Project>

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Jobs/JobSchedulerRegistrator.cs

@@ -1,6 +1,5 @@
 
 using _0_Framework.Application;
-using _0_Framework.Application.Sms;
 using Company.Domain.ContarctingPartyAgg;
 using Company.Domain.InstitutionContractAgg;
 using Hangfire;
@@ -14,22 +13,18 @@ public class JobSchedulerRegistrator
     private readonly IInstitutionContractRepository _institutionContractRepository;
     private static DateTime? _lastRunCreateTransaction;
     private static DateTime? _lastRunSendMonthlySms;
-    private readonly ISmsService _smsService;
-    private readonly ILogger<JobSchedulerRegistrator> _logger;
 
 
-    public JobSchedulerRegistrator(SmsReminder smsReminder, IBackgroundJobClient backgroundJobClient, IInstitutionContractRepository institutionContractRepository, ISmsService smsService, ILogger<JobSchedulerRegistrator> logger)
+    public JobSchedulerRegistrator(SmsReminder smsReminder, IBackgroundJobClient backgroundJobClient, IInstitutionContractRepository institutionContractRepository)
     {
         _smsReminder = smsReminder;
         _backgroundJobClient = backgroundJobClient;
         _institutionContractRepository = institutionContractRepository;
-        _smsService = smsService;
-        _logger = logger;
     }
 
     public void Register()
     {
-        _logger.LogInformation("hangfire Started");
+
         RecurringJob.AddOrUpdate(
             "InstitutionContract.CreateFinancialTransaction",
             () => CreateFinancialTransaction(),
@@ -70,7 +65,7 @@ public class JobSchedulerRegistrator
         var now =DateTime.Now;
         var endOfMonth = now.ToFarsi().FindeEndOfMonth();
         var endOfMonthGr = endOfMonth.ToGeorgianDateTime();
-        _logger.LogInformation("CreateFinancialTransaction job run");
+
         if (now.Date == endOfMonthGr.Date && now.Hour >= 2 && now.Hour < 4 &&
             now.Date != _lastRunCreateTransaction?.Date)
         {
@@ -96,8 +91,8 @@ public class JobSchedulerRegistrator
             }
             catch (Exception e)
             {
-                await _smsService.Alarm("09114221321", "خطا-ایجاد سند مالی");
-
+                //_smsService.Alarm("09114221321", "خطا-ایجاد سند مالی");
+          
             }
            
         }
@@ -115,7 +110,7 @@ public class JobSchedulerRegistrator
         var now = DateTime.Now;
         var endOfMonth = now.ToFarsi().FindeEndOfMonth();
         var endOfMonthGr = endOfMonth.ToGeorgianDateTime();
-        _logger.LogInformation("SendFirstDayOfMonthSms job run");
+
         if (now.Date == endOfMonthGr.Date && now.Hour >= 10 && now.Hour < 11 &&
             now.Date != _lastRunSendMonthlySms?.Date)
         {
@@ -143,7 +138,6 @@ public class JobSchedulerRegistrator
     [DisableConcurrentExecution(timeoutInSeconds: 1200)]
     public async System.Threading.Tasks.Task SendReminderSms()
     {
-        _logger.LogInformation("SendReminderSms job run");
         await _institutionContractRepository.SendReminderSmsForBackgroundTask();
     }
 
@@ -154,7 +148,6 @@ public class JobSchedulerRegistrator
     [DisableConcurrentExecution(timeoutInSeconds: 100)]
     public async System.Threading.Tasks.Task SendBlockSms()
     {
-        _logger.LogInformation("SendBlockSms job run");
         await _institutionContractRepository.SendBlockSmsForBackgroundTask();
     }
 
@@ -166,7 +159,6 @@ public class JobSchedulerRegistrator
     [DisableConcurrentExecution(timeoutInSeconds: 100)]
     public async System.Threading.Tasks.Task SendInstitutionContractConfirmSms()
     {
-        _logger.LogInformation("SendInstitutionContractConfirmSms job run");
         await _institutionContractRepository.SendInstitutionContractConfirmSmsTask();
     }
 

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/NullBoardNotificationPublisher.cs

@@ -1,10 +0,0 @@
-using GozareshgirProgramManager.Application.Interfaces;
-using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
-
-public class NullBoardNotificationPublisher:IBoardNotificationPublisher
-{
-    public Task SendProjectStatusChanged(long userId, TaskSectionStatus oldStatus, TaskSectionStatus newStatus, Guid sectionId)
-    {
-        throw new NotImplementedException();
-    }
-}

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Program.cs

@@ -8,7 +8,6 @@ using BackgroundInstitutionContract.Task.Jobs;
 using CompanyManagment.App.Contracts.Hubs;
 using CompanyManagment.EFCore.Services;
 using GozareshgirProgramManager.Application._Bootstrapper;
-using GozareshgirProgramManager.Application.Interfaces;
 using GozareshgirProgramManager.Application.Modules.Users.Commands.CreateUser;
 using GozareshgirProgramManager.Infrastructure;
 using GozareshgirProgramManager.Infrastructure.Persistence.Seed;
@@ -17,37 +16,9 @@ using Microsoft.AspNetCore.Identity;
 using MongoDB.Driver;
 using PersonalContractingParty.Config;
 using Query.Bootstrapper;
-using Serilog;
-using Serilog.Events;
 using Shared.Contracts.PmUser.Queries;
 using WorkFlow.Infrastructure.Config;
 
-var logDirectory = @"C:\Logs\Hangfire\BackgroundInstitutionContract\";
-
-if (!Directory.Exists(logDirectory))
-{
-    Directory.CreateDirectory(logDirectory);
-}
-
-Log.Logger = new LoggerConfiguration()
-    //NO EF Core log
-    .MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning)
-
-    //NO DbCommand log
-    .MinimumLevel.Override("Microsoft.EntityFrameworkCore.Database.Command", LogEventLevel.Warning)
-
-    //NO Microsoft Public log
-    .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
-    //.MinimumLevel.Information()
-    .WriteTo.File(
-        path: Path.Combine(logDirectory, "institution-contract-log-.txt"),
-        rollingInterval: RollingInterval.Day,
-        retainedFileCountLimit: 30,
-        shared: true,
-        outputTemplate:
-        "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level}] {Message}{NewLine}{Exception}"
-    ).CreateLogger();
-
 var builder = WebApplication.CreateBuilder(args);
 var hangfireConnectionString = builder.Configuration.GetConnectionString("HangfireDb");
 builder.Services.AddHangfire(x => x.UseSqlServerStorage(hangfireConnectionString));
@@ -60,7 +31,7 @@ builder.Services.AddTransient<ISmsService, SmsService>();
 builder.Services.AddTransient<IUidService, UidService>();
 builder.Services.AddTransient<IFileUploader, FileUploader>();
 builder.Services.Configure<AppSettingConfiguration>(builder.Configuration);
-builder.Services.AddScoped<IBoardNotificationPublisher, NullBoardNotificationPublisher>();
+
 #region MongoDb
 
 var mongoConnectionSection = builder.Configuration.GetSection("MongoDb");
@@ -87,13 +58,7 @@ builder.Services.AddHttpClient();
 builder.Services.AddHttpContextAccessor();
 builder.Services.AddSignalR();
 
-
-builder.Host.UseSerilog();
-Log.Information("SERILOG STARTED SUCCESSFULLY");
-
-
 var app = builder.Build();
-
 app.MapHub<SendSmsHub>("/sendSmsHub");
 
 app.MapHangfireDashboard();

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/appsettings.Development.json

@@ -25,8 +25,8 @@
 
     //mahan Docker
     //"MesbahDb": "Data Source=localhost,5069;Initial Catalog=mesbah_db;User ID=sa;Password=YourPassword123;TrustServerCertificate=True;",
-    "HangfireDb": "Data Source=.;Initial Catalog=hangfire_db;Integrated Security=True;TrustServerCertificate=true;",
-    //"HangfireDb": "Data Source=185.208.175.186;Initial Catalog=hangfire_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]18[3019]#@ATt;TrustServerCertificate=true;"
+    //"HangfireDb": "Data Source=.;Initial Catalog=hangfire_db;Integrated Security=True;TrustServerCertificate=true;",
+    "HangfireDb": "Data Source=185.208.175.186;Initial Catalog=hangfire_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]18[3019]#@ATt;TrustServerCertificate=true;"
   },
 
   "GoogleRecaptchaV3": {

Company.Domain/ContarctingPartyAgg/IPersonalContractingPartyRepository.cs

@@ -1,5 +1,4 @@
-using System;
-using CompanyManagment.App.Contracts.PersonalContractingParty;
+using CompanyManagment.App.Contracts.PersonalContractingParty;
 using System.Collections.Generic;
 using _0_Framework.Application;
 using _0_Framework.Domain;
@@ -33,9 +32,7 @@ public interface IPersonalContractingPartyRepository :IRepository<long, Personal
     List<PersonalContractingPartyViewModel> SearchForMain(PersonalContractingPartySearchModel searchModel2); 
     OperationResult DeletePersonalContractingParties(long id);
     bool GetHasContract(long id);
-    [Obsolete("از متدهای async استفاده کنید")]
     OperationResult DeActiveAll(long id);
-    [Obsolete("از متدهای async استفاده کنید")]
     OperationResult ActiveAll(long id);
 
     #endregion
@@ -79,9 +76,4 @@ public interface IPersonalContractingPartyRepository :IRepository<long, Personal
 
     Task<PersonalContractingParty> GetByNationalCode(string nationalCode);
     Task<PersonalContractingParty> GetByNationalId(string registerId);
-    
-    Task<OperationResult> DeActiveAllAsync(long id);
-    Task<OperationResult> ActiveAllAsync(long id);
-    
-    
 }

Company.Domain/ContractAgg/IContractRepository.cs

@@ -48,10 +48,6 @@ public interface IContractRepository : IRepository<long, Contract>
     bool Remove(long id);
 
     List<ContractViweModel> SearchForClient(ContractSearchModel searchModel);
-    
-    Task<PagedResult<GetContractListForClientResponse>> GetContractListForClient(GetContractListForClientRequest searchModel);
-    
-    Task<List<ContractPrintViewModel>> PrintAllAsync(List<long> ids);
     #endregion
     #region NewChangeByHeydari
 
@@ -67,8 +63,4 @@ public interface IContractRepository : IRepository<long, Contract>
     ContractViweModel GetByWorkshopIdEmployeeIdInDates(long workshopId, long employeeId, DateTime startOfMonth, DateTime endOfMonth);
     List<ContractViweModel> GetByWorkshopIdInDates(long workshopId, DateTime contractStart, DateTime contractEnd);
     #endregion
-
-}
-
-
-
+}

Company.Domain/EmployeeAgg/IEmployeeRepository.cs

@@ -76,7 +76,6 @@ public interface IEmployeeRepository : IRepository<long, Employee>
 	#region Api
 	Task<List<EmployeeSelectListViewModel>> GetSelectList(string searchText,long id);
 	Task<List<GetEmployeeListViewModel>> GetList(GetEmployeeListSearchModel searchModel);
-	Task<List<GetClientEmployeeListViewModel>> GetClientEmployeeList(GetClientEmployeeListSearchModel searchModel, long workshopId);
 	#endregion
 
 

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

@@ -56,7 +56,7 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     void UpdateStatusIfNeeded(long institutionContractId);
     Task<GetInstitutionVerificationDetailsViewModel> GetVerificationDetails(Guid id);
     Task<InstitutionContract> GetByPublicIdAsync(Guid id);
-    InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request,string contractStart = null);
+    InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request);
     InstitutionContractDiscountResponse ResetDiscountCreate(InstitutionContractResetDiscountForCreateRequest request);
     
 
@@ -159,5 +159,4 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     #endregion
 
     Task<long> GetIdByInstallmentId(long installmentId);
-    Task<InstitutionContract> GetPreviousContract(long currentInstitutionContractId);
 }

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopGroup.cs

@@ -23,8 +23,6 @@ public class InstitutionContractWorkshopGroup : EntityBase
         !InitialWorkshops.Cast<InstitutionContractWorkshopBase>()
             .SequenceEqual(CurrentWorkshops.Cast<InstitutionContractWorkshopBase>());
 
-    public bool IsInPersonContract => InitialWorkshops.Any(x => x.Services.ContractInPerson);
-
     public InstitutionContractWorkshopGroup(long institutionContractId,
         List<InstitutionContractWorkshopInitial> initialDetails)
     {

Company.Domain/InstitutionPlanAgg/IPlanPercentageRepository.cs

@@ -1,9 +1,7 @@
-using _0_Framework.Application;
-using _0_Framework.Domain;
+using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.InstitutionPlan;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace Company.Domain.InstitutionPlanAgg;
 
@@ -28,18 +26,4 @@ public interface IPlanPercentageRepository : IRepository<long, PlanPercentage>
     /// <param name="command"></param>
     /// <returns></returns>
     InstitutionPlanViewModel GetInstitutionPlanForWorkshop(WorkshopTempViewModel command);
-
-    /// <summary>
-    /// دریافت دیتای مودال ایجاد
-    /// </summary>
-    /// <returns></returns>
-    Task<CreateServiceAmountDto> GetCreateModalData();
-
-    /// <summary>
-    /// دریافت لیست مبالغ سرویس ها
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<PagedResult<InstitutionPlanListDto>> GetList(
-        InstitutionPlanSearchModel searchModel);
 }

Company.Domain/InsuranceListAgg/IInsuranceListRepository.cs

@@ -78,7 +78,6 @@ public interface IInsuranceListRepository:IRepository<long, InsuranceList>
 	#endregion
 
 	Task<List<InsuranceListViewModel>> GetNotCreatedWorkshop(InsuranceListSearchModel searchModel);
-	Task<InsuranceClientPrintViewModel> ClientPrintOne(long id);
 }
 
 

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

CompanyManagement.Infrastructure.Excel/Checkout/AsghaeeAzarWorkshops/AsghaeeAzarWorkshopsExcelGenerator.cs

@@ -0,0 +1,154 @@
+using System.Drawing;
+using _0_Framework.Application;
+using OfficeOpenXml;
+using OfficeOpenXml.Style;
+
+namespace CompanyManagement.Infrastructure.Excel.Checkout.AsghaeeAzarWorkshops;
+
+public class AsghaeeAzarWorkshopsExcelGenerator
+{
+    public static Dictionary<string, string> Header { get; set; } = new()
+    {
+        { "FullName", "نام و نام خانوادگی" },
+        { "NationalCode", "کد ملی" },
+        { "FinalAmount", "مبلغ نهایی" }
+    };
+
+    public static byte[] Generate(List<AsghaeeAzarWorkshopsExcelViewModel> data)
+    {
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+        using var package = new ExcelPackage();
+        var worksheet = package.Workbook.Worksheets.Add("Sheet1");
+
+        // Add index column header
+        var indexCell = worksheet.Cells[1, 1];
+        indexCell.Value = "ردیف";
+        ApplyHeaderStyle(indexCell);
+
+        // Add headers to worksheet
+        for (int i = 0; i < Header.Count; i++)
+        {
+            worksheet.Cells[1, i + 2].Value = Header.ElementAt(i).Value;
+            ApplyHeaderStyle(worksheet.Cells[1, i + 2]);
+        }
+
+        var dataRow = 2;
+        int finalAmountColumnIndex = -1;
+
+        foreach (var item in data)
+        {
+            var column = 2;
+            foreach (var header in Header)
+            {
+                var property = item.GetType().GetProperty(header.Key);
+                var value = property?.GetValue(item, null)?.ToString();
+
+                // Check if the property requires MoneyToDouble()
+                if (header.Key == "FinalAmount")
+                {
+                    worksheet.Cells[dataRow, column].Value = MoneyToDouble(value ?? "0");
+                    finalAmountColumnIndex = column;
+                }
+                else
+                {
+                    worksheet.Cells[dataRow, column].Value = value;
+                }
+
+                ApplyGeneralDataStyle(worksheet.Cells[dataRow, column]);
+                ApplySpecificStyle(worksheet.Cells[dataRow, column], header.Key);
+
+                column++;
+            }
+
+            // Add row number
+            var rowCounter = worksheet.Cells[dataRow, 1];
+            rowCounter.Value = dataRow - 1;
+            ApplyGeneralDataStyle(rowCounter);
+            ApplySpecificStyle(rowCounter, "RowNumber");
+
+            dataRow++;
+        }
+
+        worksheet.Cells[worksheet.Dimension.Address].AutoFitColumns();
+        worksheet.PrinterSettings.PaperSize = ePaperSize.A4;
+        worksheet.PrinterSettings.Orientation = eOrientation.Portrait;
+        worksheet.PrinterSettings.FitToPage = true;
+        worksheet.PrinterSettings.FitToWidth = 1;
+        worksheet.PrinterSettings.FitToHeight = 0;
+        worksheet.PrinterSettings.Scale = 85;
+        worksheet.View.RightToLeft = true;
+
+        if (finalAmountColumnIndex != -1)
+        {
+            ApplyConditionalFormatting(worksheet, dataRow, finalAmountColumnIndex);
+        }
+
+        return package.GetAsByteArray();
+    }
+
+    private static double MoneyToDouble(string value)
+    {
+        if (string.IsNullOrEmpty(value))
+            return 0;
+
+        var min = value.Length > 1 ? value.Substring(0, 2) : "";
+        var result = min == "\u200e\u2212" ? value.MoneyToDouble() * -1 : value.MoneyToDouble();
+        return result;
+    }
+
+    private static void ApplyHeaderStyle(ExcelRange cell)
+    {
+        cell.Style.Font.Bold = true;
+        cell.Style.Fill.PatternType = ExcelFillStyle.Solid;
+        cell.Style.Fill.BackgroundColor.SetColor(Color.LightGray);
+        cell.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
+        cell.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
+        cell.Style.Border.BorderAround(ExcelBorderStyle.Thin);
+    }
+
+    private static void ApplyGeneralDataStyle(ExcelRange cell)
+    {
+        cell.Style.Border.BorderAround(ExcelBorderStyle.Thin);
+        cell.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
+        cell.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
+        cell.Style.Fill.PatternType = ExcelFillStyle.Solid;
+    }
+
+    private static void ApplySpecificStyle(ExcelRange cell, string columnKey)
+    {
+        switch (columnKey)
+        {
+            case "RowNumber":
+            case "FullName":
+            case "NationalCode":
+                cell.Style.Fill.BackgroundColor.SetColor(Color.LightYellow);
+                break;
+            case "FinalAmount":
+                cell.Style.Fill.BackgroundColor.SetColor(ColorTranslator.FromHtml("#A8BAFE")); // Light blue
+                cell.Style.Numberformat.Format = "#,##0";
+                break;
+        }
+    }
+
+    private static void ApplyConditionalFormatting(ExcelWorksheet worksheet, int dataRow, int finalAmountColumnIndex)
+    {
+        for (int rowIndex = 2; rowIndex < dataRow; rowIndex++)
+        {
+            var finalAmountValue = worksheet.Cells[rowIndex, finalAmountColumnIndex].Value;
+            if (finalAmountValue != null && double.TryParse(finalAmountValue.ToString(), out double amount))
+            {
+                if (amount < 0)
+                {
+                    var rowRange = worksheet.Cells[rowIndex, 1, rowIndex, worksheet.Dimension.End.Column];
+                    rowRange.Style.Fill.PatternType = ExcelFillStyle.Solid;
+                    rowRange.Style.Fill.BackgroundColor.SetColor(Color.Red);
+                    foreach (var cell in rowRange)
+                    {
+                        cell.Style.Font.Color.SetColor(Color.White);
+                    }
+                }
+            }
+        }
+    }
+}
+

CompanyManagement.Infrastructure.Excel/Checkout/AsghaeeAzarWorkshops/AsghaeeAzarWorkshopsExcelViewModel.cs

@@ -0,0 +1,8 @@
+namespace CompanyManagement.Infrastructure.Excel.Checkout.AsghaeeAzarWorkshops;
+
+public class AsghaeeAzarWorkshopsExcelViewModel
+{
+    public string FullName { get; set; }
+    public string NationalCode { get; set; }
+    public string FinalAmount { get; set; }
+}

CompanyManagement.Infrastructure.Excel/InstitutionContract/InstitutionContractExcelGenerator.cs

@@ -8,129 +8,86 @@ 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<InstitutionContractExcelViewModel> contractViewModels)
+    public static byte[] GenerateExcel(List<InstitutionContractViewModel> institutionContractViewModels)
     {
         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();
         
-        // ایجاد شیت برای هر تب با داده‌های مربوطه
-        foreach (var viewModel in contractViewModels)
-        {
-            var worksheet = CreateWorksheet(package, viewModel.Tab);
-            CreateExcelSheet(viewModel.GetInstitutionContractListItemsViewModels ?? new List<GetInstitutionContractListItemsViewModel>(), worksheet);
-        }
+        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);
 
         return package.GetAsByteArray();
     }
 
-    /// <summary>
-    /// ایجاد شیت بر اساس نوع تب
-    /// </summary>
-    private static ExcelWorksheet CreateWorksheet(ExcelPackage package, InstitutionContractListStatus? status)
+    private static void CreateExcelSheet(List<InstitutionContractViewModel> institutionContractViewModels, ExcelWorksheet worksheet)
     {
-        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)
-        };
-    }
+        // 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 = "وضعیت مالی";
 
-    /// <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])
+        using (var range = worksheet.Cells[1, 1, 1, 11])
         {
             range.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
             range.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
@@ -153,35 +110,30 @@ public class InstitutionContractExcelGenerator
 
         int row = 2;
 
-        for (int i = 0; i < contractItems.Count; i++)
+        for (int i = 0; i < institutionContractViewModels.Count; i++)
         {
-            var contract = contractItems[i];
-            var employers = contract.EmployerNames?.ToList() ?? new();
-            var workshops = contract.WorkshopNames?.ToList() ?? new();
+            var contract = institutionContractViewModels[i];
+            var employers = contract.EmployerViewModels?.ToList() ?? new();
+            var workshops = contract.WorkshopViewModels?.ToList() ?? new();
 
-            int maxRows = 1; // هر قرارداد فقط یک ردیف؛ نیازی به مرج عمودی نیست
+            int maxRows = Math.Max(employers.Count, workshops.Count);
+            maxRows = Math.Max(1, maxRows);
 
             int startRow = row;
             int endRow = row + maxRows - 1;
 
-            // 🎨 دریافت رنگ پس‌زمینه بر اساس وضعیت قرارداد
-            var fillColor = GetColorByStatus(contract.ListStatus, contract.WorkshopsCount);
+            // 🎨 دریافت رنگ پس‌زمینه از مقدار رنگ موجود در داده
+            string colorName = contract.ExpireColor.ToLower();
+            var fillColor = GetColorByName(colorName, contract.WorkshopCount, contract.IsContractingPartyBlock);
 
             for (int j = 0; j < maxRows; j++)
             {
                 int currentRow = row + j;
 
-                // پر کردن ستون‌های employer و workshop
-                var employerColIndex = GetColumnIndexForType(ExcelColumnType.EmployerName, visibleColumnIndices);
-                var workshopColIndex = GetColumnIndexForType(ExcelColumnType.WorkshopName, visibleColumnIndices);
+                worksheet.Cells[currentRow, 4].Value = j < employers.Count ? employers[j].FullName : null;
+                worksheet.Cells[currentRow, 5].Value = j < workshops.Count ? workshops[j].WorkshopFullName : null;
 
-                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++)
+                for (int col = 1; col <= 11; col++)
                 {
                     var cell = worksheet.Cells[currentRow, col];
 
@@ -202,235 +154,109 @@ public class InstitutionContractExcelGenerator
             }
 
             // 🧱 مرج و مقداردهی ستون‌های اصلی
-            FillColumnData(worksheet, contract, startRow, endRow, visibleColumnIndices);
+            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);
 
             // 📦 بوردر ضخیم خارجی برای هر سطر
-            var boldRange = worksheet.Cells[startRow, 1, endRow, columnCount];
+            var boldRange = worksheet.Cells[startRow, 1, endRow, 11];
             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;
-
-        // تنظیم عرض ستون‌ها بر اساس نوع ستون
-        for (int i = 0; i < visibleColumns.Count; i++)
-        {
-            int columnIndex = i + 1;
-            worksheet.Columns[columnIndex].Width = GetColumnWidth(visibleColumns[i]);
-        }
-
+        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;
         worksheet.View.RightToLeft = true; // فارسی
-    }
-
-    /// <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
-        };
+        //worksheet.Cells[worksheet.Dimension.Address].AutoFitColumns();
     }
 
     private static double MoneyToDouble(string value)
     {
-        if (string.IsNullOrEmpty(value))
-            return 0;
-
+        Console.WriteLine(value);
         var min = value.Length > 1 ? value.Substring(0, 2) : "";
         var test = min == "\u200e\u2212" ? value.MoneyToDouble() * -1 : value.MoneyToDouble();
+
+        Console.WriteLine(test);
         return test;
     }
-
-    /// <summary>
-    /// دریافت رنگ بر اساس وضعیت قرارداد
-    /// </summary>
-    private static Color GetColorByStatus(InstitutionContractListStatus status, int workshopsCount)
+    private static Color GetColorByName(string name, string workshopCount, string IsContractingPartyBlock)
     {
-        return status switch
+        return name switch
         {
-            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,
+            "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,
             _ => Color.White
         };
     }
 
-}
-
-public class InstitutionContractExcelViewModel
-{
-    public InstitutionContractListStatus? Tab { get; set; }
-    public List<GetInstitutionContractListItemsViewModel> GetInstitutionContractListItemsViewModels { get; set; }
-}
+}

CompanyManagment.App.Contracts/CompanyManagment.App.Contracts.csproj

@@ -3,7 +3,6 @@
 	<PropertyGroup>
 		<TargetFramework>net10.0</TargetFramework>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-		<NoWarn>$(NoWarn);1591</NoWarn>
 	</PropertyGroup>
 
 	<ItemGroup>

CompanyManagment.App.Contracts/Contract/ContractListOrderType.cs

@@ -1,12 +0,0 @@
-namespace CompanyManagment.App.Contracts.Contract;
-
-public enum ContractListOrderType
-{
-    ByContractCreationDate,
-    BySignedContract,
-    ByUnSignedContract,
-    ByPersonnelCode,
-    ByPersonnelCodeDescending,
-    ByContractStartDate,
-    ByContractStartDateDescending
-}

CompanyManagment.App.Contracts/Contract/GetContractListForClientRequest.cs

@@ -1,13 +0,0 @@
-using _0_Framework.Application;
-
-namespace CompanyManagment.App.Contracts.Contract;
-
-public class GetContractListForClientRequest: PaginationRequest
-{
-    public int Year { get; set; }
-    public int Month { get; set; }
-    public string StartDate { get; set; }
-    public string EndDate { get; set; }
-    public long EmployeeId { get; set; }
-    public ContractListOrderType? OrderType { get; set; }
-}

CompanyManagment.App.Contracts/Contract/GetContractListForClientResponse.cs

@@ -1,15 +0,0 @@
-namespace CompanyManagment.App.Contracts.Contract;
-
-public class GetContractListForClientResponse
-{
-    public long Id { get; set; }
-    public string PersonnelCode { get; set; }
-    public string ContractNo { get; set; }
-    public string EmployeeFullName { get; set; }
-    public string ContractStart { get; set; }
-    public string ContractEnd { get; set; }
-    public bool IsSigned { get; set; }
-    public string DailyWage { get; set; }
-    public string AvgWorkingHour { get; set; }
-    public string FamilyAllowance { get; set; }
-}

CompanyManagment.App.Contracts/Contract/IContractApplication.cs

@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using _0_Framework.Application;
 using CompanyManagment.App.Contracts.Workshop;
 using System.Threading.Tasks;
-using _0_Framework.Application.Enums;
-
 namespace CompanyManagment.App.Contracts.Contract;
 
 public interface IContractApplication
@@ -47,101 +45,16 @@ public interface IContractApplication
     #region Client
 
     OperationResult Remove(long id);
-    
-    [Obsolete("این متد منسوخ شده است. لطفاً از متد GetContractListForClient استفاده کنید.")]
     List<ContractViweModel> SearchForClient(ContractSearchModel searchModel);
-    
-    /// <summary>
-    /// لیست قراردادها برای کلاینت
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<PagedResult<GetContractListForClientResponse>> 
-        GetContractListForClient(GetContractListForClientRequest searchModel);
-    Task<ContractPrintViewModel> PrintOneAsync(long id);
-    Task<List<ContractPrintViewModel>> PrintAllAsync(List<long> ids);
+    #endregion
 
-	#endregion
+    #region NewChangeByHeydari
 
-	#region NewChangeByHeydari
-
-	OperationResult DeleteAllContarcts(List<long> ids);
+    OperationResult DeleteAllContarcts(List<long> ids);
     OperationResult DeleteContarcts(long id);
     List<long> CheckHasCheckout(List<long> ids);
     List<long> CheckHasSignature(List<long> ids);
     List<ContractViweModel> SearchForMainContract(ContractSearchModel searchModel);
 
     #endregion
-}
-
-public class ContractPrintViewModel
-{
-    public string ContractNo { get; set; }
-    public ContractPrintEmployerViewModel Employer { get; set; }
-    public ContractPrintEmployeeViewModel Employee { get; set; }
-    public ContractPrintTypeOfContractViewModel TypeOfContract { get; set; }
-    public ContractPrintFeesViewModel Fees { get; set; }
-    public string ConditionAndDetials { get; set; }
-    
-    
-}
-
-public class ContractPrintFeesViewModel
-{
-    public string DailyWage { get; set; }
-    public string FamilyAllowance { get; set; }
-    public string ConsumableItems { get; set; }
-    public string HousingAllowance { get; set; }
-}
-
-public class ContractPrintTypeOfContractViewModel
-{
-    public string ContractType { get; set; }
-    public string JobName { get; set; }
-    public string SetContractDate { get; set; }
-    public string ContarctStart { get; set; }
-    public string ContractEnd { get; set; }
-    public string WorkingHoursWeekly { get; set; }
-    public List<string> WorkshopAddress { get; set; }
-    
-    
-    
-}
-
-public class ContractPrintEmployeeViewModel
-{
-    public string FullName { get; set; }
-    public string NationalCode { get; set; }
-    public string IdNumber { get; set; }
-    public string DateOfBirth { get; set; }
-    public string FatherName { get; set; }
-    public string LevelOfEducation { get; set; }
-    public string Address { get; set; }
-    
-    
-}
-
-public class ContractPrintEmployerViewModel
-{
-    public LegalType LegalType { get; set; }
-    public ContractPrintRealEmployerViewModel RealEmployer { get; set; }
-    public ContractPrintLegalEmployerViewModel LegalEmployer { get; set; }
-    public string WorkshopName { get; set; }
-    public string Address { get; set; }
-    public string WorkshopCode { get; set; }
-    
-}
-
-public class ContractPrintLegalEmployerViewModel
-{
-    public string CompanyName { get; set; }
-    public string NationalId  { get; set; }
-    public string RegisterId { get; set; }
-}
-
-public class ContractPrintRealEmployerViewModel
-{
-    public string FullName { get; set; }
-    public string NationalCode { get; set; }
-    public string IdNumber { get; set; }
 }

CompanyManagment.App.Contracts/Employee/IEmployeeApplication.cs

@@ -94,42 +94,7 @@ public interface IEmployeeApplication
 	/// </summary>
 	/// <returns></returns>
 	Task<List<GetEmployeeListViewModel>> GetList(GetEmployeeListSearchModel searchModel);
-	
-	/// <summary>
-	/// لیست کل پرسنل کلاینت
-	/// </summary>
-	/// <param name="searchModel"></param>
-	/// <param name="workshopId"></param>
-	/// <returns></returns>
-	Task<List<GetClientEmployeeListViewModel>> GetClientEmployeeList(GetClientEmployeeListSearchModel searchModel, long workshopId);
 
 	#endregion
 
-}
-
-public class GetClientEmployeeListSearchModel
-{
-}
-
-public class GetClientEmployeeListViewModel
-{
-	public string FullName { get; set; }
-	public long EmployeeId { get; set; }
-	public long WorkshopId { get; set; }
-	public long PersonnelCode { get; set; }
-	public string MaritalStatus { get; set; }
-	public string NationalCode { get; set; }
-	public string IdNumber { get; set; }
-	public string DateOfBirthFa { get; set; }
-	public string FatherName { get; set; }
-	public int ChildrenCount { get; set; }
-	public string LastStartInsuranceWork { get; set; }
-	public string LastLeftInsuranceWork { get; set; }
-	public string LastStartContractWork { get; set; }
-	public string LastLeftContractWork { get; set; }
-	public bool HasContractLeftWork { get; set; }
-	public bool HasInsuranceLeftWork { get; set; }
-	public bool LeftWorkCompletely { get; set; }
-	public bool PendingStartWork { get; set; }
-	public bool PendingLeftWork { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionContractListItemsViewModel.cs

@@ -91,11 +91,6 @@ public class GetInstitutionContractListItemsViewModel
     public bool IsInPersonContract { get; set; }
     
     public bool IsOldContract { get; set; }
-
-    /// <summary>
-    /// مبلغ قسط
-    /// </summary>
-    public double InstallmentAmount { get; set; }
 }
 
 public class InstitutionContractListWorkshop

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractPaymentOneTimeViewModel.cs

@@ -18,16 +18,6 @@ public class InstitutionContractPaymentOneTimeViewModel
     /// </summary>
     public string PaymentAmount { get; set; }
 
-    /// <summary>
-    /// مجموع مبالغ بدون تخفیف
-    /// </summary>
-    public string TotalAmountWithoutDiscount { get; set; }
-
-    /// <summary>
-    /// مبلغ یک ماه بدون تخفیف
-    /// </summary>
-    public string OneMonthPaymentWithoutDiscount { get; set; }
-
     public string DiscountedAmount { get; set; }
     public int DiscountPercetage { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractViewModel.cs

@@ -76,7 +76,5 @@ public class InstitutionContractViewModel
     public bool IsInstallment { get; set; }
     public InstitutionContractVerificationStatus VerificationStatus { get; set; }
 
-    public InstitutionContractSigningType? SigningType { get; set; }
-
     public List<InstitutionContractInstallmentViewModel> InstallmentList { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionPlan/CreateServiceAmountDto.cs

@@ -1,51 +0,0 @@
-namespace CompanyManagment.App.Contracts.InstitutionPlan;
-
-public class CreateServiceAmountDto
-{
-    /// <summary>
-    /// آی دی
-    /// </summary>
-    public long Id { get; set; }
-
-    /// <summary>
-    /// قرارداد و تصفیه
-    /// درصد از مزد روزانه
-    /// string
-    /// </summary>
-    public string ContractAndCheckoutPercentStr { get; set; }
-
-    /// <summary>
-    /// بیمه
-    /// درصد از مزد روزانه
-    /// string
-    /// </summary>
-    public string InsurancePercentStr { get; set; }
-
-    /// <summary>
-    /// حضورغباب
-    /// درصد از مزد روزانه
-    /// string
-    /// </summary>
-    public string RollCallPercentStr { get; set; }
-
-    /// <summary>
-    /// فیش غیر رسمی
-    /// درصد از مزد روزانه
-    /// string
-    /// </summary>
-    public string CustomizeCheckoutPercentStr { get; set; }
-
-    /// <summary>
-    /// خدمات حضوری قرداد و تصفیه
-    /// درصد از مزد روزانه
-    /// string
-    /// </summary>
-    public string ContractAndCheckoutInPersonPercentStr { get; set; }
-
-    /// <summary>
-    /// خدمات حضوری بیمه
-    /// درصد از مزد روزانه
-    /// string
-    /// </summary>
-    public string InsuranceInPersonPercentStr { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionPlan/IInstitutionPlanApplication.cs

@@ -1,7 +1,6 @@
-using _0_Framework.Application;
+using System.Collections.Generic;
+using _0_Framework.Application;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace CompanyManagment.App.Contracts.InstitutionPlan;
 
@@ -35,27 +34,4 @@ public interface IInstitutionPlanApplication
     /// <param name="command"></param>
     /// <returns></returns>
     InstitutionPlanViewModel GetInstitutionPlanForWorkshop(WorkshopTempViewModel command);
-
-
-    /// <summary>
-    /// دریافت دیتای درصد سرویس برای مودال ایجاد
-    /// </summary>
-    /// <returns></returns>
-    Task<CreateServiceAmountDto> GetCreateModalData();
-
-    /// <summary>
-    /// ایجاد درصد سرویس
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    Task<OperationResult> CreateInstitutionPlanPercentage(CreateServiceAmountDto command);
-
-
-    /// <summary>
-    /// دریافت لیست مبالغ سرویس ها
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<PagedResult<InstitutionPlanListDto>> GetList(
-        InstitutionPlanSearchModel searchModel);
 }

CompanyManagment.App.Contracts/InstitutionPlan/InstitutionPlanListDto.cs

@@ -1,84 +0,0 @@
-namespace CompanyManagment.App.Contracts.InstitutionPlan;
-
-public class InstitutionPlanListDto
-{
-
-
-    /// <summary>
-    /// تعداد پرسنل
-    /// </summary>
-    public int CountPerson { get; set; }
-
-    /// <summary>
-    /// مبلغ قرارداد و تصفیه 
-    /// </summary>
-    public string ContractAndCheckout { get; set; }
-
-    /// <summary>
-    /// مبلغ بیمه
-    /// </summary>
-    public string Insurance { get; set; }
-
-    /// <summary>
-    /// مبلغ حضورغباب
-    /// </summary>
-    public string RollCall { get; set; }
-
-    /// <summary>
-    /// مبلغ فیش غیر رسمی
-    /// </summary>
-    public string CustomizeCheckout { get; set; }
-
-    /// <summary>
-    /// مبلغ خدمات حضوری قرداد و تصفیه
-    /// </summary>
-    public string ContractAndCheckoutInPerson { get; set; }
-
-    /// <summary>
-    /// مبلغ خدمات حضوری بیمه
-    /// </summary>
-    public string InsuranceInPerson { get; set; }
-
-
-
-
-    #region Total
-
-
-    /// <summary>
-    /// مبلغ کل خدمات حضوری
-    /// </summary>
-    public string InPersonSumAmountStr { get; set; }
-
-    /// <summary>
-    /// مبلغ کل خدمات آنلاین
-    /// </summary>
-    public string OnlineOnlySumAmountStr { get; set; }
-
-    /// <summary>
-    /// مبلغ کل خدمات حضوری و آنلاین
-    /// </summary>
-    public string OnlineAndInPersonSumAmountStr { get; set; }
-
-    /// <summary>
-    /// مبلغ کل خدمات حضوری و آنلاین
-    /// double
-    /// </summary>
-    public double OnlineAndInPersonSumAmountDouble { get; set; }
-
-
-    /// <summary>
-    /// مبلغ کل خدمات حضوری
-    /// double
-    /// </summary>
-    public double InPersonSumAmountDouble { get; set; }
-
-    /// <summary>
-    /// مبلغ کل خدمات آنلاین
-    /// double
-    /// </summary>
-    public double OnlineOnlySumAmountDouble { get; set; }
-
-
-    #endregion
-}

CompanyManagment.App.Contracts/InstitutionPlan/InstitutionPlanSearchModel.cs

@@ -1,11 +0,0 @@
-using _0_Framework.Application;
-
-namespace CompanyManagment.App.Contracts.InstitutionPlan;
-
-public class InstitutionPlanSearchModel : PaginationRequest
-{
-    /// <summary>
-    /// تعداد پرسنل برای جستجو
-    /// </summary>
-    public int CountPerson { get; set; }
-}

CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs

@@ -5,7 +5,6 @@ using System.Text;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using CompanyManagment.App.Contracts.InsuranceList;
-using CompanyManagment.App.Contracts.Workshop;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
@@ -97,94 +96,6 @@ public interface IInsuranceListApplication
 	#endregion
 
     Task<List<InsuranceListViewModel>> GetNotCreatedWorkshop(InsuranceListSearchModel searchModel);
-    Task<InsuranceClientPrintViewModel> ClientPrintOne(long id);
-}
-
-public class InsuranceClientPrintViewModel
-{
-    public string Month { get; set; }
-    public string Year { get; set; }
-    public string WorkshopName { get; set; }
-    public string ListNo { get; set; }
-    public string AgreementNumber { get; set; }
-    public string WorkshopInsuranceCode { get; set; }
-    public string WorkshopEmployerName { get; set; }
-    public string WorkshopAddress { get; set; }
-    public List<InsuranceClientPrintItemsViewModel> Items { get; set; }
-    public string EmployerShare { get; set; }
-    public string InsuredShare { get; set; }
-    public string UnEmploymentInsurance { get; set; }
-    public string AllInsuredShare { get; set; }
-    
-}
-public class InsuranceClientPrintItemsViewModel
-{
-    /// <summary>
-    /// شماره بیمه 
-    /// </summary>
-    public string InsuranceCode { get; set; }
-    /// <summary>
-    /// نام و نام خانوادگی
-    /// </summary>
-    public string FullName { get; set; }
-    /// <summary>
-    /// شغل
-    /// </summary>
-    public string JobName { get; set; }
-    /// <summary>
-    /// کد ملی
-    /// </summary>
-    public string NationalCode { get; set; }
-    /// <summary>
-    /// شروع به کار
-    /// </summary>
-    public string StartWork { get; set; }
-    /// <summary>
-    /// ترک کار
-    /// </summary>
-    public string LeftWork { get; set; }
-    /// <summary>
-    /// روزهای کارکرد
-    /// </summary>
-    public string WorkingDays { get; set; }
-    /// <summary>
-    /// دستمزد روزانه
-    /// </summary>
-    public string DailyWage { get; set; }
-    /// <summary>
-    /// پایه سنوات روزانه
-    /// </summary>
-    public string BaseYears { get; set; }
-    /// <summary>
-    /// دستمزد ماهانه
-    /// </summary>
-    public string MonthlySalary { get; set; }
-    /// <summary>
-    /// مزایای ماهیانه مشمول
-    /// </summary>
-    public string MonthlyBenefits { get; set; }
-    /// <summary>
-    /// حق تاهل
-    /// </summary>
-    public string MarriedAllowance { get; set; }
-    /// <summary>
-    /// حقوق و مزایای ماهیانه مشمول
-    /// </summary>
-    public string BenefitsIncludedContinuous { get; set; }
-    /// <summary>
-    /// حقوق و مزایای ماهیانه غیر مشمول
-    /// </summary>
-    public string BenefitsIncludedNonContinuous { get; set; }
-    /// <summary>
-    /// مجموع مزایای ماهیانه مشمول و غیر مشمول
-    /// </summary>
-    public string IncludedAndNotIncluded { get; set; }
-    /// <summary>
-    /// حق بیمه سهم بیمه شده
-    /// </summary>
-    public string InsuranceShare { get; set; }
-    
-    
 }
 
 public class InsuranceClientSearchModel:PaginationRequest
@@ -202,11 +113,4 @@ public class InsuranceClientListViewModel
     public int YearInt { get; set; }
     public string MonthName { get; set; }
     public int MonthInt { get; set; }
-    public int PersonnelCount { get; set; }
-    public int LeftWorkCount { get; set; }
-    public string AllInsuredShare { get; set; }
-    public string InsuredShare { get; set; }
-    public string EmployerShare { get; set; }
-    public string UnEmploymentInsurance { get; set; }
-    
 }

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

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

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

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
 }

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

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

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

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

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,
-}

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

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

CompanyManagment.App.Contracts/RollCall/IRollCallApplication.cs

@@ -124,7 +124,7 @@ namespace CompanyManagment.App.Contracts.RollCall
         /// <param name="workshopId"></param>
         /// <param name="command"></param>
         /// <returns></returns>
-        Task<OperationResult> RecalculateValues(long workshopId, List<ReCalculateRollCallValues> command);
+        OperationResult RecalculateValues(long workshopId, List<ReCalculateRollCallValues> command);
     }
     public class ReCalculateRollCallValues
     {

CompanyManagment.Application/ContractApplication.cs

@@ -2712,9 +2712,7 @@ public class ContractApplication : IContractApplication
 
         var emp = workshopEmpList.Where(x => x.WorkshopId == res.WorkshopIds)
             .Select(x => x.EmployerId).ToList();
-        
         res.Employers = _employerRepository.GetEmployers(emp);
-        
         var workshopSelect = _workshopApplication.GetDetails(res.WorkshopIds);
         var workshop = new WorkshopViewModel()
         {
@@ -3109,21 +3107,6 @@ public class ContractApplication : IContractApplication
         return _contractRepository.SearchForClient(searchModel);
     }
 
-    public async Task<PagedResult<GetContractListForClientResponse>> GetContractListForClient(GetContractListForClientRequest searchModel)
-    {
-        return await _contractRepository.GetContractListForClient(searchModel);
-    }
-
-    public async Task<ContractPrintViewModel> PrintOneAsync(long id)
-    {
-	    return (await _contractRepository.PrintAllAsync([id])).FirstOrDefault();
-    }
-
-    public async Task<List<ContractPrintViewModel>> PrintAllAsync(List<long> ids)
-    {
-	            return await _contractRepository.PrintAllAsync(ids);
-    }
-
     #endregion
 
    #region NewChangeByHeydari

CompanyManagment.Application/CustomizeWorkshopSettingsApplication.cs

@@ -25,7 +25,6 @@ using Microsoft.EntityFrameworkCore.Query;
 using Company.Domain.CheckoutAgg;
 using Company.Domain.CustomizeCheckoutAgg;
 using Company.Domain.CustomizeCheckoutTempAgg;
-using Company.Domain.RollCallAgg;
 using CompanyManagment.EFCore.Repository;
 
 
@@ -39,8 +38,7 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 	IRollCallApplication rollCallAppllication,
 	ICheckoutRepository checkoutRepository,
 	ICustomizeCheckoutRepository customizeCheckoutRepository,
-	ICustomizeCheckoutTempRepository customizeCheckoutTempRepository,
-	IRollCallRepository rollCallRepository)
+	ICustomizeCheckoutTempRepository customizeCheckoutTempRepository)
 	: ICustomizeWorkshopSettingsApplication
 {
 	private readonly ICustomizeWorkshopSettingsRepository _customizeWorkshopSettingsRepository = customizeWorkshopSettingsRepository;
@@ -55,7 +53,6 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 	private readonly ICheckoutRepository _checkoutRepository = checkoutRepository;
 	private readonly ICustomizeCheckoutRepository _customizeCheckoutRepository = customizeCheckoutRepository;
 	private readonly ICustomizeCheckoutTempRepository _customizeCheckoutTempRepository = customizeCheckoutTempRepository;
-	private readonly IRollCallRepository _rollCallRepository = rollCallRepository;
 
 	#region RollCallShifts
 
@@ -825,19 +822,14 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 
 		var notSelectedEmployeeSettings = employeeSettings.Where(x => !selectedEmployeesIds.Contains(x.EmployeeId));
 
-		var weeklyOffDays = command.OffDayOfWeeks?
-			.Select(x => new WeeklyOffDay(x)).ToList() ?? [];
-
-		using var rollCallTransaction = _rollCallRepository.BeginTransactionAsync()
-			.GetAwaiter().GetResult();
+		var weeklyOffDays = command.OffDayOfWeeks?.Select(x => new WeeklyOffDay(x)).ToList() ?? [];
+		using var transaction = new TransactionScope();
 
 		entity.EditSimpleAndOverwriteOnEmployee(command.Name, selectedEmployeesIds, groupSettingsShifts, command.WorkshopShiftStatus,
 			command.IrregularShift, breakTime, isChanged, command.HolidayWork, rotatingShift, weeklyOffDays);
 		if (reCalculateCommand.Count > 0)
 		{
-			var result = _rollCallApplication
-				.RecalculateValues(workshopSettings.WorkshopId, reCalculateCommand)
-				.GetAwaiter().GetResult();
+			var result = _rollCallApplication.RecalculateValues(workshopSettings.WorkshopId, reCalculateCommand);
 
 			if (result.IsSuccedded == false)
 			{
@@ -852,7 +844,7 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 
 		_customizeWorkshopGroupSettingsRepository.SaveChanges();
 
-		rollCallTransaction.Commit();
+		transaction.Complete();
 		return op.Succcedded();
 	}
 	public OperationResult EditSimpleRollCallEmployeeSetting(EditCustomizeEmployeeSettings command,
@@ -1051,9 +1043,7 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
 		_customizeWorkshopGroupSettingsRepository.SaveChanges();
 		if (reCalculateCommand.Count > 0)
 		{
-			var result = _rollCallApplication
-				.RecalculateValues(command.WorkshopId, reCalculateCommand)
-				.GetAwaiter().GetResult();
+			var result = _rollCallApplication.RecalculateValues(command.WorkshopId, reCalculateCommand);
 
 			if (result.IsSuccedded == false)
 			{

CompanyManagment.Application/EmployeeAplication.cs

@@ -1729,10 +1729,5 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         return await _EmployeeRepository.GetList(searchModel);
     }
 
-    public async Task<List<GetClientEmployeeListViewModel>> GetClientEmployeeList(GetClientEmployeeListSearchModel searchModel, long workshopId)
-    {
-        return await _EmployeeRepository.GetClientEmployeeList(searchModel, workshopId);
-    }
-
     #endregion
 }

CompanyManagment.Application/InstitutionContractApplication.cs

@@ -1,30 +1,39 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Application.Enums;
 using _0_Framework.Application.PaymentGateway;
 using _0_Framework.Application.Sms;
+using _0_Framework.Application.UID;
 using _0_Framework.Exceptions;
 using AccountManagement.Application.Contracts.Account;
 using Company.Domain.ContarctingPartyAgg;
+using Company.Domain.EmployeeAgg;
 using Company.Domain.empolyerAgg;
 using Company.Domain.FinancialInvoiceAgg;
 using Company.Domain.FinancialStatmentAgg;
 using Company.Domain.FinancialTransactionAgg;
 using Company.Domain.InstitutionContractAgg;
+using Company.Domain.LeftWorkAgg;
 using Company.Domain.PaymentTransactionAgg;
 using Company.Domain.RepresentativeAgg;
-using Company.Domain.RollCallServiceAgg;
+using Company.Domain.TemporaryClientRegistrationAgg;
 using Company.Domain.WorkshopAgg;
 using CompanyManagment.App.Contracts.FinancialInvoice;
 using CompanyManagment.App.Contracts.FinancialStatment;
 using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
 using CompanyManagment.App.Contracts.PaymentTransaction;
+using CompanyManagment.App.Contracts.PersonalContractingParty;
 using CompanyManagment.App.Contracts.Workshop;
+using CompanyManagment.EFCore.Migrations;
+using Microsoft.AspNetCore.Mvc;
+using OfficeOpenXml.Packaging.Ionic.Zip;
 using PersianTools.Core;
 using ConnectedPersonnelViewModel = CompanyManagment.App.Contracts.Workshop.ConnectedPersonnelViewModel;
 using FinancialStatment = Company.Domain.FinancialStatmentAgg.FinancialStatment;
@@ -39,41 +48,46 @@ public class InstitutionContractApplication : IInstitutionContractApplication
     private readonly IFinancialStatmentApplication _financialStatmentApplication;
     private readonly IEmployerRepository _employerRepository;
     private readonly IWorkshopRepository _workshopRepository;
+    private readonly ILeftWorkRepository _leftWorkRepository;
     private readonly IWorkshopApplication _workshopApplication;
+    private readonly IContractingPartyTempRepository _contractingPartyTempRepository;
     private readonly IFinancialStatmentRepository _financialStatmentRepository;
     private readonly IContactInfoApplication _contactInfoApplication;
     private readonly IAccountApplication _accountApplication;
     private readonly ISmsService _smsService;
+    private readonly IUidService _uidService;
     private readonly IFinancialInvoiceRepository _financialInvoiceRepository;
     private readonly IPaymentGateway _paymentGateway;
     private readonly IPaymentTransactionRepository _paymentTransactionRepository;
-    private readonly IRollCallServiceRepository _rollCallServiceRepository;
 
 
     public InstitutionContractApplication(IInstitutionContractRepository institutionContractRepository,
         IPersonalContractingPartyRepository contractingPartyRepository,
         IRepresentativeRepository representativeRepository, IEmployerRepository employerRepository,
-        IWorkshopRepository workshopRepository,
+        IWorkshopRepository workshopRepository, ILeftWorkRepository leftWorkRepository,
         IFinancialStatmentApplication financialStatmentApplication, IWorkshopApplication workshopApplication,
+        IContractingPartyTempRepository contractingPartyTempRepository,
         IFinancialStatmentRepository financialStatmentRepository, IContactInfoApplication contactInfoApplication,
-        IAccountApplication accountApplication, ISmsService smsService,
+        IAccountApplication accountApplication, ISmsService smsService, IUidService uidService,
         IFinancialInvoiceRepository financialInvoiceRepository, IHttpClientFactory httpClientFactory,
-        IPaymentTransactionRepository paymentTransactionRepository, IRollCallServiceRepository rollCallServiceRepository)
+        IPaymentTransactionRepository paymentTransactionRepository)
     {
         _institutionContractRepository = institutionContractRepository;
         _contractingPartyRepository = contractingPartyRepository;
         _representativeRepository = representativeRepository;
         _employerRepository = employerRepository;
         _workshopRepository = workshopRepository;
+        _leftWorkRepository = leftWorkRepository;
         _financialStatmentApplication = financialStatmentApplication;
         _workshopApplication = workshopApplication;
+        _contractingPartyTempRepository = contractingPartyTempRepository;
         _financialStatmentRepository = financialStatmentRepository;
         _contactInfoApplication = contactInfoApplication;
         _accountApplication = accountApplication;
         _smsService = smsService;
+        _uidService = uidService;
         _financialInvoiceRepository = financialInvoiceRepository;
         _paymentTransactionRepository = paymentTransactionRepository;
-        _rollCallServiceRepository = rollCallServiceRepository;
         _paymentGateway = new SepehrPaymentGateway(httpClientFactory);
     }
 
@@ -800,11 +814,20 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         var contractingParty = _contractingPartyRepository.Get(institutionContract.ContractingPartyId);
         if (contractingParty != null)
         {
-            var accountsDeActiveRes = _contractingPartyRepository.DeActiveAllAsync(contractingParty.id)
-                .GetAwaiter().GetResult();
-            
-            if (!accountsDeActiveRes.IsSuccedded)
-                return opration.Failed(accountsDeActiveRes.Message);
+            contractingParty.DeActive();
+            _contractingPartyRepository.SaveChanges();
+            var employers =
+                _employerRepository.GetEmployerByContracrtingPartyID(institutionContract.ContractingPartyId);
+            //var employersIdList = employers.Select(x => x.Id).ToList();
+            //var workshops = _workshopApplication.GetWorkshopsByEmployerId(employersIdList);
+            //foreach (var workshop in workshops)
+            //{
+            //    var res = _workshopApplication.DeActive(workshop.Id);
+            //}
+            foreach (var employer in employers)
+            {
+                var res = _employerRepository.DeActiveAll(employer.Id);
+            }
         }
 
         return opration.Succcedded();
@@ -821,10 +844,20 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         var contractingParty = _contractingPartyRepository.Get(institutionContract.ContractingPartyId);
         if (contractingParty != null)
         {
-           var activeRes =  _contractingPartyRepository.ActiveAllAsync(contractingParty.id).GetAwaiter()
-                .GetResult();
-              if (!activeRes.IsSuccedded)
-                  return opration.Failed(activeRes.Message);
+            contractingParty.Active();
+            _contractingPartyRepository.SaveChanges();
+            var employers =
+                _employerRepository.GetEmployerByContracrtingPartyID(institutionContract.ContractingPartyId);
+            //var employersIdList = employers.Select(x => x.Id).ToList();
+            //var workshops = _workshopApplication.GetWorkshopsByEmployerId(employersIdList);
+            //foreach (var workshop in workshops)
+            //{
+            //    var res = _workshopApplication.DeActive(workshop.Id);
+            //}
+            foreach (var employer in employers)
+            {
+                var res = _employerRepository.ActiveAll(employer.Id);
+            }
         }
 
         return opration.Succcedded();
@@ -1522,48 +1555,28 @@ public class InstitutionContractApplication : IInstitutionContractApplication
             .Where(x => x.WorkshopCreated && x.WorkshopId is > 0).ToList();
         
         var currentWorkshops = institutionContract.WorkshopGroup.CurrentWorkshops.ToList();
-        var accountId = _contractingPartyRepository
-            .GetAccountByPersonalContractingParty(institutionContract.ContractingPartyId).Id;
         foreach (var createdWorkshop in initialCreatedWorkshops)
         {
             if (currentWorkshops.Any(x => x.WorkshopId == createdWorkshop.WorkshopId))
             {
-                //rollcall serviecs
-                if (createdWorkshop.Services.RollCall)
-                {
-                    var ActiveService = _rollCallServiceRepository.GetActiveServiceByWorkshopId(createdWorkshop.WorkshopId!.Value);
-                    var startTime = institutionContract.ContractStartGr;
-                    var endTime = institutionContract.ContractEndGr;
-                    if (ActiveService != null)
-                    {
-                        if (ActiveService.EndService> startTime)
-                        {
-                            startTime = ActiveService.EndService;
-                        }
-                        
-                    }
-                    var rollCallService = new RollCallService("BasedOnIC",
-                        startTime, endTime, createdWorkshop.WorkshopId.Value,accountId,createdWorkshop.PersonnelCount,
-                        0,"12");
-                    await _rollCallServiceRepository.CreateAsync(rollCallService);
-                }
-            }
-            else
-            {
-                var currentWorkshop = new InstitutionContractWorkshopCurrent(createdWorkshop.WorkshopName,
-                    createdWorkshop.Services.RollCall, createdWorkshop.Services.RollCallInPerson,
-                    createdWorkshop.Services.CustomizeCheckout, createdWorkshop.Services.Contract,
-                    createdWorkshop.Services.ContractInPerson, createdWorkshop.Services.Insurance,
-                    createdWorkshop.Services.InsuranceInPerson,createdWorkshop.PersonnelCount, createdWorkshop.Price,
-                    createdWorkshop.InstitutionContractWorkshopGroupId,createdWorkshop.WorkshopGroup,
-                    createdWorkshop.WorkshopId!.Value, createdWorkshop.id);
-                institutionContract.WorkshopGroup.AddCurrentWorkshop(currentWorkshop);
+                continue;
             }
+
+            var currentWorkshop = new InstitutionContractWorkshopCurrent(createdWorkshop.WorkshopName,
+                createdWorkshop.Services.RollCall, createdWorkshop.Services.RollCallInPerson,
+                createdWorkshop.Services.CustomizeCheckout, createdWorkshop.Services.Contract,
+                createdWorkshop.Services.ContractInPerson, createdWorkshop.Services.Insurance,
+                createdWorkshop.Services.InsuranceInPerson,createdWorkshop.PersonnelCount, createdWorkshop.Price,
+                createdWorkshop.InstitutionContractWorkshopGroupId,createdWorkshop.WorkshopGroup,
+                createdWorkshop.WorkshopId!.Value, createdWorkshop.id);
+            institutionContract.WorkshopGroup.AddCurrentWorkshop(currentWorkshop);
+
+
+
         }
         
         if (institutionContract.WorkshopGroup.InitialWorkshops.All(x => x.WorkshopCreated && x.WorkshopId is > 0))
         {
-            
             institutionContract.Verified();
         }
         else
@@ -1572,10 +1585,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         }
         
         institutionContract.SetSigningType(signingType);
-        var previousInstitutionContract = await _institutionContractRepository
-            .GetPreviousContract(institutionContract.id);
-        previousInstitutionContract?.DeActive();
-        ReActiveAllAfterCreateNew(institutionContract.ContractingPartyId);
+        
         await _institutionContractRepository.SaveChangesAsync();
         return op.Succcedded();
     }
@@ -1598,31 +1608,12 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         if (institutionContract.VerificationStatus == InstitutionContractVerificationStatus.Verified)
             return op.Failed("قرارداد مالی قبلا تایید شده است");
 
-        if (!institutionContract.WorkshopGroup.IsInPersonContract)
-        {
-            return op.Failed("قرارداد مالی غیر حضوری نمی تواند به صورت دستی تایید شود");
-        }
-        
         var transaction = await _institutionContractRepository.BeginTransactionAsync();
         await SetPendingWorkflow(institutionContractId,InstitutionContractSigningType.Physical);
         
-        var financialStatement = await _financialStatmentRepository
-            .GetByContractingPartyId(institutionContract.ContractingPartyId);
         
-        DateTime today = DateTime.Today;
-        var description = institutionContract.IsInstallment
-            ? "قسط اول سرویس"
-            : "پرداخت کل سرویس";
-        var debtorAmount = institutionContract.IsInstallment
-            ? institutionContract.Installments.First().Amount
-            : institutionContract.TotalAmount;
-        
-        var financialTransaction = new FinancialTransaction(0, today, today.ToFarsi(),
-            description, "debt", "بابت خدمات", debtorAmount, 0, 0);
-        financialStatement.AddFinancialTransaction(financialTransaction);
-        
-        await _institutionContractRepository.SaveChangesAsync();
         await transaction.CommitAsync();
+        await _institutionContractRepository.SaveChangesAsync();
         return op.Succcedded();
     }
 

CompanyManagment.Application/InstitutionPlanApplication.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using _0_Framework.Application;
 using Company.Domain.InstitutionPlanAgg;
 using CompanyManagment.App.Contracts.InstitutionPlan;
@@ -85,73 +84,4 @@ public class InstitutionPlanApplication : IInstitutionPlanApplication
     {
         return _planPercentageRepository.GetInstitutionPlanForWorkshop(command);
     }
-
-
-    #region ForApi
-
-    public async Task<CreateServiceAmountDto> GetCreateModalData()
-    {
-        return await _planPercentageRepository.GetCreateModalData();
-    }
-
-
-    public async Task<OperationResult> CreateInstitutionPlanPercentage(CreateServiceAmountDto command)
-    {
-        var op = new OperationResult();
-        if (string.IsNullOrWhiteSpace(command.ContractAndCheckoutInPersonPercentStr) || command.ContractAndCheckoutInPersonPercentStr == "0" ||
-            string.IsNullOrWhiteSpace(command.ContractAndCheckoutPercentStr) || (command.ContractAndCheckoutPercentStr == "0" ||
-            string.IsNullOrWhiteSpace(command.CustomizeCheckoutPercentStr) || command.CustomizeCheckoutPercentStr == "0" ||
-            string.IsNullOrWhiteSpace(command.InsuranceInPersonPercentStr) || command.InsuranceInPersonPercentStr == "0" ||
-            string.IsNullOrWhiteSpace(command.InsurancePercentStr) || command.InsurancePercentStr == "0" ||
-            string.IsNullOrWhiteSpace(command.RollCallPercentStr) || command.RollCallPercentStr == "0"))
-            return op.Failed("هیچ یک از فیلدها نمیتوانند صفر باشند");
-
-        int contractAndCheckoutInPersonPercent = 0;
-        int contractAndCheckoutPercent = 0;
-        int customizeCheckoutPercent = 0;
-        int insuranceInPersonPercent = 0;
-        int insurancePercent = 0;
-        int rollCallPercent = 0;
-
-        try
-        {
-            contractAndCheckoutInPersonPercent = Convert.ToInt32(command.ContractAndCheckoutInPersonPercentStr);
-            contractAndCheckoutPercent = Convert.ToInt32(command.ContractAndCheckoutPercentStr);
-            customizeCheckoutPercent = Convert.ToInt32(command.CustomizeCheckoutPercentStr);
-            insuranceInPersonPercent = Convert.ToInt32(command.InsuranceInPersonPercentStr);
-            insurancePercent = Convert.ToInt32(command.InsurancePercentStr);
-            rollCallPercent = Convert.ToInt32(command.RollCallPercentStr);
-        }
-        catch (Exception e)
-        {
-            return op.Failed("لطفا عدد معتبر وارد کنید");
-
-        }
-
-        var firstPlan =await _planPercentageRepository.GetCreateModalData();
-        if (firstPlan != null)
-        {
-            var planPercentage = _planPercentageRepository.Get(firstPlan.Id);
-            planPercentage.Edit(contractAndCheckoutPercent, insurancePercent, rollCallPercent, customizeCheckoutPercent, contractAndCheckoutInPersonPercent, insuranceInPersonPercent);
-            _planPercentageRepository.SaveChanges();
-        }
-        else
-        {
-            var create = new PlanPercentage(contractAndCheckoutPercent, insurancePercent, rollCallPercent,
-                customizeCheckoutPercent, contractAndCheckoutInPersonPercent, insuranceInPersonPercent);
-            await _planPercentageRepository.CreateAsync(create);
-            await _planPercentageRepository.SaveChangesAsync();
-        }
-
-
-
-        return op.Succcedded();
-    }
-
-    public async Task<PagedResult<InstitutionPlanListDto>> GetList(InstitutionPlanSearchModel searchModel)
-    {
-        return await _planPercentageRepository.GetList(searchModel);
-    }
-
-    #endregion
 }

CompanyManagment.Application/InsuranceListApplication.cs

@@ -2381,10 +2381,5 @@ public class InsuranceListApplication : IInsuranceListApplication
 		return await _insuranceListRepositpry.GetNotCreatedWorkshop(searchModel);
 	}
 
-	public async Task<InsuranceClientPrintViewModel> ClientPrintOne(long id)
-	{
-		return await _insuranceListRepositpry.ClientPrintOne(id);
-	}
-
 	#endregion
 }

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
 }

CompanyManagment.Application/RollCallApplication.cs

@@ -788,7 +788,7 @@ public class RollCallApplication : IRollCallApplication
 		return _rollCallRepository.CheckRepeat(employeeId, workshopId);
 	}
 
-    public async Task<OperationResult> RecalculateValues(long workshopId, List<ReCalculateRollCallValues> commands)
+    public OperationResult RecalculateValues(long workshopId, List<ReCalculateRollCallValues> commands)
     {
         var operationResult = new OperationResult();
         try
@@ -812,43 +812,24 @@ public class RollCallApplication : IRollCallApplication
 
             var oldestDate = commands.MinBy(x => x.FromDate).FromDate.ToGeorgianDateTime();
 
-            var allRollCalls = await _rollCallRepository
+            var allRollCalls = _rollCallRepository
                 .GetRollCallsUntilNowWithWorkshopIdEmployeeIds(workshopId, commands.Select(x => x.EmployeeId).ToList(),
-                    oldestDate);
-            
-            var rollCalls =
-	            commands.SelectMany(command =>
-		            allRollCalls.Where(x =>
-			            x.EmployeeId == command.EmployeeId &&
-			            x.ShiftDate >= command.FromDate.ToGeorgianDateTime()
-		            )
-	            );
+                    oldestDate).GetAwaiter().GetResult();
 
-            foreach (var rollCall in rollCalls)
+
+            foreach (var command in commands)
             {
-	            rollCall.ClearTimeDiff();
+                var rollCalls = allRollCalls
+                    .Where(x => x.EmployeeId == command.EmployeeId && x.ShiftDate >= command.FromDate.ToGeorgianDateTime()).ToList();
 
-	            await _rollCallRepository.SaveChangesAsync();
-
-	            rollCall.SetEndDateTime(
-		            rollCall.EndDate!.Value,
-		            _rollCallDomainService
-	            );
+                foreach (var rollCall in rollCalls)
+                {
+                    rollCall.ClearTimeDiff();
+                    _rollCallRepository.SaveChanges();
+                    rollCall.SetEndDateTime(rollCall.EndDate!.Value, _rollCallDomainService);
+                }
             }
-
-            // foreach (var command in commands)
-            // {
-            //     var rollCalls = allRollCalls
-            //         .Where(x => x.EmployeeId == command.EmployeeId && x.ShiftDate >= command.FromDate.ToGeorgianDateTime()).ToList();
-            //
-            //     foreach (var rollCall in rollCalls)
-            //     {
-            //         rollCall.ClearTimeDiff();
-            //         await _rollCallRepository.SaveChangesAsync();
-            //         rollCall.SetEndDateTime(rollCall.EndDate!.Value, _rollCallDomainService);
-            //     }
-            // }
-            await _rollCallRepository.SaveChangesAsync();
+            _rollCallRepository.SaveChanges();
 
             return operationResult.Succcedded();
         }

CompanyManagment.Application/WorkshopAppliction.cs

@@ -1092,9 +1092,7 @@ public class WorkshopAppliction : IWorkshopApplication
                 Amount = 1000,
                 MaxPersonValid = 500,
                 Duration = "12",
-                HasCustomizeCheckoutService = command.HasCustomizeCheckoutService,
-                StartService = institutionContract.ContractStartGr,
-                
+                HasCustomizeCheckoutService = command.HasCustomizeCheckoutService
             };
             _rollCallServiceApplication.Create(commandSave);
         }

CompanyManagment.EFCore/Repository/ContractRepository.cs

@@ -5,8 +5,6 @@ using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using _0_Framework.Application;
-using _0_Framework.Application.Enums;
-using _0_Framework.Exceptions;
 using _0_Framework.InfraStructure;
 using Company.Domain.ContractAgg;
 using Company.Domain.empolyerAgg;
@@ -1083,7 +1081,30 @@ public class ContractRepository : RepositoryBase<long, Contract>, IContractRepos
 
             var weeklyDouble = 0.0;
             var weekly = c.WorkingHoursWeekly;
-            c.WorkingHoursWeekly = WeeklyHourConvertor(weekly);
+            if (!string.IsNullOrWhiteSpace(weekly) &&
+                weekly != "24 - 12" && weekly != "24 - 24" && weekly != "36 - 12" && weekly != "48 - 24")
+            {
+                if (weekly.Contains("/"))
+                {
+                    weeklyDouble = double.Parse(weekly);
+                    var minute = (int)((weeklyDouble % 1) * 60);
+                    var hour = (int)(weeklyDouble);
+                    c.WorkingHoursWeekly = hour + " " + "ساعت و" + " " + minute + " " + "دقیقه";
+                }
+                else if (weekly.Contains("."))
+                {
+                    weeklyDouble = double.Parse(weekly, CultureInfo.InvariantCulture);
+                    var minute = (int)((weeklyDouble % 1) * 60);
+                    var hour = (int)(weeklyDouble);
+                    c.WorkingHoursWeekly = hour + " " + "ساعت و" + " " + minute + " " + "دقیقه";
+                }
+                else
+                {
+                    c.WorkingHoursWeekly = c.WorkingHoursWeekly + " " + "ساعت";
+                }
+
+
+            }
             var emp = workshopEmpList.Where(x => x.WorkshopId == c.WorkshopIds)
                 .Select(x => x.EmployerId).ToList();
             c.Employers = _employerRepository.GetEmployers(emp);
@@ -1140,37 +1161,6 @@ public class ContractRepository : RepositoryBase<long, Contract>, IContractRepos
         return query;
     }
 
-    private static string WeeklyHourConvertor(string weekly)
-    {
-	    double weeklyDouble;
-	    if (!string.IsNullOrWhiteSpace(weekly) &&
-	        weekly != "24 - 12" && weekly != "24 - 24" && weekly != "36 - 12" && weekly != "48 - 24")
-	    {
-		    if (weekly.Contains("/"))
-		    {
-			    weeklyDouble = double.Parse(weekly);
-			    var minute = (int)((weeklyDouble % 1) * 60);
-			    var hour = (int)(weeklyDouble);
-			    return hour + " " + "ساعت و" + " " + minute + " " + "دقیقه";
-		    }
-		    else if (weekly.Contains("."))
-		    {
-			    weeklyDouble = double.Parse(weekly, CultureInfo.InvariantCulture);
-			    var minute = (int)((weeklyDouble % 1) * 60);
-			    var hour = (int)(weeklyDouble);
-			    return hour + " " + "ساعت و" + " " + minute + " " + "دقیقه";
-		    }
-		    else
-		    {
-			    return weekly + " " + "ساعت";
-		    }
-
-
-	    }
-
-	    return "";
-    }
-
     public IQueryable<WorkshopEmployerViewModel> GetWorkshopEmployer()
     {
         return _context.WorkshopEmployers.Select(x => new WorkshopEmployerViewModel
@@ -1516,195 +1506,6 @@ public class ContractRepository : RepositoryBase<long, Contract>, IContractRepos
 
     }
 
-    public async Task<PagedResult<GetContractListForClientResponse>> GetContractListForClient(GetContractListForClientRequest searchModel)
-    {
-        var workshopId = _authHelper.GetWorkshopId();
-        var query = _context.Contracts
-            .Where(c => c.WorkshopIds == workshopId);
-
-        #region Search
-        
-        if (searchModel.EmployeeId > 0)
-            query = query.Where(x => x.EmployeeId == searchModel.EmployeeId);
-        if (!string.IsNullOrWhiteSpace(searchModel.StartDate) && string.IsNullOrWhiteSpace(searchModel.EndDate))
-        {
-            if (!searchModel.StartDate.TryToGeorgianDateTime(out var startDate))
-                throw new BadRequestException("تاریخ شروع وارد شده معتبر نمی باشد.");
-            
-            if (!searchModel.EndDate.TryToGeorgianDateTime(out var endDate))
-                throw new BadRequestException("تاریخ پایان وارد شده معتبر نمی باشد.");
-            
-            query = query.Where(x => x.ContarctStart <=endDate && x.ContractEnd >= startDate);
-        }
-
-        if (searchModel.Year>0 && searchModel.Month >0)
-        {
-            
-            var startDateFa = $"{searchModel.Year:0000}/{searchModel.Month:00}/01";
-            if (!startDateFa.TryToGeorgianDateTime(out var startDate))
-                throw new BadRequestException("سال و ماه وارد شده معتبر نمی باشد.");
-            
-            if(!startDateFa.FindeEndOfMonth().TryToGeorgianDateTime(out var endDate))
-                throw new BadRequestException("سال و ماه وارد شده معتبر نمی باشد.");
-            
-            query = query.Where(x => x.ContarctStart <=endDate && x.ContractEnd >= startDate);
-        }
-
-        if (searchModel.OrderType != null)
-        {
-            switch (searchModel.OrderType)
-            {
-                case ContractListOrderType.ByContractCreationDate:
-                    query = query.OrderBy(x => x.CreationDate);
-                    break;
-                case ContractListOrderType.ByContractStartDate:
-                    query = query.OrderBy(x => x.ContarctStart);
-                    break;
-                case ContractListOrderType.ByContractStartDateDescending:
-                    query = query.OrderByDescending(x=>x.ContarctStart);
-                    break;
-                case ContractListOrderType.ByPersonnelCode:
-                    query = query.OrderBy(x => x.PersonnelCode);
-                    break;
-                case ContractListOrderType.ByPersonnelCodeDescending:
-                    query = query.OrderByDescending(x => x.PersonnelCode);
-                    break;
-                case ContractListOrderType.BySignedContract:
-                    query = query.OrderByDescending(x => x.Signature == "1");
-                    break;
-                case ContractListOrderType.ByUnSignedContract:
-                    query = query.OrderBy(x => x.Signature == "1");
-                    break;
-            }
-        }
-        else
-        {
-            query = query.OrderByDescending(x => x.id);
-        }
-        #endregion
-
-        var pagedList =await query
-            .ApplyPagination(searchModel.PageIndex, searchModel.PageSize).ToListAsync();
-
-        var employeeIds = pagedList.Select(x => x.EmployeeId).ToList();
-        
-        var employees = await _context.Employees
-            .Where(x => employeeIds.Contains(x.id)).Select(x => new
-        {
-            Id = x.id, 
-            x.FullName
-        }).ToListAsync();
-        
-        var result = new PagedResult<GetContractListForClientResponse>
-        {
-            TotalCount = await query.CountAsync(),
-            List = pagedList.Select(c =>
-            {
-                var employeeFullName = employees
-                    .FirstOrDefault(e => e.Id == c.EmployeeId)?.FullName ?? "";
-                
-                return new GetContractListForClientResponse
-                {
-                    Id = c.id,
-                    PersonnelCode = c.PersonnelCode.ToString(),
-                    ContractStart = c.ContarctStart.ToFarsi(),
-                    ContractEnd = c.ContractEnd.ToFarsi(),
-                    ContractNo = c.ContractNo,
-                    IsSigned = c.Signature == "1",
-                    EmployeeFullName = employeeFullName,
-                    AvgWorkingHour = WeeklyHourConvertor(c.WorkingHoursWeekly),
-                    DailyWage = c.DayliWage,
-                    FamilyAllowance = c.FamilyAllowance
-                };
-            }).ToList()
-        };
-
-        return result;
-    }
-
-    public async Task<List<ContractPrintViewModel>> PrintAllAsync(List<long> ids)
-    {
-        var query =await _context.Contracts.Include(x => x.Employer)
-            .Include(x => x.Employee).Where(x => ids.Contains(x.id))
-            .ToListAsync();
-        
-        var workshopIds = query.Select(x => x.WorkshopIds).Distinct().ToList();
-        
-        var workshops = await _context.Workshops
-            .Where(x => workshopIds.Contains(x.id))
-            .ToListAsync();
-
-        List<long> exceptionWorkshops = [516,63,38,39];
-        var res = query.Select(x =>
-        {
-            var workshop = workshops.FirstOrDefault(w => w.id == x.WorkshopIds);
-
-            var employerRes = new ContractPrintEmployerViewModel()
-            {
-                WorkshopName = workshop!.WorkshopName,
-                Address =$"{workshop.State} - {workshop.City} - {workshop.Address}",
-                LegalType = x.Employer.IsLegal == "حقیقی" ? LegalType.Real : LegalType.Legal,
-                LegalEmployer = x.Employer.IsLegal == "حقیقی"
-                    ? null
-                    : new ContractPrintLegalEmployerViewModel()
-                    {
-                        NationalId = x.Employer.NationalId,
-                        RegisterId = x.Employer.RegisterId,
-                        CompanyName = x.Employer.LName,
-                    },
-                RealEmployer = x.Employer.IsLegal == "حقیقی"
-                    ? new ContractPrintRealEmployerViewModel()
-                    {
-                        FullName = x.Employer.FullName,
-                        IdNumber = x.Employer.IdNumber,
-                        NationalCode = x.Employer.Nationalcode
-                    }
-                    : null,
-                WorkshopCode = workshop.InsuranceCode
-
-            };
-            var employeeRes = new ContractPrintEmployeeViewModel()
-            {
-                Address =$"{x.Employee.State} - {x.Employee.City} - {x.Employee.Address}" ,
-                FullName = x.Employee.FullName,
-                IdNumber = x.Employee.IdNumber,
-                NationalCode = x.Employee.NationalCode,
-                DateOfBirth = x.Employee.DateOfBirth.ToFarsi(),
-                FatherName = x.Employee.FatherName,
-                LevelOfEducation = x.Employee.LevelOfEducation
-            };
-
-            var typeOfContract = new ContractPrintTypeOfContractViewModel()
-            {
-                ContarctStart = x.ContarctStart.ToFarsi(),
-                ContractEnd = x.ContractEnd.ToFarsi(),
-                JobName = x.JobType,
-                ContractType = x.ContractType,
-                SetContractDate = x.SetContractDate.ToFarsi(),
-                WorkingHoursWeekly = WeeklyHourConvertor(x.WorkingHoursWeekly),
-                WorkshopAddress = [x.WorkshopAddress1, x.WorkshopAddress2],
-            };
-            ContractPrintFeesViewModel fees= new ContractPrintFeesViewModel()
-            {
-                DailyWage = x.DayliWage,
-                FamilyAllowance = x.FamilyAllowance,
-                HousingAllowance = x.HousingAllowance,
-                ConsumableItems = x.ConsumableItems,
-            };
-            return new ContractPrintViewModel()
-            {
-                Employer = employerRes,
-                Employee = employeeRes,
-                TypeOfContract = typeOfContract,
-                Fees = fees,
-                ContractNo = x.ContractNo,
-                ConditionAndDetials = exceptionWorkshops.Contains(x.WorkshopIds) ? "بر اساس ماده 190 قانون کار جمهوری اسلامی ایران ، پرسنل اقرار مینماید کلیه مبالغ پیش بینی شده در قانون کار را وفق قرارداد منعقده دریافت مینماید. این مبالغ قسمتی بصورت مستقیم از سوی کارفرما و قسمتی بر اساس شرایط کارگاه از محل درآمد حاصله از مشتری اخذ میگردد . با توجه به شرایط کارگاه کلیه مبالغ بصورت واریز به حساب و وجه نقد رایج کشور ، تواما به پرسنل پرداخت میگردد. امضا تصفیه حساب دارای مبالغ ، توسط پرسنل نشانگر تصفیه قطعی ایشان میباشد.": "",
-
-            };
-        }).ToList();
-        return res;
-    }
-
     #endregion
 
     #region NewChangeByHeydari

CompanyManagment.EFCore/Repository/EmployeeRepository .cs

@@ -1062,116 +1062,5 @@ public class EmployeeRepository : RepositoryBase<long, Employee>, IEmployeeRepos
 
 	}
 
-    public Task<List<GetClientEmployeeListViewModel>> GetClientEmployeeList(GetClientEmployeeListSearchModel searchModel, long workshopId)
-    {
-        //  var leftDate = Tools.GetUndefinedDateTime();
-        //
-        // var personnelCodes = _context.PersonnelCodeSet.Include(x => x.Employee)
-        //     .ThenInclude(x => x.EmployeeChildrenList).IgnoreQueryFilters().Where(x => x.WorkshopId == workshopId).ToList();
-        //
-        // var contractLeftWork =
-        //     _context.LeftWorkList.Where(x => x.WorkshopId == workshopId)
-        //        .GroupBy(x => x.EmployeeId).Select(x => x.OrderByDescending(y => y.LeftWork).First()).ToList();
-        //
-        //
-        //
-        //
-        // var insuranceLeftWork = _context.LeftWorkInsuranceList.Where(x => x.WorkshopId == workshopId).Select(x => new
-        // {
-        //     EmployeeId = x.EmployeeId,
-        //     FullName = x.EmployeeFullName,
-        //     PersonnelCode = 0,
-        //     InsurancePerson = true,
-        //     InsuranceLeft = x.LeftWorkDate != null,
-        //     StartWork = x.StartWorkDate,
-        //     LeftWork = x.LeftWorkDate ?? leftDate,
-        //     LastStartInsuranceWork = x.StartWorkDate.ToFarsi(),
-        //     LastLeftInsuranceWork = x.LeftWorkDate != null ? x.LeftWorkDate.ToFarsi() : "-",
-        //     LastStartContractWork = "-",
-        //     LastLeftContractWork = "-"
-        // }).GroupBy(x => x.EmployeeId)
-        //     .Select(x => x.OrderByDescending(y => y.LeftWork).First()).ToList();
-        //
-        // var leftWorkTemp = _context.LeftWorkTemps.Where(x => x.WorkshopId == workshopId).Select(x => new
-        // {
-        //     WorkshopId = x.WorkshopId,
-        //     EmployeeId = x.EmployeeId,
-        //     PersonnelCode = 0,
-        //     ContractPerson = true,
-        //     ContractLeft = x.LeftWork != leftDate,
-        //     StartWork = x.StartWork,
-        //     LeftWork = x.LeftWork,
-        //     LastStartContractWork = x.StartWork.ToFarsi(),
-        //     LastLeftContractWork = x.LeftWork != leftDate ? x.LeftWork.ToFarsi() : "-",
-        //     LastStartInsuranceWork = "-",
-        //     LastLeftInsuranceWork = "-",
-        //     LefWorkTemp = x.LeftWorkType == LeftWorkTempType.LeftWork,
-        //     CreatedByClient = x.LeftWorkType == LeftWorkTempType.StartWork
-        // }).ToList();
-        //
-        //
-        // var employeeClientTemp = _context.EmployeeClientTemps.Where(x => x.WorkshopId == workshopId).Select(x => new
-        // {
-        //     WorkshopId = x.WorkshopId,
-        //     EmployeeId = x.EmployeeId,
-        //     PersonnelCode = 0,
-        //     CreatedByClient = true,
-        //     ContractPerson = true
-        // }).ToList();
-        //
-        // var resultTemp = employeeClientTemp.Concat(leftWorkTemp).ToList().GroupBy(x => x.EmployeeId);
-        //
-        //
-        //
-        // var result = contractLeftWork.Concat(insuranceLeftWork).GroupBy(x => x.EmployeeId).ToList();
-        //
-        // result = result.Concat(resultTemp).GroupBy(x => x.First().EmployeeId).Select(x => x.First()).ToList();
-        //
-        // var employeeClientTempList = employeeClientTemp.ToList();
-        // var startWorkTempsForWorkshop = leftWorkTemp.Where(x => x.CreatedByClient).ToList();
-        // var leftWorkTempsForWorkshop = leftWorkTemp.Where(x => x.LefWorkTemp).ToList();
-        //
-        // return result.Select(x =>
-        // {
-        //     var insurance = x.FirstOrDefault(y => y.InsurancePerson);
-        //     var contract = x.FirstOrDefault(y => y.ContractPerson);
-        //     var personnelCode = personnelCodes.FirstOrDefault(y => y.EmployeeId == x.Key);
-        //     var employee = personnelCode.Employee;
-        //     var employeeClient = employeeClientTempList.FirstOrDefault(t => t.EmployeeId == x.First().EmployeeId);
-        //     var startWorkTemp = startWorkTempsForWorkshop.FirstOrDefault(s => s.EmployeeId == x.First().EmployeeId);
-        //     var leftWorkTemp = leftWorkTempsForWorkshop.FirstOrDefault(s => s.EmployeeId == x.First().EmployeeId);
-        //
-        //
-        //     return new GetClientEmployeeListViewModel()
-        //     {
-        //         EmployeeId = x.Key,
-        //         FullName = employee.FullName,
-        //         PersonnelCode = personnelCode?.PersonnelCode ?? 0,
-        //         HasContractLeftWork = insurance != null,
-        //         HasInsuranceLeftWork = contract != null,
-        //         
-        //         LeftWorkCompletely = (insurance?.InsuranceLeft ?? false) && (contract?.ContractLeft ?? false),
-        //
-        //         LastStartInsuranceWork = insurance != null ? insurance.LastStartInsuranceWork : "-",
-        //         LastLeftInsuranceWork = insurance != null ? insurance.LastLeftInsuranceWork : "-",
-        //         LastStartContractWork = contract != null ? contract.LastStartContractWork : "-",
-        //         LastLeftContractWork = contract != null ? contract.LastLeftContractWork : "-",
-        //
-        //         NationalCode = employee.NationalCode,
-        //         IdNumber = employee.IdNumber,
-        //         MaritalStatus = employee.MaritalStatus,
-        //         DateOfBirthFa = employee.DateOfBirth.ToFarsi(),
-        //         FatherName = employee.FatherName,
-        //         ChildrenCount = employee.EmployeeChildrenList.Count,
-        //         
-        //         PendingStartWork = employeeClient != null || startWorkTemp != null,
-        //         PendingLeftWork = leftWorkTemp != null,
-        //
-        //
-        //     };
-        // }).OrderByDescending(x => x.StartWork).ToList();
-throw new NotImplementedException();
-    }
-
-    #endregion
+	#endregion
 }

CompanyManagment.EFCore/Repository/EmployerRepository.cs

@@ -722,33 +722,34 @@ public class EmployerRepository : RepositoryBase<long, Employer>, IEmployerRepos
     public OperationResult ActiveAll(long id)
     {
         OperationResult result = new OperationResult();
-        try
+        using (var transaction = _context.Database.BeginTransaction())
         {
-            var employer = _context.Employers.FirstOrDefault(x => x.id == id);
-            if (employer == null)
+            try
             {
-                return result.Failed("کارفرما یافت نشد");
+                var employer = _context.Employers.FirstOrDefault(x => x.id == id);
+                employer.Active();
+
+                var workshopIds = _context.WorkshopEmployers.Where(x => x.EmployerId == id).Select(x => x.WorkshopId)
+                    .ToList();
+                var workshops = _context.Workshops.Where(x => workshopIds.Contains(x.id)).ToList();
+                workshops.ForEach(x => x.Active(x.ArchiveCode));
+
+                var contracts = _context.Contracts.Where(x => workshopIds.Contains(x.WorkshopIds)).ToList();
+                contracts.ForEach(x => x.Active());
+
+                var contractIds = contracts.Select(x => x.id).ToList();
+                var checkouts = _context.CheckoutSet.Where(x => contractIds.Contains(x.ContractId)).ToList();
+                checkouts.ForEach(x => x.Active());
+
+                _context.SaveChanges();
+                transaction.Commit();
+                result.Succcedded();
+            }
+            catch (Exception)
+            {
+                result.Failed("فعال کردن کارفرما با خطا مواجه شد");
+                transaction.Rollback();
             }
-            employer.Active();
-
-            var workshopIds = _context.WorkshopEmployers.Where(x => x.EmployerId == id).Select(x => x.WorkshopId)
-                .ToList();
-            var workshops = _context.Workshops.Where(x => workshopIds.Contains(x.id)).ToList();
-            workshops.ForEach(x => x.Active(x.ArchiveCode));
-
-            var contracts = _context.Contracts.Where(x => workshopIds.Contains(x.WorkshopIds)).ToList();
-            contracts.ForEach(x => x.Active());
-
-            var contractIds = contracts.Select(x => x.id).ToList();
-            var checkouts = _context.CheckoutSet.Where(x => contractIds.Contains(x.ContractId)).ToList();
-            checkouts.ForEach(x => x.Active());
-
-            _context.SaveChanges();
-            result.Succcedded();
-        }
-        catch (Exception)
-        {
-            result.Failed("فعال کردن کارفرما با خطا مواجه شد");
         }
 
         return result;

CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs

@@ -25,7 +25,6 @@ using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using CompanyManagment.App.Contracts.Workshop;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
 using MongoDB.Driver;
 using PersianTools.Core;
 using System;
@@ -55,7 +54,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
     private readonly IFinancialTransactionRepository _financialTransactionRepository;
     private readonly IFinancialStatmentRepository _financialStatmentRepository;
     private readonly IHubContext<SendSmsHub> _hubContext;
-    private readonly ILogger<InstitutionContractRepository> _logger;
 
     private readonly InstitutionContratVerificationParty _firstParty = new()
     {
@@ -71,7 +69,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         IWorkshopRepository workshopRepository, IMongoDatabase database,
         IPlanPercentageRepository planPercentageRepository, ISmsService smsService,
         ISmsResultRepository smsResultRepository, IFinancialTransactionRepository financialTransactionRepository,
-        IFinancialStatmentRepository financialStatmentRepository, IHubContext<SendSmsHub> hubContext, ILogger<InstitutionContractRepository> logger) : base(context)
+        IFinancialStatmentRepository financialStatmentRepository, IHubContext<SendSmsHub> hubContext) : base(context)
     {
         _context = context;
         _employerRepository = employerRepository;
@@ -82,7 +80,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         _financialTransactionRepository = financialTransactionRepository;
         _financialStatmentRepository = financialStatmentRepository;
         _hubContext = hubContext;
-        _logger = logger;
         _institutionExtensionTemp =
             database.GetCollection<InstitutionContractExtensionTemp>("InstitutionContractExtensionTemp");
         _institutionAmendmentTemp =
@@ -1098,41 +1095,26 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
     public async Task<PagedResult<GetInstitutionContractListItemsViewModel>> GetList(
         InstitutionContractListSearchModel searchModel)
     {
+        var query = _context.InstitutionContractSet
+            .Include(x => x.WorkshopGroup)
+            .ThenInclude(x => x.InitialWorkshops)
+            .Include(x => x.WorkshopGroup)
+            .ThenInclude(x => x.CurrentWorkshops)
+            .Include(x => x.ContactInfoList).AsNoTracking();
+
         var now = DateTime.Today;
         var nowFa = now.ToFarsi();
         var endFa = nowFa.FindeEndOfMonth();
         var endThisMontGr = endFa.ToGeorgianDateTime();
 
-        var contractsWithExtension = await _context.InstitutionContractSet
-            .Where(x => x.IsActiveString == "true")
-            .Select(x => new { x.ContractingPartyId, x.ExtensionNo })
-            .ToListAsync();
-
-        // var contractsWithExtensionLookup = contractsWithExtension
-        //     .GroupBy(x => x.ContractingPartyId)
-        //     .ToDictionary(
-        //         g => g.Key,
-        //         g => g.Max(x => x.ExtensionNo)
-        //     );
-        
-        var rawQuery = _context.InstitutionContractSet
-            .Include(x=>x.Installments)
-            .AsNoTracking()
-            .Join(_context.PersonalContractingParties
-                    .AsNoTracking()
+        var joinedQuery = query.Join(_context.PersonalContractingParties
                     .Include(x => x.Employers)
                     .ThenInclude(x => x.WorkshopEmployers)
                     .ThenInclude(x => x.Workshop),
                 contract => contract.ContractingPartyId,
                 contractingParty => contractingParty.id,
-                (contract, contractingParty) => new { contract, contractingParty });
-
-        // var pendingForRenewalContracts = _context.InstitutionContractSet.AsNoTracking()
-        //     .Where(c => c.IsActiveString == "true" &&
-        //                 c.ContractEndGr >= now &&
-        //                 c.ContractEndGr <= endThisMontGr);
-        
-            var joinedQuery = rawQuery.Select(x => new
+                (contract, contractingParty) => new { contract, contractingParty })
+            .Select(x => new
             {
                 x.contract,
                 x.contractingParty,
@@ -1153,8 +1135,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                                         : x.contract.ContractAmount == 0
                                             ? (int)InstitutionContractListStatus.Free
                                             : !x.contractingParty.Employers
-                                                .SelectMany(e => e.WorkshopEmployers
-                                                    .Select(we => we.Workshop)).Any()
+                                                .SelectMany(e => e.WorkshopEmployers.Select(we => we.Workshop)).Any()
                                                 ? (int)InstitutionContractListStatus.WithoutWorkshop
                                                 : (int)InstitutionContractListStatus.Active
             });
@@ -1317,15 +1298,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
         var list = await orderedQuery.ApplyPagination(searchModel.PageIndex, searchModel.PageSize).ToListAsync();
         var contractingPartyIds = list.Select(x => x.contractingParty.id).ToList();
-        var contractIds = list.Select(x => x.contract.id).ToList();
-
-        // بارگذاری WorkshopGroups فقط برای قراردادهای صفحه فعلی
-        var workshopGroups = await _context.InstitutionContractWorkshopGroups
-            .AsNoTracking()
-            .Include(x=>x.InitialWorkshops )
-            .Include(x => x.CurrentWorkshops)
-            .Where(x => contractIds.Contains(x.InstitutionContractId))
-            .ToDictionaryAsync(x => x.InstitutionContractId, x => x);
 
         var financialStatements = _context.FinancialStatments.Include(x => x.FinancialTransactionList)
             .Where(x => contractingPartyIds.Contains(x.ContractingPartyId)).ToList();
@@ -1349,19 +1321,13 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
                 var archiveCode = minArchiveCode == 10000000 ? 0 : minArchiveCode;
                 var status = Enum.Parse<InstitutionContractListStatus>(x.StatusPriority.ToString());
-                
-                // دریافت WorkshopGroup از dictionary بارگذاری شده
-                workshopGroups.TryGetValue(x.contract.id, out var workshopGroup);
-                
-                List<InstitutionContractWorkshopBase> currentStateWorkshops = workshopGroup?.CurrentWorkshops
+                List<InstitutionContractWorkshopBase> currentStateWorkshops = x.contract.WorkshopGroup?.CurrentWorkshops
                     .Cast<InstitutionContractWorkshopBase>().ToList();
 
                 var statement = financialStatements.FirstOrDefault(f => f.ContractingPartyId == x.contractingParty.id);
 
-                if (currentStateWorkshops != null && workshopGroup != null)
-                {
-                    currentStateWorkshops.AddRange(workshopGroup.InitialWorkshops.Where(w => !w.WorkshopCreated));
-                }
+                currentStateWorkshops?.AddRange(
+                    x.contract.WorkshopGroup?.InitialWorkshops.Where(w => !w.WorkshopCreated) ?? []);
 
                 var workshopDetails = currentStateWorkshops?.Select(w =>
                 {
@@ -1391,28 +1357,9 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 var employeesCount = _context.LeftWorkList
                     .Where(l => workshops.Select(w => w.id).Contains(l.WorkshopId))
                     .Count(l => l.StartWorkDate <= DateTime.Now && l.LeftWorkDate >= DateTime.Now);
-
-
-                var contractAmount = x.contract.SigningType is not InstitutionContractSigningType.Legacy
-                                     && !x.contract.IsInstallment?
-                    x.contract.TotalAmount:0;
-
-                var installmentAmount = 0d; 
-                try
-                {
-                    installmentAmount =x.contract.SigningType == InstitutionContractSigningType.Legacy
-                        ?x.contract.ContractAmount : x.contract.IsInstallment ? x.contract.Installments.First().Amount :0;
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine(e);
-                    throw;
-                }
-               
                 return new GetInstitutionContractListItemsViewModel()
                 {
-                    ContractAmount = contractAmount,
-                    InstallmentAmount = installmentAmount,
+                    ContractAmount = x.contract.ContractAmountWithTax,
                     Balance = statement?.FinancialTransactionList.Sum(ft => ft.Deptor - ft.Creditor) ?? 0,
                     WorkshopsCount = workshops.Count(),
                     ContractStartFa = x.contract.ContractStartGr.ToFarsi(),
@@ -1430,7 +1377,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     IsExpired = x.contract.ContractEndGr <= endThisMontGr,
                     ContractingPartyId = x.contractingParty.id,
                     Workshops = workshopDetails,
-                    IsInPersonContract = workshopGroup?.CurrentWorkshops
+                    IsInPersonContract = x.contract.WorkshopGroup?.CurrentWorkshops
                         .Any(y => y.Services.ContractInPerson) ?? true,
                     IsOldContract = x.contract.SigningType == InstitutionContractSigningType.Legacy
                 };
@@ -1807,7 +1754,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             .ThenInclude(x => x.InitialWorkshops)
             .Include(x => x.WorkshopGroup)
             .ThenInclude(x => x.CurrentWorkshops)
-            .Include(x=>x.Installments)
             .FirstOrDefaultAsync(x => x.id == institutionContractId);
     }
 
@@ -1949,7 +1895,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             .FirstOrDefaultAsync(x => x.PublicId == id);
     }
 
-    public InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request,string contractStart=null)
+    public InstitutionContractDiscountResponse CalculateDiscount(InstitutionContractSetDiscountRequest request)
     {
         var baseAmount = request.TotalAmount;
         var discountAmount = (baseAmount * request.DiscountPercentage) / 100;
@@ -2208,10 +2154,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             .Include(x => x.WorkshopGroup)
             .ThenInclude(institutionContractWorkshopGroup => institutionContractWorkshopGroup.CurrentWorkshops)
             .FirstOrDefaultAsync(x => x.id == extenstionTemp.PreviousId);
-        
-        var employerWorkshopIds = _context.Employers.Where(x=>x.ContractingPartyId == prevInstitutionContracts.ContractingPartyId).Include(x=>x.WorkshopEmployers)
-            .SelectMany(x=>x.WorkshopEmployers).Select(x=>x.WorkshopId).Distinct().ToList();
-        
         if (prevInstitutionContracts == null)
         {
             throw new BadRequestException("قرارداد مالی قبلی یافت نشد");
@@ -2224,12 +2166,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         );
 
         var workshopIds = prevInstitutionContracts.WorkshopGroup.CurrentWorkshops.Select(x => x.WorkshopId.Value);
-        
-        var workshopsNotInInstitution = employerWorkshopIds.Where(x=> !workshopIds.Contains(x)).ToList();
-        
-        var workshops = await _context.Workshops.Where(x => workshopIds.Contains(x.id) || employerWorkshopIds.Contains(x.id))
-            .ToListAsync();
-        
+        var workshops = await _context.Workshops.Where(x => workshopIds.Contains(x.id)).ToListAsync();
         var workshopDetails = prevInstitutionContracts.WorkshopGroup.CurrentWorkshops
             .Select(x =>
             {
@@ -2271,32 +2208,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     RollCallInPerson = service.RollCallInPerson
                 };
             }).ToList();
-        var notIncludeWorskhopsLeftWork =await _context.LeftWorkList
-            .Where(x => workshopsNotInInstitution.Contains(x.WorkshopId) && x.StartWorkDate <= DateTime.Now &&
-                        x.LeftWorkDate >= DateTime.Now)
-            .GroupBy(x => x.WorkshopId).ToListAsync();
-       var notIncludeWorskhopsInContract = workshopsNotInInstitution.Select(x =>
-        {
-            var workshop = workshops.FirstOrDefault(w => w.id == x);
-            var leftWorks = notIncludeWorskhopsLeftWork.FirstOrDefault(l=>l.Key ==x);
-            return new WorkshopTempViewModel()
-            {
-                WorkshopName = workshop?.WorkshopName ?? "فاقد کارگاه",
-                WorkshopServicesAmount = 0,
-                WorkshopServicesAmountStr = "0",
-                WorkshopId = x,
-                Id = 0,
-                ContractAndCheckout = false,
-                ContractAndCheckoutInPerson = false,
-                CustomizeCheckout = false,
-                CountPerson = leftWorks?.Count()??0,
-                Insurance = false,
-                InsuranceInPerson = false,
-                RollCall = false,
-                RollCallInPerson = false,
-            };
-        }).ToList();
-        workshopDetails = workshopDetails.Concat(notIncludeWorskhopsInContract).ToList();
         var res = new InstitutionContractExtensionWorkshopsResponse()
         {
             TotalAmount = workshopDetails.Sum(x => x.WorkshopServicesAmount).ToMoney(),
@@ -2411,10 +2322,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
     {
         if (request.DiscountPercentage <= 0)
             throw new BadRequestException("مقدار تخفیف نمی‌تواند برابر یا کمتر از صفر باشد");
-        if (request.DiscountPercentage>=100)
-        {
-            throw new BadRequestException("مقدار تخفیف نمی‌تواند برابر یا بیشتر از صد باشد");
-        }
         var institutionTemp = await _institutionExtensionTemp.Find(x => x.Id == request.TempId)
             .FirstOrDefaultAsync();
         if (institutionTemp == null)
@@ -2432,7 +2339,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             if (institutionTemp.OneTimePayment.DiscountPercetage > 0)
                 throw new BadRequestException("تخفیف قبلا برای این قرارداد اعمال شده است");
         }
-        
+
         var selectedPlan = institutionTemp.Duration switch
         {
             InstitutionContractDuration.OneMonth => institutionTemp.OneMonth,
@@ -2449,18 +2356,12 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             IsInstallment = request.IsInstallment,
             OneMonthAmount = selectedPlan.OneMonthPaymentDiscounted.MoneyToDouble()
         };
-        var res = CalculateDiscount(calculateRequest,selectedPlan.ContractStart);
+        var res = CalculateDiscount(calculateRequest);
 
         //این به این دلیل هست که متد caclulate discount یکی از مقادیر رو پر میکنه و ما نیاز داریم هر دو مقدار رو داشته باشیم
         if (request.IsInstallment)
         {
             var onetime = institutionTemp.OneTimePayment;
-            onetime.TotalAmountWithoutDiscount = onetime.TotalAmount;
-            
-            onetime.OneMonthPaymentWithoutDiscount = selectedPlan.OneMonthPaymentDiscounted;
-            institutionTemp.OneTimePayment.TotalAmountWithoutDiscount =  onetime.TotalAmount;
-            institutionTemp.OneTimePayment.OneMonthPaymentWithoutDiscount = selectedPlan.OneMonthPaymentDiscounted;
-            
             res.OneTime = new()
             {
                 PaymentAmount = onetime.PaymentAmount,
@@ -2469,9 +2370,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 DiscountedAmount = onetime.DiscountedAmount,
                 DiscountPercetage = onetime.DiscountPercetage,
             };
-            
-
-            
             institutionTemp.MonthlyPayment = new()
             {
                 Installments = res.Monthly.Installments,
@@ -2480,10 +2378,8 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 TotalAmount = res.Monthly.TotalAmount,
                 DiscountedAmount = res.Monthly.DiscountedAmount,
                 DiscountPercetage = res.Monthly.DiscountPercetage,
-                TotalAmountWithoutDiscount = institutionTemp.MonthlyPayment.TotalAmount,
-                OneMonthPaymentWithoutDiscount = selectedPlan.OneMonthPaymentDiscounted,
             };
-            
+
             selectedPlan.TotalPayment = res.Monthly.TotalAmount;
             selectedPlan.Obligation = res.Monthly.Obligation;
             selectedPlan.OneMonthPaymentDiscounted = res.Monthly.OneMonthAmount;
@@ -2492,9 +2388,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         else
         {
             var monthly = institutionTemp.MonthlyPayment;
-            
-            institutionTemp.MonthlyPayment.TotalAmountWithoutDiscount = monthly.TotalAmount;
-            
             res.Monthly = new()
             {
                 PaymentAmount = monthly.PaymentAmount,
@@ -2504,8 +2397,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 DiscountPercetage = monthly.DiscountPercetage,
                 Installments = monthly.Installments,
             };
-            
-            
             institutionTemp.OneTimePayment = new()
             {
                 PaymentAmount = res.OneTime.PaymentAmount,
@@ -2513,8 +2404,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 TotalAmount = res.OneTime.TotalAmount,
                 DiscountedAmount = res.OneTime.DiscountedAmount,
                 DiscountPercetage = res.OneTime.DiscountPercetage,
-                TotalAmountWithoutDiscount = institutionTemp.OneTimePayment.TotalAmount,
-                OneMonthPaymentWithoutDiscount = selectedPlan.OneMonthPaymentDiscounted,
             };
             selectedPlan.TotalPayment = res.OneTime.TotalAmount;
             selectedPlan.Obligation = res.OneTime.Obligation;
@@ -2573,10 +2462,12 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         if (request.IsInstallment)
         {
             var prevMonthlyPayment = institutionTemp.MonthlyPayment;
-            var resetTotalAmount = prevMonthlyPayment.TotalAmountWithoutDiscount.MoneyToDouble();
+            var resetTotalAmount = prevMonthlyPayment.TotalAmount.MoneyToDouble() /
+                                   (1 - (prevMonthlyPayment.DiscountPercetage / 100.0));
             var resetTax = (resetTotalAmount * 0.10);
             var paymentAmount = (resetTotalAmount + resetTax);
-            var newOneMonthAmount = prevMonthlyPayment.OneMonthPaymentWithoutDiscount.MoneyToDouble();
+            var newOneMonthAmount = selectedPlan.OneMonthPaymentDiscounted.MoneyToDouble() /
+                                    (1 - (prevMonthlyPayment.DiscountPercetage / 100));
             monthlyPayment = new InstitutionContractDiscountMonthlyViewModel()
             {
                 DiscountPercetage = 0,
@@ -2585,7 +2476,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 Tax = resetTax.ToMoney(),
                 TotalAmount = resetTotalAmount.ToMoney(),
                 Installments = InstitutionMonthlyInstallmentCaculation((int)institutionTemp.Duration.Value,
-                    paymentAmount,selectedPlan.ContractStart),
+                    paymentAmount, DateTime.Now.ToFarsi()),
                 OneMonthAmount = newOneMonthAmount.ToMoney(),
                 Obligation = resetTotalAmount.ToMoney()
             };
@@ -2627,9 +2518,11 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         else
         {
             var prevOneTimePayment = institutionTemp.OneTimePayment;
-            var resetTotalAmount = prevOneTimePayment.TotalAmountWithoutDiscount.MoneyToDouble();
+            var resetTotalAmount = prevOneTimePayment.TotalAmount.MoneyToDouble() /
+                                   (1 - (prevOneTimePayment.DiscountPercetage / 100.0));
             var resetTax = (resetTotalAmount * 0.10);
-            var newOneMonthAmount = prevOneTimePayment.OneMonthPaymentWithoutDiscount.MoneyToDouble();
+            var newOneMonthAmount = selectedPlan.OneMonthPaymentDiscounted.MoneyToDouble() /
+                                    (1 - (prevOneTimePayment.DiscountPercetage / 100));
 
             oneTimePayment = new InstitutionContractDiscountOneTimeViewModel()
             {
@@ -2648,12 +2541,8 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 TotalAmount = oneTimePayment.TotalAmount,
                 DiscountedAmount = oneTimePayment.DiscountedAmount,
                 DiscountPercetage = oneTimePayment.DiscountPercetage,
-                TotalAmountWithoutDiscount = institutionTemp.OneTimePayment.TotalAmount,
-                OneMonthPaymentWithoutDiscount = institutionTemp.OneTimePayment.OneMonthPaymentWithoutDiscount
             };
-            selectedPlan.TotalPayment = institutionTemp.HasContractInPerson?
-                (oneTimePayment.TotalAmount.MoneyToDouble()/(0.9)).ToMoney()
-                :oneTimePayment.TotalAmount;
+            selectedPlan.TotalPayment = oneTimePayment.TotalAmount;
             selectedPlan.Obligation = oneTimePayment.Obligation;
             selectedPlan.OneMonthPaymentDiscounted = oneTimePayment.OneMonthAmount;
             selectedPlan.DailyCompenseation = (oneTimePayment.OneMonthAmount.MoneyToDouble() * 0.10).ToMoney();
@@ -2909,6 +2798,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 _context.InstitutionContractContactInfos.Add(contactinfo);
             }
         }
+
         await SaveChangesAsync();
 
         await _smsService.SendInstitutionCreationVerificationLink(contractingParty.Phone, contractingPartyFullName,
@@ -2919,7 +2809,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         await transaction.CommitAsync();
         return opration.Succcedded();
     }
-    
 
     #endregion
 
@@ -3526,7 +3415,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
     public async Task<bool> SendReminderSmsForBackgroundTask()
     {
         var now = DateTime.Now;
-        _logger.LogInformation("================>> SendReminderSmsForBackgroundTask job run");
+
 
         // تبدیل تاریخ میلادی به شمسی
         var persianNow = now.ToFarsi();
@@ -3565,7 +3454,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         if (checkAnyToExecute)
         {
             //اجرای تسک
-            _logger.LogInformation("اجرای تسک پیامک های یاد آور SendReminderSmsForBackgroundTask" + persianNow + " - " + hour + ":" + minute);
+
             //دریافت لیست بدهکاران
             var smsListData = await GetSmsListData(now, TypeOfSmsSetting.InstitutionContractDebtReminder);
             string typeOfSms = "یادآور بدهی ماهانه";
@@ -4340,7 +4229,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 {
                     string name = item.PartyName.Length > 18 ? item.PartyName.Substring(0, 18) : item.PartyName;
                     string errMess = $"{name}-خطا";
-                    _logger.LogError(errMess);
                     await _smsService.Alarm("09114221321", errMess);
                 }
 
@@ -4454,7 +4342,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         if (checkAnyToExecute)
         {
             //اجرای تسک
-            _logger.LogInformation("اجرای تسک ارسال یاد آور تایید قراداد مالی SendInstitutionContractConfirmSms" + persianNow + " - " + hour + ":" + minute);
+
             //دریافت لیست قراداد های تایید نشده
             var fromAmonthAgo = now.AddDays(-30);
             var pendingContracts = await _context.InstitutionContractSet
@@ -4474,10 +4362,8 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             string typeOfSms = "یادآور تایید قرارداد مالی";
             foreach (var item in pendingContracts)
             {
-             
                 var sendResult = await _smsService.SendInstitutionCreationVerificationLink(item.Number, item.FullName,
                     item.InstitutionId, item.ContractingPartyId, item.InstitutionContractId, typeOfSms);
-                Thread.Sleep(1000);
             }
 
             Console.WriteLine("executed at : " + persianNow + " - " + hour + ":" + minute);
@@ -4529,13 +4415,12 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 TypeOfContract = x.TypeOfContract,
                 IsInstallment = x.IsInstallment,
                 VerificationStatus = x.VerificationStatus,
-                SigningType = x.SigningType,
                 InstallmentList = x.Installments
                     .Select(ins => new InstitutionContractInstallmentViewModel
                     { AmountDouble = ins.Amount, InstallmentDateGr = ins.InstallmentDateGr })
                     .OrderBy(ins => ins.InstallmentDateGr).Skip(1).ToList(),
             }).Where(x =>
-                x.ContractStartGr < endOfMonthGr && x.ContractEndGr >= endOfMonthGr && x.ContractAmountDouble > 0 && x.VerificationStatus != InstitutionContractVerificationStatus.PendingForVerify)
+                x.ContractStartGr < endOfMonthGr && x.ContractEndGr >= endOfMonthGr && x.ContractAmountDouble > 0)
             .ToListAsync();
 
         #endregion
@@ -4553,13 +4438,13 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
 
         #region GetDectivedContractOnCurrentMonth
-       
+
         if (futureContracts.Any())
         {
             List<long> futureContractIds = futureContracts.Select(x => x.ContractingPartyId).ToList();
             List<InstitutionContractViewModel> deatcivedContract = await _context.InstitutionContractSet
                 .Where(x => x.IsActiveString == "false" && futureContractIds.Contains(x.ContractingPartyId) &&
-                            x.ContractEndGr.Date == endOfCurrentMonth.Date && x.ContractAmount > 0 && x.VerificationStatus != InstitutionContractVerificationStatus.PendingForVerify)
+                            x.ContractEndGr.Date == endOfCurrentMonth.Date && x.ContractAmount > 0)
                 .Select(x => new InstitutionContractViewModel
                 {
                     Id = x.id,
@@ -4574,7 +4459,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     TypeOfContract = x.TypeOfContract,
                     IsInstallment = x.IsInstallment,
                     VerificationStatus = x.VerificationStatus,
-                    SigningType = x.SigningType,
                     InstallmentList = x.Installments
                         .Select(ins => new InstitutionContractInstallmentViewModel
                         { AmountDouble = ins.Amount, InstallmentDateGr = ins.InstallmentDateGr })
@@ -4585,12 +4469,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 institutionContracts.AddRange(deatcivedContract);
         }
 
-        // قرارداد هایی که پطور یکجا پرداخت شده اند
-        var paidInFull = institutionContracts.Where(x =>
-            x.SigningType != InstitutionContractSigningType.Legacy && x.IsInstallment == false && x.SigningType != null).ToList();
-
-        //حذف قراداد هایی که یکجا پرداخت شده اند از لیست ایجاد سند ماهانه
-        institutionContracts = institutionContracts.Except(paidInFull).ToList();
 
         #region RollCallServicCompute
 
@@ -4638,7 +4516,8 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
                         if (!alreadyCreated)
                         {
-                            if (item.IsInstallment)
+                            if (item.IsInstallment &&
+                                item.VerificationStatus == InstitutionContractVerificationStatus.Verified)
                             {
                                 var instalment = item.InstallmentList
                                     .FirstOrDefault(x =>
@@ -4672,7 +4551,8 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                         await _financialStatmentRepository.SaveChangesAsync();
 
 
-                        if (item.IsInstallment)
+                        if (item.IsInstallment &&
+                            item.VerificationStatus == InstitutionContractVerificationStatus.Verified)
                         {
                             var instalment = item.InstallmentList
                                 .FirstOrDefault(x =>
@@ -4699,17 +4579,12 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
 
                     #region RollCallServicCompute
-                    //ایجاد سند مالی حضورغیاب
-                    //قرارداد هایی که جدید نیستند و اقساط ندارند
-                    //کارگاه های استثناء : کباب مهدی 30520 و نمونه پروتئین 30739 
-                    if (item.SigningType != InstitutionContractSigningType.OtpBased && item.SigningType != InstitutionContractSigningType.Physical
-                        && !item.IsInstallment && item.ContractingPartyId != 30520 && item.ContractingPartyId != 30739)
+
+                    if (item.VerificationStatus != InstitutionContractVerificationStatus.Verified &&
+                        !item.IsInstallment && item.ContractingPartyId != 30520 && item.ContractingPartyId != 30739)
                     {
                         try
                         {
-                            //TODO
-                            //@refactor Need
-
                             var employers = await _context.Employers
                                 .Where(x => x.ContractingPartyId == item.ContractingPartyId)
                                 .Select(x => x.id).ToListAsync();
@@ -4883,20 +4758,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             .Where(x => x.Installments.Any(i => i.Id == installmentId))
             .Select(x => x.id).FirstOrDefaultAsync();
     }
-
-    public async Task<InstitutionContract> GetPreviousContract(long currentInstitutionContractId)
-    {
-        var institutionContract =await _context.InstitutionContractSet
-            .FirstOrDefaultAsync(x=>x.id ==currentInstitutionContractId);
-        if (institutionContract == null)
-            return null;
-        var previousContract = await _context.InstitutionContractSet
-            .Where(x => x.ContractingPartyId == institutionContract.ContractingPartyId)
-            .Where(x => x.ContractStartGr < institutionContract.ContractStartGr)
-            .OrderByDescending(x => x.ContractEndGr)
-            .FirstOrDefaultAsync();
-        return previousContract;
-    }
+    
 
     #endregion
 

CompanyManagment.EFCore/Repository/InsuranceListRepository.cs

@@ -176,20 +176,18 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
                                 if (item.InsuranceShare.ToMoney() != checkout.InsuranceDeduction.ToMoney())
                                 {
                                     checkout.SetUpdateNeeded();
-                                    if (!_context.CheckoutWarningMessages.Any(x =>
-                                            x.CheckoutId == checkout.id && x.TypeOfCheckoutWarning ==
-                                            TypeOfCheckoutWarning.InsuranceEmployeeShare))
+                                    if (!_context.CheckoutWarningMessages.Any(x => x.CheckoutId == checkout.id && x.TypeOfCheckoutWarning != TypeOfCheckoutWarning.InsuranceEmployeeShare))
                                     {
                                         var createWarrning =
                                             new CheckoutWarningMessage(
-                                                "مبلغ بیمه سهم کارگر با مبلغ محاسبه شده در لیست بیمه مغایرت دارد",
-                                                checkout.id, TypeOfCheckoutWarning.InsuranceEmployeeShare);
+                                                "مبلغ بیمه سهم کارگر با مبلغ محاسبه شده در لیست بیمه مغایرت دارد", checkout.id, TypeOfCheckoutWarning.InsuranceEmployeeShare);
                                         _context.CheckoutWarningMessages.Add(createWarrning);
                                     }
 
                                     _context.SaveChanges();
                                 }
                             }
+
                         }
                     }
 
@@ -731,7 +729,7 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
                 var id = insuranceListObj.id;
                 if (command.EmployeeInsurancListDataList != null && command.EmployeeInsurancListDataList.Count > 0)
                 {
-                    var farisMonthName = Tools.ToFarsiMonthByNumber(command.Month);
+                     var farisMonthName = Tools.ToFarsiMonthByNumber(command.Month);
 
                     var checkouts = _context.CheckoutSet.Where(x =>
                         x.WorkshopId == command.WorkshopId && x.Year == command.Year && x.Month == farisMonthName &&
@@ -757,19 +755,20 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
                                 if (item.InsuranceShare.ToMoney() != checkout.InsuranceDeduction.ToMoney())
                                 {
                                     checkout.SetUpdateNeeded();
-                                    if (!_context.CheckoutWarningMessages.Any(x => x.CheckoutId == checkout.id && x.TypeOfCheckoutWarning == TypeOfCheckoutWarning.InsuranceEmployeeShare))
+                                    if (!_context.CheckoutWarningMessages.Any(x => x.CheckoutId == checkout.id && x.TypeOfCheckoutWarning != TypeOfCheckoutWarning.InsuranceEmployeeShare))
                                     {
                                         var createWarrning =
                                             new CheckoutWarningMessage(
-                                                "مبلغ بیمه سهم کارگر با مبلغ محاسبه شده در لیست بیمه مغایرت دارد",
-                                                checkout.id, TypeOfCheckoutWarning.InsuranceEmployeeShare);
+                                                "مبلغ بیمه سهم کارگر با مبلغ محاسبه شده در لیست بیمه مغایرت دارد", checkout.id, TypeOfCheckoutWarning.InsuranceEmployeeShare);
                                         _context.CheckoutWarningMessages.Add(createWarrning);
                                     }
-
+                    
                                     _context.SaveChanges();
                                 }
                             }
+                        
                         }
+
                     }
 
                     _employeeInsurancListDataRepository.SaveChanges();
@@ -1778,97 +1777,62 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
         return res;
     }
 
-    public async Task<PagedResult<InsuranceClientListViewModel>> GetInsuranceClientList(
-        InsuranceClientSearchModel searchModel)
+    public async Task<PagedResult<InsuranceClientListViewModel>> GetInsuranceClientList(InsuranceClientSearchModel searchModel)
     {
         var workshopId = _authHelper.GetWorkshopId();
         var query = _context.InsuranceListSet
-            .Where(x => x.WorkshopId == workshopId);
-
-
-        if (searchModel.Year > 0)
+            .Select(x => new InsuranceClientListViewModel
         {
-            query = query.Where(x => x.Year == searchModel.Year.ToString("0000"));
-        }
+            Id = x.id,
+            WorkShopId = x.WorkshopId,
+            Year = x.Year,
+            YearInt = Convert.ToInt32(x.Year),
+            Month = x.Month,
+            MonthName = x.Month.ToFarsiMonthByNumber(),
+            MonthInt = Convert.ToInt32(x.Month),
+        }).Where(x => x.WorkShopId == workshopId);
 
+
+        if (searchModel.Year>0)
+        {
+            query = query.Where(x => x.YearInt == searchModel.Year);
+        } 
         if (searchModel.Month > 0)
         {
-            query = query.Where(x => x.Month == searchModel.Month.ToString("00"));
+            query = query.Where(x => x.MonthInt == searchModel.Month);
         }
 
         var res = new PagedResult<InsuranceClientListViewModel>
         {
             TotalCount = query.Count()
         };
-        
-        var list = (await query.ApplyPagination(searchModel.PageIndex, searchModel.PageSize).ToListAsync());
-        
-        var insuranceListIds = list.Select(x => x.id).ToList();
-        
-        var employeeData = await _context.EmployeeInsurancListDataSet
-            .Where(x => insuranceListIds.Contains(x.InsuranceListId))
-            .GroupBy(x => x.InsuranceListId)
-            .Select(g => new
-            {
-                g.Key,
-                Count = g.Count(x=>x.LeftWorkDate != null)
-            }).ToListAsync();
-    
         query = searchModel.Sorting switch
         {
-            "CreationDate-Max" => query.OrderByDescending(x => x.id),
-            "CreationDate-Min" => query.OrderBy(x => x.id),
-            "Month-Max" => query.OrderByDescending(x => x.Month),
-            "Month-Min" => query.OrderBy(x => x.Month),
-            "Year-Max" => query.OrderByDescending(x => x.Year),
-            "Year-Min" => query.OrderBy(x => x.Year),
-            _ => query.OrderByDescending(x => x.id),
+            "CreationDate-Max" => query.OrderByDescending(x => x.Id),
+            "CreationDate-Min" => query.OrderBy(x => x.Id),
+            "Month-Max" => query.OrderByDescending(x => x.MonthInt),
+            "Month-Min" => query.OrderBy(x => x.MonthInt),
+            "Year-Max" => query.OrderByDescending(x => x.YearInt),
+            "Year-Min" => query.OrderBy(x => x.YearInt),
+            _ => query.OrderByDescending(x => x.Id),
         };
-
-        var resList = list
-            .Select(x => new InsuranceClientListViewModel
-            {
-                Id = x.id,
-                WorkShopId = x.WorkshopId,
-                Year = x.Year,
-                YearInt = Convert.ToInt32(x.Year),
-                Month = x.Month,
-                MonthName = x.Month.ToFarsiMonthByNumber(),
-                MonthInt = Convert.ToInt32(x.Month),
-                EmployerShare = x.EmployerShare.ToMoney(),
-                InsuredShare = x.InsuredShare.ToMoney(),
-                UnEmploymentInsurance = x.UnEmploymentInsurance.ToMoney(),
-                PersonnelCount = x.SumOfEmployees,
-                AllInsuredShare = (x.InsuredShare +
-                                   x.EmployerShare +
-                                   x.UnEmploymentInsurance).ToMoney(),
-                LeftWorkCount =employeeData.FirstOrDefault(e=>e.Key == x.id)?.Count ?? 0,
-            }).ToList();
-        
-        
-       
-        res.List = resList;
+        res.List =await query.ApplyPagination(searchModel.PageIndex,searchModel.PageSize).ToListAsync();
         return res;
     }
 
-    public async Task<List<InsuranceListViewModel>>  GetNotCreatedWorkshop(InsuranceListSearchModel searchModel)
+    public async Task<List<InsuranceListViewModel>> GetNotCreatedWorkshop(InsuranceListSearchModel searchModel)
     {
         if (string.IsNullOrEmpty(searchModel.Month) || string.IsNullOrEmpty(searchModel.Year))
         {
             return [];
         }
 
-
-        var workshopsHasInsuranceAccount = await _accountContext
-            .AccountLeftWorks
-            .Where(x => StaticWorkshopAccounts.InsuranceAccountsRoleIds.Contains(x.RoleId) && x.IsActive)
-            .Select(x => x.WorkshopId).Distinct().ToListAsync();
         var acountId = _authHelper.CurrentAccountId();
-        var accountWorkshopIds = _context.WorkshopAccounts.Where(x => x.AccountId == acountId && workshopsHasInsuranceAccount.Contains(x.WorkshopId))
+        var accountWorkshopIds = _context.WorkshopAccounts.Where(x => x.AccountId == acountId)
             .Select(x => x.WorkshopId);
         var firstDayOfMonth = $"{searchModel.Year}/{searchModel.Month}/01".ToGeorgianDateTime();
         var insuranceWorkshops = _context.Workshops
-            .Where(x => accountWorkshopIds.Contains(x.id) &&
+            .Where(x => x.InsuranceCode != null && x.InsuranceCode.Length >= 10 && accountWorkshopIds.Contains(x.id) &&
                         x.IsActiveString == "true");
 
 
@@ -1891,7 +1855,7 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
                 WorkShopId = result.id,
                 WorkShopCode = result.InsuranceWorkshopInfo != null
                     ? result.InsuranceWorkshopInfo.InsuranceCode
-                    : string.IsNullOrWhiteSpace(result.InsuranceCode) ? "کد کارگاهی ندارد" : result.InsuranceCode,
+                    : result.InsuranceCode,
                 WorkShopName = result.InsuranceWorkshopInfo != null
                     ? result.InsuranceWorkshopInfo.WorkshopName
                     : result.WorkshopFullName,
@@ -1913,10 +1877,10 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
                 query = query.Where(x => x.Month == searchModel.Month).OrderByDescending(x => x.WorkShopName)
                     .ThenByDescending(x => x.EmployerName).ThenByDescending(x => x.Year);
 
-        if (!string.IsNullOrEmpty(searchModel.Year) && searchModel.Year != "0")
-            query = query.Where(x => x.Year == searchModel.Year).OrderByDescending(x => x.EmployerName)
-                .ThenByDescending(x => x.WorkShopName).ThenByDescending(x => x.Month);
-
+            if (!string.IsNullOrEmpty(searchModel.Year) && searchModel.Year != "0")
+                query = query.Where(x => x.Year == searchModel.Year).OrderByDescending(x => x.EmployerName)
+                    .ThenByDescending(x => x.WorkShopName).ThenByDescending(x => x.Month);
+        
 
         if (!string.IsNullOrEmpty(searchModel.WorkShopCode))
             query = query.Where(x => x.WorkShopCode == searchModel.WorkShopCode).OrderByDescending(x => x.Year)
@@ -1996,77 +1960,6 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
         return res;
     }
 
-    public async Task<InsuranceClientPrintViewModel> ClientPrintOne(long id)
-    {
-        var insurance = await _context.InsuranceListSet.FirstOrDefaultAsync(x => x.id == id);
-        
-        if (insurance == null)
-            return null;
-        
-        var employeeInsurance = _context.EmployeeInsurancListDataSet
-            .Where(x => x.InsuranceListId == insurance.id);
-
-        var workshop = await _context.Workshops
-            .Include(x => x.InsuranceWorkshopInfo)
-            .FirstOrDefaultAsync(x => x.id == insurance.WorkshopId);
-
-        var employeeIds = await employeeInsurance
-            .Select(x => x.EmployeeId).ToListAsync();
-        
-        var employees = await _context.Employees
-            .Where(x => employeeIds.Contains(x.id)).ToListAsync();
-        
-        var jobIds = employeeInsurance.Select(x => x.JobId).ToList();
-        
-        var jobs = await _context.Jobs
-            .Where(x => jobIds.Contains(x.id)).ToDictionaryAsync(x => x.id, x => x.JobName);
-
-        var employeeData = employeeInsurance.ToList().Select(x =>
-        {
-            var employee = employees.FirstOrDefault(e => e.id == x.EmployeeId);
-            return new InsuranceClientPrintItemsViewModel()
-            {
-                BaseYears = x.BaseYears.ToMoney(),
-                BenefitsIncludedContinuous = x.BenefitsIncludedContinuous.ToMoney(),
-                BenefitsIncludedNonContinuous = x.BenefitsIncludedNonContinuous.ToMoney(),
-                DailyWage = x.DailyWage.ToMoney(),
-                IncludedAndNotIncluded = (x.BenefitsIncludedNonContinuous + x.BenefitsIncludedContinuous).ToMoney(),
-                WorkingDays = x.WorkingDays.ToString(),
-                MarriedAllowance = x.MarriedAllowance.ToMoney(),
-                StartWork = x.StartWorkDate.ToFarsi(),
-                LeftWork = x.LeftWorkDate.ToFarsi(),
-                MonthlyBenefits = x.MonthlyBenefits.ToMoney(),
-                MonthlySalary = x.MonthlySalary.ToMoney(),
-                NationalCode = employee.NationalCode,
-                InsuranceCode = employee.InsuranceCode,
-                JobName = jobs.GetValueOrDefault(x.JobId, ""),
-                FullName = employee.FullName,
-                InsuranceShare = x.InsuranceShare.ToMoney(),
-            };
-        }).ToList();
-
-        var result = new InsuranceClientPrintViewModel()
-        {
-            Items = employeeData.ToList(),
-            AllInsuredShare = (insurance.InsuredShare +
-                               insurance.EmployerShare +
-                               insurance.UnEmploymentInsurance).ToMoney(),
-            EmployerShare = insurance.EmployerShare.ToMoney(),
-            InsuredShare = insurance.InsuredShare.ToMoney(),
-            UnEmploymentInsurance = insurance.UnEmploymentInsurance.ToMoney(),
-            WorkshopName = workshop.InsuranceWorkshopInfo.WorkshopName,
-            WorkshopAddress = workshop.InsuranceWorkshopInfo.Address,
-            WorkshopEmployerName = workshop.InsuranceWorkshopInfo.EmployerName,
-            WorkshopInsuranceCode = workshop.InsuranceWorkshopInfo.InsuranceCode,
-            AgreementNumber = workshop.InsuranceWorkshopInfo.AgreementNumber,
-            ListNo  = "01",
-            Month = insurance.Month,
-            Year = insurance.Year
-            
-        };
-        return result;
-    }
-
     /// <summary>
     /// 
     /// </summary>

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
 }

CompanyManagment.EFCore/Repository/PersonalContractingPartyRepository.cs

@@ -773,137 +773,6 @@ public class PersonalContractingPartyRepository : RepositoryBase<long, PersonalC
         return await _context.PersonalContractingParties.FirstOrDefaultAsync(x => x.NationalId == nationalId);
     }
 
-    public async Task<OperationResult> DeActiveAllAsync(long id)
-    {
-        OperationResult result = new OperationResult();
-        await using var transaction = await _context.Database.BeginTransactionAsync();
-        await using var accountTransaction = await _accountContext.Database.BeginTransactionAsync();
-        try
-        {
-            var contractingParty = _context.PersonalContractingParties
-                .FirstOrDefault(x => x.id == id);
-            
-            if (contractingParty == null)
-                return result.Failed("طرف حساب یافت نشد");
-            
-            contractingParty.DeActive();
-
-            var employers = _context.Employers
-                .Where(x => x.ContractingPartyId == id).ToList();
-            employers.ForEach(x => x.DeActive());
-
-            var employerIds = employers.Select(x => x.id).ToList();
-            var workshopIds = _context.WorkshopEmployers
-                .Where(x => employerIds.Contains(x.EmployerId))
-                .Select(x => x.WorkshopId).ToList();
-            
-            var workshops = _context.Workshops
-                .Where(x => workshopIds.Contains(x.id)).ToList();
-            workshops.ForEach(x => x.DeActive(x.ArchiveCode));
-
-            var contracts = _context.Contracts
-                .Where(x => workshopIds.Contains(x.WorkshopIds)).ToList();
-            contracts.ForEach(x => x.DeActive());
-
-            var contractIds = contracts.Select(x => x.id).ToList();
-            var checkouts = _context.CheckoutSet
-                .Where(x => contractIds.Contains(x.ContractId)).ToList();
-            checkouts.ForEach(x => x.DeActive());
-
-            var contractingPartyAccount =await _context.ContractingPartyAccounts
-                .FirstOrDefaultAsync(x => x.PersonalContractingPartyId == id);
-            if (contractingPartyAccount != null)
-            {
-                var account = await _accountContext.Accounts
-                    .FirstOrDefaultAsync(x => x.id == contractingPartyAccount.AccountId);
-                
-                account?.DeActive();
-                
-                var cameraAccount =await _accountContext.CameraAccounts
-                    .FirstOrDefaultAsync(x=>x.AccountId==account.id);
-                
-                cameraAccount?.DeActive();
-                
-                await _accountContext.SaveChangesAsync();
-            }
-            
-            await _context.SaveChangesAsync();
-            await transaction.CommitAsync();
-            await accountTransaction.CommitAsync();
-            result.Succcedded();
-        }
-        catch (Exception)
-        {
-            result.Failed("غیرفعال کردن طرف حساب با خطا مواجه شد");
-            await transaction.RollbackAsync();
-            await accountTransaction.RollbackAsync();
-        }
-
-        return result;
-    }
-
-    public async Task<OperationResult> ActiveAllAsync(long id)
-    {
-        OperationResult result = new OperationResult();
-        await using var transaction =await _context.Database.BeginTransactionAsync();
-        await using var accountTransaction = await _accountContext.Database.BeginTransactionAsync();
-        try
-        {
-            var personel = _context.PersonalContractingParties
-                .FirstOrDefault(x => x.id == id);
-            if (personel == null)
-                return result.Failed("طرف حساب یافت نشد");
-            
-            personel.Active();
-
-            var employers = _context.Employers.Where(x => x.ContractingPartyId == id).ToList();
-            employers.ForEach(x => x.Active());
-
-            var employerIds = employers.Select(x => x.id).ToList();
-            var workshopIds = _context.WorkshopEmployers.Where(x => employerIds.Contains(x.EmployerId))
-                .Select(x => x.WorkshopId).ToList();
-            var workshops = _context.Workshops.Where(x => workshopIds.Contains(x.id)).ToList();
-            workshops.ForEach(x => x.Active(x.ArchiveCode));
-
-            var contracts = _context.Contracts.Where(x => workshopIds.Contains(x.WorkshopIds)).ToList();
-            contracts.ForEach(x => x.Active());
-
-            var contractIds = contracts.Select(x => x.id).ToList();
-            var checkouts = _context.CheckoutSet.Where(x => contractIds.Contains(x.ContractId)).ToList();
-            checkouts.ForEach(x => x.Active());
-
-            var contractingPartyAccount =await _context.ContractingPartyAccounts
-                .FirstOrDefaultAsync(x => x.PersonalContractingPartyId == id);
-            if (contractingPartyAccount != null)
-            {
-                var account = await _accountContext.Accounts
-                    .FirstOrDefaultAsync(x => x.id == contractingPartyAccount.AccountId);
-                
-                account?.Active();
-                
-                var cameraAccount =await _accountContext.CameraAccounts
-                    .FirstOrDefaultAsync(x=>x.AccountId==account.id);
-                
-                cameraAccount?.Active();
-                
-                await _accountContext.SaveChangesAsync();
-            }
-            
-            await _context.SaveChangesAsync();
-            await transaction.CommitAsync();
-            await accountTransaction.CommitAsync();
-            result.Succcedded();
-        }
-        catch (Exception)
-        {
-            result.Failed("فعال کردن طرف حساب با خطا مواجه شد");
-            await transaction.RollbackAsync();
-            await accountTransaction.RollbackAsync();
-        }
-
-        return result;
-    }
-
     #endregion
 }
 

CompanyManagment.EFCore/Repository/PlanPercentageRepository.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.InstitutionPlanAgg;
-using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.InstitutionPlan;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace CompanyManagment.EFCore.Repository;
 
@@ -46,7 +44,6 @@ public class PlanPercentageRepository : RepositoryBase<long, PlanPercentage>, IP
         }).FirstOrDefault();
     }
 
-
     public List<InstitutionPlanViewModel> GetInstitutionPlanList(int pageIndex, int countPeron)
     {
         var planPercentage = _context.PlanPercentages.FirstOrDefault();
@@ -306,109 +303,4 @@ public class PlanPercentageRepository : RepositoryBase<long, PlanPercentage>, IP
 
         return new InstitutionPlanViewModel();
     }
-
-
-    #region ForApi
-
-    public async Task<CreateServiceAmountDto> GetCreateModalData()
-    {
-        return await _context.PlanPercentages.Select(x => new CreateServiceAmountDto()
-        {
-            Id = x.id,
-            ContractAndCheckoutInPersonPercentStr = $"{x.ContractAndCheckoutInPersonPercent}",
-            CustomizeCheckoutPercentStr = $"{x.CustomizeCheckoutPercent}",
-            ContractAndCheckoutPercentStr = $"{x.ContractAndCheckoutPercent}",
-            InsuranceInPersonPercentStr = $"{x.InsuranceInPersonPercent}",
-            InsurancePercentStr = $"{x.InsurancePercent}",
-            RollCallPercentStr = $"{x.RollCallPercent}",
-        }).FirstOrDefaultAsync();
-    }
-
-
-    public async Task<PagedResult<InstitutionPlanListDto>> GetList(
-        InstitutionPlanSearchModel searchModel)
-    {
-        var planPercentage = await _context.PlanPercentages.FirstOrDefaultAsync();
-        if (planPercentage == null)
-            return new PagedResult<InstitutionPlanListDto>();
-        var dailyWageYearlySalery = await _context.YearlySalaries.Include(i => i.YearlySalaryItemsList).FirstOrDefaultAsync(x =>
-            x.StartDate.Date <= DateTime.Now.Date && x.EndDate >= DateTime.Now.Date);
-        if (dailyWageYearlySalery == null)
-            return new PagedResult<InstitutionPlanListDto>();
-
-        var dailyWage = dailyWageYearlySalery.YearlySalaryItemsList.Where(x => x.ItemName == "مزد روزانه")
-            .Select(x => x.ItemValue).FirstOrDefault();
-
-        var plans = _context.InstitutionPlans.AsQueryable();
-        if (searchModel.CountPerson > 0)
-            plans = plans.Where(x => x.CountPerson == searchModel.CountPerson);
-
-        var count = await plans.CountAsync();
-
-        var planQueryFilter =await plans.ApplyPagination(searchModel.PageIndex, searchModel.PageSize).ToListAsync();
-        var planResult =  planQueryFilter.Select(plan =>
-            new InstitutionPlanViewModel
-            {
-                CountPerson = plan.CountPerson,
-
-                ContractAndCheckoutDouble =
-                    ((dailyWage * planPercentage.ContractAndCheckoutPercent / 100) * plan.CountPerson *
-                     plan.IncreasePercentage),
-
-                InsuranceDouble = (((dailyWage * planPercentage.InsurancePercent) / 100) * plan.CountPerson *
-                                   plan.IncreasePercentage),
-
-                RollCallDouble = (((dailyWage * planPercentage.RollCallPercent) / 100) * plan.CountPerson *
-                                  plan.IncreasePercentage),
-
-                CustomizeCheckoutDouble = (((dailyWage * planPercentage.CustomizeCheckoutPercent) / 100) *
-                                           plan.CountPerson *
-                                           plan.IncreasePercentage),
-
-                ContractAndCheckoutInPersonDouble =
-                    (((dailyWage * planPercentage.ContractAndCheckoutInPersonPercent) / 100) * plan.CountPerson *
-                     plan.IncreasePercentage),
-
-                InsuranceInPersonDouble = (((dailyWage * planPercentage.InsuranceInPersonPercent) / 100) *
-                                           plan.CountPerson *
-                                           plan.IncreasePercentage)
-            }).ToList();
-
-        var finalResult = planResult.Select(plan => new InstitutionPlanListDto()
-        {
-            CountPerson = plan.CountPerson,
-
-            ContractAndCheckout = plan.ContractAndCheckoutDouble.ToMoney(),
-
-            Insurance = plan.InsuranceDouble.ToMoney(),
-
-            RollCall = plan.RollCallDouble.ToMoney(),
-
-            CustomizeCheckout = plan.CustomizeCheckoutDouble.ToMoney(),
-
-            ContractAndCheckoutInPerson = plan.ContractAndCheckoutInPersonDouble.ToMoney(),
-
-            InsuranceInPerson = plan.InsuranceInPersonDouble.ToMoney(),
-
-            InPersonSumAmountStr =
-                (plan.ContractAndCheckoutDouble + plan.InsuranceDouble + plan.ContractAndCheckoutInPersonDouble +
-                 plan.InsuranceInPersonDouble).ToMoney(),
-
-            OnlineAndInPersonSumAmountStr = (plan.ContractAndCheckoutDouble + plan.InsuranceDouble +
-                                             plan.ContractAndCheckoutInPersonDouble + plan.InsuranceInPersonDouble +
-                                             plan.RollCallDouble + plan.CustomizeCheckoutDouble).ToMoney(),
-
-            OnlineOnlySumAmountStr =
-                (plan.ContractAndCheckoutDouble + plan.InsuranceDouble + plan.RollCallDouble +
-                 plan.CustomizeCheckoutDouble).ToMoney(),
-        }).ToList();
-
-        return new PagedResult<InstitutionPlanListDto>()
-        {
-            TotalCount = count,
-            List = finalResult
-        };
-
-    }
-    #endregion
 }

CompanyManagment.EFCore/Services/SmsService.cs

@@ -1,4 +1,8 @@
-using _0_Framework.Application;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using _0_Framework.Application;
 using _0_Framework.Application.Sms;
 using Company.Domain.SmsResultAgg;
 using CompanyManagment.App.Contracts.SmsResult;
@@ -6,11 +10,6 @@ using IPE.SmsIrClient;
 using IPE.SmsIrClient.Models.Requests;
 using IPE.SmsIrClient.Models.Results;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using SmsResult = Company.Domain.SmsResultAgg.SmsResult;
 
 
@@ -18,531 +17,521 @@ namespace CompanyManagment.EFCore.Services;
 
 public class SmsService : ISmsService
 {
-    private readonly IConfiguration _configuration;
-    private readonly ISmsResultRepository _smsResultRepository;
-    private readonly bool _isDevEnvironment;
-    private readonly List<string> _testNumbers;
-    private readonly ILogger<SmsService> _logger;
-    public SmsIr SmsIr { get; set; }
+	private readonly IConfiguration _configuration;
+	private readonly ISmsResultRepository _smsResultRepository;
+	private readonly bool _isDevEnvironment;
+	private readonly List<string> _testNumbers;
+	public SmsIr SmsIr { get; set; }
 
 
-    public SmsService(IConfiguration configuration, ISmsResultRepository smsResultRepository, ILogger<SmsService> logger)
-    {
-        _configuration = configuration;
-        _smsResultRepository = smsResultRepository;
-        _logger = logger;
-        SmsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+	public SmsService(IConfiguration configuration, ISmsResultRepository smsResultRepository)
+	{
+		_configuration = configuration;
+		_smsResultRepository = smsResultRepository;
+		SmsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
 
-        // خواندن تنظیمات SMS از appsettings
-        var smsSettings = _configuration.GetSection("SmsSettings");
-        _isDevEnvironment = smsSettings.GetValue<bool>("IsTestMode");
-        _testNumbers = smsSettings.GetSection("TestNumbers").Get<List<string>>() ?? new List<string>();
-    }
+		// خواندن تنظیمات SMS از appsettings
+		var smsSettings = _configuration.GetSection("SmsSettings");
+		_isDevEnvironment = smsSettings.GetValue<bool>("IsTestMode");
+		_testNumbers = smsSettings.GetSection("TestNumbers").Get<List<string>>() ?? new List<string>();
+	}
 
-    /// <summary>
-    /// متد مرکزی برای ارسال پیامک که محیط dev را چک می‌کند
-    /// </summary>
-    private async Task<SmsIrResult<VerifySendResult>> VerifySendSmsAsync(string number, int templateId, VerifySendParameter[] parameters)
-    {
-        // اگر محیط dev است و شماره‌های تست وجود دارد، به شماره‌های تست ارسال می‌شود
-        if (_isDevEnvironment && _testNumbers is { Count: > 0 })
-        {
-            // ارسال به همه شماره‌های تست
-            SmsIrResult<VerifySendResult> lastResult = null;
-            foreach (var testNumber in _testNumbers)
-            {
-                lastResult = await SmsIr.VerifySendAsync(testNumber, templateId, parameters);
-            }
-            return lastResult; // برگرداندن نتیجه آخرین ارسال
-        }
-        else
-        {
-            // ارسال به شماره واقعی
-            return await SmsIr.VerifySendAsync(number, templateId, parameters);
-        }
-    }
+	/// <summary>
+	/// متد مرکزی برای ارسال پیامک که محیط dev را چک می‌کند
+	/// </summary>
+	private async Task<SmsIrResult<VerifySendResult>> VerifySendSmsAsync(string number, int templateId, VerifySendParameter[] parameters)
+	{
+		// اگر محیط dev است و شماره‌های تست وجود دارد، به شماره‌های تست ارسال می‌شود
+		if (_isDevEnvironment && _testNumbers is { Count: > 0 })
+		{
+			// ارسال به همه شماره‌های تست
+			SmsIrResult<VerifySendResult> lastResult = null;
+			foreach (var testNumber in _testNumbers)
+			{
+				lastResult = await SmsIr.VerifySendAsync(testNumber, templateId, parameters);
+			}
+			return lastResult; // برگرداندن نتیجه آخرین ارسال
+		}
+		else
+		{
+			// ارسال به شماره واقعی
+			return await SmsIr.VerifySendAsync(number, templateId, parameters);
+		}
+	}
 
-    public void Send(string number, string message)
-    {
-        //var token = GetToken();
-        //var lines = new SmsLine().GetSmsLines(token);
-        //if (lines == null) return;
+	public void Send(string number, string message)
+	{
+		//var token = GetToken();
+		//var lines = new SmsLine().GetSmsLines(token);
+		//if (lines == null) return;
 
-        //var line = lines.SMSLines.Last().LineNumber.ToString();
-        //var data = new MessageSendObject
-        //{
-        //    Messages = new List<string>
-        //        {message}.ToArray(),
-        //    MobileNumbers = new List<string> {number}.ToArray(),
-        //    LineNumber = line,
-        //    SendDateTime = DateTime.Now,
-        //    CanContinueInCaseOfError = true
-        //};
-        //var messageSendResponseObject = 
-        //    new MessageSend().Send(token, data);
+		//var line = lines.SMSLines.Last().LineNumber.ToString();
+		//var data = new MessageSendObject
+		//{
+		//    Messages = new List<string>
+		//        {message}.ToArray(),
+		//    MobileNumbers = new List<string> {number}.ToArray(),
+		//    LineNumber = line,
+		//    SendDateTime = DateTime.Now,
+		//    CanContinueInCaseOfError = true
+		//};
+		//var messageSendResponseObject = 
+		//    new MessageSend().Send(token, data);
 
-        //if (messageSendResponseObject.IsSuccessful) return;
+		//if (messageSendResponseObject.IsSuccessful) return;
 
-        //line = lines.SMSLines.First().LineNumber.ToString();
-        //data.LineNumber = line;
-        //new MessageSend().Send(token, data);
-    }
-    public bool VerifySend(string number, string message)
-    {
-        var verificationSendResult = VerifySendSmsAsync(number, 768382, new VerifySendParameter[] { new VerifySendParameter("VerificationCode", message) });
-        Thread.Sleep(2000);
-        if (verificationSendResult.IsCompletedSuccessfully)
-        {
+		//line = lines.SMSLines.First().LineNumber.ToString();
+		//data.LineNumber = line;
+		//new MessageSend().Send(token, data);
+	}
+	public bool VerifySend(string number, string message)
+	{
+		var verificationSendResult = VerifySendSmsAsync(number, 768382, new VerifySendParameter[] { new VerifySendParameter("VerificationCode", message) });
+		Thread.Sleep(2000);
+		if (verificationSendResult.IsCompletedSuccessfully)
+		{
 
-            var resStartStatus = verificationSendResult.Result;
-            var b = resStartStatus.Status;
-            var resResult = verificationSendResult.Status;
-            var a = verificationSendResult.IsCompleted;
-            var reseExceptiont = verificationSendResult.Exception;
-            return true;
-        }
-        else
-        {
+			var resStartStatus = verificationSendResult.Result;
+			var b = resStartStatus.Status;
+			var resResult = verificationSendResult.Status;
+			var a = verificationSendResult.IsCompleted;
+			var reseExceptiont = verificationSendResult.Exception;
+			return true;
+		}
+		else
+		{
 
-            var resStartStatus = verificationSendResult.Status;
-            var resResult = verificationSendResult.Status;
-            var reseExceptiont = verificationSendResult.Exception;
+			var resStartStatus = verificationSendResult.Status;
+			var resResult = verificationSendResult.Status;
+			var reseExceptiont = verificationSendResult.Exception;
 
-            return false;
-        }
+			return false;
+		}
 
 
 
 
-    }
+	}
 
-    public bool LoginSend(string number, string message)
-    {
-        var verificationSendResult = VerifySendSmsAsync(number, 635330, new VerifySendParameter[] { new VerifySendParameter("LOGINCODE", message) });
-        Thread.Sleep(2000);
-        if (verificationSendResult.IsCompletedSuccessfully)
-        {
+	public bool LoginSend(string number, string message)
+	{
+		var verificationSendResult = VerifySendSmsAsync(number, 635330, new VerifySendParameter[] { new VerifySendParameter("LOGINCODE", message) });
+		Thread.Sleep(2000);
+		if (verificationSendResult.IsCompletedSuccessfully)
+		{
 
-            var resStartStatus = verificationSendResult.Result;
-            var b = resStartStatus.Status;
-            var resResult = verificationSendResult.Status;
-            var a = verificationSendResult.IsCompleted;
-            var reseExceptiont = verificationSendResult.Exception;
-            return true;
-        }
-        else
-        {
+			var resStartStatus = verificationSendResult.Result;
+			var b = resStartStatus.Status;
+			var resResult = verificationSendResult.Status;
+			var a = verificationSendResult.IsCompleted;
+			var reseExceptiont = verificationSendResult.Exception;
+			return true;
+		}
+		else
+		{
 
-            var resStartStatus = verificationSendResult.Status;
-            var resResult = verificationSendResult.Status;
-            var reseExceptiont = verificationSendResult.Exception;
+			var resStartStatus = verificationSendResult.Status;
+			var resResult = verificationSendResult.Status;
+			var reseExceptiont = verificationSendResult.Exception;
 
-            return false;
-        }
-    }
+			return false;
+		}
+	}
 
-    public async Task<SentSmsViewModel> SendVerifyCodeToClient(string number, string code)
-    {
-        var result = new SentSmsViewModel();
-        var sendResult = await VerifySendSmsAsync(number, 768382, new VerifySendParameter[] { new VerifySendParameter("VerificationCode", code) });
-        Thread.Sleep(2000);
+	public async Task<SentSmsViewModel> SendVerifyCodeToClient(string number, string code)
+	{
+		var result = new SentSmsViewModel();
+		var sendResult = await VerifySendSmsAsync(number, 768382, new VerifySendParameter[] { new VerifySendParameter("VerificationCode", code) });
+		Thread.Sleep(2000);
 
-        if (sendResult.Message == "موفق")
-        {
-            var status = sendResult.Status;
-            var message = sendResult.Message;
-            var messaeId = sendResult.Data.MessageId;
-            return result.Succedded(status, message, messaeId);
-        }
-        else
-        {
-            var status = sendResult.Status;
-            var message = sendResult.Message;
-            var messaeId = sendResult.Data.MessageId;
-            return result.Failed(status, message, messaeId);
-        }
-    }
+		if (sendResult.Message == "موفق")
+		{
+			var status = sendResult.Status;
+			var message = sendResult.Message;
+			var messaeId = sendResult.Data.MessageId;
+			return result.Succedded(status, message, messaeId);
+		}
+		else
+		{
+			var status = sendResult.Status;
+			var message = sendResult.Message;
+			var messaeId = sendResult.Data.MessageId;
+			return result.Failed(status, message, messaeId);
+		}
+	}
 
-    public bool SendAccountsInfo(string number, string fullName, string userName)
-    {
+	public bool SendAccountsInfo(string number, string fullName, string userName)
+	{
 
-        var checkLength = fullName.Length;
-        if (checkLength > 25)
-            fullName = fullName.Substring(0, 24);
+		var checkLength = fullName.Length;
+		if (checkLength > 25)
+			fullName = fullName.Substring(0, 24);
 
-        var sendResult = VerifySendSmsAsync(number, 725814, new VerifySendParameter[] { new VerifySendParameter("FULLNAME", fullName), new VerifySendParameter("USERNAME", userName), new VerifySendParameter("PASSWORD", userName) });
+		var sendResult = VerifySendSmsAsync(number, 725814, new VerifySendParameter[] { new VerifySendParameter("FULLNAME", fullName), new VerifySendParameter("USERNAME", userName), new VerifySendParameter("PASSWORD", userName) });
 
 
-        Console.WriteLine(userName + " - " + sendResult.Result.Status);
-        if (sendResult.IsCompletedSuccessfully)
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
+		Console.WriteLine(userName + " - " + sendResult.Result.Status);
+		if (sendResult.IsCompletedSuccessfully)
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
 
-    }
+	}
 
-    public async Task<ApiResultViewModel> GetByMessageId(int messId)
-    {
+	public async Task<ApiResultViewModel> GetByMessageId(int messId)
+	{
 
-        SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
-        var response = await smsIr.GetReportAsync(messId);
-        MessageReportResult messages = response.Data;
+		SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+		var response = await smsIr.GetReportAsync(messId);
+		MessageReportResult messages = response.Data;
 
-        var appendData = new ApiResultViewModel()
-        {
-            MessageId = messages.MessageId,
-            LineNumber = messages.LineNumber,
-            Mobile = messages.Mobile,
-            MessageText = messages.MessageText,
-            SendUnixTime = UnixTimeStampToDateTime(messages.SendDateTime),
-            DeliveryState = DeliveryStatus(messages.DeliveryState),
-            DeliveryUnixTime = UnixTimeStampToDateTime(messages.DeliveryDateTime),
-            DeliveryColor = DeliveryColorStatus(messages.DeliveryState),
-        };
-        return appendData;
-    }
-    public async Task<List<ApiResultViewModel>> GetApiResult(string startDate, string endDate)
-    {
-        var st = new DateTime(2024, 6, 2);
-        var ed = new DateTime(2024, 7, 1);
-        if (!string.IsNullOrWhiteSpace(startDate) && startDate.Length == 10)
-        {
-            st = startDate.ToGeorgianDateTime();
-        }
-        if (!string.IsNullOrWhiteSpace(endDate) && endDate.Length == 10)
-        {
-            ed = endDate.ToGeorgianDateTime();
-        }
-        var res = new List<ApiResultViewModel>();
-        Int32 unixTimestamp = (int)st.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
-        Int32 unixTimestamp2 = (int)ed.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
-        //   int? fromDateUnixTime = null; // unix time - for instance: 1700598600
-        //int? toDateUnixTime = null; // unix time - for instance: 1703190600
-        int pageNumber = 2;
-        int pageSize = 100; // max: 100
-        SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
-        var response = await smsIr.GetArchivedReportAsync(pageNumber, pageSize, unixTimestamp, unixTimestamp2);
+		var appendData = new ApiResultViewModel()
+		{
+			MessageId = messages.MessageId,
+			LineNumber = messages.LineNumber,
+			Mobile = messages.Mobile,
+			MessageText = messages.MessageText,
+			SendUnixTime = UnixTimeStampToDateTime(messages.SendDateTime),
+			DeliveryState = DeliveryStatus(messages.DeliveryState),
+			DeliveryUnixTime = UnixTimeStampToDateTime(messages.DeliveryDateTime),
+			DeliveryColor = DeliveryColorStatus(messages.DeliveryState),
+		};
+		return appendData;
+	}
+	public async Task<List<ApiResultViewModel>> GetApiResult(string startDate, string endDate)
+	{
+		var st = new DateTime(2024, 6, 2);
+		var ed = new DateTime(2024, 7, 1);
+		if (!string.IsNullOrWhiteSpace(startDate) && startDate.Length == 10)
+		{
+			st = startDate.ToGeorgianDateTime();
+		}
+		if (!string.IsNullOrWhiteSpace(endDate) && endDate.Length == 10)
+		{
+			ed = endDate.ToGeorgianDateTime();
+		}
+		var res = new List<ApiResultViewModel>();
+		Int32 unixTimestamp = (int)st.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
+		Int32 unixTimestamp2 = (int)ed.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
+		//   int? fromDateUnixTime = null; // unix time - for instance: 1700598600
+		//int? toDateUnixTime = null; // unix time - for instance: 1703190600
+		int pageNumber = 2;
+		int pageSize = 100; // max: 100
+		SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+		var response = await smsIr.GetArchivedReportAsync(pageNumber, pageSize, unixTimestamp, unixTimestamp2);
 
-        MessageReportResult[] messages = response.Data;
-        foreach (var message in messages)
-        {
-            var appendData = new ApiResultViewModel()
-            {
-                MessageId = message.MessageId,
-                LineNumber = message.LineNumber,
-                Mobile = message.Mobile,
-                MessageText = message.MessageText,
-                SendUnixTime = UnixTimeStampToDateTime(message.SendDateTime),
-                DeliveryState = DeliveryStatus(message.DeliveryState),
-                DeliveryUnixTime = UnixTimeStampToDateTime(message.DeliveryDateTime),
-                DeliveryColor = DeliveryColorStatus(message.DeliveryState),
-            };
-            res.Add(appendData);
-        }
+		MessageReportResult[] messages = response.Data;
+		foreach (var message in messages)
+		{
+			var appendData = new ApiResultViewModel()
+			{
+				MessageId = message.MessageId,
+				LineNumber = message.LineNumber,
+				Mobile = message.Mobile,
+				MessageText = message.MessageText,
+				SendUnixTime = UnixTimeStampToDateTime(message.SendDateTime),
+				DeliveryState = DeliveryStatus(message.DeliveryState),
+				DeliveryUnixTime = UnixTimeStampToDateTime(message.DeliveryDateTime),
+				DeliveryColor = DeliveryColorStatus(message.DeliveryState),
+			};
+			res.Add(appendData);
+		}
 
 
-        return res;
-    }
+		return res;
+	}
 
-    public string DeliveryStatus(byte? dv)
-    {
-        string mess = "";
-        switch (dv)
-        {
-            case 1:
-                mess = "رسیده به گوشی";
-                break;
-            case 2:
-                mess = "نرسیده به گوشی";
-                break;
-            case 3:
-                mess = "پردازش در مخابرات";
-                break;
-            case 4:
-                mess = "نرسیده به مخابرات";
-                break;
-            case 5:
-                mess = "سیده به مخابرات";
-                break;
-            case 6:
-                mess = "خطا";
-                break;
-            case 7:
-                mess = "لیست سیاه";
-                break;
-            default:
-                mess = "";
-                break;
+	public string DeliveryStatus(byte? dv)
+	{
+		string mess = "";
+		switch (dv)
+		{
+			case 1:
+				mess = "رسیده به گوشی";
+				break;
+			case 2:
+				mess = "نرسیده به گوشی";
+				break;
+			case 3:
+				mess = "پردازش در مخابرات";
+				break;
+			case 4:
+				mess = "نرسیده به مخابرات";
+				break;
+			case 5:
+				mess = "سیده به مخابرات";
+				break;
+			case 6:
+				mess = "خطا";
+				break;
+			case 7:
+				mess = "لیست سیاه";
+				break;
+			default:
+				mess = "";
+				break;
 
-        }
+		}
 
-        return mess;
-    }
-    public string DeliveryColorStatus(byte? dv)
-    {
-        string mess = "";
-        switch (dv)
-        {
-            case 1:
-                mess = "successSend";
-                break;
-            case 2:
-                mess = "errSend";
-                break;
-            case 3:
-                mess = "pSend";
-                break;
-            case 4:
-                mess = "noSend";
-                break;
-            case 5:
-                mess = "itcSend";
-                break;
-            case 6:
-                mess = "redSend";
-                break;
-            case 7:
-                mess = "blockSend";
-                break;
-            default:
-                mess = "";
-                break;
+		return mess;
+	}
+	public string DeliveryColorStatus(byte? dv)
+	{
+		string mess = "";
+		switch (dv)
+		{
+			case 1:
+				mess = "successSend";
+				break;
+			case 2:
+				mess = "errSend";
+				break;
+			case 3:
+				mess = "pSend";
+				break;
+			case 4:
+				mess = "noSend";
+				break;
+			case 5:
+				mess = "itcSend";
+				break;
+			case 6:
+				mess = "redSend";
+				break;
+			case 7:
+				mess = "blockSend";
+				break;
+			default:
+				mess = "";
+				break;
 
-        }
+		}
 
-        return mess;
-    }
-    public string UnixTimeStampToDateTime(int? unixTimeStamp)
-    {
-        if (unixTimeStamp != null)
-        {
-            // Unix timestamp is seconds past epoch
-            DateTime dateTime = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
-            dateTime = dateTime.AddSeconds(Convert.ToDouble(unixTimeStamp)).ToLocalTime();
-            var time = dateTime.ToFarsiFull();
-            return time;
-        }
+		return mess;
+	}
+	public string UnixTimeStampToDateTime(int? unixTimeStamp)
+	{
+		if (unixTimeStamp != null)
+		{
+			// Unix timestamp is seconds past epoch
+			DateTime dateTime = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
+			dateTime = dateTime.AddSeconds(Convert.ToDouble(unixTimeStamp)).ToLocalTime();
+			var time = dateTime.ToFarsiFull();
+			return time;
+		}
 
-        return "";
-    }
-    private string GetToken()
-    {
-        return "";
-        //var smsSecrets = _configuration.GetSection("SmsSecrets");
-        //var tokenService = new Token();
-        //return tokenService.GetToken("x-api-key", "Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
-    }
+		return "";
+	}
+	private string GetToken()
+	{
+		return "";
+		//var smsSecrets = _configuration.GetSection("SmsSecrets");
+		//var tokenService = new Token();
+		//return tokenService.GetToken("x-api-key", "Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+	}
 
-    #region Mahan
+	#region Mahan
 
-    public async Task<double> GetCreditAmount()
-    {
-        try
-        {
-            var credit = await SmsIr.GetCreditAsync();
-            return (double)credit.Data;
-        }
-        catch
-        {
-            return -1;
-        }
+	public async Task<double> GetCreditAmount()
+	{
+		try
+		{
+			var credit = await SmsIr.GetCreditAsync();
+			return (double)credit.Data;
+		}
+		catch
+		{
+			return -1;
+		}
 
-    }
+	}
 
-    public async Task<bool> SendInstitutionCreationVerificationLink(string number, string fullName, Guid institutionId, long contractingPartyId, long institutionContractId, string typeOfSms)
-    {
+	public async Task<bool> SendInstitutionCreationVerificationLink(string number, string fullName, Guid institutionId, long contractingPartyId, long institutionContractId, string typeOfSms)
+	{
         typeOfSms = string.IsNullOrWhiteSpace(typeOfSms) ? "لینک تاییدیه ایجاد قرارداد مالی" : typeOfSms;
-
-
+      
+        
         var full = fullName;
-        var fullName1 = fullName;
-        if (fullName.Length >= 25)
-        {
-            fullName1 = fullName.Substring(0, 25);
-        }
-        var fullName2 = "";
-        if (full.Length > 25)
-        {
-            fullName2 = full.Substring(25);
-            if (fullName2.Length > 25)
-            {
-                fullName2 = fullName2.Substring(0, 25);
-            }
-        }
-        var guidStr = institutionId.ToString();
-        var firstPart = guidStr.Substring(0, 15);
-        var secondPart = guidStr.Substring(15);
-        var verificationSendResult = await VerifySendSmsAsync(number, 527519, new VerifySendParameter[]
-        {
-            new("FULLNAME1", fullName1),
-            new("FULLNAME2", fullName2),
-            new("CODE1",firstPart),
-            new("CODE2",secondPart)
-        });
+		var fullName1 = fullName;
+		if (fullName.Length >= 25)
+		{
+			fullName1 = fullName.Substring(0, 25);
+		}
+		var fullName2 = "";
+		if (full.Length > 25)
+		{
+			fullName2 = full.Substring(25);
+			if (fullName2.Length>25)
+			{
+				fullName2 = fullName2.Substring(0, 25);
+			}
+		}
+		var guidStr = institutionId.ToString();
+		var firstPart = guidStr.Substring(0, 15);
+		var secondPart = guidStr.Substring(15);
+		var verificationSendResult = await VerifySendSmsAsync(number, 527519, new VerifySendParameter[]
+		{
+			new("FULLNAME1", fullName1),
+			new("FULLNAME2", fullName2),
+			new("CODE1",firstPart),
+			new("CODE2",secondPart)
+		});
+       
 
-        if (verificationSendResult.Status == 1)
-        {
-            _logger.LogInformation("ارسال لینک قراداد مالی موفق بود");
-        }
-        else
-        {
-            _logger.LogError("خطا در ارسال لینک قراداد مالی");
-        }
         var smsResult = new SmsResult(verificationSendResult.Data.MessageId, verificationSendResult.Message, typeOfSms,
-             fullName, number, contractingPartyId, institutionContractId);
-        await _smsResultRepository.CreateAsync(smsResult);
-        await _smsResultRepository.SaveChangesAsync();
-        _logger.LogInformation("ذخیره در دیتابیس موفق بود");
-        return verificationSendResult.Status == 0;
-    }
+			 fullName, number, contractingPartyId, institutionContractId);
+		await _smsResultRepository.CreateAsync(smsResult);
+		await _smsResultRepository.SaveChangesAsync();
+		return verificationSendResult.Status == 0;
+	}
 
-    public async Task<bool> SendInstitutionAmendmentVerificationLink(string number, string fullName, Guid institutionId,
-        long contractingPartyId, long institutionContractId)
-    {
-        var guidStr = institutionId.ToString();
-        var firstPart = guidStr.Substring(0, 15);
-        var secondPart = guidStr.Substring(15);
-        var verificationSendResult = await VerifySendSmsAsync(number, 527519, new VerifySendParameter[]
-        {
-            new("FULLNAME", fullName),
-            new("CODE1",firstPart),
-            new("CODE2",secondPart)
-        });
-        var smsResult = new SmsResult(verificationSendResult.Data.MessageId, verificationSendResult.Message, "لینک تاییدیه ارتقا قرارداد مالی",
-            fullName, number, contractingPartyId, institutionContractId);
-        await _smsResultRepository.CreateAsync(smsResult);
-        await _smsResultRepository.SaveChangesAsync();
-        return verificationSendResult.Status == 0;
-    }
+	public async Task<bool> SendInstitutionAmendmentVerificationLink(string number, string fullName, Guid institutionId,
+		long contractingPartyId, long institutionContractId)
+	{
+		var guidStr = institutionId.ToString();
+		var firstPart = guidStr.Substring(0, 15);
+		var secondPart = guidStr.Substring(15);
+		var verificationSendResult = await VerifySendSmsAsync(number, 527519, new VerifySendParameter[]
+		{
+			new("FULLNAME", fullName),
+			new("CODE1",firstPart),
+			new("CODE2",secondPart)
+		});
+		var smsResult = new SmsResult(verificationSendResult.Data.MessageId, verificationSendResult.Message, "لینک تاییدیه ارتقا قرارداد مالی",
+			fullName, number, contractingPartyId, institutionContractId);
+		await _smsResultRepository.CreateAsync(smsResult);
+		await _smsResultRepository.SaveChangesAsync();
+		return verificationSendResult.Status == 0;
+	}
 
-    public async Task<bool> SendInstitutionVerificationCode(string number, string code, string contractingPartyFullName,
-        long contractingPartyId, long institutionContractId)
-    {
-        var verificationSendResult = await VerifySendSmsAsync(number, 965348, new VerifySendParameter[]
-        {
-            new("VERIFYCODE", code)
-        });
+	public async Task<bool> SendInstitutionVerificationCode(string number, string code, string contractingPartyFullName,
+		long contractingPartyId, long institutionContractId)
+	{
+		var verificationSendResult = await VerifySendSmsAsync(number, 965348, new VerifySendParameter[]
+		{
+			new("VERIFYCODE", code)
+		});
 
-        var smsResult = new SmsResult(verificationSendResult.Data.MessageId, verificationSendResult.Message, "کد تاییدیه قرارداد مالی",
-            contractingPartyFullName, number, contractingPartyId, institutionContractId);
-        await _smsResultRepository.CreateAsync(smsResult);
-        await _smsResultRepository.SaveChangesAsync();
-        return verificationSendResult.Status == 0;
-    }
+		var smsResult = new SmsResult(verificationSendResult.Data.MessageId, verificationSendResult.Message, "کد تاییدیه قرارداد مالی",
+			contractingPartyFullName, number, contractingPartyId, institutionContractId);
+		await _smsResultRepository.CreateAsync(smsResult);
+		await _smsResultRepository.SaveChangesAsync();
+		return verificationSendResult.Status == 0;
+	}
 
-    public _0_Framework.Application.Sms.SmsResult TaskReminderSms(string number, string taskCount)
-    {
-        throw new NotImplementedException();
-    }
+	public _0_Framework.Application.Sms.SmsResult TaskReminderSms(string number, string taskCount)
+	{
+		throw new NotImplementedException();
+	}
 
-    #endregion
+	#endregion
 
 
-    #region InstitutionContractSMS
+	#region InstitutionContractSMS
 
-    public async Task<(byte status, string message, int messaeId, bool isSucceded)> MonthlyBillNew(string number, int tamplateId, string fullname, string amount, string code1,
-    string code2)
-    {
+	public async Task<(byte status, string message, int messaeId, bool isSucceded)> MonthlyBillNew(string number, int tamplateId, string fullname, string amount, string code1,
+	string code2)
+	{
 
-        var smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
-        var result = new ValueTuple<byte, string, int, bool>();
-        var sendResult = await smsIr.VerifySendAsync(number, tamplateId,
-            new VerifySendParameter[]
-                { new("FULLNAME", fullname), new("AMOUNT", amount), new("CODE1", code1), new("CODE2", code2) });
-        Thread.Sleep(500);
+		var smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+		var result = new ValueTuple<byte, string, int, bool>();
+		var sendResult = await smsIr.VerifySendAsync(number, tamplateId,
+			new VerifySendParameter[]
+				{ new("FULLNAME", fullname), new("AMOUNT", amount), new("CODE1", code1), new("CODE2", code2) });
+		Thread.Sleep(500);
 
 
-        if (sendResult.Message == "موفق")
-        {
-            _logger.LogInformation("ارسال پیامک یادآور موفق بود");
-            result = (sendResult.Status, sendResult.Message, sendResult.Data.MessageId, true);
-            return result;
-        }
-        _logger.LogError("خطا در ارسال یاد آور");
-        result = (sendResult.Status, sendResult.Message, sendResult.Data.MessageId, false);
-        return result;
+		if (sendResult.Message == "موفق")
+		{
 
-    }
+			result = (sendResult.Status, sendResult.Message, sendResult.Data.MessageId, true);
+			return result;
+		}
 
-    public async Task<(byte status, string message, int messaeId, bool isSucceded)> MonthlyBill(string number, int tamplateId, string fullname, string amount, string id,
-        string aprove)
-    {
+		result = (sendResult.Status, sendResult.Message, sendResult.Data.MessageId, false);
+		return result;
 
-        var smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
-        var result = new ValueTuple<byte, string, int, bool>();
-        var sendResult = await smsIr.VerifySendAsync(number, tamplateId,
-            new VerifySendParameter[]
-                { new("FULLNAME", fullname), new("AMOUNT", amount), new("ID", id), new("APROVE", aprove) });
-        Thread.Sleep(500);
+	}
 
-     
-        if (sendResult.Message == "موفق")
-        {
-            _logger.LogInformation("ارسال پیامک یادآور موفق بود");
-            result = (sendResult.Status, sendResult.Message, sendResult.Data.MessageId, true);
-            return result;
-        }
-        _logger.LogError("خطا در ارسال یاد آور");
-        result = (sendResult.Status, sendResult.Message, sendResult.Data.MessageId, false);
-        return result;
-    }
+	public async Task<(byte status, string message, int messaeId, bool isSucceded)> MonthlyBill(string number, int tamplateId, string fullname, string amount, string id,
+		string aprove)
+	{
 
-    public async Task<(byte status, string message, int messaeId, bool isSucceded)> BlockMessage(string number, string fullname, string amount, string accountType, string id,
-        string aprove)
-    {
-        var tamplateId = 117946;
-        var result = new ValueTuple<byte, string, int, bool>();
-        var smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
-
-        var sendResult = await smsIr.VerifySendAsync(number, tamplateId,
-            new VerifySendParameter[]
-            {
-                new("FULLNAME", fullname), new("AMOUNT", amount), new("ACCOUNTTYPE", accountType), new("ID", id),
-                new("APROVE", aprove)
-            });
-        Thread.Sleep(500);
+		var smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+		var result = new ValueTuple<byte, string, int, bool>();
+		var sendResult = await smsIr.VerifySendAsync(number, tamplateId,
+			new VerifySendParameter[]
+				{ new("FULLNAME", fullname), new("AMOUNT", amount), new("ID", id), new("APROVE", aprove) });
+		Thread.Sleep(500);
 
 
-        if (sendResult.Message == "موفق")
-        {
+		if (sendResult.Message == "موفق")
+		{
 
-            result = (sendResult.Status, sendResult.Message, sendResult.Data.MessageId, true);
-            return result;
-        }
+			result = (sendResult.Status, sendResult.Message, sendResult.Data.MessageId, true);
+			return result;
+		}
 
-        result = (sendResult.Status, sendResult.Message, sendResult.Data.MessageId, false);
-        return result;
-    }
+		result = (sendResult.Status, sendResult.Message, sendResult.Data.MessageId, false);
+		return result;
+	}
 
-    #endregion
+	public async Task<(byte status, string message, int messaeId, bool isSucceded)> BlockMessage(string number, string fullname, string amount, string accountType, string id,
+		string aprove)
+	{
+		var tamplateId = 117946;
+		var result = new ValueTuple<byte, string, int, bool>();
+		var smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+
+		var sendResult = await smsIr.VerifySendAsync(number, tamplateId,
+			new VerifySendParameter[]
+			{
+				new("FULLNAME", fullname), new("AMOUNT", amount), new("ACCOUNTTYPE", accountType), new("ID", id),
+				new("APROVE", aprove)
+			});
+		Thread.Sleep(500);
 
 
-    #region AlarmMessage
+		if (sendResult.Message == "موفق")
+		{
 
-    public async Task<bool> Alarm(string number, string message)
-    {
-        var smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+			result = (sendResult.Status, sendResult.Message, sendResult.Data.MessageId, true);
+			return result;
+		}
 
-        //var bulkSendResult =  smsIr.BulkSendAsync(95007079000006, "your text message", new string[] { "9120000000" });
+		result = (sendResult.Status, sendResult.Message, sendResult.Data.MessageId, false);
+		return result;
+	}
 
-        var verificationSendResult =
-            smsIr.VerifySendAsync(number, 662874, new VerifySendParameter[] { new("ALARM", message) });
-        Thread.Sleep(1000);
-        var status = verificationSendResult.Result.Status;
-        var mess = verificationSendResult.Result.Message;
-        var messaeId = verificationSendResult.Result.Data.MessageId;
-        if (verificationSendResult.IsCompletedSuccessfully) return true;
+	#endregion
 
-        var resStartStatus = verificationSendResult.Result;
-        var resResult = verificationSendResult.Status;
-        var reseExceptiont = verificationSendResult.Exception;
 
-        return false;
-    }
+	#region AlarmMessage
 
-    #endregion
+	public async Task<bool> Alarm(string number, string message)
+	{
+		var smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+
+		//var bulkSendResult =  smsIr.BulkSendAsync(95007079000006, "your text message", new string[] { "9120000000" });
+
+		var verificationSendResult =
+			smsIr.VerifySendAsync(number, 662874, new VerifySendParameter[] { new("ALARM", message) });
+		Thread.Sleep(1000);
+		var status = verificationSendResult.Result.Status;
+		var mess = verificationSendResult.Result.Message;
+		var messaeId = verificationSendResult.Result.Data.MessageId;
+		if (verificationSendResult.IsCompletedSuccessfully) return true;
+
+		var resStartStatus = verificationSendResult.Result;
+		var resResult = verificationSendResult.Status;
+		var reseExceptiont = verificationSendResult.Exception;
+
+		return false;
+	}
+
+	#endregion
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/CreateProject/CreateProjectCommandValidator.cs

@@ -8,6 +8,8 @@ public class CreateProjectCommandValidator:AbstractValidator<CreateProjectComman
     public CreateProjectCommandValidator()
     {
         RuleFor(x => x.Name)
+            .MaximumLength(25)
+            .WithMessage("نام نمیتواند بیشتر از 25 کاراکتر باشد")
             .NotEmpty()
             .NotNull()
             .WithMessage("نام نمیتواند خالی باشد");

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardDetail/ProjectBoardDetailQueryHandler.cs

@@ -8,13 +8,14 @@ namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.Project
 
 public record ProjectBoardDetailQuery(Guid SectionId) : IBaseQuery<ProjectBoardDetailResponse>;
 
-public record ProjectBoardDetailResponse(List<ProjectBoardDetailUserResponse> Users, string TotalTimeMinute,string RemainingTimeMinute );
+public record ProjectBoardDetailResponse(List<ProjectBoardDetailUserResponse> Users, string TotalTime,string RemainingTime );
 
 public record ProjectBoardDetailUserResponse
 {
     public List<ProjectBoardDetailUserHistoryResponse> Histories { get; init; }
     public string UserFullName { get; init; }
-    public string SpentTimeMinute { get; init; }
+    public string TotalTime { get; init; }
+    public string SpentTime { get; init; }
     public long UserId { get; init; }
 }
 
@@ -23,7 +24,7 @@ public record ProjectBoardDetailUserHistoryResponse
     public string Date { get; init; }
     public string startTime { get; init; }
     public string EndTime { get; init; }
-    public string TotalTimeMinute { get; init; }
+    public string TotalTime { get; init; }
 }
 
 public class ProjectBoardDetailQueryHandler : IBaseQueryHandler<ProjectBoardDetailQuery, ProjectBoardDetailResponse>
@@ -67,18 +68,18 @@ public class ProjectBoardDetailQueryHandler : IBaseQueryHandler<ProjectBoardDeta
             {
                 UserId = x.Key,
                 UserFullName = usersDict[x.Key],
-                SpentTimeMinute = ((int)TimeSpan.FromTicks(x.Sum(h=>h.GetTimeSpent().Ticks)).TotalMinutes).ToString(CultureInfo.InvariantCulture),
+                TotalTime = TimeSpan.FromTicks(x.Sum(h=>h.GetTimeSpent().Ticks)).TotalHours.ToString(CultureInfo.InvariantCulture),
                 Histories = x.Select(h => new ProjectBoardDetailUserHistoryResponse()
                 {
                     Date = h.StartDate.ToFarsi(),
                     startTime = h.StartDate.ToString("HH:mm"),
                     EndTime = h.EndDate?.ToString("HH:mm") ?? "-",
-                    TotalTimeMinute = h.GetTimeSpent().TotalMinutes.ToString("F0",CultureInfo.InvariantCulture)
+                    TotalTime = h.GetTimeSpent().ToString(@"hh\:mm")
                 }).ToList()
             };
         }).ToList();
-        var response = new ProjectBoardDetailResponse(users, $"{(int)finalTime.TotalMinutes}",
-            $"{(int)remainingTimeSpan.TotalMinutes:D2}");
+        var response = new ProjectBoardDetailResponse(users, $"{(int)totalActivityTimeSpan.TotalHours}:{totalActivityTimeSpan.Minutes:D2}",
+            $"{(int)remainingTimeSpan.TotalHours}:{remainingTimeSpan.Minutes:D2}");
         return OperationResult<ProjectBoardDetailResponse>.Success(response);
     }
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardList/ProjectBoardListQueryHandler.cs

@@ -22,8 +22,9 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
         CancellationToken cancellationToken)
     {
         var currentUserId = _authHelper.GetCurrentUserId();
+        
         var queryable = _programManagerDbContext.TaskSections.AsNoTracking()
-            .Where(x => x.InitialEstimatedHours > TimeSpan.Zero)
+            .Where(x => x.InitialEstimatedHours > TimeSpan.Zero && x.Status != TaskSectionStatus.Completed)
             .Include(x => x.Task)
             .ThenInclude(x => x.Phase)
             .ThenInclude(x => x.Project)

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectDeployBoardList/ProjectDeployBoardListQueryHandler.cs

@@ -0,0 +1,67 @@
+using System.Xml.Schema;
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectsList;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectDeployBoardList;
+
+public record ProjectDeployBoardListItem()
+{
+    public string ProjectName { get; set; }
+    public string PhaseName { get; set; }
+    public int TotalTasks { get; set; }
+    public int DoneTasks { get; set; }
+    public TimeSpan TotalTimeSpan { get; set; }
+    public TimeSpan DoneTimeSpan { get; set; }
+}
+public record GetProjectsDeployBoardListResponse(List<ProjectDeployBoardListItem> Items);
+
+
+public record GetProjectDeployBoardListQuery():IBaseQuery<GetProjectsDeployBoardListResponse>;
+
+public class ProjectDeployBoardListQueryHandler:IBaseQueryHandler<GetProjectDeployBoardListQuery, GetProjectsDeployBoardListResponse>
+{
+    private readonly IProgramManagerDbContext _dbContext;
+    private readonly IAuthHelper _authHelper;
+
+    
+    public ProjectDeployBoardListQueryHandler(IProgramManagerDbContext dbContext, IAuthHelper authHelper)
+    {
+        _dbContext = dbContext;
+        _authHelper = authHelper;
+    }
+
+    public async Task<OperationResult<GetProjectsDeployBoardListResponse>> Handle(GetProjectDeployBoardListQuery request, CancellationToken cancellationToken)
+    {
+        var userId = _authHelper.GetCurrentUserId();
+        if (userId == null)
+        {
+            return OperationResult<GetProjectsDeployBoardListResponse>.NotFound("کاربر یافت نشد");
+        }
+
+        var query =await _dbContext.TaskSections
+            .Include(x=>x.Task)
+            .ThenInclude(x => x.Phase)
+            .ThenInclude(x => x.Project)
+            .AsNoTracking()
+            .Where(x => x.Status == TaskSectionStatus.Completed
+                        || x.Status == TaskSectionStatus.PendingForCompletion 
+                        || x.Task.Phase.DeployStatus != ProjectDeployStatus.NoTCompleted)
+            .GroupBy(x=>x.Task.PhaseId).ToListAsync(cancellationToken: cancellationToken);
+        
+        var list = query.Select(g => new ProjectDeployBoardListItem
+        {
+            ProjectName = g.First().Task.Phase.Project.Name,
+            PhaseName = g.First().Task.Phase.Name,
+            TotalTasks = g.Select(x => x.TaskId).Distinct().Count(),
+            DoneTasks = g.Where(x => x.Status == TaskSectionStatus.Completed).Select(x => x.TaskId).Distinct().Count(),
+            TotalTimeSpan = TimeSpan.FromHours(g.Sum(x => x.InitialEstimatedHours.TotalHours)),
+            DoneTimeSpan = TimeSpan.FromHours(g.Where(x => x.Status == TaskSectionStatus.Completed).Sum(x => x.InitialEstimatedHours.TotalHours))
+        }).ToList();
+        var response = new GetProjectsDeployBoardListResponse(list);
+        return OperationResult<GetProjectsDeployBoardListResponse>.Success(response);
+    }
+}

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/ProjectPhase.cs

@@ -23,6 +23,7 @@ public class ProjectPhase : ProjectHierarchyNode
         ProjectId = projectId;
         _tasks = new List<ProjectTask>();
         _phaseSections = new List<PhaseSection>();
+        DeployStatus = ProjectDeployStatus.NoTCompleted;
         AddDomainEvent(new PhaseCreatedEvent(Id, projectId, name));
     }
     
@@ -36,6 +37,8 @@ public class ProjectPhase : ProjectHierarchyNode
     public DateTime? StartDate { get; private set; }
     public DateTime? EndDate { get; private set; }
     public int OrderIndex { get; private set; }
+    public bool IsArchived { get; set; }
+    public ProjectDeployStatus DeployStatus { get; set; }
 
     #region Task Management
 
@@ -196,4 +199,26 @@ public class ProjectPhase : ProjectHierarchyNode
     }
 
     #endregion
+    
+    public void SetArchived()
+    {
+        IsArchived = true;
+    }
+    public void SetUnarchived()
+    {
+        IsArchived = false;
+    }
+    public void UpdateDeployStatus(ProjectDeployStatus status)
+    {
+        DeployStatus = status;
+    }
+}
+
+public enum ProjectDeployStatus
+{
+    NoTCompleted,
+    PendingDevDeploy,
+    DevDeployed,
+    PendingDeploy,
+    Deployed
 }

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Enums/TaskSectionStatus.cs

@@ -6,5 +6,6 @@ public enum TaskSectionStatus
     ReadyToStart = 1,      // آماده شروع
     InProgress = 2,        // درحال انجام
     Incomplete = 3,        // ناتمام شده
-    Completed = 4          // تکمیل شده
+    PendingForCompletion = 4, // در انتظار تکمیل
+    Completed = 5          // تکمیل شده
 }

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Events/ProjectEvents.cs

@@ -8,171 +8,171 @@ namespace GozareshgirProgramManager.Domain.ProjectAgg.Events;
 // Project Events
 public record ProjectCreatedEvent(Guid ProjectId, string Name) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record ProjectStatusUpdatedEvent(Guid ProjectId, ProjectStatus Status) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record ProjectAssignedEvent(Guid ProjectId, long UserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record ProjectUnassignedEvent(Guid ProjectId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 // Phase Events
 public record PhaseCreatedEvent(Guid PhaseId, Guid ProjectId, string Name) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record PhaseAddedEvent(Guid PhaseId, Guid ProjectId, string Name) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record PhaseRemovedEvent(Guid PhaseId, Guid ProjectId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record PhaseStatusUpdatedEvent(Guid PhaseId, PhaseStatus Status) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record PhaseAssignedEvent(Guid PhaseId, long UserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record PhaseUnassignedEvent(Guid PhaseId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 // Task Events
 public record TaskCreatedEvent(Guid TaskId, Guid PhaseId, string Name) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record TaskAddedEvent(Guid TaskId, Guid PhaseId, string Name) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record TaskRemovedEvent(Guid TaskId, Guid PhaseId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record TaskStatusUpdatedEvent(Guid TaskId, TaskStatus Status) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record TaskPriorityUpdatedEvent(Guid TaskId, TaskPriority Priority) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record TaskAssignedEvent(Guid TaskId, long UserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record TaskUnassignedEvent(Guid TaskId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record TaskSectionAddedEvent(Guid TaskId, Guid SectionId, Guid SkillId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record TaskSectionRemovedEvent(Guid TaskId, Guid SectionId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 // TaskSection Events
 public record TaskSectionStatusChangedEvent(Guid SectionId, TaskSectionStatus OldStatus,
     TaskSectionStatus NewStatus,long UserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record TaskSectionAssignedEvent(Guid SectionId, long UserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record TaskSectionTransferredEvent(Guid SectionId, long FromUserId, long ToUserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 // Section Events (Legacy - keeping for backward compatibility)
 public record ProjectPhaseAddedEvent(Guid ProjectId, Guid PhaseId, string PhaseName) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record ProjectTaskStatusChangedEvent(Guid SectionId, TaskStatus OldStatus, TaskStatus NewStatus) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record ProjectSectionAddedEvent(Guid SectionId, Guid TaskId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 
 public record ProjectSectionAssignedEvent(Guid SectionId, long UserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record ProjectSectionTransferredEvent(Guid SectionId, long FromUserId, long ToUserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record WorkStartedEvent(Guid SectionId, long UserId, DateTime StartTime, string? Notes) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record WorkStoppedEvent(Guid SectionId, long UserId, DateTime StartTime, DateTime EndTime, TimeSpan Duration, string? Notes) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record ProjectSectionCompletedEvent(Guid ProjectId, long UserId, TimeSpan TotalTimeSpent, string? Notes) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record AdditionalTimeAddedEvent(Guid ProjectId, Guid AdditionalTimeId, TimeSpan Hours, string? Reason, long? AddedByUserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record AdditionalTimeRemovedEvent(Guid ProjectId, Guid AdditionalTimeId, TimeSpan RemovedHours) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
 public record InitialEstimatedTimeUpdatedEvent(Guid ProjectId, TimeSpan OldEstimate, TimeSpan NewEstimate) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
 }

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Migrations/20251227094008_add phase deploy status and is archived.Designer.cs

@@ -0,0 +1,865 @@
+// <auto-generated />
+using System;
+using GozareshgirProgramManager.Infrastructure.Persistence.Context;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace GozareshgirProgramManager.Infrastructure.Migrations
+{
+    [DbContext(typeof(ProgramManagerDbContext))]
+    [Migration("20251227094008_add phase deploy status and is archived")]
+    partial class addphasedeploystatusandisarchived
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "10.0.1")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.CheckoutAgg.Entities.Checkout", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CheckoutEndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("CheckoutStartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<double>("DeductionFromSalary")
+                        .HasColumnType("float");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<int>("MandatoryHours")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Month")
+                        .HasColumnType("int");
+
+                    b.Property<double>("MonthlySalaryDefined")
+                        .HasColumnType("float");
+
+                    b.Property<double>("MonthlySalaryPay")
+                        .HasColumnType("float");
+
+                    b.Property<int>("RemainingHours")
+                        .HasColumnType("int");
+
+                    b.Property<int>("TotalDaysWorked")
+                        .HasColumnType("int");
+
+                    b.Property<int>("TotalHoursWorked")
+                        .HasColumnType("int");
+
+                    b.Property<long>("UserId")
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("Year")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Checkouts", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.CustomerAgg.Customer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Customers", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.PhaseSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("PhaseId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("SkillId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<long>("UserId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PhaseId");
+
+                    b.HasIndex("SkillId");
+
+                    b.ToTable("PhaseSections");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<bool>("HasAssignmentOverride")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.Property<DateTime?>("PlannedEndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("PlannedStartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Projects", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("DeployStatus")
+                        .IsRequired()
+                        .HasMaxLength(30)
+                        .HasColumnType("nvarchar(30)");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<bool>("HasAssignmentOverride")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.Property<int>("OrderIndex")
+                        .HasColumnType("int");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProjectId");
+
+                    b.ToTable("ProjectPhases", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("SkillId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<long>("UserId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProjectId");
+
+                    b.HasIndex("SkillId");
+
+                    b.ToTable("ProjectSections");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectTask", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("AllocatedTime")
+                        .HasMaxLength(30)
+                        .HasColumnType("nvarchar(30)");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<bool>("HasAssignmentOverride")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("HasTimeOverride")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.Property<int>("OrderIndex")
+                        .HasColumnType("int");
+
+                    b.Property<Guid>("PhaseId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PhaseId");
+
+                    b.ToTable("ProjectTasks", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<long>("CurrentAssignedUserId")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("InitialDescription")
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.Property<string>("InitialEstimatedHours")
+                        .IsRequired()
+                        .HasMaxLength(30)
+                        .HasColumnType("nvarchar(30)");
+
+                    b.Property<long>("OriginalAssignedUserId")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SkillId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<Guid>("TaskId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SkillId");
+
+                    b.HasIndex("TaskId");
+
+                    b.ToTable("TaskSections", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSectionActivity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("EndNotes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<long>("UserId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("TaskSectionActivities", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSectionAdditionalTime", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("AddedAt")
+                        .HasColumnType("datetime2");
+
+                    b.Property<long?>("AddedByUserId")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Hours")
+                        .IsRequired()
+                        .HasMaxLength(30)
+                        .HasColumnType("nvarchar(30)");
+
+                    b.Property<string>("Reason")
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.Property<Guid?>("TaskSectionId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TaskSectionId");
+
+                    b.ToTable("TaskSectionAdditionalTimes", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.RoleAgg.Entities.Role", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<long?>("GozareshgirRoleId")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("RoleName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PmRoles", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.SalaryPaymentSettingAgg.Entities.SalaryPaymentSetting", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("EndSettingDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<bool>("HolidayWorking")
+                        .HasColumnType("bit");
+
+                    b.Property<double>("MonthlySalary")
+                        .HasColumnType("float");
+
+                    b.Property<DateTime?>("StartSettingDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<long>("UserId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SalaryPaymentSetting", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.SkillAgg.Entities.Skill", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Skills", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.UserAgg.Entities.User", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<long>("Id"));
+
+                    b.Property<long?>("AccountId")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Mobile")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("nvarchar(20)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)");
+
+                    b.Property<string>("ProfilePhotoPath")
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
+                    b.Property<string>("VerifyCode")
+                        .HasMaxLength(10)
+                        .HasColumnType("nvarchar(10)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Users", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.UserAgg.Entities.UserRefreshToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("ExpiresAt")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("IpAddress")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<DateTime?>("RevokedAt")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.Property<string>("UserAgent")
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.Property<long>("UserId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ExpiresAt");
+
+                    b.HasIndex("Token")
+                        .IsUnique();
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserRefreshTokens", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.PhaseSection", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", "Phase")
+                        .WithMany("PhaseSections")
+                        .HasForeignKey("PhaseId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("GozareshgirProgramManager.Domain.SkillAgg.Entities.Skill", "Skill")
+                        .WithMany()
+                        .HasForeignKey("SkillId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.Navigation("Phase");
+
+                    b.Navigation("Skill");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project", "Project")
+                        .WithMany("Phases")
+                        .HasForeignKey("ProjectId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Project");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectSection", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project", "Project")
+                        .WithMany("ProjectSections")
+                        .HasForeignKey("ProjectId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("GozareshgirProgramManager.Domain.SkillAgg.Entities.Skill", "Skill")
+                        .WithMany()
+                        .HasForeignKey("SkillId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.Navigation("Project");
+
+                    b.Navigation("Skill");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectTask", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", "Phase")
+                        .WithMany("Tasks")
+                        .HasForeignKey("PhaseId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Phase");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSection", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.SkillAgg.Entities.Skill", "Skill")
+                        .WithMany("Sections")
+                        .HasForeignKey("SkillId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectTask", "Task")
+                        .WithMany("Sections")
+                        .HasForeignKey("TaskId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Skill");
+
+                    b.Navigation("Task");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSectionActivity", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSection", "Section")
+                        .WithMany("Activities")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSectionAdditionalTime", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSection", null)
+                        .WithMany("AdditionalTimes")
+                        .HasForeignKey("TaskSectionId");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.RoleAgg.Entities.Role", b =>
+                {
+                    b.OwnsMany("GozareshgirProgramManager.Domain.PermissionAgg.Entities.Permission", "Permissions", b1 =>
+                        {
+                            b1.Property<long>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("bigint");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<long>("Id"));
+
+                            b1.Property<int>("Code")
+                                .HasColumnType("int");
+
+                            b1.Property<long>("RoleId")
+                                .HasColumnType("bigint");
+
+                            b1.HasKey("Id");
+
+                            b1.HasIndex("RoleId");
+
+                            b1.ToTable("PmRolePermissions", (string)null);
+
+                            b1.WithOwner("Role")
+                                .HasForeignKey("RoleId");
+
+                            b1.Navigation("Role");
+                        });
+
+                    b.Navigation("Permissions");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.SalaryPaymentSettingAgg.Entities.SalaryPaymentSetting", b =>
+                {
+                    b.OwnsMany("GozareshgirProgramManager.Domain.SalaryPaymentSettingAgg.Entities.WorkingHours", "WorkingHoursList", b1 =>
+                        {
+                            b1.Property<long>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("bigint");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<long>("Id"));
+
+                            b1.Property<TimeSpan>("EndShiftOne")
+                                .HasColumnType("time(0)");
+
+                            b1.Property<TimeSpan>("EndShiftTwo")
+                                .HasColumnType("time(0)");
+
+                            b1.Property<bool>("HasRestTime")
+                                .HasColumnType("bit");
+
+                            b1.Property<bool>("HasShiftOne")
+                                .HasColumnType("bit");
+
+                            b1.Property<bool>("HasShiftTow")
+                                .HasColumnType("bit");
+
+                            b1.Property<bool>("IsActiveDay")
+                                .HasColumnType("bit");
+
+                            b1.Property<int>("PersianDayOfWeek")
+                                .HasColumnType("int");
+
+                            b1.Property<TimeSpan>("RestTime")
+                                .HasColumnType("time(0)");
+
+                            b1.Property<long>("SalaryPaymentSettingId")
+                                .HasColumnType("bigint");
+
+                            b1.Property<int>("ShiftDurationInMinutes")
+                                .HasColumnType("int");
+
+                            b1.Property<TimeSpan>("StartShiftOne")
+                                .HasColumnType("time(0)");
+
+                            b1.Property<TimeSpan>("StartShiftTwo")
+                                .HasColumnType("time(0)");
+
+                            b1.HasKey("Id");
+
+                            b1.HasIndex("SalaryPaymentSettingId");
+
+                            b1.ToTable("WorkingHours", (string)null);
+
+                            b1.WithOwner("SalaryPaymentSetting")
+                                .HasForeignKey("SalaryPaymentSettingId");
+
+                            b1.Navigation("SalaryPaymentSetting");
+                        });
+
+                    b.Navigation("WorkingHoursList");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.UserAgg.Entities.User", b =>
+                {
+                    b.OwnsMany("GozareshgirProgramManager.Domain.RoleUserAgg.RoleUser", "RoleUser", b1 =>
+                        {
+                            b1.Property<long>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("bigint");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<long>("Id"));
+
+                            b1.Property<long>("RoleId")
+                                .HasColumnType("bigint");
+
+                            b1.Property<long>("UserId")
+                                .HasColumnType("bigint");
+
+                            b1.HasKey("Id");
+
+                            b1.HasIndex("UserId");
+
+                            b1.ToTable("RoleUsers", (string)null);
+
+                            b1.WithOwner("User")
+                                .HasForeignKey("UserId");
+
+                            b1.Navigation("User");
+                        });
+
+                    b.Navigation("RoleUser");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.UserAgg.Entities.UserRefreshToken", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.UserAgg.Entities.User", "User")
+                        .WithMany("RefreshTokens")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project", b =>
+                {
+                    b.Navigation("Phases");
+
+                    b.Navigation("ProjectSections");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", b =>
+                {
+                    b.Navigation("PhaseSections");
+
+                    b.Navigation("Tasks");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectTask", b =>
+                {
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSection", b =>
+                {
+                    b.Navigation("Activities");
+
+                    b.Navigation("AdditionalTimes");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.SkillAgg.Entities.Skill", b =>
+                {
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.UserAgg.Entities.User", b =>
+                {
+                    b.Navigation("RefreshTokens");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Migrations/20251227094008_add phase deploy status and is archived.cs

@@ -0,0 +1,41 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace GozareshgirProgramManager.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class addphasedeploystatusandisarchived : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "DeployStatus",
+                table: "ProjectPhases",
+                type: "nvarchar(30)",
+                maxLength: 30,
+                nullable: false,
+                defaultValue: "");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "IsArchived",
+                table: "ProjectPhases",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "DeployStatus",
+                table: "ProjectPhases");
+
+            migrationBuilder.DropColumn(
+                name: "IsArchived",
+                table: "ProjectPhases");
+        }
+    }
+}

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Migrations/AppDbContextModelSnapshot.cs

@@ -126,7 +126,7 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
 
                     b.HasIndex("SkillId");
 
-                    b.ToTable("PhaseSections", (string)null);
+                    b.ToTable("PhaseSections");
                 });
 
             modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project", b =>
@@ -179,6 +179,11 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("DeployStatus")
+                        .IsRequired()
+                        .HasMaxLength(30)
+                        .HasColumnType("nvarchar(30)");
+
                     b.Property<string>("Description")
                         .HasMaxLength(1000)
                         .HasColumnType("nvarchar(1000)");
@@ -189,6 +194,9 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.Property<bool>("HasAssignmentOverride")
                         .HasColumnType("bit");
 
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("bit");
+
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(200)
@@ -238,7 +246,7 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
 
                     b.HasIndex("SkillId");
 
-                    b.ToTable("ProjectSections", (string)null);
+                    b.ToTable("ProjectSections");
                 });
 
             modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectTask", b =>

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Mappings/ProjectPhaseMapping.cs

@@ -48,6 +48,9 @@ public class ProjectPhaseMapping : IEntityTypeConfiguration<ProjectPhase>
         builder.Property(ph => ph.HasAssignmentOverride)
             .IsRequired();
 
+        builder.Property(x => x.DeployStatus)
+            .HasConversion<string>().HasMaxLength(30);
+
         // Relationship with Project
         builder.HasOne(ph => ph.Project)
             .WithMany(p => p.Phases)

ServiceHost/Areas/Admin/Controllers/ProgramManager/ProjectController.cs

@@ -12,6 +12,7 @@ using GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectA
 using GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectsList;
 using GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectBoardDetail;
 using GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectBoardList;
+using GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectDeployBoardList;
 using GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectSetTimeDetails;
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
@@ -112,4 +113,11 @@ public class ProjectController : ProgramManagerBaseController
         var res = await _mediator.Send(query);
         return res;
     }
+
+    [HttpGet("deploy-board")]
+    public async Task<ActionResult<OperationResult<GetProjectsDeployBoardListResponse>>> GetProjectDeployBoard()
+    {
+        var request = new GetProjectDeployBoardListQuery();
+        return await _mediator.Send(request);
+    }
 }

ServiceHost/Areas/Admin/Controllers/ServiceAmountsManagement.cs

@@ -1,63 +0,0 @@
-using _0_Framework.Application;
-using AccountManagement.Application.Contracts.Ticket;
-using CompanyManagment.App.Contracts.InstitutionPlan;
-using CompanyManagment.App.Contracts.Workshop;
-using Microsoft.AspNetCore.Mvc;
-using ServiceHost.BaseControllers;
-
-namespace ServiceHost.Areas.Admin.Controllers;
-
-public class ServiceAmountsManagement : AdminBaseController
-{
-    private readonly IInstitutionPlanApplication _institutionPlanApplication;
-    private readonly IAuthHelper _authHelper;
-
-    public ServiceAmountsManagement(IInstitutionPlanApplication institutionPlanApplication, IAuthHelper authHelper)
-    {
-        _institutionPlanApplication = institutionPlanApplication;
-        _authHelper = authHelper;
-    }
-
-
-    /// <summary>
-    /// دریافت دیتای مودال ایجاد
-    /// </summary>
-    /// <returns></returns>
-    [HttpGet("GetCreateModalData")]
-    public async Task<ActionResult<CreateServiceAmountDto>> GetCreateModalData()
-    {
-        if(!_authHelper.HasPermission(315))
-            return Forbid();
-        var data = await _institutionPlanApplication.GetCreateModalData();
-
-        return data;
-    }
-
-    /// <summary>
-    /// ذخیره درصدها
-    /// </summary>
-    /// <param name="command"></param>
-    /// <returns></returns>
-    [HttpPost("CreateServicePercentage")]
-    public async Task<ActionResult<OperationResult>> CreateServicePercentage([FromBody] CreateServiceAmountDto command)
-    {
-
-        if (!_authHelper.HasPermission(315))
-            return Forbid();
-
-        var result = await _institutionPlanApplication.CreateInstitutionPlanPercentage(command);
-
-        return result;
-    }
-
-    /// <summary>
-    /// دریافت لیست مبالغ سرویس ها
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    [HttpGet("GetList")]
-    public async Task<ActionResult<PagedResult<InstitutionPlanListDto>>> GetList(InstitutionPlanSearchModel searchModel)
-    {
-        return await _institutionPlanApplication.GetList(searchModel);
-    }
-}

ServiceHost/Areas/Admin/Controllers/institutionContractController.cs

@@ -235,8 +235,7 @@ public class institutionContractController : AdminBaseController
         if (balance == "0")
         {
             result = _institutionContractApplication.DeActive(id);
-            if (result.IsSuccedded)
-                result = _institutionContractApplication.DeActiveAllConnections(id);
+            if (result.IsSuccedded) result = _institutionContractApplication.DeActiveAllConnections(id);
         }
         else
         {
@@ -333,6 +332,21 @@ public class institutionContractController : AdminBaseController
         });
     }
 
+    /// <summary>
+    /// دانلود اکسل
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("excel")]
+    public IActionResult OnGetDownloadExcel()
+    {
+        var institutionContractViewModels =
+            _institutionContractApplication.NewSearch(new() { IsActiveString = "both", TypeOfContract = "both" });
+        var bytes = InstitutionContractExcelGenerator.GenerateExcel(institutionContractViewModels);
+        return File(bytes,
+            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+            $"قرارداد های مالی.xlsx");
+    }
+
     [HttpPost("create/inquiry")]
     public async Task<ActionResult<OperationResult<ContractingPartyTempViewModel>>> CreateInquiry(
         [FromBody] CreateInquiryRequest request)
@@ -795,39 +809,11 @@ public class institutionContractController : AdminBaseController
     }
 
     [HttpPost("mannual-verify/{id}")]
-    public async Task<ActionResult<OperationResult>> VerifyInstitutionContractManually(long id)
+    public async Task<ActionResult<OperationResult>> VerifyInstitutionContractMannualy(long id)
     {
         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");
-    }
 }
 
 

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

@@ -2,7 +2,6 @@
 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;
@@ -39,7 +38,6 @@ public class IndexModel : PageModel
 	private readonly IInstitutionContractApplication _institutionContract;
 	private readonly ILeftWorkApplication _leftWorkApplication;
 	private readonly IRepresentativeApplication _representativeApplication;
-	private readonly IInstitutionContractRepository _institutionContractRepository;
 
 
 	private readonly string _viewName;
@@ -62,7 +60,7 @@ public class IndexModel : PageModel
 		IPersonalContractingPartyApp contractingPartyApplication,
 		IRepresentativeApplication representativeApplication, IInstitutionContractApplication institutionContract,
 		ILeftWorkApplication leftWorkApplication
-		, IContactInfoApplication contactInfoApplication, IAccountApplication accountApplication, IInstitutionContractRepository institutionContractRepository)
+		, IContactInfoApplication contactInfoApplication, IAccountApplication accountApplication)
 
 	{
 		_workshopApplication = workshopApplication;
@@ -73,7 +71,6 @@ public class IndexModel : PageModel
 		_leftWorkApplication = leftWorkApplication;
 		_contactInfoApplication = contactInfoApplication;
 		_accountApplication = accountApplication;
-		_institutionContractRepository = institutionContractRepository;
 	}
 
 	public string Message { get; set; }
@@ -923,27 +920,12 @@ public class IndexModel : PageModel
 		});
 	}
 
-    public async Task<IActionResult> OnGetDownloadExcel()
+    public IActionResult OnGetDownloadExcel()
     {
-	    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);
+        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);
         return File(bytes,
             "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
             $"قرارداد های مالی.xlsx");

ServiceHost/Areas/Admin/Pages/Company/SmsResult/_SmsSettingPartials/_CreateSmsSetting.cshtml

@@ -43,9 +43,6 @@
             case TypeOfSmsSetting.Warning:
                 <h5 class="modal-title">ایجاد پیامک هشدار قضائی</h5>
                 break;
-            case TypeOfSmsSetting.InstitutionContractConfirm:
-                <h5 class="modal-title">ایجاد پیامک یادآور تایید قراداد</h5>
-                break;
         }
     }
   

ServiceHost/Areas/Admin/Pages/Company/SmsResult/_SmsSettingPartials/_EditSmsSetting.cshtml

@@ -41,10 +41,6 @@
             case TypeOfSmsSetting.Warning:
                 <h5 class="modal-title">ویرایش پیامک هشدار قضائی</h5>
                 break;
-            case TypeOfSmsSetting.InstitutionContractConfirm:
-                <h5 class="modal-title">ویرایش پیامک یادآور تایید قراداد</h5>
-                break;
-
         }
     }
     <button type="button" class="close" data-dismiss="modal" aria-label="بستن">
@@ -104,8 +100,8 @@
                  success: function (response) {
                      if(response.isSuccess){
                         $.Notification.autoHideNotify('success', 'top center', 'پیام سیستم ', response.message);
-                          
-                                $('.close').click();
+                          $('.close').click();
+
                            setTimeout(function () {
                                 if(modelTypeOfSmsSetting == '@TypeOfSmsSetting.InstitutionContractDebtReminder'){
                                     $('#institutionContractDebtReminderTab').click();
@@ -118,16 +114,14 @@
                                }else if(modelTypeOfSmsSetting == '@TypeOfSmsSetting.Warning'){
                                    $('#warningTab').click();
 
-                               }else if(modelTypeOfSmsSetting == '@TypeOfSmsSetting.InstitutionContractConfirm'){
-                              
+                               }else if(typeOfSmsSetting == '@TypeOfSmsSetting.InstitutionContractConfirm'){
                                    $('#institutionContractConfirmTab').click();
 
                                }
 
-                             
 
-                           }, 700);
-                     
+
+                           }, 500);
                      }else{
                        $.Notification.autoHideNotify('error', 'top center', 'پیام سیستم ', response.message);
                      }

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

@@ -74,8 +74,8 @@
 </form>
 <div class="lineDiv"></div>
 <div class="row m-t-20">
-    <div class="col-md-4 visible-md visible-lg"></div>
-    <div class="col-6 col-md-2">
+    <div class="col-4"></div>
+    <div class="col-2">
         <form asp-page-handler="UploadFrontEnd" id="12" method="post">
             <button type="submit"
                     class="btn btn-danger"
@@ -84,14 +84,14 @@
             </button>
         </form>
     </div>
-    <div class="col-6 col-md-2">
+    <div class="col-2">
         <button type="button" class="btn btn-outline-secondary"
                 data-bs-toggle="modal"
                 data-bs-target="#logModal">
             مشاهده لاگ Deploy
         </button>
     </div>
-    <div class="col-md-4 visible-md visible-lg"></div>
+    <div class="col-4"></div>
 </div>
 <div class="lineDiv"></div>
 

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

@@ -14,6 +14,7 @@ using Company.Domain.PaymentTransactionAgg;
 using Company.Domain.RewardAgg;
 using Company.Domain.RollCallAgg.DomainService;
 using CompanyManagement.Infrastructure.Excel.WorkshopsRollCall;
+using CompanyManagement.Infrastructure.Excel.Checkout.AsghaeeAzarWorkshops;
 using CompanyManagment.App.Contracts.AndroidApkVersion;
 using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.PaymentTransaction;
@@ -52,7 +53,6 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         private readonly IOnlinePayment _onlinePayment;
         private readonly IFaceEmbeddingService _faceEmbeddingService;
         private readonly IAuthHelper _authHelper;
-        private readonly IInstitutionContractApplication _institutionContractApplication;
 
 
         [BindProperty] public IFormFile File { get; set; }
@@ -78,8 +78,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         public IndexModel(IAndroidApkVersionApplication application, IRollCallDomainService rollCallDomainService,
             CompanyContext context, AccountContext accountContext, IHttpClientFactory httpClientFactory,
             IOptions<AppSettingConfiguration> appSetting,
-            ITemporaryClientRegistrationApplication clientRegistrationApplication, IOnlinePayment onlinePayment,
-            IFaceEmbeddingService faceEmbeddingService, IAuthHelper authHelper, IInstitutionContractApplication institutionContractApplication)
+            ITemporaryClientRegistrationApplication clientRegistrationApplication, IOnlinePayment onlinePayment, IFaceEmbeddingService faceEmbeddingService, IAuthHelper authHelper)
         {
             _application = application;
             _rollCallDomainService = rollCallDomainService;
@@ -90,7 +89,6 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
             _onlinePayment = onlinePayment;
             _faceEmbeddingService = faceEmbeddingService;
             _authHelper = authHelper;
-            _institutionContractApplication = institutionContractApplication;
             _paymentGateway = new SepehrPaymentGateway(httpClientFactory);
         }
 
@@ -156,59 +154,33 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
             //await UpdateInstitutionContract();
             //await UpdateFaceEmbeddingNames();
             //await SetInstitutionContractSigningType();
-            await ReActivateInstitution();
+            var data = OnGetExportAsghaeeAzarWorkshops();
+            return File(data, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+                "AsghaeeAzarWorkshops.xlsx");
             ViewData["message"] = "تومام یک";
             return Page();
         }
 
-        private async System.Threading.Tasks.Task ReActivateInstitution()
-        {
-            var blueInstitutionContracts = await _context.InstitutionContractSet.Where(x =>
-                x.IsActiveString == "blue").ToListAsync();
-
-
-            var blueContracts = new List<InstitutionContract>();
-
-            foreach (var blueContract in blueInstitutionContracts)
-            {
-                var verifiedContracts = await _context.InstitutionContractSet
-                    .Where(x => x.ContractingPartyId == blueContract.ContractingPartyId
-                                && x.VerificationStatus == InstitutionContractVerificationStatus.Verified
-                                && x.ContractStartGr > blueContract.ContractEndGr)
-                    .ToListAsync();
-
-                if (verifiedContracts.Any())
-                {
-                    blueContracts.Add(blueContract);
-                }
-            }
-
-            foreach (var institutionContract in blueContracts)
-            {
-                institutionContract.DeActive();
-                _institutionContractApplication.ReActiveAllAfterCreateNew(institutionContract.ContractingPartyId);
-            }
-        }
-
         private async System.Threading.Tasks.Task SetInstitutionContractSigningType()
         {
             var query = _context.InstitutionContractSet
-                .Where(x => x.VerificationStatus != InstitutionContractVerificationStatus.PendingForVerify);
-
-
-            var otpSigned = query.Where(x => x.VerifierFullName != null && x.LawId != 0).ToList();
+                .Where(x=>x.VerificationStatus != InstitutionContractVerificationStatus.PendingForVerify);
+            
+            
+            var otpSigned = query.Where(x=>x.VerifierFullName != null && x.LawId != 0).ToList();
             foreach (var institutionContract in otpSigned)
             {
                 institutionContract.SetSigningType(InstitutionContractSigningType.OtpBased);
             }
-
-            var lagacySigned = query.Where(x => x.VerifierFullName == null && x.LawId == 0).ToList();
+            var lagacySigned = query.Where(x=>x.VerifierFullName == null && x.LawId == 0).ToList();
             foreach (var institutionContract in lagacySigned)
             {
                 institutionContract.SetSigningType(InstitutionContractSigningType.Legacy);
             }
 
             await _context.SaveChangesAsync();
+
+
         }
 
         public async Task<IActionResult> OnPostShiftDateNew2()
@@ -358,51 +330,30 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
             //TranslateCode(result?.ErrorCode);
             return Page();
         }
-
         [DisableConcurrentExecution(timeoutInSeconds: 120)]
         public async Task<IActionResult> OnPostUploadFrontEnd(CancellationToken cancellationToken)
         {
             var validAccountId = _authHelper.CurrentAccountId();
             if (validAccountId == 2 || validAccountId == 322)
             {
-                //var batPath = @"C:\next-ui\deploy-next-ui.bat";
-
-                //var psi = new ProcessStartInfo
-                //{
-                //    FileName = batPath,
-                //    UseShellExecute = true,   // خیلی مهم
-                //    Verb = "runas",           // اجرای Administrator
-                //    CreateNoWindow = true,
-                //    WindowStyle = ProcessWindowStyle.Hidden
-                //};
-
-                //Process.Start(psi);
+                var batPath = @"C:\next-ui\deploy-next-ui.bat";
 
                 var psi = new ProcessStartInfo
                 {
-                    FileName = "cmd.exe",
-                    Arguments = "/c schtasks /run /tn \"DeployNextUI\"",
-                    UseShellExecute = false,
-                    CreateNoWindow = true
+                    FileName = batPath,
+                    UseShellExecute = true,   // خیلی مهم
+                    Verb = "runas",           // اجرای Administrator
+                    CreateNoWindow = true,
+                    WindowStyle = ProcessWindowStyle.Hidden
                 };
 
                 Process.Start(psi);
 
-                //var psi = new ProcessStartInfo
-                //{
-                //    FileName = @"C:\next-ui\deploy-next-ui.bat",
-                //    UseShellExecute = false,
-                //    CreateNoWindow = false
-                //};
-
-                //Process.Start(psi);
-
-
                 TempData["Message"] = "فرآیند Deploy شروع شد. لاگ را بررسی کنید.";
                 return RedirectToPage();
             }
-
             return Forbid();
+
         }
 
         /// <summary>
@@ -428,10 +379,13 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
                     {
                         contractingPartyIdList.Add(employer.Employer.ContractingPartyId);
                     }
+
                 }
 
                 if (contractingPartyIdList.Count > 0)
                 {
+
+
                     if (contractingPartyIdList.Count == 1)
                     {
                         workshop.AddContractingPartyId(contractingPartyIdList[0]);
@@ -452,6 +406,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
 
             ViewData["message"] = "آی دی های طرف حساب اضافه شد";
             return Page();
+
         }
 
         /// <summary>
@@ -470,8 +425,8 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
                 var content = System.IO.File.ReadAllText(logPath, Encoding.UTF8);
                 return Content(content);
             }
-
             return Content("شما مجاز به دیدن لاگ نیستید");
+
         }
 
 
@@ -1084,7 +1039,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
                         x.PersonnelCount,
                         x.Price, x.InstitutionContractWorkshopGroupId,
                         group,
-                        x.WorkshopId.Value, x.id);
+                        x.WorkshopId.Value,x.id);
                     entity.SetEmployers(x.Employers.Select(e => e.EmployerId).ToList());
 
                     return entity;
@@ -1160,6 +1115,28 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         }
 
         #endregion
+
+        #region Excel
+
+        /// <summary>
+        /// خروجی اکسل آقایی آذر ورکشاپ
+        /// </summary>
+        /// <returns></returns>
+        private byte[] OnGetExportAsghaeeAzarWorkshops()
+        {
+            var data = _context.CheckoutSet
+                .Where(x => x.WorkshopId == 768 && x.Month =="آذر"  && x.Year =="1404")
+                .Select(x => new AsghaeeAzarWorkshopsExcelViewModel()
+                {
+                    FinalAmount = x.TotalPayment.ToMoney(),
+                    FullName = x.EmployeeFullName,
+                    NationalCode = x.NationalCode
+                }).ToList();
+
+            return AsghaeeAzarWorkshopsExcelGenerator.Generate(data);
+        }
+
+        #endregion
     }
 
     public class IndexModel2 : PageModel

ServiceHost/Areas/Client/Controllers/ContractController.cs

@@ -1,39 +0,0 @@
-using _0_Framework.Application;
-using Company.Domain.ContractAgg;
-using CompanyManagment.App.Contracts.Contract;
-using Microsoft.AspNetCore.Mvc;
-using ServiceHost.BaseControllers;
-
-namespace ServiceHost.Areas.Client.Controllers;
-
-public class ContractController:ClientBaseController
-{
-    private readonly IContractApplication _contractApplication;
-
-    public ContractController(IContractApplication contractApplication)
-    {
-        _contractApplication = contractApplication;
-    }
-
-    [HttpGet]
-    public async Task<ActionResult<PagedResult<GetContractListForClientResponse>>> GetList(
-        GetContractListForClientRequest searchModel)
-    {
-        var res = await _contractApplication
-            .GetContractListForClient(searchModel);
-
-        return res;
-    }
-    [HttpGet("print/{id}")]
-    public async Task<ActionResult<ContractPrintViewModel>> PrintOne(long id)
-    {
-        var res = await _contractApplication.PrintOneAsync(id);
-        return res;
-    }
-    [HttpGet("print")]
-    public async Task<ActionResult<List<ContractPrintViewModel>>> PrintAll([FromQuery] List<long> ids)
-    {
-        var res = await _contractApplication.PrintAllAsync(ids);
-        return res;
-    }
-}

ServiceHost/Areas/Client/Controllers/EmployeeController.cs

@@ -1,25 +0,0 @@
-using _0_Framework.Application;
-using CompanyManagment.App.Contracts.Employee;
-using Microsoft.AspNetCore.Mvc;
-using ServiceHost.BaseControllers;
-
-namespace ServiceHost.Areas.Client.Controllers;
-
-public class EmployeeController:ClientBaseController
-{
-    private readonly IEmployeeApplication _employeeApplication;
-    private readonly long _workshopId;
-
-    public EmployeeController(IEmployeeApplication employeeApplication,IAuthHelper authHelper)
-    {
-        _employeeApplication = employeeApplication;
-        _workshopId = authHelper.GetWorkshopId();
-    }
-    
-    [HttpGet("select-list")]
-    public async Task<ActionResult<List<EmployeeSelectListViewModel>>> GetEmployeeSelectList()
-    {
-        var result = await _employeeApplication.WorkedEmployeesInWorkshopSelectList(_workshopId);
-        return result;
-    }
-}

ServiceHost/Areas/Client/Controllers/InsuranceController.cs

@@ -19,15 +19,4 @@ public class InsuranceController:ClientBaseController
         var insurances =await _insuranceListApplication.GetInsuranceClientList(searchModel);
         return Ok(insurances);
     }
-
-    [HttpGet("print-one")]
-    public async Task<ActionResult<InsuranceClientPrintViewModel>> ClientPrintList(long id)
-    {
-        InsuranceClientPrintViewModel res = await _insuranceListApplication.ClientPrintOne(id);
-        return res;
-    }
-}
-
-public class InsuranceClientViewModel
-{
 }

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,
-        });
-
-    }
-
-}

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

@@ -293,9 +293,9 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall
             });
         }
 
-        public async Task<IActionResult> OnPostReCalculateValues(List<ReCalculateRollCallValues> command)
+        public IActionResult OnPostReCalculateValues(List<ReCalculateRollCallValues> command)
         {
-	        var result =await _rollCallApplication.RecalculateValues(_workshopId, command);
+	        var result = _rollCallApplication.RecalculateValues(_workshopId, command);
 
 			return new JsonResult(new
 			{

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

@@ -91,9 +91,9 @@
 		</span>
 	</a>
 	<ul class="submenu">
-		<li Permission="@SubAccountPermissionHelper.ContractListPermissionCode"><a class="selectLi" href="https://client@(AppSetting.Value.Domain)/contract-list"><span>لیست قرارداد</span></a></li>
+		<li Permission="@SubAccountPermissionHelper.ContractListPermissionCode"><a class="selectLi" asp-page="/Company/Contracts/Index"><span>لیست قرارداد</span></a></li>
 		<li Permission="@SubAccountPermissionHelper.CheckoutListPermissionCode"><a class="selectLi" asp-page="/Company/Checkouts/Index"><span>لیست فیش حقوقی</span></a></li>
-					<li Permission="@SubAccountPermissionHelper.InsuranceListPermissionCode"><a class="selectLi" href="https://client@(AppSetting.Value.Domain)/insurance-list"><span>لیست بیمه</span></a></li>
+		<li Permission="@SubAccountPermissionHelper.InsuranceListPermissionCode"><a class="selectLi" asp-page="/Company/InsuranceList/Index"><span>لیست بیمه</span></a></li>
 		<li Permission="@SubAccountPermissionHelper.PersonnelStatusIndividualReportPermissionCode"><a class="selectLi disable" @*onclick="AjaxUrlContentModal('@Url.Page("/Company/Employees/Index", "ContractCheckoutStatus")');"*@><span>گزارش وضعیت انفرادی پرسنل</span></a></li>
 		<li Permission="@SubAccountPermissionHelper.PersonnelStatusGroupReportPermissionCode"><a class="selectLi disable" @*onclick="AjaxUrlContentModal('@Url.Page("/Company/Workshop/Index", "ContractCheckoutYearlyStatus")');"*@><span>گزارش وضعیت گروهی پرسنل</span></a></li>
 	</ul>

ServiceHost/Controllers/GeneralController.cs

@@ -75,7 +75,7 @@ public class GeneralController : GeneralBaseController
     }
 
     [HttpGet("/api/callback"), HttpPost("/api/callback")]
-    public async Task<IActionResult> Verify([FromForm]SepehrGatewayPayResponse payResponse)
+    public async Task<IActionResult> Verify(SepehrGatewayPayResponse payResponse)
     {
         if (!long.TryParse(payResponse.invoiceid, out var paymentTransactionId))
         {
@@ -133,12 +133,7 @@ public class GeneralController : GeneralBaseController
             DigitalReceipt = payResponse.digitalreceipt
         };
 
-        
         var verifyRes = await _paymentGateway.Verify(verifyCommand, CancellationToken.None);
-#if DEBUG
-        verifyRes.IsSuccess = true;
-#endif
-
         _financialInvoiceApplication.SetPaid(financialInvoiceId, DateTime.Now);
 
         if (verifyRes.IsSuccess)
@@ -163,18 +158,14 @@ public class GeneralController : GeneralBaseController
                 payResponse.cardnumber, payResponse.issuerbank, payResponse.rrn.ToString(),
                 payResponse.digitalreceipt);
 
-            if (financialInvoice.Items?.Any(x =>
-                    x.Type is FinancialInvoiceItemType.BuyInstitutionContract
-                        or FinancialInvoiceItemType.BuyInstitutionContractInstallment) ?? false)
+            if (financialInvoice.Items?.Any(x => x.Type is FinancialInvoiceItemType.BuyInstitutionContract or FinancialInvoiceItemType.BuyInstitutionContractInstallment) ?? false)
             {
                 var financialItems = financialInvoice.Items
                     .Where(x => x.Type == FinancialInvoiceItemType.BuyInstitutionContract);
                 foreach (var editFinancialInvoiceItem in financialItems)
                 {
-                    await _institutionContractApplication.SetPendingWorkflow(editFinancialInvoiceItem.EntityId,
-                        InstitutionContractSigningType.OtpBased);
+                    await _institutionContractApplication.SetPendingWorkflow(editFinancialInvoiceItem.EntityId,InstitutionContractSigningType.OtpBased);
                 }
-
                 var financialInstallmentItems = financialInvoice.Items
                     .Where(x => x.Type == FinancialInvoiceItemType.BuyInstitutionContractInstallment);
 
@@ -183,8 +174,7 @@ public class GeneralController : GeneralBaseController
                     var institutionContractId =
                         await _institutionContractApplication.GetIdByInstallmentId(
                             editFinancialInvoiceItem.EntityId);
-                    await _institutionContractApplication.SetPendingWorkflow(institutionContractId,
-                        InstitutionContractSigningType.OtpBased);
+                    await _institutionContractApplication.SetPendingWorkflow(institutionContractId,InstitutionContractSigningType.OtpBased);
                 }
             }
 

ServiceHost/Program.cs

@@ -289,7 +289,6 @@ 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",