add: implement AsghaeeAzarWorkshopsExcelGenerator and view model for generating Excel reports

# Conflicts:
#	CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs

0_Framework/Excel/ExcelGenerator.cs

@@ -17,7 +17,7 @@ public class ExcelGenerator
 {
     public ExcelGenerator()
     {
-        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        OfficeOpenXml.ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
     }
     public static byte[] GenerateExcel<T>(List<T> obj, string date = "") where T : class
     {

AccountManagement.Application/AccountApplication.cs

@@ -155,6 +155,8 @@ public class AccountApplication : IAccountApplication
 
         if (command.IsProgramManagerUser)
         {
+            if (command.UserRoles == null)
+                return operation.Failed("حداقل یک نقش برای کاربر مدیریت پروژه لازم است");
             var pmUserRoles = command.UserRoles.Where(x => x > 0).ToList();
             var createPm = await _pmUserCommandService.Create(new CreatePmUserDto(command.Fullname, command.Username, account.Password, command.Mobile,
                 null, account.id, pmUserRoles));
@@ -252,6 +254,8 @@ public class AccountApplication : IAccountApplication
         //);
         var userResult =await _pmUserQueryService.GetPmUserDataByAccountId(account.id);
 
+        if (command.UserRoles == null)
+            return operation.Failed("حداقل یک نقش برای کاربر مدیریت پروژه لازم است");
         var pmUserRoles = command.UserRoles.Where(x => x > 0).ToList();
 
         //اگر کاربر در پروگرام منیجر قبلا ایجاد شده
@@ -396,6 +400,23 @@ public class AccountApplication : IAccountApplication
                 .Permissions
                 .Select(x => x.Code)
                 .ToList();
+            //PmPermission
+            var PmUserData = _pmUserQueryService.GetPmUserDataByAccountId(account.id).GetAwaiter().GetResult();
+            if (PmUserData.AccountId > 0 && PmUserData.IsActive)
+            {
+                
+                var pmUserPermissions =
+                    PmUserData.RoleListDto != null
+                        ? PmUserData.RoleListDto
+                            .SelectMany(x => x.Permissions)
+                            .Where(p => p != 99)
+                            .Distinct()                    
+                            .ToList()
+                        : new List<int>();
+                permissions.AddRange(pmUserPermissions);
+            }
+           
+
             int? positionValue;
             if (account.PositionId != null)
             {
@@ -405,7 +426,7 @@ public class AccountApplication : IAccountApplication
             {
                 positionValue = null;
             }
-            var pmUserId = _pmUserQueryService.GetCurrentPmUserIdFromAccountId(account.id).GetAwaiter().GetResult();
+            var pmUserId = PmUserData.AccountId > 0 ? PmUserData.AccountId : null;
             var authViewModel = new AuthViewModel(account.id, account.RoleId, account.Fullname
                 , account.Username, account.Mobile, account.ProfilePhoto,
                 permissions, account.RoleName, account.AdminAreaPermission, 

Company.Domain/InstitutionContractAgg/InstitutionContract.cs

@@ -98,6 +98,11 @@ 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; }
 
@@ -159,6 +164,10 @@ 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 = [];
@@ -262,6 +271,10 @@ public class InstitutionContract : EntityBase
     {
         WorkshopGroup = null;
     }
+    public void SetSigningType(InstitutionContractSigningType signingType)
+    {
+        SigningType = signingType;
+    }
 }
 
 public class InstitutionContractAmendment : EntityBase

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopCurrent.cs

@@ -10,13 +10,15 @@ 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,InstitutionContractWorkshopGroup workshopGroup,long workshopId) : base(workshopName, hasRollCallPlan, 
+        int personnelCount, double price,long institutionContractWorkshopGroupId,
+        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,4 +37,10 @@ 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);
+            Services.InsuranceInPerson,PersonnelCount,Price,InstitutionContractWorkshopGroupId,WorkshopGroup,workshopId,id);
         WorkshopCurrent.SetEmployers(Employers.Select(x=>x.EmployerId).ToList());
     }
 

Company.Domain/InsuranceListAgg/IInsuranceListRepository.cs

@@ -73,6 +73,7 @@ public interface IInsuranceListRepository:IRepository<long, InsuranceList>
     Task<InsuranceListConfirmOperation> GetInsuranceOperationDetails(long id);
 
 	Task<InsuranceListTabsCountViewModel> GetTabCounts(InsuranceListSearchModel searchModel);
+	Task<PagedResult<InsuranceClientListViewModel>> GetInsuranceClientList(InsuranceClientSearchModel searchModel);
 
 	#endregion
 

Company.Domain/WorkshopAgg/Workshop.cs

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

CompanyManagement.Infrastructure.Excel/CWS/CustomizeWorkshopGroupSettingExcelGenerator.cs

@@ -26,7 +26,7 @@ public class CustomizeWorkshopGroupSettingExcelGenerator
 {
     public static byte[] Generate(List<CustomizeWorkshopGroupExcelViewModel> groups)
     {
-        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         using (var package = new ExcelPackage())
         {
             var worksheet = package.Workbook.Worksheets.Add("GroupsAndEmployees");

CompanyManagement.Infrastructure.Excel/CaseManagement/CaseManagementExcelGenerator.cs

@@ -24,7 +24,7 @@ public class CaseManagementExcelGenerator
     };
     public static byte[] GenerateCheckoutTempExcelInfo(List<FileExcelViewModel> data)
     {
-        OfficeOpenXml.ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        OfficeOpenXml.ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         using var package = new ExcelPackage();
         CreateSheet(data, package,"همه");
         CreateSheet(data.Where(x=>x.Status ==2).ToList(), package,"فعال");

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

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

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

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

CompanyManagement.Infrastructure.Excel/Checkout/CustomizeCheckoutExcelGenerator.cs

@@ -46,7 +46,7 @@ public class CustomizeCheckoutExcelGenerator
     };
     public static byte[] GenerateCheckoutTempExcelInfo(List<CustomizeCheckoutTempExcelViewModel> data, List<string> selectedParameters)
     {
-        OfficeOpenXml.ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         using var package = new ExcelPackage();
         var worksheet = package.Workbook.Worksheets.Add("Sheet1");
 

CompanyManagement.Infrastructure.Excel/EmployeeBankInfo/EmployeeBankInfoExcelGenerator.cs

@@ -7,7 +7,7 @@ public class EmployeeBankInfoExcelGenerator
 {
     public static byte[] Generate(List<EmployeeBankInfoExcelViewModel> list)
     {
-        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         using var package = new ExcelPackage();
         var worksheet = package.Workbook.Worksheets.Add("EmployeeBankInfo");
 
@@ -166,7 +166,7 @@ public class EmployeeBankInfoExcelGenerator
 
     public static byte[] Generate2(List<EmployeeBankInfoExcelViewModel> list)
     {
-        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         using var package = new ExcelPackage();
         foreach (var employee in list)
         {
@@ -220,4 +220,4 @@ public class EmployeeBankInfoExcelGenerator
         cell.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
         cell.Style.Fill.PatternType = ExcelFillStyle.Solid;
     }
-}
+}

CompanyManagement.Infrastructure.Excel/InstitutionContract/InstitutionContractExcelGenerator.cs

@@ -13,7 +13,7 @@ public class InstitutionContractExcelGenerator
 
     public static byte[] GenerateExcel(List<InstitutionContractViewModel> institutionContractViewModels)
     {
-        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         using var package = new ExcelPackage();
         var allWorksheet = package.Workbook.Worksheets.Add("همه");
 

CompanyManagement.Infrastructure.Excel/RollCall/RollCallExcelGenerator.cs

@@ -8,7 +8,7 @@ public class RollCallExcelGenerator : ExcelGenerator
 {
     public static byte[] CaseHistoryExcelForEmployee(CaseHistoryRollCallExcelForEmployeeViewModel data)
     {
-        OfficeOpenXml.ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        OfficeOpenXml.ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         using var package = new OfficeOpenXml.ExcelPackage();
         var worksheet = package.Workbook.Worksheets.Add("Sheet1");
         var rollCalls = data.RollCalls;
@@ -181,7 +181,7 @@ public class RollCallExcelGenerator : ExcelGenerator
 
     public static byte[] CaseHistoryExcelForOneDay(CaseHistoryRollCallForOneDayViewModel data)
     {
-        OfficeOpenXml.ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        OfficeOpenXml.ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         using var package = new OfficeOpenXml.ExcelPackage();
         var worksheet = package.Workbook.Worksheets.Add("Sheet1");
         var rollCalls = data.RollCalls;

CompanyManagement.Infrastructure.Excel/SalaryAid/SalaryAidImportExcel.cs

@@ -43,7 +43,7 @@ public class SalaryAidImportExcel
             ValidData = []
         };
 
-        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
 
         if (file == null || file.Length == 0)
         {

CompanyManagement.Infrastructure.Excel/WorkshopsRollCall/WorkshopRollCallExcelExporter.cs

@@ -9,7 +9,7 @@ public class WorkshopRollCallExcelExporter
 {
     public static byte[] Export(List<WorkshopRollCallExcelViewModel> workshops)
     {
-        ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
         using (var package = new ExcelPackage())
         {
             var ws = package.Workbook.Worksheets.Add("Workshops");

CompanyManagment.App.Contracts/Employee/IEmployeeApplication.cs

@@ -60,7 +60,7 @@ public interface IEmployeeApplication
     /// <returns></returns>
     Task<OperationResult<EmployeeByNationalCodeInWorkshopViewModel>>
         ValidateCreateEmployeeClientByNationalCodeAndWorkshopId(string nationalCode,
-            string birthDate, long workshopId);
+            string birthDate,bool authorizedCanceled, long workshopId);
 
     /// <summary>
     /// پرسنل هایی که در کارگاهی از سمت ادمین شروع به کار کرده اند

CompanyManagment.App.Contracts/InstitutionContract/ContractSigningType.cs

@@ -0,0 +1,17 @@
+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,7 +7,6 @@ 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;
@@ -260,154 +259,13 @@ public interface IInstitutionContractApplication
     /// <returns></returns>
     Task<InstitutionContractPrintViewModel> PrintOneAsync(long id);
 
-    Task<OperationResult> SetPendingWorkflow(long entityId);
+    Task<OperationResult> SetPendingWorkflow(long entityId,InstitutionContractSigningType signingType);
     Task<long> GetIdByInstallmentId(long installmentId);
-
-}
-
-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; }
+    /// <param name="institutionContractId"></param>
+    /// <returns></returns>
+    Task<OperationResult> VerifyInstitutionContractManually(long institutionContractId);
 
-    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

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

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

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

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

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

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

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

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

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

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractSetDiscountForExtensionRequest.cs

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

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

@@ -90,8 +90,27 @@ public interface IInsuranceListApplication
     Task<InsuranceListConfirmOperation> GetInsuranceOperationDetails(long id);
 
 	Task<InsuranceListTabsCountViewModel> GetTabCounts(InsuranceListSearchModel searchModel);
+    Task<PagedResult<InsuranceClientListViewModel>> GetInsuranceClientList(InsuranceClientSearchModel searchModel);
+    
 
 	#endregion
 
     Task<List<InsuranceListViewModel>> GetNotCreatedWorkshop(InsuranceListSearchModel searchModel);
+}
+
+public class InsuranceClientSearchModel:PaginationRequest
+{
+    public int Year { get; set; }
+    public int Month { get; set; }
+    public string Sorting { get; set; }
+}
+public class InsuranceClientListViewModel
+{
+    public long Id { get; set; }
+    public string Year { get; set; }
+    public string Month { get; set; }
+    public long WorkShopId { get; set; }
+    public int YearInt { get; set; }
+    public string MonthName { get; set; }
+    public int MonthInt { get; set; }
 }

CompanyManagment.Application/EmployeeAplication.cs

@@ -1263,7 +1263,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         System.IO.File.WriteAllBytes(filePath, bytes);
     }
     public async Task<OperationResult<EmployeeByNationalCodeInWorkshopViewModel>>
-        ValidateCreateEmployeeClientByNationalCodeAndWorkshopId(string nationalCode, string birthDate, long workshopId)
+        ValidateCreateEmployeeClientByNationalCodeAndWorkshopId(string nationalCode, string birthDate,bool authorizedCanceled, long workshopId)
     {
         var op = new OperationResult<EmployeeByNationalCodeInWorkshopViewModel>();
 
@@ -1279,65 +1279,25 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         var employee = _EmployeeRepository.GetByNationalCodeIgnoreQueryFilter(nationalCode);
 
-        if (employee == null)
+        if (employee == null && !authorizedCanceled)
         {
             var personalInfo = await _uidService.GetPersonalInfo(nationalCode, birthDate);
-
-            if (personalInfo.ResponseContext.Status.Code == 14)
+            if (personalInfo != null)
             {
-                return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید", new EmployeeByNationalCodeInWorkshopViewModel() { AuthorizedCanceled = true });
-            }
-            if (personalInfo.ResponseContext.Status.Code != 0)
-            {
-                return op.Failed("کد ملی و تاریخ تولد با هم همخانی ندارند");
-            }
+                if (personalInfo.ResponseContext.Status.Code == 14)
+                {
+                    return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید", new EmployeeByNationalCodeInWorkshopViewModel() { AuthorizedCanceled = true });
+                }
+                if (personalInfo.ResponseContext.Status.Code != 0)
+                {
+                    return op.Failed("کد ملی و تاریخ تولد با هم همخانی ندارند");
+                }
 
-            var basicInfo = personalInfo.BasicInformation;
-            var identityInfo = personalInfo.IdentificationInformation;
-            DateTime apiBirthDate = identityInfo.BirthDate.ToGeorgianDateTime();
+                var basicInfo = personalInfo.BasicInformation;
+                var identityInfo = personalInfo.IdentificationInformation;
+                DateTime apiBirthDate = identityInfo.BirthDate.ToGeorgianDateTime();
 
-            var dateOfIssue = new DateTime(1922, 1, 1);
-
-            var gender = basicInfo.GenderEnum switch
-            {
-                Gender.Female => "زن",
-                Gender.Male => "مرد",
-                _ => throw new AggregateException()
-            };
-
-            var idNumber = identityInfo.ShenasnamehNumber == "0" ? identityInfo.NationalId : identityInfo.ShenasnamehNumber;
-
-            var newEmployee = new Employee(basicInfo.FirstName, basicInfo.LastName, basicInfo.FatherName, apiBirthDate,
-                dateOfIssue, null, identityInfo.NationalId, idNumber, gender, "ایرانی", identityInfo.ShenasnameSerial, identityInfo.ShenasnameSeri);
-            newEmployee.Authorized();
-            await _EmployeeRepository.CreateAsync(newEmployee);
-            await _EmployeeRepository.SaveChangesAsync();
-
-            return op.Succcedded(new EmployeeByNationalCodeInWorkshopViewModel()
-            {
-                EmployeeId = newEmployee.id,
-                EmployeeFName = newEmployee.FName,
-                Gender = newEmployee.Gender,
-                Nationality = newEmployee.Nationality,
-                EmployeeLName = newEmployee.LName
-            });
-        }
-
-        if (_leftWorkTempRepository.ExistsIgnoreQueryFilter(x =>
-                x.EmployeeId == employee.id && x.WorkshopId == workshopId && x.LeftWorkType == LeftWorkTempType.StartWork))
-        {
-            return op.Failed("این پرسنل در کارگاه شما قبلا افزوده شده است و در انتظار تایید میباشد");
-        }
-
-        if (employee.IsAuthorized == false)
-        {
-            var personalInfoResponse = await _uidService.GetPersonalInfo(nationalCode, birthDate);
-
-            if (personalInfoResponse.ResponseContext.Status.Code == 0)
-            {
-                var basicInfo = personalInfoResponse.BasicInformation;
-                var identityInfo = personalInfoResponse.IdentificationInformation;
-                var apiBirthDate = identityInfo.BirthDate.ToGeorgianDateTime();
+                var dateOfIssue = new DateTime(1922, 1, 1);
 
                 var gender = basicInfo.GenderEnum switch
                 {
@@ -1348,31 +1308,90 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
                 var idNumber = identityInfo.ShenasnamehNumber == "0" ? identityInfo.NationalId : identityInfo.ShenasnamehNumber;
 
-
-                employee.Edit(basicInfo.FirstName, basicInfo.LastName, basicInfo.FatherName, apiBirthDate,
-                    employee.DateOfIssue, employee.PlaceOfIssue, identityInfo.NationalId, idNumber,
-                    gender, "ایرانی", employee.Phone, employee.Address, employee.State, employee.City,
-                    employee.MaritalStatus, employee.MilitaryService, employee.LevelOfEducation,
-                    employee.FieldOfStudy, employee.BankCardNumber, employee.BankBranch, employee.InsuranceCode, employee.InsuranceHistoryByYear,
-                    employee.InsuranceHistoryByMonth, employee.NumberOfChildren,
-                    employee.OfficePhone, employee.MclsUserName, employee.MclsPassword,
-                    employee.EserviceUserName, employee.EservicePassword, employee.TaxOfficeUserName,
-                    employee.TaxOfficepassword, employee.SanaUserName, employee.SanaPassword);
-
-                employee.Authorized();
-
+                var newEmployee = new Employee(basicInfo.FirstName, basicInfo.LastName, basicInfo.FatherName, apiBirthDate,
+                    dateOfIssue, null, identityInfo.NationalId, idNumber, gender, "ایرانی", identityInfo.ShenasnameSerial, identityInfo.ShenasnameSeri);
+                newEmployee.Authorized();
+                await _EmployeeRepository.CreateAsync(newEmployee);
                 await _EmployeeRepository.SaveChangesAsync();
 
+                return op.Succcedded(new EmployeeByNationalCodeInWorkshopViewModel()
+                {
+                    EmployeeId = newEmployee.id,
+                    EmployeeFName = newEmployee.FName,
+                    Gender = newEmployee.Gender,
+                    Nationality = newEmployee.Nationality,
+                    EmployeeLName = newEmployee.LName
+                });
             }
             else
+            {
+                return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید", new EmployeeByNationalCodeInWorkshopViewModel() { AuthorizedCanceled = true });
+            }
+          
+           
+            
+        
+        }
+        else if (employee == null && authorizedCanceled)
+        {
+            return op.Succcedded(new EmployeeByNationalCodeInWorkshopViewModel());
+        }
+
+        if (_leftWorkTempRepository.ExistsIgnoreQueryFilter(x =>
+                x.EmployeeId == employee.id && x.WorkshopId == workshopId && x.LeftWorkType == LeftWorkTempType.StartWork))
+        {
+            return op.Failed("این پرسنل در کارگاه شما قبلا افزوده شده است و در انتظار تایید میباشد");
+        }
+
+        var personalInfoResponse = await _uidService.GetPersonalInfo(nationalCode, birthDate);
+        if (personalInfoResponse != null)
+        {
+            if (employee.IsAuthorized == false)
+            {
+
+
+                if (personalInfoResponse.ResponseContext.Status.Code == 0)
+                {
+                    var basicInfo = personalInfoResponse.BasicInformation;
+                    var identityInfo = personalInfoResponse.IdentificationInformation;
+                    var apiBirthDate = identityInfo.BirthDate.ToGeorgianDateTime();
+
+                    var gender = basicInfo.GenderEnum switch
+                    {
+                        Gender.Female => "زن",
+                        Gender.Male => "مرد",
+                        _ => throw new AggregateException()
+                    };
+
+                    var idNumber = identityInfo.ShenasnamehNumber == "0" ? identityInfo.NationalId : identityInfo.ShenasnamehNumber;
+
+
+                    employee.Edit(basicInfo.FirstName, basicInfo.LastName, basicInfo.FatherName, apiBirthDate,
+                        employee.DateOfIssue, employee.PlaceOfIssue, identityInfo.NationalId, idNumber,
+                        gender, "ایرانی", employee.Phone, employee.Address, employee.State, employee.City,
+                        employee.MaritalStatus, employee.MilitaryService, employee.LevelOfEducation,
+                        employee.FieldOfStudy, employee.BankCardNumber, employee.BankBranch, employee.InsuranceCode, employee.InsuranceHistoryByYear,
+                        employee.InsuranceHistoryByMonth, employee.NumberOfChildren,
+                        employee.OfficePhone, employee.MclsUserName, employee.MclsPassword,
+                        employee.EserviceUserName, employee.EservicePassword, employee.TaxOfficeUserName,
+                        employee.TaxOfficepassword, employee.SanaUserName, employee.SanaPassword);
+
+                    employee.Authorized();
+
+                    await _EmployeeRepository.SaveChangesAsync();
+
+                }
+                else
+                {
+                    return op.Failed("کد ملی با تاریخ تولد وارد شده مطابقت ندارد");
+                }
+            }
+            else if (employee.DateOfBirth.ToFarsi() != birthDate || employee.NationalCode != nationalCode)
             {
                 return op.Failed("کد ملی با تاریخ تولد وارد شده مطابقت ندارد");
             }
         }
-        else if (employee.DateOfBirth.ToFarsi() != birthDate || employee.NationalCode != nationalCode)
-        {
-            return op.Failed("کد ملی با تاریخ تولد وارد شده مطابقت ندارد");
-        }
+       
 
         var leftWorkViewModel = _leftWorkRepository.GetLastLeftWorkByEmployeeIdAndWorkshopId(workshopId, employee.id);
         if (leftWorkViewModel == null)

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)
+    public async Task<OperationResult> SetPendingWorkflow(long entityId,InstitutionContractSigningType signingType)
     {
         var op = new OperationResult();
         var institutionContract = await _institutionContractRepository.GetIncludeWorkshopDetailsAsync(entityId);
@@ -1551,6 +1551,30 @@ 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();
@@ -1559,7 +1583,9 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         {
             institutionContract.SetPendingWorkflow();
         }
-
+        
+        institutionContract.SetSigningType(signingType);
+        
         await _institutionContractRepository.SaveChangesAsync();
         return op.Succcedded();
     }
@@ -1569,6 +1595,28 @@ 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

@@ -2371,6 +2371,11 @@ public class InsuranceListApplication : IInsuranceListApplication
 		return _insuranceListRepositpry.GetTabCounts(searchModel);
 	}
 
+	public async Task<PagedResult<InsuranceClientListViewModel>> GetInsuranceClientList(InsuranceClientSearchModel searchModel)
+	{
+		return await _insuranceListRepositpry.GetInsuranceClientList(searchModel);
+	}
+
 	public async Task<List<InsuranceListViewModel>> GetNotCreatedWorkshop(InsuranceListSearchModel searchModel)
 	{
 		return await _insuranceListRepositpry.GetNotCreatedWorkshop(searchModel);

CompanyManagment.EFCore/Mapping/InstitutionContractMapping.cs

@@ -34,6 +34,10 @@ 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)
@@ -45,5 +49,10 @@ 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

@@ -0,0 +1,29 @@
+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,6 +3462,10 @@ 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,9 +4,7 @@ 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;
@@ -17,7 +15,6 @@ 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;
@@ -26,30 +23,17 @@ 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;
@@ -1375,7 +1359,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     .Count(l => l.StartWorkDate <= DateTime.Now && l.LeftWorkDate >= DateTime.Now);
                 return new GetInstitutionContractListItemsViewModel()
                 {
-                    ContractAmount = x.contract.ContractAmount,
+                    ContractAmount = x.contract.ContractAmountWithTax,
                     Balance = statement?.FinancialTransactionList.Sum(ft => ft.Deptor - ft.Creditor) ?? 0,
                     WorkshopsCount = workshops.Count(),
                     ContractStartFa = x.contract.ContractStartGr.ToFarsi(),
@@ -1395,9 +1379,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     Workshops = workshopDetails,
                     IsInPersonContract = x.contract.WorkshopGroup?.CurrentWorkshops
                         .Any(y => y.Services.ContractInPerson) ?? true,
-                    IsOldContract = x.contract.WorkshopGroup?.CurrentWorkshops == null
-                                    || x.contract.WorkshopGroup.CurrentWorkshops.Count == 0
-                                    || x.contract.WorkshopGroup.CurrentWorkshops.Any(y => y.Price == 0)
+                    IsOldContract = x.contract.SigningType == InstitutionContractSigningType.Legacy
                 };
             }).ToList()
         };
@@ -3216,6 +3198,9 @@ 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,
@@ -4773,6 +4758,7 @@ 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

@@ -1777,6 +1777,49 @@ public class InsuranceListRepository : RepositoryBase<long, InsuranceList>, IIns
         return res;
     }
 
+    public async Task<PagedResult<InsuranceClientListViewModel>> GetInsuranceClientList(InsuranceClientSearchModel searchModel)
+    {
+        var workshopId = _authHelper.GetWorkshopId();
+        var query = _context.InsuranceListSet
+            .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),
+        }).Where(x => x.WorkShopId == workshopId);
+
+
+        if (searchModel.Year>0)
+        {
+            query = query.Where(x => x.YearInt == searchModel.Year);
+        } 
+        if (searchModel.Month > 0)
+        {
+            query = query.Where(x => x.MonthInt == searchModel.Month);
+        }
+
+        var res = new PagedResult<InsuranceClientListViewModel>
+        {
+            TotalCount = query.Count()
+        };
+        query = searchModel.Sorting switch
+        {
+            "CreationDate-Max" => query.OrderByDescending(x => x.Id),
+            "CreationDate-Min" => query.OrderBy(x => x.Id),
+            "Month-Max" => query.OrderByDescending(x => x.MonthInt),
+            "Month-Min" => query.OrderBy(x => x.MonthInt),
+            "Year-Max" => query.OrderByDescending(x => x.YearInt),
+            "Year-Min" => query.OrderBy(x => x.YearInt),
+            _ => query.OrderByDescending(x => x.Id),
+        };
+        res.List =await query.ApplyPagination(searchModel.PageIndex,searchModel.PageSize).ToListAsync();
+        return res;
+    }
+
     public async Task<List<InsuranceListViewModel>> GetNotCreatedWorkshop(InsuranceListSearchModel searchModel)
     {
         if (string.IsNullOrEmpty(searchModel.Month) || string.IsNullOrEmpty(searchModel.Year))

CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs

@@ -1994,8 +1994,9 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
                     case "شنبه":
                         w1 = 7;
                         w2 = 14;
-                        w3 = 28;
-                        w4 = 31;
+                        w3 = 21;
+                        w4 = 28;
+                        w5 = 31;
                         break;
                     case "یکشنبه":
                         w1 = 6;
@@ -2361,6 +2362,7 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
                         break;
                 }
             }
+
         }
 
         #endregion

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

@@ -0,0 +1,49 @@
+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/CreateProject/CreateProjectCommandValidator.cs

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

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

@@ -1,3 +1,4 @@
+using System.Globalization;
 using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Domain._Common;
@@ -7,21 +8,23 @@ namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.Project
 
 public record ProjectBoardDetailQuery(Guid SectionId) : IBaseQuery<ProjectBoardDetailResponse>;
 
-public record ProjectBoardDetailResponse(List<ProjectBoardDetailUserResponse> Users, string TotalTime);
+public record ProjectBoardDetailResponse(List<ProjectBoardDetailUserResponse> Users, string TotalTime,string RemainingTime );
 
 public record ProjectBoardDetailUserResponse
 {
-    public List<ProjectBoardDetailUserHistoryResponse> Histories { get; set; } = new();
-    public string UserFullName { get; set; }
-    public long UserId { get; set; }
+    public List<ProjectBoardDetailUserHistoryResponse> Histories { get; init; }
+    public string UserFullName { get; init; }
+    public string TotalTime { get; init; }
+    public string SpentTime { get; init; }
+    public long UserId { get; init; }
 }
 
-public class ProjectBoardDetailUserHistoryResponse
+public record ProjectBoardDetailUserHistoryResponse
 {
-    public string Date { get; set; }
-    public string startTime { get; set; }
-    public string EndTime { get; set; }
-    public string TotalTime { get; set; }
+    public string Date { get; init; }
+    public string startTime { get; init; }
+    public string EndTime { get; init; }
+    public string TotalTime { get; init; }
 }
 
 public class ProjectBoardDetailQueryHandler : IBaseQueryHandler<ProjectBoardDetailQuery, ProjectBoardDetailResponse>
@@ -38,6 +41,7 @@ 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)
@@ -49,16 +53,22 @@ public class ProjectBoardDetailQueryHandler : IBaseQueryHandler<ProjectBoardDeta
             .Where(x => userIds.Contains(x.Id))
             .ToDictionaryAsync(x => x.Id, x => x.FullName, cancellationToken);
 
-        var totalTimeSpan = section.Activities
+        var totalActivityTimeSpan = 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(),
@@ -68,7 +78,8 @@ public class ProjectBoardDetailQueryHandler : IBaseQueryHandler<ProjectBoardDeta
                 }).ToList()
             };
         }).ToList();
-        var response = new ProjectBoardDetailResponse(users, $"{totalTimeSpan.TotalHours}:{totalTimeSpan.Minutes:D2}");
+        var response = new ProjectBoardDetailResponse(users, $"{(int)totalActivityTimeSpan.TotalHours}:{totalActivityTimeSpan.Minutes:D2}",
+            $"{(int)remainingTimeSpan.TotalHours}:{remainingTimeSpan.Minutes:D2}");
         return OperationResult<ProjectBoardDetailResponse>.Success(response);
     }
 }

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

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

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

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

ProgramManager/src/Application/GozareshgirProgramManager.Application/_Common/Constants/ProgramManagerPermissionCode.cs

@@ -231,11 +231,11 @@ public static class ProgramManagerPermissionCode
     #endregion
 
    
-    public static List<int> GetAllCodes()
+    public static Dictionary<string, object> GetAllCodes()
     {
-        var result = new List<int>();
+        var result = new Dictionary<string, object>();
 
-        void Collect(Type type)
+        void Collect(Type type, Dictionary<string, object> dict)
         {
             // Collect const int fields directly declared on this type
             var fields = type.GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.DeclaredOnly);
@@ -246,7 +246,7 @@ public static class ProgramManagerPermissionCode
                     var raw = f.GetRawConstantValue();
                     if (raw is int value)
                     {
-                        result.Add(value);
+                        dict[f.Name] = value;
                     }
                 }
             }
@@ -255,11 +255,16 @@ public static class ProgramManagerPermissionCode
             var nestedTypes = type.GetNestedTypes(BindingFlags.Public | BindingFlags.NonPublic);
             foreach (var nt in nestedTypes)
             {
-                Collect(nt);
+                var nestedDict = new Dictionary<string, object>();
+                Collect(nt, nestedDict);
+                if (nestedDict.Count > 0)
+                {
+                    dict[nt.Name] = nestedDict;
+                }
             }
         }
 
-        Collect(typeof(ProgramManagerPermissionCode));
+        Collect(typeof(ProgramManagerPermissionCode), result);
         return result;
     }
 }

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

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

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

@@ -217,4 +217,39 @@ 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,6 +40,22 @@ 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,5 +6,6 @@ public enum TaskSectionStatus
     ReadyToStart = 1,      // آماده شروع
     InProgress = 2,        // درحال انجام
     Incomplete = 3,        // ناتمام شده
-    Completed = 4          // تکمیل شده
+    PendingForCompletion = 4, // در انتظار تکمیل
+    Completed = 5          // تکمیل شده
 }

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

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

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

@@ -1,3 +1,4 @@
+using System.Collections;
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
 
@@ -11,4 +12,5 @@ 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/Infrastructure/GozareshgirProgramManager.Infrastructure/Migrations/20251227094008_add phase deploy status and is archived.Designer.cs

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

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

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

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

@@ -179,6 +179,11 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.Property<DateTime>("CreationDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("DeployStatus")
+                        .IsRequired()
+                        .HasMaxLength(30)
+                        .HasColumnType("nvarchar(30)");
+
                     b.Property<string>("Description")
                         .HasMaxLength(1000)
                         .HasColumnType("nvarchar(1000)");
@@ -189,6 +194,9 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.Property<bool>("HasAssignmentOverride")
                         .HasColumnType("bit");
 
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("bit");
+
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(200)

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

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

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

@@ -1,4 +1,5 @@
 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;
@@ -35,4 +36,13 @@ 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);
+    }
 }

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

@@ -1,6 +1,7 @@
 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.ChangeStatusSection;
 using GozareshgirProgramManager.Application.Modules.Projects.Commands.CreateProject;
 using GozareshgirProgramManager.Application.Modules.Projects.Commands.DeleteProject;
@@ -11,6 +12,7 @@ using GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectA
 using GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectsList;
 using GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectBoardDetail;
 using GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectBoardList;
+using GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectDeployBoardList;
 using GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectSetTimeDetails;
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
@@ -98,14 +100,24 @@ public class ProjectController : ProgramManagerBaseController
     [HttpGet("board")]
     public async Task<ActionResult<OperationResult<List<ProjectBoardListResponse>>>> GetProjectBoard([FromQuery] ProjectBoardListQuery query)
     {
+        // اجرای Command برای متوقف کردن تسک‌های overtime قبل از نمایش
+        await _mediator.Send(new AutoStopOverTimeTaskSectionsCommand());
+        
         var res = await _mediator.Send(query);
         return res;
     }
-    [HttpGet("board/{id:guid}")]
-    public async Task<ActionResult<OperationResult<ProjectBoardDetailResponse>>> Test(Guid id)
+    [HttpGet("board/details")]
+    public async Task<ActionResult<OperationResult<ProjectBoardDetailResponse>>> GetProjectBoardDetails(Guid id)
     {
         var query = new ProjectBoardDetailQuery(id);
         var res = await _mediator.Send(query);
         return res;
     }
+
+    [HttpGet("deploy-board")]
+    public async Task<ActionResult<OperationResult<GetProjectsDeployBoardListResponse>>> GetProjectDeployBoard()
+    {
+        var request = new GetProjectDeployBoardListQuery();
+        return await _mediator.Send(request);
+    }
 }

ServiceHost/Areas/Admin/Controllers/institutionContractController.cs

@@ -807,6 +807,13 @@ 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/Admin/Pages/Accounts/Account/Create.cshtml

@@ -129,7 +129,7 @@
                 <div class="col-md-6">
                     <div class="row"></div>
                     <div class="form-group" style="margin: 29px 7px 0px;">
-                        <span> فعالیت کاربر در پروگرام منیجر </span>
+                        <span> فعالیت کاربر در مدیریت پروژه </span>
                         <span>&nbsp;</span>
                         <label class="switch">
                             <input id="checkAll" asp-for="IsProgramManagerUser" type="checkbox"/>
@@ -143,7 +143,7 @@
 				
                 <div class="col-md-6">
                     <div class="form-group">
-                        <label asp-for="UserRoles" > نقش  در پروگرام منیجر </label>
+                        <label asp-for="UserRoles" > انتخاب نقش در مدیریت پروژه </label>
                         <select disabled="disabled" class="form-control select-city" multiple="multiple" asp-for="UserRoles" asp-items="Model.RoleList">
                             <option value="0"></option>
                         </select>

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

@@ -133,7 +133,7 @@
                 <div class="col-md-6">
                     <div class="row"></div>
                     <div class="form-group" style="margin: 29px 7px 0px;">
-                        <span> فعالیت کاربر در پروگرام منیجر </span>
+                        <span> فعالیت کاربر درمدیریت پروژه </span>
                         <span>&nbsp;</span>
                         <label class="switch">
                             <input id="editcheckAll" asp-for="IsProgramManagerUser" type="checkbox"/>
@@ -148,7 +148,7 @@
                 <div class="col-md-6">
                     <div class="form-group">
 
-                        <label  asp-for="UserRoles"> نقش در پروگرام منیجر </label>
+                        <label asp-for="UserRoles"> انتخاب نقش در مدیریت پروژه </label>
                         @if (Model.IsProgramManagerUser)
                         {
                             <select class="form-control select-city editSelect" multiple="multiple" asp-for="UserRoles" asp-items="Model.RoleList">

ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml.cs

@@ -2642,8 +2642,9 @@ public class AutoExtensionModel : PageModel
                     case "شنبه":
                         w1 = 7;
                         w2 = 14;
-                        w3 = 28;
-                        w4 = 31;
+                        w3 = 21;
+                        w4 = 28;
+                        w5 = 31;
                         break;
                     case "یکشنبه":
                         w1 = 6;

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

@@ -0,0 +1,15 @@
+@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,6 +2,14 @@
 @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>
@@ -60,16 +68,85 @@
 </form>
 
 
-<form style="margin:50px" asp-page-handler="PaymentGateWay" id="11" method="post">
+<form style="margin:30px" 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,36 +1,41 @@
 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 CompanyManagement.Infrastructure.Excel.Checkout.AsghaeeAzarWorkshops;
 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 _0_Framework.Application.Enums;
-using _0_Framework.Application.FaceEmbedding;
-using CompanyManagement.Infrastructure.Excel.WorkshopsRollCall;
+using System.Diagnostics;
+using System.Net.Http;
+using System.Security.Cryptography.Xml;
+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
@@ -47,6 +52,7 @@ 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; }
@@ -61,13 +67,18 @@ 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)
+            ITemporaryClientRegistrationApplication clientRegistrationApplication, IOnlinePayment onlinePayment, IFaceEmbeddingService faceEmbeddingService, IAuthHelper authHelper)
         {
             _application = application;
             _rollCallDomainService = rollCallDomainService;
@@ -77,6 +88,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
             _clientRegistrationApplication = clientRegistrationApplication;
             _onlinePayment = onlinePayment;
             _faceEmbeddingService = faceEmbeddingService;
+            _authHelper = authHelper;
             _paymentGateway = new SepehrPaymentGateway(httpClientFactory);
         }
 
@@ -140,11 +152,37 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         public async Task<IActionResult> OnPostShiftDateNew()
         {
             //await UpdateInstitutionContract();
-            await UpdateFaceEmbeddingNames();
+            //await UpdateFaceEmbeddingNames();
+            //await SetInstitutionContractSigningType();
+            var data = OnGetExportAsghaeeAzarWorkshops();
+            return File(data, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+                "AsghaeeAzarWorkshops.xlsx");
             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);
@@ -292,6 +330,105 @@ 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)
@@ -840,8 +977,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
@@ -902,7 +1039,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
                         x.PersonnelCount,
                         x.Price, x.InstitutionContractWorkshopGroupId,
                         group,
-                        x.WorkshopId.Value);
+                        x.WorkshopId.Value,x.id);
                     entity.SetEmployers(x.Employers.Select(e => e.EmployerId).ToList());
 
                     return entity;
@@ -978,6 +1115,28 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
         }
 
         #endregion
+
+        #region Excel
+
+        /// <summary>
+        /// خروجی اکسل آقایی آذر ورکشاپ
+        /// </summary>
+        /// <returns></returns>
+        private byte[] OnGetExportAsghaeeAzarWorkshops()
+        {
+            var data = _context.CheckoutSet
+                .Where(x => x.WorkshopId == 768 && x.Month =="آذر"  && x.Year =="1404")
+                .Select(x => new AsghaeeAzarWorkshopsExcelViewModel()
+                {
+                    FinalAmount = x.TotalPayment.ToMoney(),
+                    FullName = x.EmployeeFullName,
+                    NationalCode = x.NationalCode
+                }).ToList();
+
+            return AsghaeeAzarWorkshopsExcelGenerator.Generate(data);
+        }
+
+        #endregion
     }
 
     public class IndexModel2 : PageModel

ServiceHost/Areas/Client/Controllers/InsuranceController.cs

@@ -0,0 +1,22 @@
+using _0_Framework.Application;
+using CompanyManagment.App.Contracts.InsuranceList;
+using Microsoft.AspNetCore.Mvc;
+using ServiceHost.BaseControllers;
+
+namespace ServiceHost.Areas.Client.Controllers;
+
+public class InsuranceController:ClientBaseController
+{
+    private readonly IInsuranceListApplication _insuranceListApplication;
+
+    public InsuranceController(IInsuranceListApplication insuranceListApplication)
+    {
+        _insuranceListApplication = insuranceListApplication;
+    }
+    [HttpGet]
+    public async Task<ActionResult<PagedResult<InsuranceClientListViewModel>>> GetInsurances(InsuranceClientSearchModel searchModel)
+    {
+        var insurances =await _insuranceListApplication.GetInsuranceClientList(searchModel);
+        return Ok(insurances);
+    }
+}

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

@@ -157,9 +157,10 @@ namespace ServiceHost.Areas.Client.Pages.Company.Employees
 		    });
 	    }
 
-	    public async Task<IActionResult> OnGetEmployeeDetailsWithNationalCode(string nationalCode,string birthDate)
+	    public async Task<IActionResult> OnGetEmployeeDetailsWithNationalCode(string nationalCode,string birthDate, bool authorizedCanceled)
 	    {
-			var result = await _employeeApplication.ValidateCreateEmployeeClientByNationalCodeAndWorkshopId(nationalCode, birthDate, _workshopId);
+          
+			var result = await _employeeApplication.ValidateCreateEmployeeClientByNationalCodeAndWorkshopId(nationalCode, birthDate, authorizedCanceled, _workshopId);
 			return new JsonResult(result);
 	    }
 

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

@@ -47,7 +47,7 @@
         </div>
     </div>
     
-    <div id="AuthorizedCanceled"  class="col-12 p-2 disable">
+    <div id="AuthorizedCanceled" class="col-12 p-2 disable">
         <input id="authorizedCheckboxInput" type="checkbox"/> 
         <label>ثبت مشخصات پرسنل بدون احراز هویت</label>
 

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

@@ -1,4 +1,4 @@
-using System;
+ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -39,7 +39,7 @@ namespace ServiceHost.Areas.Client.Pages.Company.InsuranceList
         public string WorkshopName;
         public List<string> YearlyList;
         public string Year;
-        public string Month;
+        public string Month; 
         public string Sorting;
         public int PageIndex;
         public string TypeOfInsurance;
@@ -163,6 +163,7 @@ namespace ServiceHost.Areas.Client.Pages.Company.InsuranceList
         }
 
         #endregion
+        
         #region OldClientByHeydari
 
         //public IActionResult OnGetSearch(InsuranceListSearchModel searchModel)

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

@@ -777,9 +777,9 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall
 			});
 		}
 
-		public async Task<IActionResult> OnGetEmployeeDetailsWithNationalCode(string nationalCode, string birthDate)
+		public async Task<IActionResult> OnGetEmployeeDetailsWithNationalCode(string nationalCode, string birthDate, bool? authorizedCanceled = null)
 		{
-			var result = await _employeeApplication.ValidateCreateEmployeeClientByNationalCodeAndWorkshopId(nationalCode, birthDate, _workshopId);
+			var result = await _employeeApplication.ValidateCreateEmployeeClientByNationalCodeAndWorkshopId(nationalCode, birthDate,false, _workshopId);
 			return new JsonResult(result);
 		}
 

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

@@ -546,11 +546,11 @@ namespace ServiceHost.Areas.Client.Pages
 	        return new JsonResult(jobViewModels);
         }
 
-		public async Task<IActionResult> OnGetEmployeeDetailsWithNationalCode(string nationalCode, string birthDate)
+		public async Task<IActionResult> OnGetEmployeeDetailsWithNationalCode(string nationalCode, string birthDate, bool? authorizedCanceled = null)
         {
 	        var workshopSlug = User.FindFirst("WorkshopSlug")?.Value;
 	        long workshopIDecrypt = _passwordHasher.SlugDecrypt(workshopSlug);
-			var result = await _employeeApplication.ValidateCreateEmployeeClientByNationalCodeAndWorkshopId(nationalCode, birthDate, workshopIDecrypt);
+			var result = await _employeeApplication.ValidateCreateEmployeeClientByNationalCodeAndWorkshopId(nationalCode, birthDate,false, workshopIDecrypt);
 	        return new JsonResult(result);
         }
 

ServiceHost/Controllers/GeneralController.cs

@@ -21,6 +21,8 @@ using System.Security.Cryptography;
 using System.Threading;
 using CompanyManagment.App.Contracts.FinancialInvoice;
 using CompanyManagment.App.Contracts.InstitutionContract;
+using GozareshgirProgramManager.Application._Common.Constants;
+using GozareshgirProgramManager.Infrastructure.Persistence.Context;
 
 namespace ServiceHost.Controllers;
 
@@ -65,6 +67,12 @@ public class GeneralController : GeneralBaseController
         });
     }
 
+    [HttpGet("pm-permissions")]
+    public IActionResult GetPMPermissions()
+    {
+        var permissions = ProgramManagerPermissionCode.GetAllCodes();
+        return new JsonResult(permissions);
+    }
 
     [HttpGet("/api/callback"), HttpPost("/api/callback")]
     public async Task<IActionResult> Verify(SepehrGatewayPayResponse payResponse)
@@ -156,7 +164,7 @@ public class GeneralController : GeneralBaseController
                     .Where(x => x.Type == FinancialInvoiceItemType.BuyInstitutionContract);
                 foreach (var editFinancialInvoiceItem in financialItems)
                 {
-                    await _institutionContractApplication.SetPendingWorkflow(editFinancialInvoiceItem.EntityId);
+                    await _institutionContractApplication.SetPendingWorkflow(editFinancialInvoiceItem.EntityId,InstitutionContractSigningType.OtpBased);
                 }
                 var financialInstallmentItems = financialInvoice.Items
                     .Where(x => x.Type == FinancialInvoiceItemType.BuyInstitutionContractInstallment);
@@ -166,7 +174,7 @@ public class GeneralController : GeneralBaseController
                     var institutionContractId =
                         await _institutionContractApplication.GetIdByInstallmentId(
                             editFinancialInvoiceItem.EntityId);
-                    await _institutionContractApplication.SetPendingWorkflow(institutionContractId);
+                    await _institutionContractApplication.SetPendingWorkflow(institutionContractId,InstitutionContractSigningType.OtpBased);
                 }
             }
 

ServiceHost/Conventions/ParameterBindingConvention.cs

@@ -70,7 +70,8 @@ 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;
             }
         }
@@ -80,7 +81,8 @@ 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;
             }
         }

ServiceHost/Filters/OperationResultFilter.cs

@@ -0,0 +1,38 @@
+using GozareshgirProgramManager.Application._Common.Models;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace ServiceHost.Filters;
+
+public class OperationResultFilter : ActionFilterAttribute
+{
+    public override void OnActionExecuted(ActionExecutedContext context)
+    {
+        // بررسی کنید که درخواست برای مسیر /api/programmanager/ است
+        var path = context.HttpContext.Request.Path.Value ?? string.Empty;
+        if (!path.StartsWith("/api/programmanager/", StringComparison.OrdinalIgnoreCase))
+        {
+            return; // اگر مسیر مطابقت ندارد، فیلتر را اعمال نکنید
+        }
+
+        if (context.Result is ObjectResult objectResult)
+        {
+            if (objectResult.Value is OperationResult operationResult && !operationResult.IsSuccess)
+            {
+                int statusCode = GetStatusCode(operationResult.ErrorType);
+                objectResult.StatusCode = statusCode;
+                context.HttpContext.Response.StatusCode = statusCode;
+            }
+        }
+    }
+
+    private static int GetStatusCode(ErrorType errorType) => errorType switch
+    {
+        ErrorType.NotFound => StatusCodes.Status404NotFound,
+        ErrorType.Unauthorized => StatusCodes.Status401Unauthorized,
+        ErrorType.Validation => StatusCodes.Status400BadRequest,
+        ErrorType.BadRequest => StatusCodes.Status400BadRequest,
+        ErrorType.InternalServerError => StatusCodes.Status500InternalServerError,
+        _ => StatusCodes.Status400BadRequest
+    };
+}

ServiceHost/Program.cs

@@ -35,6 +35,7 @@ using Microsoft.OpenApi;
 using ServiceHost.Hubs.ProgramManager;
 using ServiceHost.Notifications.ProgramManager;
 using ServiceHost.Conventions;
+using ServiceHost.Filters;
 
 
 var builder = WebApplication.CreateBuilder(args);
@@ -178,6 +179,7 @@ builder.Services.AddAuthorization(options =>
 builder.Services.AddControllers(options =>
     {
         options.Conventions.Add(new ParameterBindingConvention());
+        options.Filters.Add(new OperationResultFilter());
     })
     .AddJsonOptions(options =>
 {

ServiceHost/wwwroot/AssetsClient/pages/Employees/js/CreateEmployeeForm.js

@@ -69,14 +69,14 @@ $(document).ready(function () {
 function checkInputs() {
     const genderSelected = $(".genderStatus:checked").length > 0;
     const maritalStatusSelected = $(".maritalStatus:checked").length > 0;
-
-    const nationality = $("#NationalitySelect").val();
+    ;
+    const nationality = $('#NationalitySelect option:selected').length > 0;
     const fName = $("#firstName").val();
     const lName = $("#lastName").val();
     const startWork = $("#startWork").val().trim();
     const startWorkIsValidDate = /^\d{4}[-\/]\d{2}[-\/]\d{2}$/.test(startWork);
     const semat = $("#sematSelect").val();
-    debugger;
+ 
     let isEmpty = false;
 
     if (!genderSelected || !maritalStatusSelected || !nationality || !fName || !lName || !startWork || !startWorkIsValidDate || semat === "0") {
@@ -88,6 +88,11 @@ function checkInputs() {
             validateField(".validMariage", "لطفا وضعیت تاهل را مشخص کنید.");
             return false;
         }
+        debugger;
+        if (!nationality) {
+            validateField("#NationalitySelect", "لطفا ملیت را مشخص نمایید.");
+            return false;
+        }
         if (!$("input[name='Command.Gender']:checked").val()) {
             validateField(".validGender", "لطفا جنسیت را مشخص کنید.");
             return false;

ServiceHost/wwwroot/AssetsClient/pages/Employees/js/CreateEmployeeModal.js

@@ -186,6 +186,14 @@ $(document).ready(function () {
 
 		next() {
 			if (goToStep2) {
+				if ($('#authorizedCheckboxInput').is(':checked')) {
+					$('#nationalCodeS2Section').removeClass('disable');
+					$('#birthDateS2Section').removeClass('disable');
+					$('#nameS2Section').removeClass('disable');
+					$('#fNameS2Section').removeClass('disable');
+					$('.disablemightBeNullDB1').removeClass('disable');
+				} 
+
                 this.modal.setState(this.modal.step2);
             }
 		}
@@ -454,7 +462,17 @@ function saveFullData() {
 
     formData.append("Command.CreateCustomizeEmployeeSettings.FridayWork", $('#Friday1').prop('checked') ? "Default" : "WorkInFriday");
     formData.append("Command.CreateCustomizeEmployeeSettings.HolidayWork", $('#HolidayWork1').prop('checked') ? "Default" : "WorkInHolidays");
+	var authorizedCanceled = false;
+	if ($('#authorizedCheckboxInput').is(':checked')) {
+		//$('#nationalCodeS2Section').removeClass('disable');
+		//$('#birthDateS2Section').removeClass('disable');
+		//$('#nameS2Section').removeClass('disable');
+		//$('#fNameS2Section').removeClass('disable');
+		//$('.disablemightBeNullDB1').removeClass('disable');
 
+		formData.append("Command.CanceledAuthorize", true)
+
+	} 
     let pic1 = $("#pic1").attr('src');
     let pic2 = $("#pic2").attr('src');
     if (pic1) formData.append("Command.RollCallUploadEmployeePicture.Picture1", pic1);

ServiceHost/wwwroot/AssetsClient/pages/Employees/js/IdentityInformationModal.js

@@ -82,12 +82,24 @@ function checkNationalCode(nationalCode, birthDate) {
         checkNationalUrl = getEmployeeDataByNationalCodeUrl;
     }
 
+    var authorizedCanceled = false;
+    if ($('#authorizedCheckboxInput').is(':checked')) {
+        //$('#nationalCodeS2Section').removeClass('disable');
+        //$('#birthDateS2Section').removeClass('disable');
+        //$('#nameS2Section').removeClass('disable');
+        //$('#fNameS2Section').removeClass('disable');
+        //$('.disablemightBeNullDB1').removeClass('disable');
+
+        authorizedCanceled = true;
+
+    } 
+
     $("#IdentityLoading").show();
     $.ajax({
         async: false,
         url: checkNationalUrl,
         method: "GET",
-        data: { nationalCode: nationalCode, birthDate: birthDate },
+        data: { nationalCode: nationalCode, birthDate: birthDate, authorizedCanceled: authorizedCanceled },
         success: (response) => {
             if (response.isSuccedded) {
                 if (response.data) {