fix: correct spelling of 'Month' and enhance insurance client list retrieval with additional properties

Company.Domain/InstitutionContractAgg/InstitutionContract.cs

@@ -98,11 +98,6 @@ public class InstitutionContract : EntityBase
     // مبلغ قرارداد
     public double ContractAmount { get; private set; }
 
-    public double ContractAmountWithTax => !IsOldContract  ? ContractAmount + ContractAmountTax
-        : ContractAmount;
-    
-    public double ContractAmountTax => ContractAmount*0.10;
-
     //خسارت روزانه
     public double DailyCompenseation { get; private set; }
 
@@ -164,10 +159,6 @@ public class InstitutionContract : EntityBase
 
     public List<InstitutionContractAmendment> Amendments { get; private set; }
 
-    public InstitutionContractSigningType? SigningType { get; private set; }
-
-    public bool IsOldContract => LawId== 0;
-
     public InstitutionContract()
     {
         ContactInfoList = [];
@@ -271,10 +262,6 @@ public class InstitutionContract : EntityBase
     {
         WorkshopGroup = null;
     }
-    public void SetSigningType(InstitutionContractSigningType signingType)
-    {
-        SigningType = signingType;
-    }
 }
 
 public class InstitutionContractAmendment : EntityBase

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopCurrent.cs

@@ -10,15 +10,13 @@ public class InstitutionContractWorkshopCurrent:InstitutionContractWorkshopBase
     public InstitutionContractWorkshopCurrent(string workshopName, bool hasRollCallPlan,
         bool hasRollCallPlanInPerson, bool hasCustomizeCheckoutPlan, bool hasContractPlan,
         bool hasContractPlanInPerson, bool hasInsurancePlan, bool hasInsurancePlanInPerson,
-        int personnelCount, double price,long institutionContractWorkshopGroupId,
+        int personnelCount, double price,long institutionContractWorkshopGroupId,InstitutionContractWorkshopGroup workshopGroup,long workshopId) : base(workshopName, hasRollCallPlan, 
-        InstitutionContractWorkshopGroup workshopGroup,long workshopId,long initialWorkshopId) : base(workshopName, hasRollCallPlan, 
         hasRollCallPlanInPerson, hasCustomizeCheckoutPlan, hasContractPlan,
         hasContractPlanInPerson, hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, price)
     {
         InstitutionContractWorkshopGroupId = institutionContractWorkshopGroupId;
         WorkshopGroup = workshopGroup;
         WorkshopId = workshopId;
-        InitialWorkshopId = initialWorkshopId;
     }
     public long InstitutionContractWorkshopGroupId { get; private set; }
     public InstitutionContractWorkshopGroup WorkshopGroup { get; private set; }

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopGroup.cs

@@ -37,10 +37,4 @@ public class InstitutionContractWorkshopGroup : EntityBase
         CurrentWorkshops = updatedDetails.ToList();
         LastModifiedDate = DateTime.Now;
     }
-
-    public void AddCurrentWorkshop(InstitutionContractWorkshopCurrent currentWorkshop)
-    {
-        CurrentWorkshops.Add(currentWorkshop);
-        LastModifiedDate = DateTime.Now;
-    }
 }

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopInitial.cs

@@ -31,7 +31,7 @@ public class InstitutionContractWorkshopInitial:InstitutionContractWorkshopBase
         WorkshopCreated = true;
         WorkshopCurrent = new InstitutionContractWorkshopCurrent(WorkshopName,Services.RollCall,Services.RollCallInPerson,
             Services.CustomizeCheckout,Services.Contract,Services.ContractInPerson,Services.Insurance,
-            Services.InsuranceInPerson,PersonnelCount,Price,InstitutionContractWorkshopGroupId,WorkshopGroup,workshopId,id);
+            Services.InsuranceInPerson,PersonnelCount,Price,InstitutionContractWorkshopGroupId,WorkshopGroup,workshopId);
         WorkshopCurrent.SetEmployers(Employers.Select(x=>x.EmployerId).ToList());
     }
 

Company.Domain/InsuranceListAgg/IInsuranceListRepository.cs

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

Company.Domain/WorkshopAgg/Workshop.cs

@@ -316,10 +316,7 @@ public class Workshop : EntityBase
         IsStaticCheckout = isStaticCheckout;
     }
 
-    public void AddContractingPartyId(long contractingPartyId)
+
-    {
-        ContractingPartyId = contractingPartyId;
-    }
     public void Active(string archiveCode)
     {
         this.IsActive = true;

CompanyManagment.App.Contracts/InstitutionContract/ContractSigningType.cs

@@ -1,17 +0,0 @@
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public enum InstitutionContractSigningType
-{ 
-    /// <summary>
-    /// قدیمی
-    /// </summary>
-    Legacy = 0,
-    /// <summary>
-    /// الکترونیکی با کد یکبار مصرف
-    /// </summary>
-    OtpBased = 1,
-    /// <summary>
-    /// به صورت فیزیکی
-    /// </summary>
-    Physical = 2
-}

CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Application.Sms;
 using CompanyManagment.App.Contracts.Checkout;
+using CompanyManagment.App.Contracts.Law;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using CompanyManagment.App.Contracts.Workshop;
 using CompanyManagment.App.Contracts.WorkshopPlan;
@@ -259,13 +260,154 @@ public interface IInstitutionContractApplication
     /// <returns></returns>
     Task<InstitutionContractPrintViewModel> PrintOneAsync(long id);
 
-    Task<OperationResult> SetPendingWorkflow(long entityId,InstitutionContractSigningType signingType);
+    Task<OperationResult> SetPendingWorkflow(long entityId);
     Task<long> GetIdByInstallmentId(long installmentId);
-    /// <summary>
-    /// تایید قرارداد مالی به صورت دستی
-    /// </summary>
-    /// <param name="institutionContractId"></param>
-    /// <returns></returns>
-    Task<OperationResult> VerifyInstitutionContractManually(long institutionContractId);
 
+}
+
+public class InstitutionContractDiscountResponse
+{
+    public InstitutionContractDiscountOneTimeViewModel OneTime { get; set; }
+    public InstitutionContractDiscountMonthlyViewModel Monthly { get; set; }
+}
+
+public class InstitutionContractDiscountMonthlyViewModel:InstitutionContractDiscountOneTimeViewModel
+{
+    public List<MonthlyInstallment> Installments { get; set; }
+}
+
+public class InstitutionContractDiscountOneTimeViewModel
+{
+    /// <summary>
+    /// مجموع مبالغ
+    /// </summary>
+    public string TotalAmount { get; set; }
+    /// <summary>
+    /// ارزش افزوده
+    /// </summary>
+    public string Tax { get; set; }
+    /// <summary>
+    /// مبلغ قابل پرداخت
+    /// </summary>
+    public string PaymentAmount { get; set; }
+    
+    public string DiscountedAmount { get; set; }
+    
+    public int DiscountPercetage { get; set; }
+
+    public string Obligation { get; set; }
+    
+    public string OneMonthAmount { get; set; }
+}
+
+public class InstitutionContractResetDiscountForCreateRequest
+{
+    public int DiscountPercentage { get; set; }
+    public double TotalAmount { get; set; }
+    public bool IsInstallment { get; set; }
+    public InstitutionContractDuration Duration { get; set; }
+    public double OneMonthAmount { get; set; }
+}
+
+public class InstitutionContractSetDiscountForExtensionRequest
+{
+    public Guid TempId { get; set; }
+    public int DiscountPercentage { get; set; }
+    public double TotalAmount { get; set; }
+    public bool IsInstallment { get; set; }
+}
+public class InstitutionContractResetDiscountForExtensionRequest
+{
+    public Guid TempId { get; set; }
+    public bool IsInstallment { get; set; }
+}
+
+
+public class InstitutionContractSetDiscountRequest
+{
+    public int DiscountPercentage { get; set; }
+    public double TotalAmount { get; set; }
+    public InstitutionContractDuration Duration { get; set; }
+    public double OneMonthAmount { get; set; }
+    public bool IsInstallment { get; set; }
+}
+
+public class InstitutionContractPrintViewModel
+{
+    public InstitutionContratVerificationParty FirstParty { get; set; }
+    public InstitutionContratVerificationParty SecondParty { get; set; }
+    public string ContractNo { get; set; }
+    public string CreationDate { get; set; }
+    public string ContractStart { get; set; }
+    public string ContractEnd { get; set; }
+    public List<GetInstitutionVerificationDetailsWorkshopsViewModel> Workshops { get; set; }
+    public string TotalPrice { get; set; }
+    public string TaxPrice { get; set; }
+    public string PaymentPrice { get; set; }
+    public string VerifyCode { get; set; }
+    public string VerifyDate { get; set; }
+    public string VerifyTime { get; set; }
+    public string VerifierFullName { get; set; }
+    public string VerifierPhoneNumber { get; set; }
+    public LawViewModel LawViewModel { get; set; }
+    public string Obligation { get; set; }
+}
+
+public class InsertAmendmentTempWorkshopResponse
+{
+    public Guid WorkshopTempId { get; set; }
+    public string Amount { get; set; }
+}
+
+public class InstitutionContractAmendmentWorkshopsResponse
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public List<InstitutionContractAmendmentTempWorkshopViewModel> Workshops { get; set; }
+
+    public Guid TempId { get; set; }
+
+}
+
+public class InstitutionContractSelectListViewModel : SelectListViewModel;
+
+public class InstitutionContractExtensionInquiryResponse
+{
+    public long Id { get; set; }
+    public string FName { get; set; }
+    public string LName { get; set; }
+    public string DateOfBirthFa { get; set; }
+    public string FatherName { get; set; }
+    public string IdNumberSerial { get; set; }
+    public string IdNumber { get; set; }
+    public string Address { get; set; }
+    public string Phone { get; set; }
+    public string City { get; set; }
+    public string State { get; set; }
+    public long RepresentativeId { get; set; }
+    public string NationalCode { get; set; }
+}
+
+
+
+public class InstitutionContractExtensionPaymentMonthly:InstitutionContractExtensionPaymentOneTime
+{
+    public List<MonthlyInstallment> Installments { get; set; }
+}
+
+public class InstitutionContractExtensionPaymentOneTime
+{
+    /// <summary>
+    /// مجموع مبالغ
+    /// </summary>
+    public string TotalAmount { get; set; }
+    /// <summary>
+    /// ارزش افزوده
+    /// </summary>
+    public string Tax { get; set; }
+    /// <summary>
+    /// مبلغ قابل پرداخت
+    /// </summary>
+    public string PaymentAmount { get; set; }
 }

CompanyManagment.App.Contracts/InstitutionContract/InsertAmendmentTempWorkshopResponse.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InsertAmendmentTempWorkshopResponse
-{
-    public Guid WorkshopTempId { get; set; }
-    public string Amount { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractAmendmentWorkshopsResponse.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractAmendmentWorkshopsResponse
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public List<InstitutionContractAmendmentTempWorkshopViewModel> Workshops { get; set; }
-
-    public Guid TempId { get; set; }
-
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractDiscountResponse.cs

@@ -1,38 +0,0 @@
-using System.Collections.Generic;
-using CompanyManagment.App.Contracts.TemporaryClientRegistration;
-
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractDiscountResponse
-{
-    public InstitutionContractDiscountOneTimeViewModel OneTime { get; set; }
-    public InstitutionContractDiscountMonthlyViewModel Monthly { get; set; }
-}
-public class InstitutionContractDiscountMonthlyViewModel:InstitutionContractDiscountOneTimeViewModel
-{
-    public List<MonthlyInstallment> Installments { get; set; }
-}
-
-public class InstitutionContractDiscountOneTimeViewModel
-{
-    /// <summary>
-    /// مجموع مبالغ
-    /// </summary>
-    public string TotalAmount { get; set; }
-    /// <summary>
-    /// ارزش افزوده
-    /// </summary>
-    public string Tax { get; set; }
-    /// <summary>
-    /// مبلغ قابل پرداخت
-    /// </summary>
-    public string PaymentAmount { get; set; }
-    
-    public string DiscountedAmount { get; set; }
-    
-    public int DiscountPercetage { get; set; }
-
-    public string Obligation { get; set; }
-    
-    public string OneMonthAmount { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionInquiryResponse.cs

@@ -1,18 +0,0 @@
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractExtensionInquiryResponse
-{
-    public long Id { get; set; }
-    public string FName { get; set; }
-    public string LName { get; set; }
-    public string DateOfBirthFa { get; set; }
-    public string FatherName { get; set; }
-    public string IdNumberSerial { get; set; }
-    public string IdNumber { get; set; }
-    public string Address { get; set; }
-    public string Phone { get; set; }
-    public string City { get; set; }
-    public string State { get; set; }
-    public long RepresentativeId { get; set; }
-    public string NationalCode { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionPaymentOneTime.cs

@@ -1,24 +0,0 @@
-using System.Collections.Generic;
-using CompanyManagment.App.Contracts.TemporaryClientRegistration;
-
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractExtensionPaymentMonthly:InstitutionContractExtensionPaymentOneTime
-{
-    public List<MonthlyInstallment> Installments { get; set; }
-}
-public class InstitutionContractExtensionPaymentOneTime
-{
-    /// <summary>
-    /// مجموع مبالغ
-    /// </summary>
-    public string TotalAmount { get; set; }
-    /// <summary>
-    /// ارزش افزوده
-    /// </summary>
-    public string Tax { get; set; }
-    /// <summary>
-    /// مبلغ قابل پرداخت
-    /// </summary>
-    public string PaymentAmount { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractPrintViewModel.cs

@@ -1,28 +0,0 @@
-using System.Collections.Generic;
-using CompanyManagment.App.Contracts.Law;
-
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractPrintViewModel
-{
-    public InstitutionContratVerificationParty FirstParty { get; set; }
-    public InstitutionContratVerificationParty SecondParty { get; set; }
-    public string ContractNo { get; set; }
-    public string CreationDate { get; set; }
-    public string ContractStart { get; set; }
-    public string ContractEnd { get; set; }
-    public List<GetInstitutionVerificationDetailsWorkshopsViewModel> Workshops { get; set; }
-    public string TotalPrice { get; set; }
-    public string TaxPrice { get; set; }
-    public string PaymentPrice { get; set; }
-    public string OneMonthPrice { get; set; }
-    public string VerifyCode { get; set; }
-    public string VerifyDate { get; set; }
-    public string VerifyTime { get; set; }
-    public string VerifierFullName { get; set; }
-    public string VerifierPhoneNumber { get; set; }
-    public LawViewModel LawViewModel { get; set; }
-    public string Obligation { get; set; }
-    public string OneMonthWithoutTax { get; set; }
-    public string OneMonthTax { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractResetDiscountForCreateRequest.cs

@@ -1,10 +0,0 @@
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractResetDiscountForCreateRequest
-{
-    public int DiscountPercentage { get; set; }
-    public double TotalAmount { get; set; }
-    public bool IsInstallment { get; set; }
-    public InstitutionContractDuration Duration { get; set; }
-    public double OneMonthAmount { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractResetDiscountForExtensionRequest.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractResetDiscountForExtensionRequest
-{
-    public Guid TempId { get; set; }
-    public bool IsInstallment { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractSelectListViewModel.cs

@@ -1,5 +0,0 @@
-using _0_Framework.Application;
-
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractSelectListViewModel : SelectListViewModel;

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractSetDiscountForExtensionRequest.cs

@@ -1,11 +0,0 @@
-using System;
-
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractSetDiscountForExtensionRequest
-{
-    public Guid TempId { get; set; }
-    public int DiscountPercentage { get; set; }
-    public double TotalAmount { get; set; }
-    public bool IsInstallment { get; set; }
-}

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractSetDiscountRequest.cs

@@ -1,10 +0,0 @@
-namespace CompanyManagment.App.Contracts.InstitutionContract;
-
-public class InstitutionContractSetDiscountRequest
-{
-    public int DiscountPercentage { get; set; }
-    public double TotalAmount { get; set; }
-    public InstitutionContractDuration Duration { get; set; }
-    public double OneMonthAmount { get; set; }
-    public bool IsInstallment { get; set; }
-}

CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs

@@ -5,6 +5,7 @@ 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;
 
@@ -96,6 +97,94 @@ 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
@@ -113,4 +202,11 @@ 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.Application/InstitutionContractApplication.cs

@@ -1537,7 +1537,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         return (await _institutionContractRepository.PrintAllAsync([id])).FirstOrDefault();
     }
 
-    public async Task<OperationResult> SetPendingWorkflow(long entityId,InstitutionContractSigningType signingType)
+    public async Task<OperationResult> SetPendingWorkflow(long entityId)
     {
         var op = new OperationResult();
         var institutionContract = await _institutionContractRepository.GetIncludeWorkshopDetailsAsync(entityId);
@@ -1551,30 +1551,6 @@ public class InstitutionContractApplication : IInstitutionContractApplication
             return op.Failed("وضعیت قرارداد مالی برای این عملیات مناسب نمی باشد");
         }
 
-        var initialCreatedWorkshops = institutionContract.WorkshopGroup.InitialWorkshops
-            .Where(x => x.WorkshopCreated && x.WorkshopId is > 0).ToList();
-        
-        var currentWorkshops = institutionContract.WorkshopGroup.CurrentWorkshops.ToList();
-        foreach (var createdWorkshop in initialCreatedWorkshops)
-        {
-            if (currentWorkshops.Any(x => x.WorkshopId == createdWorkshop.WorkshopId))
-            {
-                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();
@@ -1583,9 +1559,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         {
             institutionContract.SetPendingWorkflow();
         }
-        
+
-        institutionContract.SetSigningType(signingType);
-        
         await _institutionContractRepository.SaveChangesAsync();
         return op.Succcedded();
     }
@@ -1595,28 +1569,6 @@ public class InstitutionContractApplication : IInstitutionContractApplication
 		return await _institutionContractRepository.GetIdByInstallmentId(installmentId);
 	}
 
-    public async Task<OperationResult> VerifyInstitutionContractManually(long institutionContractId)
-    {
-        var op = new OperationResult();
-        
-        var institutionContract =await _institutionContractRepository
-            .GetIncludeWorkshopDetailsAsync(institutionContractId);
-        
-        if (institutionContract == null)
-            return op.Failed("قرارداد مالی یافت نشد");
-        
-        if (institutionContract.VerificationStatus == InstitutionContractVerificationStatus.Verified)
-            return op.Failed("قرارداد مالی قبلا تایید شده است");
-
-        var transaction = await _institutionContractRepository.BeginTransactionAsync();
-        await SetPendingWorkflow(institutionContractId,InstitutionContractSigningType.Physical);
-        
-        
-        await transaction.CommitAsync();
-        await _institutionContractRepository.SaveChangesAsync();
-        return op.Succcedded();
-    }
-
     private async Task<OperationResult<PersonalContractingParty>> CreateLegalContractingPartyEntity(
         CreateInstitutionContractLegalPartyRequest request, long representativeId, string address, string city,
         string state)

CompanyManagment.Application/InsuranceListApplication.cs

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

CompanyManagment.EFCore/Mapping/InstitutionContractMapping.cs

@@ -34,10 +34,6 @@ public class InstitutionContractMapping : IEntityTypeConfiguration<InstitutionCo
         builder.Property(x => x.VerifierPhoneNumber).HasMaxLength(20);
 
         builder.Property(x => x.VerificationStatus).HasConversion<string>().HasMaxLength(122);
-        
-        builder.Property(x=>x.SigningType).HasConversion<string>()
-            .HasMaxLength(25)
-            .IsRequired(false);
 
         builder.HasMany(x => x.Installments)
             .WithOne(x => x.InstitutionContract)
@@ -49,10 +45,5 @@ public class InstitutionContractMapping : IEntityTypeConfiguration<InstitutionCo
 
         builder.HasMany(x => x.Amendments).WithOne(x => x.InstitutionContract)
             .HasForeignKey(x => x.InstitutionContractId);
-
-
-        builder.Ignore(x => x.ContractAmountWithTax);
-        builder.Ignore(x => x.ContractAmountTax);
-        builder.Ignore(x => x.ContractAmountTax);
     }
 }

CompanyManagment.EFCore/Migrations/20251220143403_addsigningTypeforinstitutioncontract.cs

@@ -1,29 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CompanyManagment.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addsigningTypeforinstitutioncontract : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "SigningType",
-                table: "InstitutionContracts",
-                type: "nvarchar(25)",
-                maxLength: 25,
-                nullable: true);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "SigningType",
-                table: "InstitutionContracts");
-        }
-    }
-}

CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs

@@ -3462,10 +3462,6 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(1)
                         .HasColumnType("nvarchar(1)");
 
-                    b.Property<string>("SigningType")
-                        .HasMaxLength(25)
-                        .HasColumnType("nvarchar(25)");
-
                     b.Property<string>("State")
                         .HasMaxLength(20)
                         .HasColumnType("nvarchar(20)");

CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs

@@ -4,7 +4,9 @@ using _0_Framework.Application.Sms;
 using _0_Framework.Exceptions;
 using _0_Framework.InfraStructure;
 using Company.Domain.ContarctingPartyAgg;
+using Company.Domain.ContractingPartyAccountAgg;
 using Company.Domain.empolyerAgg;
+using Company.Domain.FinancialInvoiceAgg;
 using Company.Domain.FinancialStatmentAgg;
 using Company.Domain.FinancialTransactionAgg;
 using Company.Domain.InstitutionContractAgg;
@@ -15,6 +17,7 @@ using Company.Domain.InstitutionPlanAgg;
 using Company.Domain.SmsResultAgg;
 using Company.Domain.WorkshopAgg;
 using CompanyManagment.App.Contracts.Employer;
+using CompanyManagment.App.Contracts.FinancialInvoice;
 using CompanyManagment.App.Contracts.FinancialStatment;
 using CompanyManagment.App.Contracts.FinancilTransaction;
 using CompanyManagment.App.Contracts.Hubs;
@@ -23,17 +26,30 @@ using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
 using CompanyManagment.App.Contracts.Law;
 using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using CompanyManagment.App.Contracts.Workshop;
+using CompanyManagment.App.Contracts.WorkshopPlan;
+using CompanyManagment.EFCore.Migrations;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using MongoDB.Driver;
+using OfficeOpenXml.Packaging.Ionic.Zip;
 using PersianTools.Core;
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Diagnostics;
+using System.Diagnostics.Metrics;
+using System.Drawing;
 using System.Globalization;
 using System.Linq;
+using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
+using static System.Runtime.InteropServices.JavaScript.JSType;
 using ContractingPartyAccount = Company.Domain.ContractingPartyAccountAgg.ContractingPartyAccount;
 using FinancialStatment = Company.Domain.FinancialStatmentAgg.FinancialStatment;
 using String = System.String;
@@ -1359,7 +1375,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     .Count(l => l.StartWorkDate <= DateTime.Now && l.LeftWorkDate >= DateTime.Now);
                 return new GetInstitutionContractListItemsViewModel()
                 {
-                    ContractAmount = x.contract.ContractAmountWithTax,
+                    ContractAmount = x.contract.ContractAmount,
                     Balance = statement?.FinancialTransactionList.Sum(ft => ft.Deptor - ft.Creditor) ?? 0,
                     WorkshopsCount = workshops.Count(),
                     ContractStartFa = x.contract.ContractStartGr.ToFarsi(),
@@ -1379,7 +1395,9 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     Workshops = workshopDetails,
                     IsInPersonContract = x.contract.WorkshopGroup?.CurrentWorkshops
                         .Any(y => y.Services.ContractInPerson) ?? true,
-                    IsOldContract = x.contract.SigningType == InstitutionContractSigningType.Legacy
+                    IsOldContract = x.contract.WorkshopGroup?.CurrentWorkshops == null
+                                    || x.contract.WorkshopGroup.CurrentWorkshops.Count == 0
+                                    || x.contract.WorkshopGroup.CurrentWorkshops.Any(y => y.Price == 0)
                 };
             }).ToList()
         };
@@ -3198,9 +3216,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 PaymentPrice = institution.TotalAmount.ToMoney(),
                 TotalPrice = (institution.TotalAmount - institution.ValueAddedTax).ToMoney(),
                 TaxPrice = institution.ValueAddedTax.ToMoney(),
-                OneMonthPrice = institution.ContractAmountWithTax.ToMoney(),
-                OneMonthWithoutTax = institution.ContractAmount.ToMoney(),
-                OneMonthTax = institution.ContractAmountTax.ToMoney(),
                 VerifierFullName = institution.VerifierFullName,
                 VerifierPhoneNumber = institution.VerifierPhoneNumber,
                 VerifyCode = institution.VerifyCode,
@@ -4758,7 +4773,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             .Where(x => x.Installments.Any(i => i.Id == installmentId))
             .Select(x => x.id).FirstOrDefaultAsync();
     }
-    
 
     #endregion
 

CompanyManagment.EFCore/Repository/InsuranceListRepository.cs

@@ -176,18 +176,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();
                                 }
                             }
-
                         }
                     }
 
@@ -729,7 +731,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 &&
@@ -755,20 +757,21 @@ 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();
@@ -1777,46 +1780,76 @@ 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
-            .Select(x => new InsuranceClientListViewModel
+            .Where(x => x.WorkshopId == workshopId);
-        {
-            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)
+        if (searchModel.Year > 0)
         {
-            query = query.Where(x => x.YearInt == searchModel.Year);
+            query = query.Where(x => x.Year == searchModel.Year.ToString("0000"));
-        } 
+        }
+
         if (searchModel.Month > 0)
         {
-            query = query.Where(x => x.MonthInt == searchModel.Month);
+            query = query.Where(x => x.Month == searchModel.Month.ToString("00"));
         }
 
         var res = new PagedResult<InsuranceClientListViewModel>
         {
             TotalCount = query.Count()
         };
-        query = searchModel.Sorting switch
+        
+        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();
+    
+        
+        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();
+        
+        resList = searchModel.Sorting switch
         {
-            "CreationDate-Max" => query.OrderByDescending(x => x.Id),
+            "CreationDate-Max" => resList.OrderByDescending(x => x.Id).ToList(),
-            "CreationDate-Min" => query.OrderBy(x => x.Id),
+            "CreationDate-Min" => resList.OrderBy(x => x.Id).ToList(),
-            "Month-Max" => query.OrderByDescending(x => x.MonthInt),
+            "Month-Max" => resList.OrderByDescending(x => x.MonthInt).ToList(),
-            "Month-Min" => query.OrderBy(x => x.MonthInt),
+            "Month-Min" => resList.OrderBy(x => x.MonthInt).ToList(),
-            "Year-Max" => query.OrderByDescending(x => x.YearInt),
+            "Year-Max" => resList.OrderByDescending(x => x.YearInt).ToList(),
-            "Year-Min" => query.OrderBy(x => x.YearInt),
+            "Year-Min" => resList.OrderBy(x => x.YearInt).ToList(),
-            _ => query.OrderByDescending(x => x.Id),
+            _ => resList.OrderByDescending(x => x.Id).ToList(),
         };
-        res.List =await query.ApplyPagination(searchModel.PageIndex,searchModel.PageSize).ToListAsync();
+
+       
+        res.List = resList;
         return res;
     }
 
@@ -1846,41 +1879,41 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
             .Include(x => x.LeftWorkInsurances)
             .Where(x => x.LeftWorkInsurances.Any(l => l.StartWorkDate <= firstDayOfMonth &&
                                                       (l.LeftWorkDate == null || l.LeftWorkDate >= firstDayOfMonth)));
-        
-        
-        var query = notCreatedWorkshop.Select(result=>new InsuranceListViewModel
-            {
-                Year = searchModel.Year,
-                Month = searchModel.Month,
-                WorkShopId = result.id,
-                WorkShopCode = result.InsuranceWorkshopInfo != null
-                    ? result.InsuranceWorkshopInfo.InsuranceCode
-                    : result.InsuranceCode,
-                WorkShopName = result.InsuranceWorkshopInfo != null
-                    ? result.InsuranceWorkshopInfo.WorkshopName
-                    : result.WorkshopFullName,
-                TypeOfInsuranceSend = result.TypeOfInsuranceSend == "NormalList" ? "عادی" :
-                    result.TypeOfInsuranceSend == "Govermentlist" ? "کمک دولت" :
-                    result.TypeOfInsuranceSend == "Familylist" ? "خانوادگی" : "",
-                FixedSalary = result.FixedSalary,
-                StrFixedSalary = result.FixedSalary ? "دارد" : "ندارد",
-                EmployerName = result.InsuranceWorkshopInfo != null
-                    ? result.InsuranceWorkshopInfo.EmployerName
-                    : result.WorkshopFullName,
-                Branch = "",
-                City = "",
-                ArchiveCode = result.ArchiveCode,
-            });
-        
-    
-            if (!string.IsNullOrEmpty(searchModel.Month) && searchModel.Month != "0")
-                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)
+        var query = notCreatedWorkshop.Select(result => new InsuranceListViewModel
-                    .ThenByDescending(x => x.WorkShopName).ThenByDescending(x => x.Month);
+        {
-        
+            Year = searchModel.Year,
+            Month = searchModel.Month,
+            WorkShopId = result.id,
+            WorkShopCode = result.InsuranceWorkshopInfo != null
+                ? result.InsuranceWorkshopInfo.InsuranceCode
+                : result.InsuranceCode,
+            WorkShopName = result.InsuranceWorkshopInfo != null
+                ? result.InsuranceWorkshopInfo.WorkshopName
+                : result.WorkshopFullName,
+            TypeOfInsuranceSend = result.TypeOfInsuranceSend == "NormalList" ? "عادی" :
+                result.TypeOfInsuranceSend == "Govermentlist" ? "کمک دولت" :
+                result.TypeOfInsuranceSend == "Familylist" ? "خانوادگی" : "",
+            FixedSalary = result.FixedSalary,
+            StrFixedSalary = result.FixedSalary ? "دارد" : "ندارد",
+            EmployerName = result.InsuranceWorkshopInfo != null
+                ? result.InsuranceWorkshopInfo.EmployerName
+                : result.WorkshopFullName,
+            Branch = "",
+            City = "",
+            ArchiveCode = result.ArchiveCode,
+        });
+
+
+        if (!string.IsNullOrEmpty(searchModel.Month) && searchModel.Month != "0")
+            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.WorkShopCode))
             query = query.Where(x => x.WorkShopCode == searchModel.WorkShopCode).OrderByDescending(x => x.Year)
@@ -1925,41 +1958,112 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
 
 
         var workshopList = await query.Skip(searchModel.PageIndex).Take(30).ToListAsync();
-            var workshopIds = workshopList.Select(x=>x.WorkShopId);
+        var workshopIds = workshopList.Select(x => x.WorkShopId);
-            
+
-              var employers =await _context.WorkshopEmployers
+        var employers = await _context.WorkshopEmployers
-                      .Where(x=>workshopIds.Contains(x.WorkshopId))
+            .Where(x => workshopIds.Contains(x.WorkshopId))
-                      .GroupBy(x=>x.WorkshopId)
+            .GroupBy(x => x.WorkshopId)
-                      .Select(x=>x.First()).ToListAsync();
+            .Select(x => x.First()).ToListAsync();
-              
+
-              var res = workshopList.Select(x =>
+        var res = workshopList.Select(x =>
-              {
+        {
-                  var employer = employers.FirstOrDefault(e => e.WorkshopId ==x.WorkShopId)?.Employer;
+            var employer = employers.FirstOrDefault(e => e.WorkshopId == x.WorkShopId)?.Employer;
-                  
+
-                  return new InsuranceListViewModel
+            return new InsuranceListViewModel
-                  {
+            {
-                      WorkShopId = x.WorkShopId,
+                WorkShopId = x.WorkShopId,
-                      WorkShopCode = x.WorkShopCode,
+                WorkShopCode = x.WorkShopCode,
-                      WorkShopName = x.WorkShopName,
+                WorkShopName = x.WorkShopName,
-                      EmployerName = employer != null
+                EmployerName = employer != null
-                          ? employer.FullName
+                    ? employer.FullName
-                          : (x.EmployerName),
+                    : (x.EmployerName),
-                      Year = searchModel.Year,
+                Year = searchModel.Year,
-                      Month = searchModel.Month,
+                Month = searchModel.Month,
-                      TypeOfInsuranceSend = x.TypeOfInsuranceSend == "NormalList" ? "عادی" :
+                TypeOfInsuranceSend = x.TypeOfInsuranceSend == "NormalList" ? "عادی" :
-                          x.TypeOfInsuranceSend == "Govermentlist" ? "کمک دولت" :
+                    x.TypeOfInsuranceSend == "Govermentlist" ? "کمک دولت" :
-                          x.TypeOfInsuranceSend == "Familylist" ? "خانوادگی" : "",
+                    x.TypeOfInsuranceSend == "Familylist" ? "خانوادگی" : "",
-                      FixedSalary = (bool)x.FixedSalary,
+                FixedSalary = (bool)x.FixedSalary,
-                      StrFixedSalary = (bool)x.FixedSalary ? "دارد" : "ندارد",
+                StrFixedSalary = (bool)x.FixedSalary ? "دارد" : "ندارد",
-                      EmployerId = employer?.id ?? 0,
+                EmployerId = employer?.id ?? 0,
-                      ArchiveCode = x.ArchiveCode,
+                ArchiveCode = x.ArchiveCode,
-                      City = x.City,
+                City = x.City,
-                  };
+            };
-              }).ToList();
+        }).ToList();
 
         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>

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/AutoStopOverTimeTaskSections/AutoStopOverTimeTaskSectionsCommand.cs

@@ -1,49 +0,0 @@
-using GozareshgirProgramManager.Application._Common.Interfaces;
-using GozareshgirProgramManager.Application._Common.Models;
-using GozareshgirProgramManager.Domain._Common;
-using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
-using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
-using Microsoft.EntityFrameworkCore;
-
-namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.AutoStopOverTimeTaskSections;
-
-public record AutoStopOverTimeTaskSectionsCommand : IBaseCommand;
-
-public class AutoStopOverTimeTaskSectionsCommandHandler : IBaseCommandHandler<AutoStopOverTimeTaskSectionsCommand>
-{
-    private readonly ITaskSectionRepository _taskSectionRepository;
-    private readonly IUnitOfWork _unitOfWork;
-
-    public AutoStopOverTimeTaskSectionsCommandHandler(ITaskSectionRepository taskSectionRepository,
-        IUnitOfWork unitOfWork)
-    {
-        _taskSectionRepository = taskSectionRepository;
-        _unitOfWork = unitOfWork;
-    }
-
-    public async Task<OperationResult> Handle(AutoStopOverTimeTaskSectionsCommand request,
-        CancellationToken cancellationToken)
-    {
-        try
-        {
-            // دریافت تمام تسک‌های در حال انجام
-            var taskSections = await _taskSectionRepository.GetActiveSectionsIncludeAllAsync(cancellationToken);
-
-
-            foreach (var taskSection in taskSections)
-            {
-                // استفاده از متد Domain برای بررسی و متوقف کردن خودکار
-                taskSection.AutoStopIfOverTime();
-            }
-
-            // ذخیره تغییرات در دیتابیس
-            await _unitOfWork.SaveChangesAsync(cancellationToken);
-
-            return OperationResult.Success();
-        }
-        catch (Exception ex)
-        {
-            return OperationResult.Failure($"خطا در ناتمام کردن تسک‌های overtime: {ex.Message}");
-        }
-    }
-}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/AutoUpdateDeployStatus/AutoUpdateDeployStatusCommand.cs

@@ -1,52 +0,0 @@
-using System.Linq;
-using GozareshgirProgramManager.Application._Common.Interfaces;
-using GozareshgirProgramManager.Application._Common.Models;
-using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
-using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
-using Microsoft.EntityFrameworkCore;
-
-namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.AutoUpdateDeployStatus;
-
-public record AutoUpdateDeployStatusCommand : IBaseCommand;
-
-public class AutoUpdateDeployStatusCommandHandler : IBaseCommandHandler<AutoUpdateDeployStatusCommand>
-{
-    private readonly IProgramManagerDbContext _dbContext;
-
-    public AutoUpdateDeployStatusCommandHandler(IProgramManagerDbContext dbContext)
-    {
-        _dbContext = dbContext;
-    }
-
-    public async Task<OperationResult> Handle(AutoUpdateDeployStatusCommand request,
-        CancellationToken cancellationToken)
-    {
-        // Fetch all sections whose phase is still marked as not completed
-        var sections = await _dbContext.TaskSections
-            .Include(ts => ts.Task)
-            .ThenInclude(t => t.Phase)
-            .Where(ts => ts.Task.Phase.DeployStatus == ProjectDeployStatus.NotCompleted)
-            .ToListAsync(cancellationToken);
-
-        if (sections.Count == 0)
-            return OperationResult.Success();
-
-        var phasesToUpdate = sections
-            .GroupBy(ts => ts.Task.PhaseId)
-            .Where(g => g.All(s => s.Status == TaskSectionStatus.Completed))
-            .Select(g => g.First().Task.Phase)
-            .Distinct()
-            .ToList();
-
-        if (phasesToUpdate.Count == 0)
-            return OperationResult.Success();
-
-        foreach (var phase in phasesToUpdate)
-        {
-            phase.UpdateDeployStatus(ProjectDeployStatus.PendingDevDeploy);
-        }
-
-        await _dbContext.SaveChangesAsync(cancellationToken);
-        return OperationResult.Success();
-    }
-}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/ChangeDeployStatusProject/ChangeDeployeStatusProjectComand.cs

@@ -1,44 +0,0 @@
-using GozareshgirProgramManager.Application._Common.Interfaces;
-using GozareshgirProgramManager.Application._Common.Models;
-using GozareshgirProgramManager.Domain._Common;
-using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
-using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
-
-namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.ChangeDeployStatusProject;
-
-public record ChangeDeployStatusProjectCommand(Guid PhaseId, ProjectDeployStatus Status):IBaseCommand;
-
-public class ChangeDeployStatusProjectCommandHandler : IBaseCommandHandler<ChangeDeployStatusProjectCommand>
-{
-    private readonly IProjectRepository _projectRepository;
-    private readonly IProjectPhaseRepository _projectPhaseRepository;
-    private readonly IUnitOfWork _unitOfWork;
-
-    public ChangeDeployStatusProjectCommandHandler(IProjectRepository projectRepository, IUnitOfWork unitOfWork, IProjectPhaseRepository projectPhaseRepository)
-    {
-        _projectRepository = projectRepository;
-        _unitOfWork = unitOfWork;
-        _projectPhaseRepository = projectPhaseRepository;
-    }
-
-    public async Task<OperationResult> Handle(ChangeDeployStatusProjectCommand request, CancellationToken cancellationToken)
-    {
-        var project = await _projectPhaseRepository.GetByIdAsync(request.PhaseId, cancellationToken);
-        if (project == null)
-            return OperationResult.NotFound("بخش مورد نظر یافت نشد");
-
-        if (project.DeployStatus == ProjectDeployStatus.NotCompleted)
-        {
-            return OperationResult.Failure("وضعیت استقرار نمی‌تواند از حالت 'تایید نشده' تغییر کند.");
-        }
-
-        if (request.Status == ProjectDeployStatus.NotCompleted)
-        {
-            return OperationResult.Failure("وضعیت استقرار نمی‌تواند به حالت 'تایید نشده' تغییر کند.");
-        }
-        project.UpdateDeployStatus(request.Status);
-
-        await _unitOfWork.SaveChangesAsync(cancellationToken);
-        return OperationResult.Success();
-    }
-}

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

@@ -1,4 +1,3 @@
-using System.Globalization;
 using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Domain._Common;
@@ -8,23 +7,21 @@ namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.Project
 
 public record ProjectBoardDetailQuery(Guid SectionId) : IBaseQuery<ProjectBoardDetailResponse>;
 
-public record ProjectBoardDetailResponse(List<ProjectBoardDetailUserResponse> Users, string TotalTime,string RemainingTime );
+public record ProjectBoardDetailResponse(List<ProjectBoardDetailUserResponse> Users, string TotalTime);
 
 public record ProjectBoardDetailUserResponse
 {
-    public List<ProjectBoardDetailUserHistoryResponse> Histories { get; init; }
+    public List<ProjectBoardDetailUserHistoryResponse> Histories { get; set; } = new();
-    public string UserFullName { get; init; }
+    public string UserFullName { get; set; }
-    public string TotalTime { get; init; }
+    public long UserId { get; set; }
-    public string SpentTime { get; init; }
-    public long UserId { get; init; }
 }
 
-public record ProjectBoardDetailUserHistoryResponse
+public class ProjectBoardDetailUserHistoryResponse
 {
-    public string Date { get; init; }
+    public string Date { get; set; }
-    public string startTime { get; init; }
+    public string startTime { get; set; }
-    public string EndTime { get; init; }
+    public string EndTime { get; set; }
-    public string TotalTime { get; init; }
+    public string TotalTime { get; set; }
 }
 
 public class ProjectBoardDetailQueryHandler : IBaseQueryHandler<ProjectBoardDetailQuery, ProjectBoardDetailResponse>
@@ -41,7 +38,6 @@ public class ProjectBoardDetailQueryHandler : IBaseQueryHandler<ProjectBoardDeta
     {
         var section = await _programManagerDbContext.TaskSections
             .Include(x => x.Activities)
-            .Include(x=>x.AdditionalTimes)
             .FirstOrDefaultAsync(x => x.Id == request.SectionId, cancellationToken: cancellationToken);
         
         if (section == null)
@@ -53,22 +49,16 @@ public class ProjectBoardDetailQueryHandler : IBaseQueryHandler<ProjectBoardDeta
             .Where(x => userIds.Contains(x.Id))
             .ToDictionaryAsync(x => x.Id, x => x.FullName, cancellationToken);
 
-        var totalActivityTimeSpan = section.Activities
+        var totalTimeSpan = section.Activities
             .Select(x => x.GetTimeSpent())
             .Aggregate(TimeSpan.Zero, (sum, next) => sum.Add(next));
         
-        var finalTime = section.FinalEstimatedHours;
-        
-        var remainingTimeSpan = finalTime >= totalActivityTimeSpan
-            ? TimeSpan.FromTicks(finalTime.Ticks - totalActivityTimeSpan.Ticks)
-            : TimeSpan.Zero;
         var users = section.Activities.GroupBy(x => x.UserId).Select(x =>
         {
             return new ProjectBoardDetailUserResponse()
             {
                 UserId = x.Key,
                 UserFullName = usersDict[x.Key],
-                TotalTime = TimeSpan.FromTicks(x.Sum(h=>h.GetTimeSpent().Ticks)).TotalHours.ToString(CultureInfo.InvariantCulture),
                 Histories = x.Select(h => new ProjectBoardDetailUserHistoryResponse()
                 {
                     Date = h.StartDate.ToFarsi(),
@@ -78,8 +68,7 @@ public class ProjectBoardDetailQueryHandler : IBaseQueryHandler<ProjectBoardDeta
                 }).ToList()
             };
         }).ToList();
-        var response = new ProjectBoardDetailResponse(users, $"{(int)totalActivityTimeSpan.TotalHours}:{totalActivityTimeSpan.Minutes:D2}",
+        var response = new ProjectBoardDetailResponse(users, $"{(int)totalTimeSpan.TotalHours}:{totalTimeSpan.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,9 +22,8 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
         CancellationToken cancellationToken)
     {
         var currentUserId = _authHelper.GetCurrentUserId();
-        
         var queryable = _programManagerDbContext.TaskSections.AsNoTracking()
-            .Where(x => x.InitialEstimatedHours > TimeSpan.Zero && x.Status != TaskSectionStatus.Completed)
+            .Where(x => x.InitialEstimatedHours > TimeSpan.Zero)
             .Include(x => x.Task)
             .ThenInclude(x => x.Phase)
             .ThenInclude(x => x.Project)

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectDeployBoardDetail/ProjectDeployBoardDetailsQueryHandler.cs

@@ -1,113 +0,0 @@
-using System.Security.AccessControl;
-using GozareshgirProgramManager.Application._Common.Interfaces;
-using GozareshgirProgramManager.Application._Common.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectDeployBoardDetail;
-
-public record ProjectDeployBoardDetailsResponse(
-    ProjectDeployBoardDetailPhaseItem Phase,
-    List<ProjectDeployBoardDetailTaskItem> Tasks);
-
-public record ProjectDeployBoardDetailPhaseItem(
-    string Name,
-    TimeSpan TotalTimeSpan,
-    TimeSpan DoneTimeSpan);
-
-public record ProjectDeployBoardDetailTaskItem(
-    string Name,
-    TimeSpan TotalTimeSpan,
-    TimeSpan DoneTimeSpan,
-    List<ProjectDeployBoardDetailItemSkill> Skills)
-    : ProjectDeployBoardDetailPhaseItem(Name, TotalTimeSpan, DoneTimeSpan);
-
-public record ProjectDeployBoardDetailItemSkill(string OriginalUserFullName, string SkillName, int TimePercentage);
-
-public record ProjectDeployBoardDetailsQuery(Guid PhaseId) : IBaseQuery<ProjectDeployBoardDetailsResponse>;
-
-public class
-    ProjectDeployBoardDetailsQueryHandler : IBaseQueryHandler<ProjectDeployBoardDetailsQuery,
-    ProjectDeployBoardDetailsResponse>
-{
-    private readonly IProgramManagerDbContext _dbContext;
-
-    public ProjectDeployBoardDetailsQueryHandler(IProgramManagerDbContext dbContext)
-    {
-        _dbContext = dbContext;
-    }
-
-    public async Task<OperationResult<ProjectDeployBoardDetailsResponse>> Handle(ProjectDeployBoardDetailsQuery request,
-        CancellationToken cancellationToken)
-    {
-        var phase = await _dbContext.ProjectPhases
-            .Include(x => x.Tasks)
-            .ThenInclude(x => x.Sections)
-            .ThenInclude(x => x.Activities)
-            .Include(x => x.Tasks)
-            .ThenInclude(x => x.Sections)
-            .ThenInclude(x => x.AdditionalTimes)
-            .Include(x => x.Tasks)
-            .ThenInclude(x => x.Sections)
-            .ThenInclude(x => x.Skill)
-            .FirstOrDefaultAsync(x => x.Id == request.PhaseId, cancellationToken);
-
-        if (phase == null)
-            return OperationResult<ProjectDeployBoardDetailsResponse>.NotFound("بخش اصلی مورد نظر یافت نشد");
-
-        var userIds = phase.Tasks
-            .SelectMany(t => t.Sections)
-            .Select(s => s.OriginalAssignedUserId)
-            .Distinct()
-            .ToList();
-
-        var usersDict = await _dbContext.Users
-            .Where(x => userIds.Contains(x.Id))
-            .ToDictionaryAsync(x => x.Id, x => x.FullName, cancellationToken);
-
-        var tasksRes = phase.Tasks.Select(t =>
-        {
-            var totalTime = t.Sections.Select(s => s.FinalEstimatedHours)
-                .Aggregate(TimeSpan.Zero, (sum, next) => sum.Add(next));
-
-            var doneTime = t.Sections.Aggregate(TimeSpan.Zero,
-                (sum, next) => sum.Add(next.GetTotalTimeSpent()));
-            var skills = t.Sections
-                .Select(s =>
-                {
-                    var originalUserFullName = usersDict.GetValueOrDefault(s.OriginalAssignedUserId,
-                        "کاربر ناشناس");
-
-                    var skillName = s.Skill?.Name ?? "بدون مهارت";
-
-                    var totalTimeSpent = s.GetTotalTimeSpent();
-                    
-                    var timePercentage = s.FinalEstimatedHours.Ticks > 0
-                        ? (int)((totalTimeSpent.Ticks / (double)s.FinalEstimatedHours.Ticks) * 100)
-                        : 0;
-                    
-                    return new ProjectDeployBoardDetailItemSkill(
-                        originalUserFullName,
-                        skillName,
-                        timePercentage);
-                }).ToList();
-
-            return new ProjectDeployBoardDetailTaskItem(
-                t.Name,
-                totalTime,
-                doneTime,
-                skills);
-        }).ToList();
-
-        var totalTimeSpan = tasksRes.Aggregate(TimeSpan.Zero,
-            (sum, next) => sum.Add(next.TotalTimeSpan));
-
-        var doneTimeSpan = tasksRes.Aggregate(TimeSpan.Zero,
-            (sum, next) => sum.Add(next.DoneTimeSpan));
-
-        var phaseRes = new ProjectDeployBoardDetailPhaseItem(phase.Name, totalTimeSpan, doneTimeSpan);
-
-        var res = new ProjectDeployBoardDetailsResponse(phaseRes, tasksRes);
-
-        return OperationResult<ProjectDeployBoardDetailsResponse>.Success(res);
-    }
-}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectDeployBoardDetail/ProjectDeployBoardDetailsQueryValidator.cs

@@ -1,11 +0,0 @@
-using FluentValidation;
-
-namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectDeployBoardDetail;
-
-public class ProjectDeployBoardDetailsQueryValidator:AbstractValidator<ProjectDeployBoardDetailsQuery>
-{
-    public ProjectDeployBoardDetailsQueryValidator()
-    {
-        RuleFor(x=>x.PhaseId).NotNull().WithMessage("شناسه بخش اصلی نمی‌تواند خالی باشد");
-    }
-}

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

@@ -1,74 +0,0 @@
-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 Guid Id { get; set; }
-    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 ProjectDeployStatus DeployStatus { 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.Activities)
-            .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 
-                            && x.InitialEstimatedHours>TimeSpan.Zero))
-            .GroupBy(x=>x.Task.PhaseId).ToListAsync(cancellationToken: cancellationToken);
-        
-        var list = query.Select(g => new ProjectDeployBoardListItem
-        {
-            Id = g.Key,
-            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.FromTicks(g.Sum(x => x.InitialEstimatedHours.Ticks)),
-            DoneTimeSpan = TimeSpan.FromTicks(g.Sum(x=>x.GetTotalTimeSpent().Ticks)),
-            DeployStatus = g.First().Task.Phase.DeployStatus
-        }).ToList();
-        var response = new GetProjectsDeployBoardListResponse(list);
-        return OperationResult<GetProjectsDeployBoardListResponse>.Success(response);
-    }
-}

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

@@ -23,7 +23,6 @@ public class ProjectPhase : ProjectHierarchyNode
         ProjectId = projectId;
         _tasks = new List<ProjectTask>();
         _phaseSections = new List<PhaseSection>();
-        DeployStatus = ProjectDeployStatus.NotCompleted;
         AddDomainEvent(new PhaseCreatedEvent(Id, projectId, name));
     }
     
@@ -37,8 +36,6 @@ 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
 
@@ -199,30 +196,4 @@ public class ProjectPhase : ProjectHierarchyNode
     }
 
     #endregion
-    
-    public void SetArchived()
-    {
-        IsArchived = true;
-    }
-    public void SetUnarchived()
-    {
-        IsArchived = false;
-    }
-    public void UpdateDeployStatus(ProjectDeployStatus status)
-    {
-        DeployStatus = status;
-        if (status == ProjectDeployStatus.Deployed)
-        {
-            IsArchived = true;
-        }
-    }
-}
-
-public enum ProjectDeployStatus
-{
-    NotCompleted,
-    PendingDevDeploy,
-    DevDeployed,
-    PendingDeploy,
-    Deployed
 }

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

@@ -217,39 +217,4 @@ public class TaskSection : EntityBase<Guid>
         var finalEstimate = FinalEstimatedHours;
         return totalSpent < finalEstimate;
     }
-
-    /// <summary>
-    /// اگر زمان کار شده بیش از تایم تعیین شده باشد، تسک را متوقف می‌کند
-    /// و EndDate را به طوری تنظیم می‌کند که کل زمان برابر با FinalEstimatedHours شود
-    /// </summary>
-    public void AutoStopIfOverTime()
-    {
-        if (Status != TaskSectionStatus.InProgress)
-            return;
-
-        var activeActivity = _activities.FirstOrDefault(a => a.IsActive);
-        if (activeActivity == null)
-            return;
-
-        // محاسبه کل زمان صرف شده تا کنون (بدون فعالیت فعال)
-        var totalTimeSpentExcludingActive = _activities.Where(a => !a.IsActive).Sum(a => a.GetTimeSpent().Ticks);
-        var totalTimeSpentTimeSpan = TimeSpan.FromTicks(totalTimeSpentExcludingActive);
-        var finalEstimate = FinalEstimatedHours;
-
-        // اگر زمان صرف شده (بدون فعالیت فعال) + فعالیت فعال > تایم تعیین شده
-        var activeTimeSpent = activeActivity.GetTimeSpent();
-        if (totalTimeSpentTimeSpan + activeTimeSpent > finalEstimate)
-        {
-            // محاسبه مدت زمانی که این فعالیت باید برای رسیدن به FinalEstimatedHours داشته باشد
-            var remainingTime = finalEstimate - totalTimeSpentTimeSpan;
-            
-            // EndDate = StartDate + remainingTime
-            var adjustedEndDate = activeActivity.StartDate.Add(remainingTime);
-            
-            // متوقف کردن فعالیت با EndDate دقیق شده
-            activeActivity.StopWorkWithSpecificTime(adjustedEndDate, "متوقف خودکار - بیش از تایم تعیین شده");
-            
-            UpdateStatus(TaskSectionStatus.Incomplete);
-        }
-    }
 }

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

@@ -40,22 +40,6 @@ public class TaskSectionActivity : EntityBase<Guid>
         IsActive = false;
     }
 
-    /// <summary>
-    /// متوقف کردن فعالیت با مشخص کردن EndDate دقیق
-    /// </summary>
-    public void StopWorkWithSpecificTime(DateTime endDate, string? endNotes = null)
-    {
-        if (!IsActive)
-            throw new InvalidOperationException("این فعالیت قبلاً متوقف شده است.");
-
-        if (endDate < StartDate)
-            throw new InvalidOperationException("تاریخ پایان نمی‌تواند قبل از تاریخ شروع باشد.");
-
-        EndDate = endDate;
-        EndNotes = endNotes;
-        IsActive = false;
-    }
-
     public TimeSpan GetTimeSpent()
    {
            if (IsActive)

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

@@ -6,6 +6,5 @@ public enum TaskSectionStatus
     ReadyToStart = 1,      // آماده شروع
     InProgress = 2,        // درحال انجام
     Incomplete = 3,        // ناتمام شده
-    PendingForCompletion = 4, // در انتظار تکمیل
+    Completed = 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.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record ProjectStatusUpdatedEvent(Guid ProjectId, ProjectStatus Status) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record ProjectAssignedEvent(Guid ProjectId, long UserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record ProjectUnassignedEvent(Guid ProjectId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 // Phase Events
 public record PhaseCreatedEvent(Guid PhaseId, Guid ProjectId, string Name) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record PhaseAddedEvent(Guid PhaseId, Guid ProjectId, string Name) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record PhaseRemovedEvent(Guid PhaseId, Guid ProjectId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record PhaseStatusUpdatedEvent(Guid PhaseId, PhaseStatus Status) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record PhaseAssignedEvent(Guid PhaseId, long UserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record PhaseUnassignedEvent(Guid PhaseId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 // Task Events
 public record TaskCreatedEvent(Guid TaskId, Guid PhaseId, string Name) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record TaskAddedEvent(Guid TaskId, Guid PhaseId, string Name) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record TaskRemovedEvent(Guid TaskId, Guid PhaseId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record TaskStatusUpdatedEvent(Guid TaskId, TaskStatus Status) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record TaskPriorityUpdatedEvent(Guid TaskId, TaskPriority Priority) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record TaskAssignedEvent(Guid TaskId, long UserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record TaskUnassignedEvent(Guid TaskId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record TaskSectionAddedEvent(Guid TaskId, Guid SectionId, Guid SkillId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record TaskSectionRemovedEvent(Guid TaskId, Guid SectionId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 // TaskSection Events
 public record TaskSectionStatusChangedEvent(Guid SectionId, TaskSectionStatus OldStatus,
     TaskSectionStatus NewStatus,long UserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record TaskSectionAssignedEvent(Guid SectionId, long UserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record TaskSectionTransferredEvent(Guid SectionId, long FromUserId, long ToUserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 // Section Events (Legacy - keeping for backward compatibility)
 public record ProjectPhaseAddedEvent(Guid ProjectId, Guid PhaseId, string PhaseName) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record ProjectTaskStatusChangedEvent(Guid SectionId, TaskStatus OldStatus, TaskStatus NewStatus) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record ProjectSectionAddedEvent(Guid SectionId, Guid TaskId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 
 public record ProjectSectionAssignedEvent(Guid SectionId, long UserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record ProjectSectionTransferredEvent(Guid SectionId, long FromUserId, long ToUserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record WorkStartedEvent(Guid SectionId, long UserId, DateTime StartTime, string? Notes) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record WorkStoppedEvent(Guid SectionId, long UserId, DateTime StartTime, DateTime EndTime, TimeSpan Duration, string? Notes) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record ProjectSectionCompletedEvent(Guid ProjectId, long UserId, TimeSpan TotalTimeSpent, string? Notes) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record AdditionalTimeAddedEvent(Guid ProjectId, Guid AdditionalTimeId, TimeSpan Hours, string? Reason, long? AddedByUserId) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record AdditionalTimeRemovedEvent(Guid ProjectId, Guid AdditionalTimeId, TimeSpan RemovedHours) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }
 
 public record InitialEstimatedTimeUpdatedEvent(Guid ProjectId, TimeSpan OldEstimate, TimeSpan NewEstimate) : IDomainEvent
 {
-    public DateTime OccurredOn { get; init; } = DateTime.Now;
+    public DateTime OccurredOn { get; init; } = DateTime.UtcNow;
 }

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Repositories/ITaskSectionActivityRepository.cs

@@ -5,6 +5,7 @@ namespace GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 
 public interface ITaskSectionActivityRepository:IRepository<Guid,TaskSectionActivity>
 {
+    Task<TaskSectionActivity?> GetByIdAsync(Guid id);
     Task<List<TaskSectionActivity>> GetBySectionIdAsync(Guid sectionId);
     Task<List<TaskSectionActivity>> GetByUserIdAsync(long userId);
     Task<List<TaskSectionActivity>> GetActiveByUserAsync(long userId);

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Repositories/ITaskSectionRepository.cs

@@ -1,4 +1,3 @@
-using System.Collections;
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
 
@@ -12,5 +11,4 @@ public interface ITaskSectionRepository: IRepository<Guid,TaskSection>
     Task<TaskSection?> GetByIdWithFullDataAsync(Guid id, CancellationToken cancellationToken = default);
 
     Task<List<TaskSection>> GetAssignedToUserAsync(long userId);
-    Task<List<TaskSection>> GetActiveSectionsIncludeAllAsync(CancellationToken cancellationToken);
 }

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/_Common/IRepository.cs

@@ -5,7 +5,7 @@ namespace GozareshgirProgramManager.Domain._Common;
 public interface IRepository<TKey, T> where  T:class
 {
     T Get(TKey id);
-    Task<T?> GetByIdAsync(TKey id, CancellationToken cancellationToken = default);
+    Task<T?> GetByIdAsync(TKey id);
     List<T> Get();
     IQueryable<T> GetQueryable();
     void Create(T entity);

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

@@ -1,865 +0,0 @@
-// <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

@@ -1,41 +0,0 @@
-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

@@ -179,11 +179,6 @@ 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)");
@@ -194,9 +189,6 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.Property<bool>("HasAssignmentOverride")
                         .HasColumnType("bit");
 
-                    b.Property<bool>("IsArchived")
-                        .HasColumnType("bit");
-
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(200)

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

@@ -48,9 +48,6 @@ 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)

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Repositories/TaskSectionRepository.cs

@@ -1,5 +1,4 @@
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
-using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 using GozareshgirProgramManager.Infrastructure.Persistence._Common;
 using GozareshgirProgramManager.Infrastructure.Persistence.Context;
@@ -36,13 +35,4 @@ public class TaskSectionRepository:RepositoryBase<Guid,TaskSection>,ITaskSection
             .Where(x => x.CurrentAssignedUserId == userId)
             .ToListAsync();
     }
-
-    public Task<List<TaskSection>> GetActiveSectionsIncludeAllAsync(CancellationToken cancellationToken)
-    {
-        return _context.TaskSections
-            .Where(x => x.Status == TaskSectionStatus.InProgress)
-            .Include(x => x.Activities)
-            .Include(x => x.AdditionalTimes)
-            .ToListAsync(cancellationToken);
-    }
 }

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/_Common/RepositoryBase.cs

@@ -43,9 +43,9 @@ public class RepositoryBase<TKey, T> : IRepository<TKey, T> where T : class
         return _context.Find<T>(id);
     }
 
-    public async Task<T?> GetByIdAsync(TKey id, CancellationToken cancellationToken = default)
+    public async Task<T?> GetByIdAsync(TKey id)
     {
-        return await _context.Set<T>().FindAsync([id], cancellationToken);
+        return await _context.Set<T>().FindAsync(id);
     }
 
     public List<T> Get()

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

@@ -1,9 +1,6 @@
 using System.Runtime.InteropServices;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Application.Modules.Projects.Commands.AssignProject;
-using GozareshgirProgramManager.Application.Modules.Projects.Commands.AutoStopOverTimeTaskSections;
-using GozareshgirProgramManager.Application.Modules.Projects.Commands.AutoUpdateDeployStatus;
-using GozareshgirProgramManager.Application.Modules.Projects.Commands.ChangeDeployStatusProject;
 using GozareshgirProgramManager.Application.Modules.Projects.Commands.ChangeStatusSection;
 using GozareshgirProgramManager.Application.Modules.Projects.Commands.CreateProject;
 using GozareshgirProgramManager.Application.Modules.Projects.Commands.DeleteProject;
@@ -14,8 +11,6 @@ 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.ProjectDeployBoardDetail;
-using GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectDeployBoardList;
 using GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectSetTimeDetails;
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
@@ -26,75 +21,70 @@ namespace ServiceHost.Areas.Admin.Controllers.ProgramManager;
 public class ProjectController : ProgramManagerBaseController
 {
     private readonly IMediator _mediator;
-
+    
     public ProjectController(IMediator mediator)
     {
         _mediator = mediator;
     }
 
     [HttpGet]
-    public async Task<ActionResult<OperationResult<GetProjectsListResponse>>> Get(
+    public async Task<ActionResult<OperationResult<GetProjectsListResponse>>> Get([FromQuery]GetProjectsListQuery query)
-        [FromQuery] GetProjectsListQuery query)
     {
-        var res = await _mediator.Send(query);
+        var res=await _mediator.Send(query);
         return res;
     }
-
+    
     [HttpPost]
     public async Task<ActionResult<OperationResult>> Create([FromBody] CreateProjectCommand command)
     {
-        var res = await _mediator.Send(command);
+        var res=await _mediator.Send(command);
         return res;
     }
-
+    
     [HttpPut]
     public async Task<ActionResult<OperationResult>> Edit([FromBody] EditProjectCommand command)
     {
-        var res = await _mediator.Send(command);
+        var res=await _mediator.Send(command);
         return res;
     }
-
+    
     [HttpDelete]
     public async Task<ActionResult<OperationResult>> Delete([FromQuery] DeleteProjectCommand command)
     {
-        var res = await _mediator.Send(command);
+        var res=await _mediator.Send(command);
         return res;
     }
-
+    
     [HttpGet("assign")]
-    public async Task<ActionResult<OperationResult<GetProjectAssignDetailsResponse>>> GetAssignableProjects(
+    public async Task<ActionResult<OperationResult<GetProjectAssignDetailsResponse>>> GetAssignableProjects(GetProjectAssignDetailsQuery query)
-        GetProjectAssignDetailsQuery query)
     {
-        var res = await _mediator.Send(query);
+        var res=await _mediator.Send(query);
         return res;
     }
-
+    
     [HttpPost("assign")]
     public async Task<ActionResult<OperationResult>> Assign(AssignProjectCommand command)
     {
-        var res = await _mediator.Send(command);
+        var res=await _mediator.Send(command);
         return res;
     }
-
     [HttpGet("set-time")]
-    public async Task<ActionResult<OperationResult<ProjectSetTimeResponse>>> GetSetTimeProjectDetails(
+    public async Task<ActionResult<OperationResult<ProjectSetTimeResponse>>> GetSetTimeProjectDetails(ProjectSetTimeDetailsQuery query)
-        ProjectSetTimeDetailsQuery query)
     {
-        var res = await _mediator.Send(query);
+        var  res=await _mediator.Send(query);
         return res;
     }
-
     [HttpPost("set-time")]
     public async Task<ActionResult<OperationResult>> SetTimeProject(SetTimeProjectCommand command)
     {
-        var res = await _mediator.Send(command);
+        var  res=await _mediator.Send(command);
         return res;
     }
 
     [HttpPost("change-status")]
     public async Task<ActionResult<OperationResult>> ChangeStatus(ChangeStatusSectionCommand command)
     {
-        var res = await _mediator.Send(command);
+        var res = await  _mediator.Send(command);
         return res;
     }
 
@@ -106,16 +96,11 @@ public class ProjectController : ProgramManagerBaseController
     }
 
     [HttpGet("board")]
-    public async Task<ActionResult<OperationResult<List<ProjectBoardListResponse>>>> GetProjectBoard(
+    public async Task<ActionResult<OperationResult<List<ProjectBoardListResponse>>>> GetProjectBoard([FromQuery] ProjectBoardListQuery query)
-        [FromQuery] ProjectBoardListQuery query)
     {
-        // اجرای Command برای متوقف کردن تسک‌های overtime قبل از نمایش
-        await _mediator.Send(new AutoStopOverTimeTaskSectionsCommand());
-
         var res = await _mediator.Send(query);
         return res;
     }
-
     [HttpGet("board/details")]
     public async Task<ActionResult<OperationResult<ProjectBoardDetailResponse>>> GetProjectBoardDetails(Guid id)
     {
@@ -123,28 +108,4 @@ public class ProjectController : ProgramManagerBaseController
         var res = await _mediator.Send(query);
         return res;
     }
-
-    [HttpGet("deploy-board")]
-    public async Task<ActionResult<OperationResult<GetProjectsDeployBoardListResponse>>> GetProjectDeployBoard()
-    {
-        // قبل از دریافت دیتا، وضعیت دیپلوی را بر اساس تکمیل شدن تمام سکشن‌ها به‌روزرسانی می‌کنیم
-        await _mediator.Send(new AutoUpdateDeployStatusCommand());
-        var request = new GetProjectDeployBoardListQuery();
-        return await _mediator.Send(request);
-    }
-
-    [HttpGet("deploy-board/details")]
-    public async Task<ActionResult<OperationResult<ProjectDeployBoardDetailsResponse>>> GetProjectDeployBoardDetails(Guid id)
-    {
-        var query = new ProjectDeployBoardDetailsQuery(id);
-        var res = await _mediator.Send(query);
-        return res;
-    }
-
-    [HttpPost("deploy-board/change-status")]
-    public async Task<ActionResult<OperationResult>> ChangeDeployStatus(ChangeDeployStatusProjectCommand command)
-    {
-        var res = await _mediator.Send(command);
-        return res;
-    }
 }

ServiceHost/Areas/Admin/Controllers/institutionContractController.cs

@@ -807,13 +807,6 @@ public class institutionContractController : AdminBaseController
         var res =await _institutionContractApplication.PrintOneAsync(id);
         return res;
     }
-
-    [HttpPost("mannual-verify/{id}")]
-    public async Task<ActionResult<OperationResult>> VerifyInstitutionContractMannualy(long id)
-    {
-        var res= await _institutionContractApplication.VerifyInstitutionContractManually(id);
-        return res;
-    }
 }
 
 

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

@@ -1,15 +0,0 @@
-@page
-
-
-<h4>Deploy Log</h4>
-
-<pre style="
-    background:#111;
-    color:#0f0;
-    padding:15px;
-    max-height:600px;
-    overflow:auto;
-    font-size:13px;
-    border-radius:6px;">
-
-</pre>

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

@@ -2,14 +2,6 @@
 @model ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk.IndexModel
 @{
     ViewData["Title"] = "File Upload";
-    <style>
-        .lineDiv {
-            width: 100%;
-            height: 2px;
-            background-image: linear-gradient(to right, #ffffff, #e5e5e5, #cbcbcb, #b2b2b2, #9a9a9a, #9a9a9a, #9a9a9a, #9a9a9a, #b2b2b2, #cbcbcb, #e5e5e5, #ffffff);
-            margin: 10px;
-        }
-    </style>
 }
 
 <h1>Upload APK File</h1>
@@ -68,85 +60,16 @@
 </form>
 
 
-<form style="margin:30px" asp-page-handler="PaymentGateWay" id="11" method="post">
+<form style="margin:50px" asp-page-handler="PaymentGateWay" id="11" method="post">
 
     <button type="submit">درگاه پرداخت تستی  </button>
 </form>
-<div class="lineDiv"></div>
-<div class="row m-t-20">
-    <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"
-                    onclick="return confirm('آیا از انتشار نسخه جدید فرانت مطمئن هستید؟');">
-                🚀 Deploy Next UI
-            </button>
-        </form>
-    </div>
-    <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-4"></div>
-</div>
-<div class="lineDiv"></div>
-
-
-
-
-<div class="modal fade" id="logModal" tabindex="-1">
-    <div class="modal-dialog modal-xl modal-dialog-scrollable">
-        <div class="modal-content">
-
-            <div class="modal-header">
-                <h5 class="modal-title">Deploy Log</h5>
-                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-            </div>
-
-            <div class="modal-body">
-                <pre id="logContent"
-                     style="background: #111;
-                            color: #0f0;
-                            padding: 15px;
-                            font-size: 13px;
-                            text-align: left;
-                            direction: ltr;">
-
-                </pre>
-
-            </div>
-
-        </div>
-    </div>
-</div>
-
-<form style="margin:20px" asp-page-handler="ContractingPartyToWorkshop" id="13" method="post">
-
-    <button class="btn btn-outline-secondary" type="submit">  افزودن آی دی طرف حساب به کارگاه </button>
-</form>
-
-
 
 
 @if (ViewData["message"] != null)
 {
     <p>@ViewData["message"]</p>
 }
-<script>
-    document.getElementById('logModal')
-        .addEventListener('show.bs.modal', function () {
-
-            fetch('?handler=Log')
-                .then(r => r.text())
-                .then(t => {
-                    document.getElementById('logContent').textContent = t;
-                });
-        });
-</script>
 
 @* <script>
 

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

@@ -1,40 +1,36 @@
 using _0_Framework.Application;
-using _0_Framework.Application.Enums;
-using _0_Framework.Application.FaceEmbedding;
-using _0_Framework.Application.PaymentGateway;
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using AccountManagement.Domain.AccountLeftWorkAgg;
 using AccountMangement.Infrastructure.EFCore;
 using Company.Domain.AndroidApkVersionAgg;
 using Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 using Company.Domain.CustomizeCheckoutTempAgg.ValueObjects;
-using Company.Domain.InstitutionContractAgg;
-using Company.Domain.InstitutionPlanAgg;
-using Company.Domain.PaymentTransactionAgg;
 using Company.Domain.RewardAgg;
 using Company.Domain.RollCallAgg.DomainService;
-using CompanyManagement.Infrastructure.Excel.WorkshopsRollCall;
 using CompanyManagment.App.Contracts.AndroidApkVersion;
-using CompanyManagment.App.Contracts.InstitutionContract;
-using CompanyManagment.App.Contracts.PaymentTransaction;
-using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using CompanyManagment.EFCore;
-using Hangfire;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.EntityFrameworkCore;
+using System.Net.Http;
+using System.Security.Cryptography.Xml;
+using System.Text.Json.Serialization;
+using _0_Framework.Application.PaymentGateway;
+using Company.Domain.InstitutionContractAgg;
+using Company.Domain.InstitutionPlanAgg;
+using Company.Domain.PaymentTransactionAgg;
+using CompanyManagment.App.Contracts.InstitutionContract;
+using CompanyManagment.App.Contracts.PaymentTransaction;
+using CompanyManagment.App.Contracts.TemporaryClientRegistration;
 using Microsoft.Extensions.Options;
 using Parbad;
 using Parbad.AspNetCore;
 using Parbad.Gateway.Sepehr;
 using System.ComponentModel.DataAnnotations;
-using System.Diagnostics;
+using _0_Framework.Application.Enums;
-using System.Net.Http;
+using _0_Framework.Application.FaceEmbedding;
-using System.Security.Cryptography.Xml;
+using CompanyManagement.Infrastructure.Excel.WorkshopsRollCall;
-using System.Text;
-using System.Text.Json.Serialization;
-using Microsoft.AspNetCore.Authentication;
 using static ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk.IndexModel2;
 
 namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
@@ -51,7 +47,6 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         private readonly IHttpClientFactory _httpClientFactory;
         private readonly IOnlinePayment _onlinePayment;
         private readonly IFaceEmbeddingService _faceEmbeddingService;
-        private readonly IAuthHelper _authHelper;
 
 
         [BindProperty] public IFormFile File { get; set; }
@@ -66,18 +61,13 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         [Display(Name = "کد ورژن")]
         public string VersionCode { get; set; }
 
-        /// <summary>
-        /// لاگ آپلود فرانت
-        /// </summary>
-        public string LogContent { get; set; }
-
         [BindProperty] public ApkType SelectedApkType { get; set; }
         [BindProperty] public bool IsForce { get; set; }
 
         public IndexModel(IAndroidApkVersionApplication application, IRollCallDomainService rollCallDomainService,
             CompanyContext context, AccountContext accountContext, IHttpClientFactory httpClientFactory,
             IOptions<AppSettingConfiguration> appSetting,
-            ITemporaryClientRegistrationApplication clientRegistrationApplication, IOnlinePayment onlinePayment, IFaceEmbeddingService faceEmbeddingService, IAuthHelper authHelper)
+            ITemporaryClientRegistrationApplication clientRegistrationApplication, IOnlinePayment onlinePayment, IFaceEmbeddingService faceEmbeddingService)
         {
             _application = application;
             _rollCallDomainService = rollCallDomainService;
@@ -87,7 +77,6 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
             _clientRegistrationApplication = clientRegistrationApplication;
             _onlinePayment = onlinePayment;
             _faceEmbeddingService = faceEmbeddingService;
-            _authHelper = authHelper;
             _paymentGateway = new SepehrPaymentGateway(httpClientFactory);
         }
 
@@ -151,34 +140,11 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         public async Task<IActionResult> OnPostShiftDateNew()
         {
             //await UpdateInstitutionContract();
-            //await UpdateFaceEmbeddingNames();
+            await UpdateFaceEmbeddingNames();
-            await SetInstitutionContractSigningType();
             ViewData["message"] = "تومام یک";
             return Page();
         }
 
-        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();
-            foreach (var institutionContract in otpSigned)
-            {
-                institutionContract.SetSigningType(InstitutionContractSigningType.OtpBased);
-            }
-            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()
         {
             //var startRollCall = new DateTime(2025, 3, 21);
@@ -326,105 +292,6 @@ 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);
-
-                TempData["Message"] = "فرآیند Deploy شروع شد. لاگ را بررسی کنید.";
-                return RedirectToPage();
-            }
-            return Forbid();
-
-        }
-
-        /// <summary>
-        /// افزودن آی دی طرف حساب  به  کارگاه
-        /// </summary>
-        /// <returns></returns>
-        [DisableConcurrentExecution(timeoutInSeconds: 120)]
-        public async Task<IActionResult> OnPostContractingPartyToWorkshop()
-        {
-            var workshops = await _context.Workshops.Where(x => x.ContractingPartyId == 0).ToListAsync();
-
-            var worskhopEmployeer = await _context.WorkshopEmployers.Include(x => x.Employer).ToListAsync();
-
-            var contractingParties = await _context.PersonalContractingParties.ToListAsync();
-
-            foreach (var workshop in workshops)
-            {
-                var employers = worskhopEmployeer.Where(x => x.WorkshopId == workshop.id);
-                var contractingPartyIdList = new List<long>();
-                foreach (var employer in employers)
-                {
-                    if (contractingParties.Any(x => x.id == employer.Employer.ContractingPartyId))
-                    {
-                        contractingPartyIdList.Add(employer.Employer.ContractingPartyId);
-                    }
-
-                }
-
-                if (contractingPartyIdList.Count > 0)
-                {
-
-
-                    if (contractingPartyIdList.Count == 1)
-                    {
-                        workshop.AddContractingPartyId(contractingPartyIdList[0]);
-                        await _context.SaveChangesAsync();
-                    }
-                    else
-                    {
-                        var idDistinct = contractingPartyIdList.Distinct().ToList();
-                        if (idDistinct.Count == 1)
-                        {
-                            workshop.AddContractingPartyId(contractingPartyIdList[0]);
-                            await _context.SaveChangesAsync();
-                        }
-                    }
-                }
-            }
-
-
-            ViewData["message"] = "آی دی های طرف حساب اضافه شد";
-            return Page();
-
-        }
-
-        /// <summary>
-        /// دریافت لاگ آپلود فرانت
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult OnGetLog()
-        {
-            var validAccountId = _authHelper.CurrentAccountId();
-            if (validAccountId == 2 || validAccountId == 322)
-            {
-                var logPath = @"C:\next-ui\log.txt";
-                if (!System.IO.File.Exists(logPath))
-                    return Content("Log file not found.");
-
-                var content = System.IO.File.ReadAllText(logPath, Encoding.UTF8);
-                return Content(content);
-            }
-            return Content("شما مجاز به دیدن لاگ نیستید");
-
-        }
-
 
         public async System.Threading.Tasks.Task OnGetCallback(string? transid, string? cardnumber,
             string? tracking_number, string status)
@@ -973,8 +840,8 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
                     contract => contract.ContractingPartyId,
                     contractingParty => contractingParty.id,
                     (contract, contractingParty) => new { contract, contractingParty });
-
+        
-
+        
             var remoteContractsQuery = query
                 .Where(x => x.contractingParty.Employers
                     .Any(e => e.WorkshopEmployers
@@ -1035,7 +902,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
                         x.PersonnelCount,
                         x.Price, x.InstitutionContractWorkshopGroupId,
                         group,
-                        x.WorkshopId.Value,x.id);
+                        x.WorkshopId.Value);
                     entity.SetEmployers(x.Employers.Select(e => e.EmployerId).ToList());
 
                     return entity;

ServiceHost/Areas/Client/Controllers/InsuranceController.cs

@@ -19,4 +19,15 @@ 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/Controllers/GeneralController.cs

@@ -164,7 +164,7 @@ public class GeneralController : GeneralBaseController
                     .Where(x => x.Type == FinancialInvoiceItemType.BuyInstitutionContract);
                 foreach (var editFinancialInvoiceItem in financialItems)
                 {
-                    await _institutionContractApplication.SetPendingWorkflow(editFinancialInvoiceItem.EntityId,InstitutionContractSigningType.OtpBased);
+                    await _institutionContractApplication.SetPendingWorkflow(editFinancialInvoiceItem.EntityId);
                 }
                 var financialInstallmentItems = financialInvoice.Items
                     .Where(x => x.Type == FinancialInvoiceItemType.BuyInstitutionContractInstallment);
@@ -174,7 +174,7 @@ public class GeneralController : GeneralBaseController
                     var institutionContractId =
                         await _institutionContractApplication.GetIdByInstallmentId(
                             editFinancialInvoiceItem.EntityId);
-                    await _institutionContractApplication.SetPendingWorkflow(institutionContractId,InstitutionContractSigningType.OtpBased);
+                    await _institutionContractApplication.SetPendingWorkflow(institutionContractId);
                 }
             }
 

ServiceHost/Conventions/ParameterBindingConvention.cs

@@ -70,8 +70,7 @@ public class ParameterBindingConvention : IApplicationModelConvention
         {
             if (selector.AttributeRouteModel?.Template != null)
             {
-                if (selector.AttributeRouteModel.Template.Contains($"{{{parameterName}}}", StringComparison.OrdinalIgnoreCase) ||
+                if (selector.AttributeRouteModel.Template.Contains($"{{{parameterName}}}", StringComparison.OrdinalIgnoreCase))
-                    selector.AttributeRouteModel.Template.Contains($"{{{parameterName}:", StringComparison.OrdinalIgnoreCase))
                     return true;
             }
         }
@@ -81,8 +80,7 @@ public class ParameterBindingConvention : IApplicationModelConvention
         {
             if (selector.AttributeRouteModel?.Template != null)
             {
-                if (selector.AttributeRouteModel.Template.Contains($"{{{parameterName}}}", StringComparison.OrdinalIgnoreCase) ||
+                if (selector.AttributeRouteModel.Template.Contains($"{{{parameterName}}}", StringComparison.OrdinalIgnoreCase))
-                    selector.AttributeRouteModel.Template.Contains($"{{{parameterName}:", StringComparison.OrdinalIgnoreCase))
                     return true;
             }
         }