Merge branch 'Feature/loan/client-api'

# Conflicts:
#	ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Queries/GetMessages/GetMessagesQuery.cs

.gitignore

@@ -362,7 +362,12 @@ MigrationBackup/
 # # Fody - auto-generated XML schema
 # FodyWeavers.xsd
 .idea
+/ServiceHost/appsettings.Development.json
+/ServiceHost/appsettings.json
 
 # Storage folder - ignore all uploaded files, thumbnails, and temporary files
 ServiceHost/Storage
 
+.env
+.env.*
+

0_Framework/Application/Enums/TypeOfSmsSetting.cs

@@ -2,6 +2,8 @@
 
 public enum TypeOfSmsSetting
 {
+    //همه انواع پیامک
+    All = 0,
 
     /// <summary>
     /// پیامک
@@ -23,7 +25,7 @@ public enum TypeOfSmsSetting
 
     /// <summary>
     /// پیامک
-    /// هشدار اول
+    /// هشدار بدهی
     /// </summary>
     Warning,
 
@@ -38,4 +40,19 @@ public enum TypeOfSmsSetting
     /// </summary>
     InstitutionContractConfirm,
 
+    /// <summary>
+    /// ارسال کد تاییدیه قرارداد مالی
+    /// </summary>
+    SendInstitutionContractConfirmationCode,
+
+    /// <summary>
+    /// لینک تاییدیه ایجاد قرارداد مالی
+    /// </summary>
+    SendInstitutionContractConfirmationLink,
+
+    /// <summary>
+    /// یادآور وظایف
+    /// </summary>
+    TaskReminder,
+
 }

0_Framework/Application/PagedResult.cs

@@ -7,7 +7,7 @@ namespace _0_Framework.Application;
 public class PagedResult<T> where T : class
 {
     public int TotalCount  { get; set; }
-    public List<T> List { get; set; }
+    public List<T> List { get; set; } = [];
 }
 public class PagedResult<T,TMeta>:PagedResult<T> where T : class
 {

0_Framework/Application/Sms/ApiResultViewModel.cs

@@ -17,4 +17,35 @@ public class ApiResultViewModel
     public string DeliveryUnixTime { get; set; }
     public string DeliveryColor { get; set; }
     public string FullName { get; set; }
+}
+
+
+public class ApiReportDto
+{
+    public int MessageId { get; set; }
+
+    public long Mobile { get; set; }
+
+    public string SendUnixTime { get; set; }
+    public string DeliveryState { get; set; }
+    public string DeliveryUnixTime { get; set; }
+    public string DeliveryColor { get; set; }
+    public string FullName { get; set; }
+
+}
+
+public class SmsDetailsDto
+{
+
+
+    public string MessageText { get; set; }
+
+    public long Mobile { get; set; }
+
+    public string SendUnixTime { get; set; }
+    public string DeliveryState { get; set; }
+    public string DeliveryUnixTime { get; set; }
+    public string DeliveryColor { get; set; }
+    public string FullName { get; set; }
+
 }

0_Framework/Application/Sms/ISmsService.cs

@@ -16,9 +16,22 @@ public interface ISmsService
     /// <param name="code"></param>
     /// <returns></returns>
     Task<SentSmsViewModel> SendVerifyCodeToClient(string number, string code);
-    bool SendAccountsInfo(string number,string fullName, string userName);
+    bool SendAccountsInfo(string number, string fullName, string userName);
     Task<ApiResultViewModel> GetByMessageId(int messId);
     Task<List<ApiResultViewModel>> GetApiResult(string startDate, string endDate);
+
+    #region ForApi
+
+    Task<List<ApiReportDto>> GetApiReport(string startDate, string endDate);
+    /// <summary>
+    /// دریافت جزئیات پیامک
+    /// </summary>
+    /// <param name="messId"></param>
+    /// <param name="fullName"></param>
+    /// <returns></returns>
+    Task<SmsDetailsDto> GetSmsDetailsByMessageId(int messId, string fullName);
+    #endregion
+
     string DeliveryStatus(byte? dv);
     string DeliveryColorStatus(byte? dv);
     string UnixTimeStampToDateTime(int? unixTimeStamp);
@@ -26,9 +39,9 @@ public interface ISmsService
     #region Mahan
 
     Task<double> GetCreditAmount();
-    
+
     public Task<bool> SendInstitutionCreationVerificationLink(string number, string fullName, Guid institutionId, long contractingPartyId, long institutionContractId, string typeOfSms = null);
-    
+
     public Task<bool> SendInstitutionVerificationCode(string number, string code, string contractingPartyFullName,
         long contractingPartyId, long institutionContractId);
 
@@ -61,7 +74,7 @@ public interface ISmsService
     /// <param name="aprove"></param>
     /// <returns></returns>
     Task<(byte status, string message, int messaeId, bool isSucceded)> MonthlyBill(string number, int tamplateId, string fullname, string amount, string id, string aprove);
-   
+
     /// <summary>
     /// پیامک مسدودی طرف حساب
     /// قراردادهای قدیم

0_Framework/Application/StaticWorkshopAccounts.cs

@@ -31,8 +31,9 @@ public static class StaticWorkshopAccounts
     /// 381 - مهدی قربانی
     /// 392 - عمار حسن دوست
     /// 20 - سمیرا الهی نیا
+    /// 322 - ماهان چمنی
     /// </summary>
-    public static List<long> StaticAccountIds = [2, 3, 380, 381, 392, 20, 476];
+    public static List<long> StaticAccountIds = [2, 3, 380, 381, 392, 20, 476,322];
 
     /// <summary>
     /// این تاریخ در جدول اکانت لفت ورک به این معنیست

AccountManagement.Application.Contracts/AccountManagement.Application.Contracts.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
+	  <NuGetAudit>false</NuGetAudit>
   </PropertyGroup>
 
   <ItemGroup>

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Jobs/JobSchedulerRegistrator.cs

@@ -1,5 +1,6 @@
 
 using _0_Framework.Application;
+using _0_Framework.Application.Enums;
 using _0_Framework.Application.Sms;
 using Company.Domain.ContarctingPartyAgg;
 using Company.Domain.InstitutionContractAgg;
@@ -12,19 +13,21 @@ public class JobSchedulerRegistrator
     private readonly IBackgroundJobClient _backgroundJobClient;
     private readonly SmsReminder _smsReminder;
     private readonly IInstitutionContractRepository _institutionContractRepository;
+    private readonly IInstitutionContractSmsServiceRepository _institutionContractSmsServiceRepository;
     private static DateTime? _lastRunCreateTransaction;
     private static DateTime? _lastRunSendMonthlySms;
     private readonly ISmsService _smsService;
     private readonly ILogger<JobSchedulerRegistrator> _logger;
 
 
-    public JobSchedulerRegistrator(SmsReminder smsReminder, IBackgroundJobClient backgroundJobClient, IInstitutionContractRepository institutionContractRepository, ISmsService smsService, ILogger<JobSchedulerRegistrator> logger)
+    public JobSchedulerRegistrator(SmsReminder smsReminder, IBackgroundJobClient backgroundJobClient, IInstitutionContractRepository institutionContractRepository, ISmsService smsService, ILogger<JobSchedulerRegistrator> logger, IInstitutionContractSmsServiceRepository institutionContractSmsServiceRepository)
     {
         _smsReminder = smsReminder;
         _backgroundJobClient = backgroundJobClient;
         _institutionContractRepository = institutionContractRepository;
         _smsService = smsService;
         _logger = logger;
+        _institutionContractSmsServiceRepository = institutionContractSmsServiceRepository;
     }
 
     public void Register()
@@ -58,17 +61,43 @@ public class JobSchedulerRegistrator
             "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
         );
 
-        //RecurringJob.AddOrUpdate(
-        //    "InstitutionContract.SendWarningSms",
-        //    () => SendWarningSms(),
-        //    "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
-        //);
+        RecurringJob.AddOrUpdate(
+            "InstitutionContract.SendWarningSms",
+            () => SendWarningSms(),
+            "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
+        );
 
-        //RecurringJob.AddOrUpdate(
-        //    "InstitutionContract.SendLegalActionSms",
-        //    () => SendLegalActionSms(),
-        //    "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
-        //);
+        RecurringJob.AddOrUpdate(
+            "InstitutionContract.SendLegalActionSms",
+            () => SendLegalActionSms(),
+            "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
+        );
+
+
+
+        RecurringJob.AddOrUpdate(
+            "InstitutionContract.Block",
+            () => Block(),
+            "*/30 * * * *"  // هر 30 دقیقه یکبار چک کن
+        );
+
+        RecurringJob.AddOrUpdate(
+            "InstitutionContract.UnBlock",
+            () => UnBlock(),
+            "*/10 * * * *"
+        );
+
+        RecurringJob.AddOrUpdate(
+            "InstitutionContract.DeActiveInstitutionEndOfContract",
+            () => DeActiveInstitutionEndOfContract(),
+            "*/30 * * * *"
+        );
+
+        RecurringJob.AddOrUpdate(
+            "InstitutionContract.BlueDeActiveAfterZeroDebt",
+            () => BlueDeActiveAfterZeroDebt(),
+            "*/10 * * * *"
+        );
     }
 
 
@@ -79,14 +108,14 @@ public class JobSchedulerRegistrator
     [DisableConcurrentExecution(timeoutInSeconds: 1200)]
     public async System.Threading.Tasks.Task CreateFinancialTransaction()
     {
-        var now =DateTime.Now;
+        var now = DateTime.Now;
         var endOfMonth = now.ToFarsi().FindeEndOfMonth();
         var endOfMonthGr = endOfMonth.ToGeorgianDateTime();
         _logger.LogInformation("CreateFinancialTransaction job run");
         if (now.Date == endOfMonthGr.Date && now.Hour >= 2 && now.Hour < 4 &&
             now.Date != _lastRunCreateTransaction?.Date)
         {
-            
+
             var month = endOfMonth.Substring(5, 2);
             var year = endOfMonth.Substring(0, 4);
             var monthName = month.ToFarsiMonthByNumber();
@@ -101,17 +130,17 @@ public class JobSchedulerRegistrator
 
             try
             {
-                 await _institutionContractRepository.CreateTransactionForInstitutionContracts(endNewGr, endNewFa, description);
+                await _institutionContractRepository.CreateTransactionForInstitutionContracts(endNewGr, endNewFa, description);
                 _lastRunCreateTransaction = now;
                 Console.WriteLine("CreateTransAction executed");
-      
+
             }
             catch (Exception e)
             {
                 await _smsService.Alarm("09114221321", "خطا-ایجاد سند مالی");
 
             }
-           
+
         }
     }
 
@@ -134,7 +163,7 @@ public class JobSchedulerRegistrator
 
             try
             {
-                await _institutionContractRepository.SendMonthlySms(now);
+                await _institutionContractSmsServiceRepository.SendMonthlySms(now);
                 _lastRunSendMonthlySms = now;
                 Console.WriteLine("Send Monthly sms executed");
 
@@ -156,7 +185,7 @@ public class JobSchedulerRegistrator
     public async System.Threading.Tasks.Task SendReminderSms()
     {
         _logger.LogInformation("SendReminderSms job run");
-        await _institutionContractRepository.SendReminderSmsForBackgroundTask();
+        await _institutionContractSmsServiceRepository.SendReminderSmsForBackgroundTask();
     }
 
     /// <summary>
@@ -167,7 +196,7 @@ public class JobSchedulerRegistrator
     public async System.Threading.Tasks.Task SendBlockSms()
     {
         _logger.LogInformation("SendBlockSms job run");
-        await _institutionContractRepository.SendBlockSmsForBackgroundTask();
+        await _institutionContractSmsServiceRepository.SendBlockSmsForBackgroundTask();
     }
 
 
@@ -179,7 +208,7 @@ public class JobSchedulerRegistrator
     public async System.Threading.Tasks.Task SendInstitutionContractConfirmSms()
     {
         _logger.LogInformation("SendInstitutionContractConfirmSms job run");
-        await _institutionContractRepository.SendInstitutionContractConfirmSmsTask();
+        await _institutionContractSmsServiceRepository.SendInstitutionContractConfirmSmsTask();
     }
 
     /// <summary>
@@ -190,14 +219,86 @@ public class JobSchedulerRegistrator
     public async System.Threading.Tasks.Task SendWarningSms()
     {
         _logger.LogInformation("SendWarningSms job run");
-        await _institutionContractRepository.SendWarningSmsTask();
+        await _institutionContractSmsServiceRepository.SendWarningOrLegalActionSmsTask(TypeOfSmsSetting.Warning);
     }
 
+    /// <summary>
+    /// پیامک اقدام قضایی 
+    /// </summary>
+    /// <returns></returns>
     [DisableConcurrentExecution(timeoutInSeconds: 100)]
     public async System.Threading.Tasks.Task SendLegalActionSms()
     {
         _logger.LogInformation("SendWarningSms job run");
-        await _institutionContractRepository.SendLegalActionSmsTask();
+        await _institutionContractSmsServiceRepository.SendWarningOrLegalActionSmsTask(TypeOfSmsSetting.LegalAction);
+    }
+
+    /// <summary>
+    /// بلاگ سازی
+    /// </summary>
+    /// <returns></returns>
+    [DisableConcurrentExecution(timeoutInSeconds: 100)]
+    public async System.Threading.Tasks.Task Block()
+    {
+        _logger.LogInformation("block job run");
+        var now = DateTime.Now;
+        var executeDate = now.ToFarsi().Substring(8, 2);
+        if (executeDate == "20")
+        {
+            if (now.Hour >= 9 && now.Hour < 10)
+            {
+                await _institutionContractSmsServiceRepository.Block(now);
+            }
+
+        }
+    }
+
+    /// <summary>
+    /// آنبلاک
+    /// </summary>
+    /// <returns></returns>
+    [DisableConcurrentExecution(timeoutInSeconds: 100)]
+    public async System.Threading.Tasks.Task UnBlock()
+    {
+        _logger.LogInformation("UnBlock job run");
+
+        await _institutionContractSmsServiceRepository.UnBlock();
+
+    }
+
+
+    /// <summary>
+    /// غیر فعال سازی قراداد های پایان یافته
+    /// </summary>
+    /// <returns></returns>
+    [DisableConcurrentExecution(timeoutInSeconds: 100)]
+    public async System.Threading.Tasks.Task DeActiveInstitutionEndOfContract()
+    {
+        _logger.LogInformation("DeActiveInstitutionEndOfContract job run");
+
+
+        var now = DateTime.Now;
+        var executeDate = now.ToFarsi().Substring(8, 2);
+        if (executeDate == "01")
+        {
+            if (now.Hour >= 9 && now.Hour < 10)
+            {
+                await _institutionContractSmsServiceRepository.DeActiveInstitutionEndOfContract(now);
+            }
+
+        }
+
+    }
+
+    /// <summary>
+    /// غیرفعال سازس قرارداد های آبی که بدهی ندارند
+    /// </summary>
+    /// <returns></returns>
+    [DisableConcurrentExecution(timeoutInSeconds: 800)]
+    public async System.Threading.Tasks.Task BlueDeActiveAfterZeroDebt()
+    {
+        _logger.LogInformation("BlueDeActiveAfterZeroDebt job run");
+        await _institutionContractSmsServiceRepository.BlueDeActiveAfterZeroDebt();
     }
 
 }

Company.Domain/CheckoutAgg/Checkout.cs

@@ -31,7 +31,7 @@ public class Checkout : EntityBase
         string overNightWorkValue, string fridayWorkValue, string rotatingShifValue, string absenceValue,
         string totalDayOfLeaveCompute, string totalDayOfYearsCompute, string totalDayOfBunosesCompute,
         ICollection<CheckoutLoanInstallment> loanInstallments,
-        ICollection<CheckoutSalaryAid> salaryAids, CheckoutRollCall checkoutRollCall, TimeSpan employeeMandatoryHours, bool hasInsuranceShareTheSameAsList)
+        ICollection<CheckoutSalaryAid> salaryAids, CheckoutRollCall checkoutRollCall, TimeSpan employeeMandatoryHours, bool hasInsuranceShareTheSameAsList, ICollection<CheckoutReward> rewards,double rewardPay)
     {
         EmployeeFullName = employeeFullName;
         FathersName = fathersName;
@@ -71,7 +71,7 @@ public class Checkout : EntityBase
         TotalClaims = totalClaims;
         TotalDeductions = totalDeductions;
         TotalPayment = totalPayment;
-        RewardPay = 0;
+        RewardPay = rewardPay;
         IsActiveString = "true";
         Signature = signature;
         MarriedAllowance = marriedAllowance;
@@ -93,6 +93,7 @@ public class Checkout : EntityBase
         CheckoutRollCall = checkoutRollCall;
         EmployeeMandatoryHours = employeeMandatoryHours;
         HasInsuranceShareTheSameAsList = hasInsuranceShareTheSameAsList;
+        Rewards = rewards;
     }
 
 
@@ -130,7 +131,7 @@ public class Checkout : EntityBase
     public double BonusesPay { get; private set; }
     public double YearsPay { get; private set; }
     public double LeavePay { get; private set; }
-    public double? RewardPay { get; private set; }
+    public double RewardPay { get; private set; }
     public double InsuranceDeduction { get; private set; }
     public double TaxDeducation { get; private set; }
     public double InstallmentDeduction { get; private set; }
@@ -223,6 +224,8 @@ public class Checkout : EntityBase
 
     public ICollection<CheckoutLoanInstallment> LoanInstallments { get; set; } = [];
     public ICollection<CheckoutSalaryAid> SalaryAids { get; set; } = [];
+
+    public ICollection<CheckoutReward> Rewards { get; set; } = [];
     public CheckoutRollCall CheckoutRollCall { get; private set; }
     #endregion
 
@@ -239,7 +242,7 @@ public class Checkout : EntityBase
         double insuranceDeduction, double taxDeducation, double installmentDeduction,
         double salaryAidDeduction, double absenceDeduction, string sumOfWorkingDays
         , string archiveCode, string personnelCode,
-        string totalClaims, string totalDeductions, double totalPayment, double? rewardPay)
+        string totalClaims, string totalDeductions, double totalPayment, double rewardPay)
     {
         EmployeeFullName = employeeFullName;
         FathersName = fathersName;
@@ -337,6 +340,11 @@ public class Checkout : EntityBase
         InstallmentDeduction = installmentsAmount;
     }
 
+    public void SetReward(ICollection<CheckoutReward> rewards, double rewardAmount)
+    {
+        RewardPay = rewardAmount;
+        Rewards = rewards;
+    }
     public void SetCheckoutRollCall(CheckoutRollCall checkoutRollCall)
     {
         CheckoutRollCall = checkoutRollCall;

Company.Domain/CheckoutAgg/ValueObjects/CheckoutReward.cs

@@ -0,0 +1,57 @@
+using System;
+
+namespace Company.Domain.CheckoutAgg.ValueObjects;
+
+public class CheckoutReward
+{
+    public CheckoutReward(string amount, double amountDouble, string grantDateFa, DateTime grantDateGr, string description, string title, long entityId)
+    {
+        Amount = amount;
+        AmountDouble = amountDouble;
+        GrantDateFa = grantDateFa;
+        GrantDateGr = grantDateGr;
+        Description = description;
+        Title = title;
+        EntityId = entityId;
+    }
+
+    /// <summary>
+    /// مبلغ پاداش
+    /// string
+    /// </summary>
+    public string Amount { get; set; }
+
+    /// <summary>
+    /// مبلغ پاداش
+    /// double
+    /// </summary>
+    public double AmountDouble { get; set; }
+
+    /// <summary>
+    /// تاریخ اعطاء
+    /// شمسی
+    /// </summary>
+    public string GrantDateFa { get; set; }
+
+    /// <summary>
+    /// تاریخ اعطاء
+    /// میلادی
+    /// </summary>
+    public DateTime GrantDateGr { get; set; }
+
+    /// <summary>
+    /// توضیحات
+    /// </summary>
+    public string Description { get; set; }
+
+    /// <summary>
+    /// عنوان
+    /// </summary>
+    public string Title { get; set; }
+
+
+    /// <summary>
+    /// آی دی پاداش
+    /// </summary>
+    public long EntityId { get; set; }
+}

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

@@ -91,65 +91,7 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     Task<List<InstitutionContractPrintViewModel>> PrintAllAsync(List<long> ids);
 
 
-    #region ReminderSMS
-    /// <summary>
-    /// دریافت لیست - ارسال پیامک
-    /// فراخوانی از سمت بک گراند سرویس
-    /// </summary>
-    /// <returns></returns>
-    Task<bool> SendReminderSmsForBackgroundTask();
-
-    /// <summary>
-    /// ارسال پیامک صورت حساب ماهانه
-    /// </summary>
-    /// <param name="now"></param>
-    /// <returns></returns>
-    Task SendMonthlySms(DateTime now);
-
-    /// <summary>
-    /// ارسال پیامک مسدودی از طرف بک گراند سرویس
-    /// </summary>
-    /// <returns></returns>
-    Task SendBlockSmsForBackgroundTask();
-
-    /// <summary>
-    /// دریافت لیست واجد شرایط بلاک
-    /// جهت ارسال پیامک مسدودی
-    /// </summary>
-    /// <param name="checkDate"></param>
-    /// <returns></returns>
-    Task<List<BlockSmsListData>> GetBlockListData(DateTime checkDate);
-
-    /// <summary>
-    /// ارسال پیامک مسدودی
-    /// </summary>
-    /// <param name="smsListData"></param>
-    /// <param name="typeOfSms"></param>
-    /// <param name="sendMessStart"></param>
-    /// <param name="sendMessEnd"></param>
-    /// <returns></returns>
-    Task SendBlockSmsToContractingParties(List<BlockSmsListData> smsListData, string typeOfSms,
-        string sendMessStart, string sendMessEnd);
-
-    /// <summary>
-    ///دریافت لیست بدهکارن
-    /// جهت ارسال پیامک
-    /// </summary>
-    /// <returns></returns>
-    Task<List<SmsListData>> GetSmsListData(DateTime checkDate, TypeOfSmsSetting typeOfSmsSetting);
-
-    /// <summary>
-    /// ارسال پیامک های یاد آور بدهی
-    /// </summary>
-    /// <returns></returns>
-    Task SendReminderSmsToContractingParties(List<SmsListData> smsListData, string typeOfSms, string sendMessStart, string sendMessEnd);
-
-    /// <summary>
-    /// ارسال پیامک یادآور تایید قراداد مالی
-    /// </summary>
-    /// <returns></returns>
-    Task SendInstitutionContractConfirmSmsTask();
-    #endregion
+  
 
     #region CreateMontlyTransaction
 
@@ -162,24 +104,12 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
 
     #endregion
 
-    #region WarningSms
-    /// <summary>
-    /// پیامک های هشدار
-    /// </summary>
-    /// <returns></returns>
-    Task SendWarningSmsTask();
-
-    #endregion
 
 
-    #region legalAction
-    /// <summary>
-    /// پیامک اقدام قضائی
-    /// </summary>
-    /// <returns></returns>
-    Task SendLegalActionSmsTask();
 
-    #endregion
+
+   
+
 
     Task<long> GetIdByInstallmentId(long installmentId);
     Task<InstitutionContract> GetPreviousContract(long currentInstitutionContractId);

Company.Domain/InstitutionContractAgg/IInstitutionContractSmsServiceRepository.cs

@@ -0,0 +1,145 @@
+using _0_Framework.Application.Enums;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.InstitutionContract;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Company.Domain.InstitutionContractAgg;
+
+public interface IInstitutionContractSmsServiceRepository : IRepository<long, InstitutionContract>
+{
+    #region reminderSMs
+
+
+    /// <summary>
+    /// ارسال پیامک یادآور تایید قراداد مالی
+    /// </summary>
+    /// <returns></returns>
+    Task SendInstitutionContractConfirmSmsTask();
+    #endregion
+
+    //هشدار و اقدام قضایی
+    #region WarningOrLegalActionSmsListData
+    /// <summary>
+    /// اجرای تسک پیامک هشدار یا اقدام قضایی
+    /// </summary>
+    /// <param name="typeOfSmsSetting"></param>
+    /// <returns></returns>
+    Task SendWarningOrLegalActionSmsTask(TypeOfSmsSetting typeOfSmsSetting);
+
+    /// <summary>
+    /// دریافت لیست بدهکاران آبی جهت هشدار یا اقدام قضایی
+    /// </summary>
+    /// <param name="typeOfSmsSetting"></param>
+    /// <returns></returns>
+    Task<List<SmsListData>> GetWarningOrLegalActionSmsListData(TypeOfSmsSetting typeOfSmsSetting);
+
+    /// <summary>
+    /// ارسال پیامک هشدار یا اقدام قضایی
+    /// </summary>
+    /// <param name="smsListData"></param>
+    /// <param name="typeOfSmsSetting"></param>
+    /// <returns></returns>
+    Task SendWarningOrLegalActionSms(List<SmsListData> smsListData, TypeOfSmsSetting typeOfSmsSetting);
+
+    #endregion
+
+    //بلاک - آنبلاک - پیامک بلاک - 
+    // غیر فعال سازی قراداد های پایان یافته
+    #region Block
+
+    /// <summary>
+    /// ارسال پیامک مسدودی از طرف بک گراند سرویس
+    /// </summary>
+    /// <returns></returns>
+    Task SendBlockSmsForBackgroundTask();
+
+    /// <summary>
+    /// دریافت لیست واجد شرایط بلاک
+    /// جهت ارسال پیامک مسدودی
+    /// </summary>
+    /// <param name="checkDate"></param>
+    /// <returns></returns>
+    Task<List<BlockSmsListData>> GetBlockListData(DateTime checkDate);
+
+    /// <summary>
+    /// ارسال پیامک مسدودی
+    /// </summary>
+    /// <param name="smsListData"></param>
+    /// <param name="typeOfSms"></param>
+    /// <param name="sendMessStart"></param>
+    /// <param name="sendMessEnd"></param>
+    /// <returns></returns>
+    Task SendBlockSmsToContractingParties(List<BlockSmsListData> smsListData, string typeOfSms,
+        string sendMessStart, string sendMessEnd);
+
+    /// <summary>
+    /// بلاک سازی
+    /// </summary>
+    /// <param name="checkDate"></param>
+    /// <returns></returns>
+    Task Block(DateTime checkDate);
+
+    /// <summary>
+    /// دریافت لیست بدهکارانی که باید بلاک شوند 
+    /// </summary>
+    /// <param name="checkDate"></param>
+    /// <returns></returns>
+    Task<List<long>> GetToBeBlockList(DateTime checkDate);
+
+    /// <summary>
+    /// آنبلاک
+    /// </summary>
+    /// <returns></returns>
+    Task UnBlock();
+
+
+    /// <summary>
+    /// غیر فعالسازی قرارداد های پایان یافته
+    /// </summary>
+    /// <param name="checkDate"></param>
+    /// <returns></returns>
+    Task DeActiveInstitutionEndOfContract(DateTime checkDate);
+
+    /// <summary>
+    /// غیرفعال سازس قرارداد های آبی که بدهی ندارند
+    /// </summary>
+    /// <returns></returns>
+    Task BlueDeActiveAfterZeroDebt();
+    #endregion
+
+
+    #region ReminderSMS
+
+    /// <summary>
+    /// دریافت لیست - ارسال پیامک
+    /// فراخوانی از سمت بک گراند سرویس
+    /// </summary>
+    /// <returns></returns>
+    Task<bool> SendReminderSmsForBackgroundTask();
+
+    /// <summary>
+    /// ارسال پیامک صورت حساب ماهانه
+    /// </summary>
+    /// <param name="now"></param>
+    /// <returns></returns>
+    Task SendMonthlySms(DateTime now);
+
+
+
+    /// <summary>
+    ///دریافت لیست بدهکارن
+    /// جهت ارسال پیامک
+    /// </summary>
+    /// <returns></returns>
+    Task<List<SmsListData>> GetSmsListData(DateTime checkDate, TypeOfSmsSetting typeOfSmsSetting);
+
+    /// <summary>
+    /// ارسال پیامک های یاد آور بدهی
+    /// </summary>
+    /// <returns></returns>
+    Task SendReminderSmsToContractingParties(List<SmsListData> smsListData, string typeOfSms, string sendMessStart, string sendMessEnd);
+
+    #endregion
+}

Company.Domain/InstitutionContractSendFlagAgg/IInstitutionContractSendFlagRepository.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Company.Domain.InstitutionContractSendFlagAgg;
+
+/// <summary>
+/// Interface برای Repository مربوط به فلگ ارسال قرارداد
+/// </summary>
+public interface IInstitutionContractSendFlagRepository
+{
+    /// <summary>
+    /// ایجاد یک رکورد جدید برای فلگ ارسال قرارداد
+    /// </summary>
+    Task Create(InstitutionContractSendFlag flag);
+
+    /// <summary>
+    /// بازیابی فلگ بر اساس شناسه قرارداد
+    /// </summary>
+    Task<InstitutionContractSendFlag> GetByContractId(long contractId);
+
+    /// <summary>
+    /// به‌روزرسانی فلگ ارسال
+    /// </summary>
+    Task Update(InstitutionContractSendFlag flag);
+
+    /// <summary>
+    /// بررسی اینکه آیا قرارداد ارسال شده است
+    /// </summary>
+    Task<bool> IsContractSent(long contractId);
+    
+
+}
+

Company.Domain/InstitutionContractSendFlagAgg/InstitutionContractSendFlag.cs

@@ -0,0 +1,82 @@
+using System;
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+
+namespace Company.Domain.InstitutionContractSendFlagAgg;
+
+/// <summary>
+/// نمایندگی فلگ ارسال قرارداد در MongoDB
+/// این موجودیت برای ردیابی اینکه آیا قرارداد ارسال شده است استفاده می‌شود
+/// </summary>
+public class InstitutionContractSendFlag
+{
+    public InstitutionContractSendFlag(long institutionContractId,bool isSent)
+    {
+        Id = Guid.NewGuid();
+        InstitutionContractId = institutionContractId;
+        IsSent = isSent;
+        CreatedDate = DateTime.Now;
+    }
+
+    /// <summary>
+    /// شناسه یکتای MongoDB
+    /// </summary>
+    [BsonId]
+    [BsonRepresentation(BsonType.String)]
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// شناسه قرارداد در SQL
+    /// </summary>
+    public long InstitutionContractId { get; set; }
+    
+    /// <summary>
+    /// آیا قرارداد ارسال شده است
+    /// </summary>
+    public bool IsSent { get; set; }
+
+    /// <summary>
+    /// تاریخ و زمان ارسال
+    /// </summary>
+    public DateTime? SentDate { get; set; }
+
+    /// <summary>
+    /// تاریخ و زمان ایجاد رکورد
+    /// </summary>
+    public DateTime CreatedDate { get; set; }
+
+    /// <summary>
+    /// تاریخ و زمان آخرین به‌روزرسانی
+    /// </summary>
+    public DateTime? LastModifiedDate { get; set; }
+    
+
+    /// <summary>
+    /// علامت‌گذاری قرارداد به عنوان ارسال‌شده
+    /// </summary>
+    public void MarkAsSent()
+    {
+        IsSent = true;
+        SentDate = DateTime.Now;
+        LastModifiedDate = DateTime.Now;
+    }
+
+    /// <summary>
+    /// بازگردانی علامت ارسال
+    /// </summary>
+    public void MarkAsNotSent()
+    {
+        IsSent = false;
+        SentDate = null;
+        LastModifiedDate = DateTime.Now;
+    }
+
+    /// <summary>
+    /// به‌روزرسانی علامت آخری اصلاح
+    /// </summary>
+    public void UpdateLastModified()
+    {
+        LastModifiedDate = DateTime.Now;
+    }
+}
+

Company.Domain/RollCallAgg/IRollCallMandatoryRepository.cs

@@ -1,15 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using _0_Framework.Domain;
+using _0_Framework.Domain;
 using Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities;
 using CompanyManagment.App.Contracts.Contract;
 using CompanyManagment.App.Contracts.CustomizeCheckout;
 using CompanyManagment.App.Contracts.Leave;
 using CompanyManagment.App.Contracts.Loan;
+using CompanyManagment.App.Contracts.Reward;
 using CompanyManagment.App.Contracts.RollCall;
 using CompanyManagment.App.Contracts.SalaryAid;
 using CompanyManagment.App.Contracts.WorkingHoursTemp;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Company.Domain.RollCallAgg;
 
@@ -53,6 +54,9 @@ public interface IRollCallMandatoryRepository : IRepository<long, RollCall>
     List<SalaryAidViewModel> SalaryAidsForCheckout(long employeeId, long workshopId, DateTime checkoutStart,
         DateTime checkoutEnd);
 
+    List<RewardViewModel> RewardForCheckout(long employeeId, long workshopId, DateTime checkoutEnd,
+        DateTime checkoutStart);
+
     Task<ComputingViewModel> RotatingShiftReport(long workshopId, long employeeId, DateTime contractStart,
         DateTime contractEnd, string shiftwork, bool hasRollCall, CreateWorkingHoursTemp command,bool holidayWorking);
 }

Company.Domain/RollCallAgg/IRollCallRepository.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.RollCall;
 using CompanyManagment.App.Contracts.WorkingHoursTemp;
@@ -91,5 +92,9 @@ namespace Company.Domain.RollCallAgg
         Task<List<RollCall>> GetRollCallsUntilNowWithWorkshopIdEmployeeIds(long workshopId, List<long> employeeIds,
             DateTime fromDate);
         #endregion
+
+        Task<PagedResult<RollCallCaseHistoryTitleDto>> GetCaseHistoryTitles(long workshopId,RollCallCaseHistorySearchModel searchModel);
+        Task<List<RollCallCaseHistoryDetail>> GetCaseHistoryDetails(long workshopId,
+            string titleId, RollCallCaseHistorySearchModel searchModel);
     }
 }

Company.Domain/SmsResultAgg/ISmsResultRepository.cs

@@ -1,10 +1,32 @@
-using CompanyManagment.App.Contracts.SmsResult;
-using System.Collections.Generic;
+using _0_Framework.Application.Enums;
 using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.SmsResult;
+using CompanyManagment.App.Contracts.SmsResult.Dto;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Company.Domain.SmsResultAgg;
 
 public interface ISmsResultRepository : IRepository<long, SmsResult>
 {
+    #region ForApi
+
+    /// <summary>
+    /// دریافت لیست پیامکها
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    Task<List<SmsReportDto>> GetSmsReportList(SmsReportSearchModel searchModel);
+
+    /// <summary>
+    /// دریافت اکسپند لیست هر تاریخ
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <param name="date"></param>
+    /// <param name="typeOfSmsSetting"></param>
+    /// <returns></returns>
+    Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date, string typeOfSmsSetting);
+
+    #endregion
     List<SmsResultViewModel> Search(SmsResultSearchModel searchModel);
 }

Company.Domain/SmsResultAgg/ISmsSettingsRepository.cs

@@ -1,6 +1,7 @@
 using _0_Framework.Application.Enums;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.SmsResult;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace Company.Domain.SmsResultAgg;
@@ -27,4 +28,25 @@ public interface ISmsSettingsRepository : IRepository<long, SmsSetting>
     /// <param name="id"></param>
     /// <returns></returns>
     Task RemoveItem(long id);
+
+
+    #region ForApi
+   
+    /// <summary>
+    /// دریافت لیست پیامک های خودکار بر اساس نوع آن
+    /// Api
+    /// </summary>
+    /// <param name="typeOfSmsSetting"></param>
+    /// <returns></returns>
+    Task<List<SmsSettingDto>> GetSmsSettingList(TypeOfSmsSetting typeOfSmsSetting);
+
+
+
+    /// <summary>
+    /// دریافت اطلاعات تنظیمات پیامک جهت ویرایش
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    Task<SmsSettingDto> GetSmsSettingDataToEdit(long id);
+    #endregion
 }

CompanyManagement.Infrastructure.Excel/RollCall/RollCallExcelGenerator.cs

@@ -1,6 +1,12 @@
 using _0_Framework.Excel;
+using _0_Framework.Application;
+using CompanyManagment.App.Contracts.RollCall;
 using OfficeOpenXml;
 using OfficeOpenXml.Drawing;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace CompanyManagement.Infrastructure.Excel.RollCall;
 
@@ -308,6 +314,111 @@ public class RollCallExcelGenerator : ExcelGenerator
         return package.GetAsByteArray();
     }
 
+    public static byte[] CaseHistoryExcelForEmployee(List<RollCallCaseHistoryDetail> data, string titleId)
+    {
+        if (!Regex.IsMatch(titleId, @"^\d{4}_\d{2}$"))
+            throw new ArgumentException("Invalid titleId format.", nameof(titleId));
+
+        var splitDate = titleId.Split("_");
+        var year = Convert.ToInt32(splitDate.First());
+        var month = Convert.ToInt32(splitDate.Last());
+
+        var startDateFa = $"{year:D4}/{month:D2}/01";
+        var startDate = startDateFa.ToGeorgianDateTime();
+        var endDateFa = startDateFa.FindeEndOfMonth();
+        var endDate = endDateFa.ToGeorgianDateTime();
+
+        var dateRange = (int)(endDate.Date - startDate.Date).TotalDays + 1;
+        var dates = Enumerable.Range(0, dateRange).Select(x => startDate.AddDays(x)).ToList();
+
+        var safeData = data ?? new List<RollCallCaseHistoryDetail>();
+        var first = safeData.FirstOrDefault();
+        var totalWorkingTime = new TimeSpan(safeData.Sum(x => x.TotalWorkingTime.Ticks));
+
+        var viewModel = new CaseHistoryRollCallExcelForEmployeeViewModel
+        {
+            EmployeeId = first?.EmployeeId ?? 0,
+            DateGr = startDate,
+            PersonnelCode = first?.PersonnelCode,
+            EmployeeFullName = first?.EmployeeFullName,
+            PersianMonthName = month.ToFarsiMonthByIntNumber(),
+            PersianYear = year.ToString(),
+            TotalWorkingHoursFa = totalWorkingTime.ToFarsiHoursAndMinutes("-"),
+            TotalWorkingTimeSpan = $"{(int)totalWorkingTime.TotalHours}:{totalWorkingTime.Minutes:00}",
+            RollCalls = dates.Select((date, index) =>
+            {
+                var item = index < safeData.Count ? safeData[index] : null;
+                var records = item?.Records ?? new List<RollCallCaseHistoryDetailRecord>();
+
+                return new RollCallItemForEmployeeExcelViewModel
+                {
+                    DateGr = date,
+                    DateFa = date.ToFarsi(),
+                    DayOfWeekFa = date.DayOfWeek.DayOfWeeKToPersian(),
+                    PersonnelCode = item?.PersonnelCode,
+                    EmployeeFullName = item?.EmployeeFullName,
+                    IsAbsent = item?.Status == RollCallRecordStatus.Absent,
+                    HasLeave = item?.Status == RollCallRecordStatus.Leaved,
+                    IsHoliday = false,
+                    TotalWorkingHours = (item?.TotalWorkingTime ?? TimeSpan.Zero).ToFarsiHoursAndMinutes("-"),
+                    StartsItems = JoinRecords(records, r => r.StartTime),
+                    EndsItems = JoinRecords(records, r => r.EndTime),
+                    EnterTimeDifferences = JoinRecords(records, r => FormatSignedTimeSpan(r.EntryTimeDifference)),
+                    ExitTimeDifferences = JoinRecords(records, r => FormatSignedTimeSpan(r.ExitTimeDifference))
+                };
+            }).ToList()
+        };
+
+        return CaseHistoryExcelForEmployee(viewModel);
+    }
+
+    public static byte[] CaseHistoryExcelForOneDay(List<RollCallCaseHistoryDetail> data, string titleId)
+    {
+        if (!Regex.IsMatch(titleId, @"^\d{4}/\d{2}/\d{2}$"))
+            throw new ArgumentException("Invalid titleId format.", nameof(titleId));
+
+        var dateGr = titleId.ToGeorgianDateTime();
+        var safeData = data ?? new List<RollCallCaseHistoryDetail>();
+
+        var viewModel = new CaseHistoryRollCallForOneDayViewModel
+        {
+            DateFa = titleId,
+            DateGr = dateGr,
+            DayOfWeekFa = dateGr.DayOfWeek.DayOfWeeKToPersian(),
+            RollCalls = safeData.Select(item =>
+            {
+                var records = item.Records ?? new List<RollCallCaseHistoryDetailRecord>();
+                return new RollCallItemForOneDayExcelViewModel
+                {
+                    EmployeeFullName = item.EmployeeFullName,
+                    PersonnelCode = item.PersonnelCode,
+                    StartsItems = JoinRecords(records, r => r.StartTime),
+                    EndsItems = JoinRecords(records, r => r.EndTime),
+                    TotalWorkingHours = item.TotalWorkingTime.ToFarsiHoursAndMinutes("-")
+                };
+            }).ToList()
+        };
+
+        return CaseHistoryExcelForOneDay(viewModel);
+    }
+
+    private static string JoinRecords(IEnumerable<RollCallCaseHistoryDetailRecord> records, Func<RollCallCaseHistoryDetailRecord, string> selector)
+    {
+        var safeRecords = records ?? Enumerable.Empty<RollCallCaseHistoryDetailRecord>();
+        var values = safeRecords.Select(selector).Where(x => !string.IsNullOrWhiteSpace(x)).ToList();
+        return values.Count == 0 ? string.Empty : string.Join(Environment.NewLine, values);
+    }
+
+    private static string FormatSignedTimeSpan(TimeSpan value)
+    {
+        if (value == TimeSpan.Zero)
+            return "-";
+
+        var abs = value.Duration();
+        var sign = value.Ticks < 0 ? "-" : "+";
+        return $"{(int)abs.TotalHours}:{abs.Minutes:00}{sign}";
+    }
+
     private string CalculateExitMinuteDifference(TimeSpan early, TimeSpan late)
     {
         if (early == TimeSpan.Zero && late == TimeSpan.Zero)

CompanyManagement.Infrastructure.Mongo/InstitutionContractSendFlagRepo/InstitutionContractSendFlagRepository.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Company.Domain.InstitutionContractSendFlagAgg;
+using MongoDB.Driver;
+
+namespace CompanyManagement.Infrastructure.Mongo.InstitutionContractSendFlagRepo;
+
+/// <summary>
+/// Repository برای مدیریت فلگ ارسال قرارداد در MongoDB
+/// </summary>
+public class InstitutionContractSendFlagRepository : IInstitutionContractSendFlagRepository
+{
+    private readonly IMongoCollection<InstitutionContractSendFlag> _collection;
+
+    public InstitutionContractSendFlagRepository(IMongoDatabase database)
+    {
+        _collection = database.GetCollection<InstitutionContractSendFlag>("InstitutionContractSendFlag");
+    }
+    
+    public async Task Create(InstitutionContractSendFlag flag)
+    {
+        await _collection.InsertOneAsync(flag);
+    }
+
+    public async Task<InstitutionContractSendFlag> GetByContractId(long contractId)
+    {
+        var filter = Builders<InstitutionContractSendFlag>.Filter
+            .Eq(x => x.InstitutionContractId, contractId);
+        
+        return await _collection.Find(filter).FirstOrDefaultAsync();
+    }
+    
+
+    public async Task Update(InstitutionContractSendFlag flag)
+    {
+        var filter = Builders<InstitutionContractSendFlag>.Filter
+            .Eq(x => x.InstitutionContractId, flag.InstitutionContractId);
+        
+        await _collection.ReplaceOneAsync(filter, flag);
+    }
+
+    public async Task<bool> IsContractSent(long contractId)
+    {
+        var flag = await GetByContractId(contractId);
+        return flag != null && flag.IsSent;
+    }
+
+    public async Task Remove(long contractId)
+    {
+        var filter = Builders<InstitutionContractSendFlag>.Filter
+            .Eq(x => x.InstitutionContractId, contractId);
+        
+        await _collection.DeleteOneAsync(filter);
+    }
+    
+}
+

CompanyManagment.App.Contracts/Checkout/CreateCheckout.cs

@@ -193,4 +193,9 @@ public class CreateCheckout
     /// پایه سنوات قبل از تاثیر ساعت کار
     /// </summary>
     public double BaseYearUnAffected { get; set; }
+
+    /// <summary>
+    /// آیا برای محاسبه پاداش مجاز است
+    /// </summary>
+    public bool RewardPayCompute { get; set; }
 }

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

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

CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionContractListItemsViewModel.cs

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

CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs

@@ -148,7 +148,7 @@ public interface IInstitutionContractApplication
     /// <param name="id">شناسه قرارداد</param>
     /// <returns>نتیجه عملیات</returns>
     OperationResult UnSign(long id);
-
+    
     /// <summary>
     /// ایجاد حساب کاربری برای طرف قرارداد
     /// </summary>
@@ -305,6 +305,14 @@ public interface IInstitutionContractApplication
     Task<InstitutionContractDiscountResponse> SetDiscountForCreation(InstitutionContractSetDiscountForCreationRequest request);
     Task<InstitutionContractDiscountResponse> ResetDiscountForCreation(InstitutionContractResetDiscountForExtensionRequest request);
     Task<OperationResult> CreationComplete(InstitutionContractExtensionCompleteRequest request);
+
+    /// <summary>
+    /// تعیین فلگ ارسال قرارداد در MongoDB
+    /// اگر فلگ وجود نداشتن‌د ایجاد می‌کند
+    /// </summary>
+    /// <param name="request">درخواست تعیین فلگ</param>
+    /// <returns>نتیجه عملیات</returns>
+    Task<OperationResult> SetContractSendFlag(SetInstitutionContractSendFlagRequest request);
 }
 
 public class CreationSetContractingPartyResponse
@@ -316,6 +324,7 @@ public class InstitutionContractCreationWorkshopsResponse
 {
     public List<WorkshopTempViewModel> WorkshopTemps { get; set; }
     public string TotalAmount { get; set; }
+    public Guid TempId { get; set; }
 }
 
 public class InstitutionContractCreationWorkshopsRequest

CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionCompleteRequest.cs

@@ -7,6 +7,7 @@ public class InstitutionContractExtensionCompleteRequest
     public Guid TemporaryId { get; set; }
     public bool IsInstallment { get; set; }
     public long LawId { get; set; }
+    public bool CancelSendVerificationSms { get; set; }
 }
 
 public class InstitutionContractCreationCompleteRequest

CompanyManagment.App.Contracts/InstitutionContract/SetInstitutionContractSendFlagRequest.cs

@@ -0,0 +1,19 @@
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+/// <summary>
+/// درخواست برای تعیین فلگ ارسال قرارداد
+/// </summary>
+public class SetInstitutionContractSendFlagRequest
+{
+    /// <summary>
+    /// شناسه قرارداد
+    /// </summary>
+    public long InstitutionContractId { get; set; }
+
+    /// <summary>
+    /// آیا قرارداد ارسال شده است
+    /// </summary>
+    public bool IsSent { get; set; }
+    
+}
+

CompanyManagment.App.Contracts/InstitutionContract/SmsListData.cs

@@ -1,4 +1,6 @@
-namespace CompanyManagment.App.Contracts.InstitutionContract;
+using System.Collections.Generic;
+
+namespace CompanyManagment.App.Contracts.InstitutionContract;
 
 /// <summary>
 /// لیست پیامکهای بدهکاران قرارداد ملی
@@ -113,10 +115,30 @@ public class BlockSmsListData
 
 
 /// <summary>
-/// لیست قراداد های آبی
-/// جهت ارسال هشدار یا اقدام قضائی
+///پیامک آنی یادآور
 /// </summary>
-public class BlueWarningSmsData
+public class InstantReminderSendSms
 {
+    /// <summary>
+    /// نام طرف حساب
+    /// </summary>
+    public string FullName { get; set; }
 
+    /// <summary>
+    /// مبلغ بدهی
+    /// </summary>
+    public string Amount { get; set; }
+    public List<InstantReminderSmsList> InstantReminderSmsList { get; set; }
+}
+
+public class InstantReminderSmsList
+{
+    /// <summary>
+    /// شماره تماس طرف حساب
+    /// </summary>
+    public string PhoneNumber { get; set; }
+
+
+
+  
 }

CompanyManagment.App.Contracts/Loan/ILoanApplication.cs

@@ -21,6 +21,6 @@ public class LoanGroupedViewModel
 {
     public List<LoanGroupedByDateViewModel> GroupedByDate { get; set; }
     public List<LoanGroupedByEmployeeViewModel>GroupedByEmployee  { get; set; }
-    public List<LoanViewModel> LoanListViewModel { get; set; }
+    public PagedResult<LoanViewModel> LoanListViewModel { get; set; }
 }
 

CompanyManagment.App.Contracts/Loan/LoanSearchViewModel.cs

@@ -16,5 +16,6 @@ public class LoanSearchViewModel
 	public string EndDate { get; set; }
 	
 	public int PageIndex { get; set; }
+	public int PageSize { get; set; } = 30;
     public bool ShowAsGrouped { get; set; }
 }

CompanyManagment.App.Contracts/RollCall/IRollCallApplication.cs

@@ -4,6 +4,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using _0_Framework.Application;
+using CompanyManagment.App.Contracts.Workshop;
+using Microsoft.AspNetCore.Mvc;
 
 namespace CompanyManagment.App.Contracts.RollCall
 {
@@ -125,7 +127,62 @@ namespace CompanyManagment.App.Contracts.RollCall
         /// <param name="command"></param>
         /// <returns></returns>
         Task<OperationResult> RecalculateValues(long workshopId, List<ReCalculateRollCallValues> command);
+
+        Task<PagedResult<RollCallCaseHistoryTitleDto>> GetCaseHistoryTitles(long workshopId,RollCallCaseHistorySearchModel searchModel);
+        Task<List<RollCallCaseHistoryDetail>> GetCaseHistoryDetails(long workshopId, string titleId,
+	        RollCallCaseHistorySearchModel searchModel);
+
+        Task<RollCallCaseHistoryExcelDto> DownloadCaseHistoryExcel(long workshopId, string titleId,
+	        RollCallCaseHistorySearchModel searchModel);
     }
+
+    public class RollCallCaseHistoryExcelDto
+    {
+	    public byte[] Bytes { get; set; }
+	    public string FileName { get; set; }
+	    public string MimeType { get; set; }
+    }
+
+    public class RollCallCaseHistoryDetail
+    {
+	    public string EmployeeFullName { get; set; }
+	    public string PersonnelCode { get; set; }
+	    public TimeSpan TotalWorkingTime { get; set; }
+	    public List<RollCallCaseHistoryDetailRecord> Records { get; set; }
+	    public RollCallRecordStatus Status { get; set; }
+	    public long EmployeeId { get; set; }
+    }
+
+    public enum RollCallRecordStatus
+    {
+	    Worked = 0,
+	    Absent = 1,
+	    Leaved = 2
+    }
+
+    public class RollCallCaseHistoryDetailRecord
+    {
+	    public TimeSpan EntryTimeDifference { get; set; }
+	    public string StartTime { get; set; }
+	    public string EndTime { get; set; }
+	    public TimeSpan ExitTimeDifference { get; set; }
+	    
+    }
+
+    public class RollCallCaseHistorySearchModel:PaginationRequest
+    {
+	    public string StartDate { get; set; }
+	    public string EndDate { get; set; }
+	    public string OneDayDate { get; set; }
+	    public long? EmployeeId { get; set; }
+    }
+
+    public class RollCallCaseHistoryTitleDto
+    {
+	    public string Id { get; set; }
+	    public string Title { get; set; }
+    }
+
     public class ReCalculateRollCallValues
     {
         public long EmployeeId { get; set; }

CompanyManagment.App.Contracts/SalaryAid/CreateSalaryAidViewModel.cs

@@ -8,7 +8,6 @@ public class CreateSalaryAidViewModel
 	public long WorkshopId { get; set; }
 	public string Amount { get; set; }
 	public string SalaryDateTime { get; set; }
-	public string CalculationDateTime { get; set; }
     public string NationalCode { get; set; }
     public int CalculationMonth { get; set; }
     public int CalculationYear { get; set; }

CompanyManagment.App.Contracts/SalaryAid/SalaryAidGroupedByDateViewModel.cs

@@ -8,7 +8,7 @@ public class SalaryAidGroupedByDateViewModel
     public string YearFa { get; set; }
     public int Month { get; set; }
     public int Year { get; set; }
-    public List<SalaryAidGroupedByDateViewModelItems> SalaryAidViewModels { get; set; }
+    public List<SalaryAidGroupedByDateViewModelItems> Items { get; set; }
     public string TotalAmount { get; set; }
 
 }

CompanyManagment.App.Contracts/SalaryAid/SalaryAidGroupedByEmployeeViewModel.cs

@@ -6,7 +6,7 @@ public class SalaryAidGroupedByEmployeeViewModel
 {
     public string EmployeeName { get; set; }
     public long EmployeeId { get; set; }
-    public List<SalaryAidGroupedByEmployeeViewModelItems> SalaryAidViewModels { get; set; }
+    public List<SalaryAidGroupedByEmployeeViewModelItems> Items { get; set; }
     public string TotalAmount { get; set; }
 
 }

CompanyManagment.App.Contracts/SalaryAid/SalaryAidSearchViewModel.cs

@@ -3,15 +3,15 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using _0_Framework.Application;
 
 namespace CompanyManagment.App.Contracts.SalaryAid;
-public class SalaryAidSearchViewModel
+public class SalaryAidSearchViewModel:PaginationRequest
 {
     public string StartDate { get; set; }
     public string EndDate { get; set; }
 	public long EmployeeId { get; set; }
 	public long WorkshopId { get; set; }
-	public int PageIndex { get; set; }
     public bool ShowAsGrouped { get; set; }
 
 }

CompanyManagment.App.Contracts/SalaryAid/SalaryAidsGroupedViewModel.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Security.Cryptography;
+using _0_Framework.Application;
 
 namespace CompanyManagment.App.Contracts.SalaryAid;
 
@@ -7,7 +8,7 @@ public class SalaryAidsGroupedViewModel
 {
     public List<SalaryAidGroupedByEmployeeViewModel> GroupedByEmployee { get; set; }
     public List<SalaryAidGroupedByDateViewModel> GroupedByDate { get; set; }
-    public List<SalaryAidViewModel> SalaryAidListViewModels { get; set; }
+    public PagedResult<SalaryAidViewModel> List { get; set; }
 
 }
 

CompanyManagment.App.Contracts/SmsResult/CreateSmsSetting.cs

@@ -60,3 +60,43 @@ public class SmsSettingViewModel
     /// </summary>
     public List<EditSmsSetting> EditSmsSettings { get; set; }
 }
+
+
+
+/// <summary>
+/// لیست تنظیمات پیامک خودکار
+/// </summary>
+public class SmsSettingDto
+{
+    /// <summary>
+    /// آی دی
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// عدد روز از ماه
+    /// </summary>
+    public int DayOfMonth { get; set; }
+
+    /// <summary>
+    /// نمایش ساعت  و دقیقه
+    /// </summary>
+    public string TimeOfDayDisplay { get; set; }
+}
+
+
+public class CreateSmsSettingDto
+{
+    /// <summary>
+    /// عدد روز از ماه
+    /// </summary>
+    public int DayOfMonth { get; set; }
+
+    /// <summary>
+    /// نمایش ساعت  و دقیقه
+    /// </summary>
+    public string TimeOfDayDisplay { get; set; }
+}
+
+
+

CompanyManagment.App.Contracts/SmsResult/Dto/SendStatus.cs

@@ -0,0 +1,15 @@
+namespace CompanyManagment.App.Contracts.SmsResult.Dto;
+
+/// <summary>
+/// وضعیت ارسال پیامک
+/// </summary>
+public enum SendStatus
+{
+    All=0,
+    /// <summary>
+    /// موفق
+    /// </summary>
+    Success,
+    //ناموفق
+    Failed,
+}

CompanyManagment.App.Contracts/SmsResult/Dto/SmsReportDto.cs

@@ -0,0 +1,59 @@
+using System;
+
+namespace CompanyManagment.App.Contracts.SmsResult.Dto;
+
+public class SmsReportDto
+{
+    /// <summary>
+    /// تاریخ ارسال
+    /// </summary>
+    public string SentDate { get; set; }
+
+    /// <summary>
+    /// نوع پیامک
+    /// </summary>
+    public string TypeOfSms { get; set; }
+
+
+}
+
+public class SmsReportListDto
+{
+    /// <summary>
+    /// آی دی
+    /// </summary>
+    public long Id { get; set; }
+    /// <summary>
+    /// آی دی پیامک در sms.ir
+    /// </summary>
+    public int MessageId { get; set; }
+
+    /// <summary>
+    /// وضعیت ارسال
+    /// </summary>
+    public string Status { get; set; }
+
+    /// <summary>
+    /// نوع پیامک
+    /// </summary>
+    public string TypeOfSms { get; set; }
+
+    /// <summary>
+    /// نام طرف حساب
+    /// </summary>
+    public string ContractingPartyName { get; set; }
+
+    /// <summary>
+    /// شماره موبایل
+    /// </summary>
+    public string Mobile { get; set; }
+
+
+    /// <summary>
+    /// ساعت و دقیقه
+    /// </summary>
+    public string HourAndMinute { get; set; }
+}
+
+
+

CompanyManagment.App.Contracts/SmsResult/Dto/SmsReportSearchModel.cs

@@ -0,0 +1,43 @@
+using _0_Framework.Application.Enums;
+
+namespace CompanyManagment.App.Contracts.SmsResult.Dto;
+
+public class SmsReportSearchModel
+{
+    //نوع پیامک
+    public TypeOfSmsSetting TypeOfSms { get; set; }
+
+    /// <summary>
+    /// وضعیت ارسال پیامک
+    /// </summary>
+    public SendStatus SendStatus { get; set; }
+
+    /// <summary>
+    /// شماره موبایل
+    /// </summary>
+    public string Mobile { get; set; }
+
+    /// <summary>
+    /// آی دی طرف حساب
+    /// </summary>
+    public long ContractingPatyId { get; set; }
+
+    /// <summary>
+    /// سال
+    /// </summary>
+    public string Year { get; set; }
+    /// <summary>
+    /// ماه
+    /// </summary>
+    public string Month { get; set; }
+
+    /// <summary>
+    /// تاریخ شروع
+    /// </summary>
+    public string StartDateFa { get; set; }
+
+    /// <summary>
+    /// تاریخ پایان
+    /// </summary>
+    public string EndDateFa { get; set; }
+}

CompanyManagment.App.Contracts/SmsResult/ISmsResultApplication.cs

@@ -1,14 +1,36 @@
-using System;
+using _0_Framework.Application;
+using _0_Framework.Application.Enums;
+using CompanyManagment.App.Contracts.SmsResult.Dto;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using _0_Framework.Application;
 
 namespace CompanyManagment.App.Contracts.SmsResult;
 
 public interface ISmsResultApplication
 {
+    #region ForApi
+
+    /// <summary>
+    /// دریافت لیست پیامکها
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <returns></returns>
+    Task<List<SmsReportDto>> GetSmsReportList(SmsReportSearchModel searchModel);
+
+    /// <summary>
+    /// دریافت اکسپند لیست هر تاریخ
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <param name="date"></param>
+    /// <param name="typeOfSmsSetting"></param>
+    /// <returns></returns>
+    Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date, string typeOfSmsSetting);
+
+    #endregion
+
     OperationResult Create(CreateSmsResult command);
     List<SmsResultViewModel> Search(SmsResultSearchModel searchModel);
 }

CompanyManagment.App.Contracts/SmsResult/ISmsSettingApplication.cs

@@ -75,4 +75,45 @@ public interface ISmsSettingApplication
     /// <param name="command"></param>
     /// <returns></returns>
     Task<OperationResult> InstantSendBlockSms(List<BlockSmsListData> command);
+
+
+    #region ForApi
+
+    /// <summary>
+    /// دریافت لیست پیامک های خودکار بر اساس نوع آن
+    /// Api
+    /// </summary>
+    /// <param name="typeOfSmsSetting"></param>
+    /// <returns></returns>
+    Task<List<SmsSettingDto>> GetSmsSettingList(TypeOfSmsSetting typeOfSmsSetting);
+
+    /// <summary>
+    /// دریافت اطلاعات تنظیمات پیامک جهت ویرایش
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    Task<SmsSettingDto> GetSmsSettingDataToEdit(long id);
+
+    /// <summary>
+    /// ویرایش تنظیمات پیامک
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    Task<OperationResult> EditSmsSetting(SmsSettingDto command);
+
+    /// <summary>
+    /// دریافت لیست ارسال آنی 
+    /// </summary>
+    /// <returns></returns>
+    Task<List<InstantReminderSendSms>> GetInstantReminderSmsListData(TypeOfSmsSetting typeOfSmsSetting);
+
+    /// <summary>
+    /// ارسال پیامک آنی
+    /// </summary>
+    /// <param name="typeOfSmsSetting"></param>
+    /// <param name="phoneNumbers"></param>
+    /// <returns></returns>
+    Task<OperationResult> InstantSmsSendApi(TypeOfSmsSetting typeOfSmsSetting, List<string> phoneNumbers);
+
+    #endregion
 }

CompanyManagment.App.Contracts/Workshop/CreateWorkshop.cs

@@ -151,6 +151,9 @@ public class CreateWorkshop
     /// تصفیه حساب بصورت استاتیک محاصبه شود
     /// </summary>
     public bool IsStaticCheckout { get; set; }
-    
 
+    /// <summary>
+    /// آیا پاداش در فیش حقوقی محاسبه شود
+    /// </summary>
+    public bool RewardComputeOnCheckout { get; set; }
 }

CompanyManagment.Application/CheckoutApplication.cs

@@ -240,6 +240,16 @@ public class CheckoutApplication : ICheckoutApplication
 
 		command.InstallmentDeduction = loanInstallments.Sum(x => x.AmountForMonth.MoneyToDouble());
 
+        var rewards = new List<CheckoutReward>();
+        double rewardPay = 0;
+        if (command.RewardPayCompute)
+        {
+            rewards = _rollCallMandatoryRepository.RewardForCheckout(command.EmployeeId, command.WorkshopId, checkoutEnd.ToGeorgianDateTime(), checkoutStart.ToGeorgianDateTime())
+                .Select(x => new CheckoutReward(x.Amount, x.AmountDouble, x.GrantDateFa, x.GrantDateGr, x.Description, x.Title, x.Id)).ToList();
+
+            rewardPay = rewards.Sum(x => x.AmountDouble);
+        }
+		
 
 		
 
@@ -361,7 +371,7 @@ public class CheckoutApplication : ICheckoutApplication
 
 
 		var totalClaimsDouble = monthlyWage + bacicYears + consumableItem + housingAllowance + marriedAllowance + command.OvertimePay +
-								command.NightworkPay + familyAllowance + bunos + years + command.LeavePay + command.FridayPay + command.ShiftPay;
+								command.NightworkPay + familyAllowance + bunos + years + command.LeavePay + command.FridayPay + command.ShiftPay + rewardPay;
 		var totalClaims = totalClaimsDouble.ToMoney();
 		var totalDeductionDouble = insuranceDeduction + command.AbsenceDeduction + command.InstallmentDeduction + command.SalaryAidDeduction;
 		var totalDeductions = totalDeductionDouble.ToMoney();
@@ -386,7 +396,7 @@ public class CheckoutApplication : ICheckoutApplication
 				, command.OvertimePay, command.NightworkPay, command.FridayPay, 0, command.ShiftPay, familyAllowance, bunos, years, command.LeavePay, insuranceDeduction, 0, command.InstallmentDeduction, command.SalaryAidDeduction, command.AbsenceDeduction, sumOfWorkingDays,
 				command.ArchiveCode, command.PersonnelCode, totalClaims, totalDeductions, totalPayment, command.Signature, marriedAllowance, command.LeaveCheckout, command.CreditLeaves, command.AbsencePeriod, command.AverageHoursPerDay, command.HasRollCall, command.OverTimeWorkValue, command.OverNightWorkValue
 				, command.FridayWorkValue, command.RotatingShiftValue, command.AbsenceValue, command.TotalDayOfLeaveCompute, command.TotalDayOfYearsCompute, command.TotalDayOfBunosesCompute,
-				loanInstallments, salaryAids,checkoutRollCall,command.EmployeeMandatoryHours, hasInsuranceShareTheSameAsList);
+				loanInstallments, salaryAids,checkoutRollCall,command.EmployeeMandatoryHours, hasInsuranceShareTheSameAsList, rewards, rewardPay);
 
 			_checkoutRepository.CreateCkeckout(checkout).GetAwaiter().GetResult();
 			//_checkoutRepository.SaveChanges();

CompanyManagment.Application/CompanyManagment.Application.csproj

@@ -13,6 +13,7 @@
   <ItemGroup>
     <ProjectReference Include="..\0_Framework\0_Framework.csproj" />
     <ProjectReference Include="..\Company.Domain\Company.Domain.csproj" />
+    <ProjectReference Include="..\CompanyManagement.Infrastructure.Excel\CompanyManagement.Infrastructure.Excel.csproj" />
     <ProjectReference Include="..\CompanyManagment.App.Contracts\CompanyManagment.App.Contracts.csproj" />
     <ProjectReference Include="..\CompanyManagment.EFCore\CompanyManagment.EFCore.csproj" />
   </ItemGroup>

CompanyManagment.Application/InstitutionContractApplication.cs

@@ -19,6 +19,7 @@ using Company.Domain.PaymentTransactionAgg;
 using Company.Domain.RepresentativeAgg;
 using Company.Domain.RollCallServiceAgg;
 using Company.Domain.WorkshopAgg;
+using Company.Domain.InstitutionContractSendFlagAgg;
 using CompanyManagment.App.Contracts.FinancialInvoice;
 using CompanyManagment.App.Contracts.FinancialStatment;
 using CompanyManagment.App.Contracts.InstitutionContract;
@@ -51,6 +52,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
     private readonly IPaymentTransactionRepository _paymentTransactionRepository;
     private readonly IRollCallServiceRepository _rollCallServiceRepository;
     private readonly ISepehrPaymentGatewayService _sepehrPaymentGatewayService;
+    private readonly IInstitutionContractSendFlagRepository _institutionContractSendFlagRepository;
 
 
     public InstitutionContractApplication(IInstitutionContractRepository institutionContractRepository,
@@ -62,7 +64,8 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         IAccountApplication accountApplication, ISmsService smsService,
         IFinancialInvoiceRepository financialInvoiceRepository, IHttpClientFactory httpClientFactory,
         IPaymentTransactionRepository paymentTransactionRepository, IRollCallServiceRepository rollCallServiceRepository,
-        ISepehrPaymentGatewayService sepehrPaymentGatewayService,ILogger<SepehrPaymentGateway> sepehrGatewayLogger)
+        ISepehrPaymentGatewayService sepehrPaymentGatewayService,ILogger<SepehrPaymentGateway> sepehrGatewayLogger,
+        IInstitutionContractSendFlagRepository institutionContractSendFlagRepository)
     {
         _institutionContractRepository = institutionContractRepository;
         _contractingPartyRepository = contractingPartyRepository;
@@ -80,6 +83,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         _rollCallServiceRepository = rollCallServiceRepository;
         _sepehrPaymentGatewayService = sepehrPaymentGatewayService;
         _paymentGateway = new SepehrPaymentGateway(httpClientFactory,sepehrGatewayLogger);
+        _institutionContractSendFlagRepository = institutionContractSendFlagRepository;
     }
 
 	public OperationResult Create(CreateInstitutionContract command)
@@ -894,6 +898,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         return opration.Succcedded();
     }
 
+
     public void CreateContractingPartyAccount(long contractingPartyid, long accountId)
     {
         _institutionContractRepository.CreateContractingPartyAccount(contractingPartyid, accountId);
@@ -1511,8 +1516,9 @@ public class InstitutionContractApplication : IInstitutionContractApplication
             .Where(x => x.WorkshopCreated && x.WorkshopId is > 0).ToList();
         
         var currentWorkshops = institutionContract.WorkshopGroup.CurrentWorkshops.ToList();
-        var accountId = _contractingPartyRepository
-            .GetAccountByPersonalContractingParty(institutionContract.ContractingPartyId).Id;
+        var account = _contractingPartyRepository
+            .GetAccountByPersonalContractingParty(institutionContract.ContractingPartyId);
+        var accountId = account.Id;
         foreach (var createdWorkshop in initialCreatedWorkshops)
         {
             if (currentWorkshops.Any(x => x.WorkshopId == createdWorkshop.WorkshopId))
@@ -1564,7 +1570,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         var previousInstitutionContract = await _institutionContractRepository
             .GetPreviousContract(institutionContract.id);
         previousInstitutionContract?.DeActive();
-        ReActiveAllAfterCreateNew(institutionContract.ContractingPartyId);
+        await _contractingPartyRepository.ActiveAllAsync(institutionContract.ContractingPartyId);
         await _institutionContractRepository.SaveChangesAsync();
         return op.Succcedded();
     }
@@ -1820,7 +1826,60 @@ public class InstitutionContractApplication : IInstitutionContractApplication
             installments.Add(lastInstallment);
             return installments;
         }
+
+     
     }
+       /// <summary>
+        /// تعیین فلگ ارسال قرارداد
+        /// اگر فلگ وجود نداشتن‌د ایجاد می‌کند
+        /// </summary>
+        public async Task<OperationResult> SetContractSendFlag(SetInstitutionContractSendFlagRequest request)
+        {
+            var operationResult = new OperationResult();
+
+            try
+            {
+                // بازیابی قرارداد از SQL
+                var contract = _institutionContractRepository.Get(request.InstitutionContractId);
+                if (contract == null)
+                    return operationResult.Failed("قرارداد مورد نظر یافت نشد");
+
+                // بررسی اینکه آیا فلگ در MongoDB وجود دارد
+                var existingFlag = await _institutionContractSendFlagRepository
+                    .GetByContractId(request.InstitutionContractId);
+
+                if (existingFlag != null)
+                {
+                    // اگر فلگ وجود داشتن‌د، آن را اپدیت کنیم
+                    if (request.IsSent)
+                    {
+                        existingFlag.MarkAsSent();
+                    }
+                    else
+                    {
+                        existingFlag.MarkAsNotSent();
+                    }
+                    existingFlag.UpdateLastModified();
+                    await _institutionContractSendFlagRepository.Update(existingFlag);
+                }
+                else
+                {
+                    // اگر فلگ وجود ندارد، آن را ایجاد کنیم
+                    var newFlag = new InstitutionContractSendFlag(
+                        request.InstitutionContractId,
+                        request.IsSent
+                    );
+
+                    await _institutionContractSendFlagRepository.Create(newFlag);
+                }
+
+                return operationResult.Succcedded();
+            }
+            catch (Exception ex)
+            {
+                return operationResult.Failed($"خطا در تعیین فلگ ارسال: {ex.Message}");
+            }
+        }
 }
 
 #region CustomViewModels

CompanyManagment.Application/InsuranceListApplication.cs

@@ -1524,7 +1524,8 @@ public class InsuranceListApplication : IInsuranceListApplication
 			var dateOfBirth = employeeData.DateOfBirthGr.ToFarsi();
 			var dateOfIssue = employeeData.DateOfIssueGr.ToFarsi();
 			var leftDate = employeeData.LeftWorkDateGr != null ? employeeData.LeftWorkDateGr.Value.AddDays(-1) : new DateTime();
-			var workingDays = Tools.GetEmployeeInsuranceWorkingDays(employeeData.StartWorkDateGr, leftDate, startDateGr, endDateGr, employeeData.EmployeeId);
+      
+            var workingDays = Tools.GetEmployeeInsuranceWorkingDays(employeeData.StartWorkDateGr, leftDate, startDateGr, endDateGr, employeeData.EmployeeId);
 			var leftWorkFa = workingDays.hasLeftWorkInMonth ? employeeData.LeftWorkDateGr.ToFarsi() : "";
 			var startWorkFa = employeeData.StartWorkDateGr.ToFarsi();
 			var workshop = _workShopRepository.GetDetails(workshopId);
@@ -1606,7 +1607,7 @@ public class InsuranceListApplication : IInsuranceListApplication
                 MaritalStatus = employeeData.MaritalStatus,
 
 				StartMonthCurrent = startMonthFa,
-				WorkingDays = workingDays.countWorkingDays,
+				WorkingDays = employeeData.WorkingDays,
 				StartWorkDate = startWorkFa,
 				StartWorkDateGr = employeeData.StartWorkDateGr,
 				LeftWorkDate = leftWorkFa,

CompanyManagment.Application/RollCallApplication.cs

@@ -3,9 +3,11 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
+using _0_Framework.Exceptions;
 using Company.Domain.CheckoutAgg;
 using Company.Domain.CustomizeCheckoutAgg;
 using Company.Domain.CustomizeCheckoutTempAgg;
@@ -16,6 +18,8 @@ using Company.Domain.LeaveAgg;
 using Company.Domain.RollCallAgg;
 using Company.Domain.RollCallAgg.DomainService;
 using Company.Domain.RollCallEmployeeAgg;
+using Company.Domain.WorkshopAgg;
+using CompanyManagement.Infrastructure.Excel.RollCall;
 using CompanyManagment.App.Contracts.Checkout;
 using CompanyManagment.App.Contracts.Employee;
 using CompanyManagment.App.Contracts.RollCall;
@@ -34,8 +38,9 @@ public class RollCallApplication : IRollCallApplication
 	private readonly ICustomizeWorkshopSettingsRepository _customizeWorkshopSettingsRepository;
 	private readonly ICustomizeWorkshopEmployeeSettingsRepository _customizeWorkshopEmployeeSettingsRepository;
     private readonly ICustomizeCheckoutTempRepository _customizeCheckoutTempRepository;
+    private readonly IWorkshopRepository _workshopRepository;
 
-    public RollCallApplication(IRollCallRepository rollCallRepository, IRollCallEmployeeRepository rollCallEmployeeRepository, IEmployeeRepository employeeRepository, ILeaveRepository leaveRepository, ICustomizeCheckoutRepository customizeCheckoutRepository, ICheckoutRepository checkoutRepository, IRollCallDomainService rollCallDomainService, ICustomizeWorkshopSettingsRepository customizeWorkshopSettingsRepository, ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository, ICustomizeCheckoutTempRepository customizeCheckoutTempRepository)
+    public RollCallApplication(IRollCallRepository rollCallRepository, IRollCallEmployeeRepository rollCallEmployeeRepository, IEmployeeRepository employeeRepository, ILeaveRepository leaveRepository, ICustomizeCheckoutRepository customizeCheckoutRepository, ICheckoutRepository checkoutRepository, IRollCallDomainService rollCallDomainService, ICustomizeWorkshopSettingsRepository customizeWorkshopSettingsRepository, ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository, ICustomizeCheckoutTempRepository customizeCheckoutTempRepository, IWorkshopRepository workshopRepository)
 	{
 		_rollCallRepository = rollCallRepository;
 		_rollCallEmployeeRepository = rollCallEmployeeRepository;
@@ -47,7 +52,8 @@ public class RollCallApplication : IRollCallApplication
 		_customizeWorkshopSettingsRepository = customizeWorkshopSettingsRepository;
 		_customizeWorkshopEmployeeSettingsRepository = customizeWorkshopEmployeeSettingsRepository;
         _customizeCheckoutTempRepository = customizeCheckoutTempRepository;
-    }
+        _workshopRepository = workshopRepository;
+	}
 
 	public OperationResult Create(CreateRollCall command)
 	{
@@ -447,8 +453,7 @@ public class RollCallApplication : IRollCallApplication
                 return operation.Failed("کارمند در بازه انتخاب شده مرخصی ساعتی دارد");
         }
 
-        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.StartDate.Value.Date >= y.StartDateGr.Date && x.EndDate.Value.Date <= y.EndDateGr.Date)))
-            return operation.Failed("کارمند در بازه وارد شده غیر فعال است");
+       
 
 
 
@@ -458,7 +463,10 @@ public class RollCallApplication : IRollCallApplication
                 _rollCallDomainService.GetEmployeeShiftDateByRollCallStartDate(command.WorkshopId, command.EmployeeId,
                     x.StartDate!.Value,x.EndDate.Value);
         });
-
+        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.ShiftDate.Date >= y.StartDateGr.Date && x.ShiftDate.Date <= y.EndDateGr.Date)))
+	        return operation.Failed("کارمند در بازه وارد شده غیر فعال است");
+        
+        
         if (newRollCallDates.Any(x => x.ShiftDate.Date != date.Date))
         {
             return operation.Failed("حضور غیاب در حال ویرایش را نمیتوانید از تاریخ شیفت عقب تر یا جلو تر ببرید");
@@ -487,8 +495,8 @@ public class RollCallApplication : IRollCallApplication
 
 
 
-        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.StartDate.Value.Date >= y.StartDateGr.Date 
-	            && x.EndDate.Value.Date <= y.EndDateGr.Date)))
+        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.ShiftDate.Date >= y.StartDateGr.Date 
+	            && x.ShiftDate.Date <= y.EndDateGr.Date)))
             return operation.Failed("کارمند در بازه وارد شده غیر فعال است");
 
 
@@ -632,9 +640,6 @@ public class RollCallApplication : IRollCallApplication
                 return operation.Failed("کارمند در بازه انتخاب شده مرخصی ساعتی دارد");
         }
 
-        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.StartDate.Value.Date >= y.StartDateGr.Date && x.EndDate.Value.Date <= y.EndDateGr.Date)))
-            return operation.Failed("کارمند در بازه وارد شده غیر فعال است");
-
 
         newRollCallDates.ForEach(x =>
         {
@@ -642,6 +647,11 @@ public class RollCallApplication : IRollCallApplication
                 _rollCallDomainService.GetEmployeeShiftDateByRollCallStartDate(command.WorkshopId, command.EmployeeId,
                     x.StartDate!.Value,x.EndDate.Value);
         });
+        
+        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.ShiftDate.Date >= y.StartDateGr.Date && x.ShiftDate.Date <= y.EndDateGr.Date)))
+	        return operation.Failed("کارمند در بازه وارد شده غیر فعال است");
+
+        
         if (newRollCallDates.Any(x => x.ShiftDate.Date != date.Date))
         {
             return operation.Failed("حضور غیاب در حال ویرایش را نمیتوانید از تاریخ شیفت عقب تر یا جلو تر ببرید");
@@ -664,7 +674,7 @@ public class RollCallApplication : IRollCallApplication
                                                                   && (y.StartDate.Value.Date <= x.ContractEndGr.Date))))
             return operation.Failed("برای بازه های وارد شده فیش حقوقی ثبت شده است");
 
-        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.StartDate.Value.Date >= y.StartDateGr.Date && x.EndDate.Value.Date <= y.EndDateGr.Date)))
+        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.ShiftDate.Date >= y.StartDateGr.Date && x.ShiftDate.Date <= y.EndDateGr.Date)))
             return operation.Failed("کارمند در بازه وارد شده غیر فعال است");
 
         var currentDayRollCall = employeeRollCalls.FirstOrDefault(x => x.EndDate == null);
@@ -858,4 +868,58 @@ public class RollCallApplication : IRollCallApplication
         }
     }
 
+    public async Task<PagedResult<RollCallCaseHistoryTitleDto>> GetCaseHistoryTitles(long workshopId,
+	    RollCallCaseHistorySearchModel searchModel)
+    {
+	    return await _rollCallRepository.GetCaseHistoryTitles(workshopId,searchModel);
+    }
+
+    public async Task<List<RollCallCaseHistoryDetail>> GetCaseHistoryDetails(long workshopId,
+	    string titleId, RollCallCaseHistorySearchModel searchModel)
+    {
+	    return await _rollCallRepository.GetCaseHistoryDetails(workshopId, titleId, searchModel);
+    }
+
+    public async Task<RollCallCaseHistoryExcelDto> DownloadCaseHistoryExcel(long workshopId, string titleId,
+        RollCallCaseHistorySearchModel searchModel)
+    {
+        var data = await _rollCallRepository
+            .GetCaseHistoryDetails(workshopId, titleId, searchModel);
+        string nameSecondPart = "";
+        byte[] excelBytes;
+
+        if (Regex.IsMatch(titleId, @"^\d{4}_\d{2}$"))
+        {
+            var splitDate = titleId.Split("_");
+            var year = Convert.ToInt32(splitDate.First());
+            var month = Convert.ToInt32(splitDate.Last());
+
+            var monthName = Convert.ToInt32(month).ToFarsiMonthByIntNumber();
+            nameSecondPart = $"{year}/{monthName}";
+            excelBytes = RollCallExcelGenerator.CaseHistoryExcelForEmployee(data, titleId);
+        }
+        else if (Regex.IsMatch(titleId, @"^\d{4}/\d{2}/\d{2}$"))
+        {
+            var oneDayDate = titleId.ToGeorgianDateTime();
+            nameSecondPart = $" {oneDayDate.DayOfWeek.DayOfWeeKToPersian()}،{titleId}";
+            excelBytes = RollCallExcelGenerator.CaseHistoryExcelForOneDay(data, titleId);
+        }
+        else
+        {
+            throw new BadRequestException("شناسه سر تیتر وارد شده نامعتبر است");
+        }
+
+        var workshopFullName = _workshopRepository.Get(workshopId)?.WorkshopFullName ?? "بدون کارگاه";
+
+        var fileName = $"{workshopFullName} - {nameSecondPart}.xlsx";
+
+        var res = new RollCallCaseHistoryExcelDto()
+        {
+            Bytes = excelBytes,
+            MimeType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+            FileName = fileName
+        };
+
+        return res;
+    }
 }

CompanyManagment.Application/SalaryAidApplication.cs

@@ -433,7 +433,7 @@ public class SalaryAidApplication : ISalaryAidApplication
                     var checkouts = _checkoutRepository.GetByWorkshopIdEmployeeIdInDate(
                         command.WorkshopId, employeeId, calculationDateGr).GetAwaiter().GetResult();
 
-                    checkouts?.SetAmountConflict(true);           
+                    checkouts?.SetAmountConflict(true);
                 }
             }
 

CompanyManagment.Application/SmsResultApplication.cs

@@ -1,20 +1,45 @@
-using System.Collections.Generic;
-using System.Linq;
-using _0_Framework.Application;
+using _0_Framework.Application;
+using _0_Framework.Application.Enums;
+using _0_Framework.Application.Sms;
 using Company.Domain.SmsResultAgg;
 using CompanyManagment.App.Contracts.SmsResult;
+using CompanyManagment.App.Contracts.SmsResult.Dto;
+using CompanyManagment.EFCore.Services;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using SmsResult = Company.Domain.SmsResultAgg.SmsResult;
 
 namespace CompanyManagment.Application;
 
 public class SmsResultApplication : ISmsResultApplication
 {
     private readonly ISmsResultRepository _smsResultRepository;
+    private readonly ISmsService _smsService;
 
-    public SmsResultApplication(ISmsResultRepository smsResultRepository)
+    public SmsResultApplication(ISmsResultRepository smsResultRepository, ISmsService smsService)
     {
         _smsResultRepository = smsResultRepository;
+        _smsService = smsService;
     }
 
+
+    #region ForApi
+
+    public async Task<List<SmsReportDto>> GetSmsReportList(SmsReportSearchModel searchModel)
+    {
+        return await _smsResultRepository.GetSmsReportList(searchModel);
+    }
+
+    public async Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date, string typeOfSmsSetting)
+    {
+        return await _smsResultRepository.GetSmsReportExpandList(searchModel, date, typeOfSmsSetting);
+    }
+
+    #endregion
+
+
+
     public OperationResult Create(CreateSmsResult command)
     {
         var op = new OperationResult();
@@ -48,4 +73,6 @@ public class SmsResultApplication : ISmsResultApplication
         }).ToList();
         return result;
     }
+
+
 }

CompanyManagment.Application/SmsSettingApplication.cs

@@ -1,13 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using _0_Framework.Application;
+using _0_Framework.Application;
 using _0_Framework.Application.Enums;
 using Company.Domain.InstitutionContractAgg;
 using Company.Domain.SmsResultAgg;
 using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.SmsResult;
+using CompanyManagment.EFCore.Repository;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Hosting;
 
 namespace CompanyManagment.Application;
 
@@ -15,11 +18,16 @@ public class SmsSettingApplication : ISmsSettingApplication
 {
     private readonly ISmsSettingsRepository _smsSettingsRepository;
     private readonly IInstitutionContractRepository _institutionContractRepository;
+    private readonly IInstitutionContractSmsServiceRepository _institutionContractSmsServiceRepository;
+    private readonly IHostEnvironment _hostEnvironment;
 
-    public SmsSettingApplication(ISmsSettingsRepository smsSettingsRepository, IInstitutionContractRepository institutionContractRepository)
+    public SmsSettingApplication(ISmsSettingsRepository smsSettingsRepository, IInstitutionContractRepository institutionContractRepository, IInstitutionContractSmsServiceRepository institutionContractSmsServiceRepository, IHostEnvironment hostEnvironment)
     {
         _smsSettingsRepository = smsSettingsRepository;
         _institutionContractRepository = institutionContractRepository;
+        _institutionContractSmsServiceRepository = institutionContractSmsServiceRepository;
+        _hostEnvironment = hostEnvironment;
+
     }
 
 
@@ -116,25 +124,31 @@ public class SmsSettingApplication : ISmsSettingApplication
 
     public async Task<List<SmsListData>> GetSmsListData(TypeOfSmsSetting typeOfSmsSetting)
     {
-       return await _institutionContractRepository.GetSmsListData(DateTime.Now, typeOfSmsSetting);
+       return await _institutionContractSmsServiceRepository.GetSmsListData(DateTime.Now, typeOfSmsSetting);
     }
 
     public async Task<List<BlockSmsListData>> GetBlockSmsListData(TypeOfSmsSetting typeOfSmsSetting)
     {
-        return await _institutionContractRepository.GetBlockListData(DateTime.Now);
+        return await _institutionContractSmsServiceRepository.GetBlockListData(DateTime.Now);
     }
 
 
     public async Task<OperationResult> InstantSendReminderSms(List<SmsListData> command)
     {
         var op = new OperationResult();
+        if (_hostEnvironment.IsDevelopment())
+        {
+
+            return op.Failed(" در محیط توسعه امکان ارسال وجود ندارد ");
+
+        }
         string typeOfSms = "یادآور بدهی ماهانه";
         string sendMessStart = "شروع یادآور آنی";
         string sendMessEnd = "پایان یادآور آنی";
 
         if (command.Any())
         {
-            await _institutionContractRepository.SendReminderSmsToContractingParties(command, typeOfSms, sendMessStart, sendMessEnd);
+            await _institutionContractSmsServiceRepository.SendReminderSmsToContractingParties(command, typeOfSms, sendMessStart, sendMessEnd);
             return op.Succcedded();
         }
         else
@@ -148,12 +162,19 @@ public class SmsSettingApplication : ISmsSettingApplication
     public async Task<OperationResult> InstantSendBlockSms(List<BlockSmsListData> command)
     {
         var op = new OperationResult();
+
+        if (_hostEnvironment.IsDevelopment())
+        {
+        
+            return op.Failed(" در محیط توسعه امکان ارسال وجود ندارد ");
+
+        }
         string typeOfSms = "اعلام مسدودی طرف حساب";
         string sendMessStart = "شروع مسدودی آنی";
         string sendMessEnd = "پایان مسدودی آنی ";
         if (command.Any())
         {
-            await _institutionContractRepository.SendBlockSmsToContractingParties(command, typeOfSms, sendMessStart,
+            await _institutionContractSmsServiceRepository.SendBlockSmsToContractingParties(command, typeOfSms, sendMessStart,
                 sendMessEnd);
             return op.Succcedded();
         }
@@ -162,4 +183,166 @@ public class SmsSettingApplication : ISmsSettingApplication
             return op.Failed("موردی انتخاب نشده است");
         }
     }
+
+    #region ForApi
+   
+    /// <summary>
+    /// دریافت لیست پیامک های خودکار بر اساس نوع آن
+    /// Api
+    /// </summary>
+    /// <param name="typeOfSmsSetting"></param>
+    /// <returns></returns>
+    public async Task<List<SmsSettingDto>> GetSmsSettingList(TypeOfSmsSetting typeOfSmsSetting)
+    {
+        return await _smsSettingsRepository.GetSmsSettingList(typeOfSmsSetting);
+    }
+
+
+    public async Task<SmsSettingDto> GetSmsSettingDataToEdit(long id)
+    {
+        return await _smsSettingsRepository.GetSmsSettingDataToEdit(id);
+    }
+
+
+    public async Task<OperationResult> EditSmsSetting(SmsSettingDto command)
+    {
+        var op = new OperationResult();
+        var editSmsSetting = _smsSettingsRepository.Get(command.Id);
+        var timeSpan = new TimeSpan();
+        if (string.IsNullOrWhiteSpace(command.TimeOfDayDisplay))
+            return op.Failed("ساعت وارد نشده است");
+      
+        try
+        {
+            timeSpan = TimeSpan.ParseExact(command.TimeOfDayDisplay, @"hh\:mm", null);
+        }
+        catch (Exception e)
+        {
+            return op.Failed("فرمت ساعت اشتباه است");
+        }
+
+        if (command.DayOfMonth < 1 || command.DayOfMonth > 31)
+        {
+            return op.Failed("عدد روز می بایست بین 1 تا 31 باشد");
+        }
+
+        if (_smsSettingsRepository.Exists(x => x.DayOfMonth == command.DayOfMonth && x.TimeOfDay == timeSpan && x.TypeOfSmsSetting == editSmsSetting.TypeOfSmsSetting && x.id != command.Id))
+            return op.Failed("رکورد ایجاد شده تکراری است");
+
+      
+        editSmsSetting.Edit(command.DayOfMonth, timeSpan);
+        await _smsSettingsRepository.SaveChangesAsync();
+
+        return op.Succcedded();
+    }
+
+
+    public async Task<List<InstantReminderSendSms>> GetInstantReminderSmsListData(TypeOfSmsSetting typeOfSmsSetting)
+    {
+        var result = new List<InstantReminderSendSms>();
+
+
+        if (typeOfSmsSetting == TypeOfSmsSetting.InstitutionContractDebtReminder)
+        {
+            var data = await _institutionContractSmsServiceRepository.GetSmsListData(DateTime.Now, TypeOfSmsSetting.InstitutionContractDebtReminder);
+
+            if (data.Any())
+            {
+                result = data.GroupBy(x => x.PartyName).Select(m => new InstantReminderSendSms()
+                {
+                    FullName = m.Key,
+                    Amount = m.Select(c => c.Amount).First(),
+                    InstantReminderSmsList = m.Select(c => new InstantReminderSmsList()
+                    {
+                        PhoneNumber = c.PhoneNumber,
+                    }).ToList()
+
+
+                }).ToList();
+            }
+        }
+
+        if (typeOfSmsSetting == TypeOfSmsSetting.BlockContractingParty)
+        {
+            var data = await _institutionContractSmsServiceRepository.GetBlockListData(DateTime.Now);
+
+            if (data.Any())
+            {
+                result = data.GroupBy(x => x.PartyName).Select(m => new InstantReminderSendSms()
+                {
+                    FullName = m.Key,
+                    Amount = m.Select(c => c.Amount).First(),
+                    InstantReminderSmsList = m.Select(c => new InstantReminderSmsList()
+                    {
+                        PhoneNumber = c.PhoneNumber,
+                    }).ToList()
+
+
+                }).ToList();
+            }
+        }
+
+        return result;
+    }
+
+    public async Task<OperationResult> InstantSmsSendApi(TypeOfSmsSetting typeOfSmsSetting, List<string> phoneNumbers)
+    {
+     
+        var op = new OperationResult();
+        if (_hostEnvironment.IsDevelopment())
+        {
+            var str = "";
+            foreach (var item in phoneNumbers)
+            {
+                str += $" {item}, ";
+            }
+            return op.Failed(" در محیط توسعه امکان ارسال وجود ندارد " + "  لیست ارسال شما " + str);
+
+        }
+        if (typeOfSmsSetting == TypeOfSmsSetting.InstitutionContractDebtReminder)
+        {
+            if (phoneNumbers.Any())
+            {
+                var data = await _institutionContractSmsServiceRepository.GetSmsListData(DateTime.Now, TypeOfSmsSetting.InstitutionContractDebtReminder);
+
+                if (data.Any())
+                {
+                    phoneNumbers = phoneNumbers.Where(x => x.Length == 11).ToList();
+                    var sendItems = data.Where(x => phoneNumbers.Contains(x.PhoneNumber)).ToList();
+                    var res = await InstantSendReminderSms(sendItems);
+                    return res;
+
+                }
+
+                return op.Succcedded();
+            }
+
+            return op.Failed("موردی انتخاب نشده است");
+
+        }
+
+        if (typeOfSmsSetting == TypeOfSmsSetting.BlockContractingParty)
+        {
+            if (phoneNumbers.Any())
+            {
+                var data = await _institutionContractSmsServiceRepository.GetBlockListData(DateTime.Now);
+
+                if (data.Any())
+                {
+                    phoneNumbers = phoneNumbers.Where(x => x.Length == 11).ToList();
+                    var sendItems = data.Where(x => phoneNumbers.Contains(x.PhoneNumber)).ToList();
+                    var res = await InstantSendBlockSms(sendItems);
+                    return res;
+                }
+                return op.Succcedded();
+            }
+            return op.Failed("موردی انتخاب نشده است");
+        }
+
+
+
+
+        return op.Failed("خطای انتخاب نوع ارسال");
+    }
+    #endregion
 }

CompanyManagment.EFCore/Mapping/CheckoutMapping.cs

@@ -34,7 +34,7 @@ class CheckoutMapping : IEntityTypeConfiguration<Checkout>
         builder.Property(x => x.FamilyAllowance);
         builder.Property(x => x.HousingAllowance);
         builder.Property(x => x.ConsumableItems);
-        builder.Property(x => x.RewardPay).HasColumnType("float").IsRequired(false);
+        builder.Property(x => x.RewardPay);
 
         builder.Property(x => x.LeaveCheckout);
         builder.Property(x => x.CreditLeaves);
@@ -82,6 +82,15 @@ class CheckoutMapping : IEntityTypeConfiguration<Checkout>
             salaryAid.Property(x => x.CalculationDateTimeFa).HasMaxLength(15);
         });
 
+
+        builder.OwnsMany(x => x.Rewards, reward =>
+        {
+            reward.Property(x => x.Description).HasColumnType("ntext");
+            reward.Property(x => x.Title).HasMaxLength(255);
+            reward.Property(x=> x.Amount).HasMaxLength(25);
+            reward.Property(x => x.GrantDateFa).HasMaxLength(10);
+        });
+
         builder.OwnsOne(x => x.CheckoutRollCall, rollCall =>
         {
 	        rollCall.Property(x => x.TotalPresentTimeSpan).HasTimeSpanConversion();

CompanyManagment.EFCore/Migrations/20260124132444_Add Reward to checkout.cs

@@ -0,0 +1,66 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddRewardtocheckout : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<double>(
+                name: "RewardPay",
+                table: "Checkouts",
+                type: "float",
+                nullable: false,
+                defaultValue: 0.0,
+                oldClrType: typeof(double),
+                oldType: "float",
+                oldNullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "CheckoutReward",
+                columns: table => new
+                {
+                    Checkoutid = table.Column<long>(type: "bigint", nullable: false),
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    Amount = table.Column<string>(type: "nvarchar(25)", maxLength: 25, nullable: true),
+                    AmountDouble = table.Column<double>(type: "float", nullable: false),
+                    GrantDateFa = table.Column<string>(type: "nvarchar(10)", maxLength: 10, nullable: true),
+                    GrantDateGr = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    Description = table.Column<string>(type: "ntext", nullable: true),
+                    Title = table.Column<string>(type: "nvarchar(255)", maxLength: 255, nullable: true),
+                    EntityId = table.Column<long>(type: "bigint", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CheckoutReward", x => new { x.Checkoutid, x.Id });
+                    table.ForeignKey(
+                        name: "FK_CheckoutReward_Checkouts_Checkoutid",
+                        column: x => x.Checkoutid,
+                        principalTable: "Checkouts",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "CheckoutReward");
+
+            migrationBuilder.AlterColumn<double>(
+                name: "RewardPay",
+                table: "Checkouts",
+                type: "float",
+                nullable: true,
+                oldClrType: typeof(double),
+                oldType: "float");
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs

@@ -635,7 +635,7 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(10)
                         .HasColumnType("nvarchar(10)");
 
-                    b.Property<double?>("RewardPay")
+                    b.Property<double>("RewardPay")
                         .HasColumnType("float");
 
                     b.Property<string>("RotatingShiftValue")
@@ -7501,6 +7501,49 @@ namespace CompanyManagment.EFCore.Migrations
                                 .HasForeignKey("Checkoutid");
                         });
 
+                    b.OwnsMany("Company.Domain.CheckoutAgg.ValueObjects.CheckoutReward", "Rewards", b1 =>
+                        {
+                            b1.Property<long>("Checkoutid")
+                                .HasColumnType("bigint");
+
+                            b1.Property<int>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("int");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<int>("Id"));
+
+                            b1.Property<string>("Amount")
+                                .HasMaxLength(25)
+                                .HasColumnType("nvarchar(25)");
+
+                            b1.Property<double>("AmountDouble")
+                                .HasColumnType("float");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("ntext");
+
+                            b1.Property<long>("EntityId")
+                                .HasColumnType("bigint");
+
+                            b1.Property<string>("GrantDateFa")
+                                .HasMaxLength(10)
+                                .HasColumnType("nvarchar(10)");
+
+                            b1.Property<DateTime>("GrantDateGr")
+                                .HasColumnType("datetime2");
+
+                            b1.Property<string>("Title")
+                                .HasMaxLength(255)
+                                .HasColumnType("nvarchar(255)");
+
+                            b1.HasKey("Checkoutid", "Id");
+
+                            b1.ToTable("CheckoutReward");
+
+                            b1.WithOwner()
+                                .HasForeignKey("Checkoutid");
+                        });
+
                     b.OwnsMany("Company.Domain.CheckoutAgg.ValueObjects.CheckoutSalaryAid", "SalaryAids", b1 =>
                         {
                             b1.Property<long>("Checkoutid")
@@ -7545,6 +7588,8 @@ namespace CompanyManagment.EFCore.Migrations
 
                     b.Navigation("LoanInstallments");
 
+                    b.Navigation("Rewards");
+
                     b.Navigation("SalaryAids");
 
                     b.Navigation("Workshop");

CompanyManagment.EFCore/Repository/CheckoutRepository.cs

@@ -531,6 +531,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
 
         entity.SetSalaryAid(command.SalaryAids, command.SalaryAidDeduction);
         entity.SetLoanInstallment(command.LoanInstallments, command.InstallmentDeduction);
+        entity.SetReward(command.Rewards,command.RewardPay);
         entity.SetCheckoutRollCall(command.CheckoutRollCall);
         entity.SetEmployeeMandatoryHours(command.EmployeeMandatoryHours);
         if(command.HasInsuranceShareTheSameAsList)
@@ -934,7 +935,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                     TotalClaims = item.TotalClaims,
                     TotalDeductions = item.TotalDeductions,
                     TotalPayment = item.TotalPayment.ToMoney(),
-                    RewardPay = item.RewardPay.ToMoneyNullable(),
+                    RewardPay = item.RewardPay.ToMoney(),
                     ContractStartGr = item.ContractStart,
                     ContractEndGr = item.ContractEnd,
                     IsLeft = false,
@@ -1335,7 +1336,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                 TotalClaims = x.TotalClaims,
                 TotalDeductions = x.TotalDeductions,
                 TotalPayment = x.TotalPayment.ToMoney(),
-                RewardPay = x.RewardPay.ToMoneyNullable(),
+                RewardPay = x.RewardPay.ToMoney(),
                 ContractStartGr = x.ContractStart,
                 ContractEndGr = x.ContractEnd,
                 IsLeft = false,

CompanyManagment.EFCore/Repository/EmployeeDocumentsRepository.cs

@@ -713,10 +713,15 @@ public class EmployeeDocumentsRepository : RepositoryBase<long, EmployeeDocument
         var itemsQuery = _companyContext.EmployeeDocumentItems
             .Where(x => x.DocumentStatus != DocumentStatus.Unsubmitted)
             .Include(x => x.EmployeeDocuments)
-            .ThenInclude(x => x.Workshop).ThenInclude(x => x.WorkshopEmployers).ThenInclude(x => x.Employer)
-            .GroupBy(x => x.WorkshopId).Select(x => new WorkshopWithEmployeeDocumentsViewModel()
+            .ThenInclude(x => x.Workshop)
+            .ThenInclude(x => x.WorkshopEmployers)
+            .ThenInclude(x => x.Employer)
+            .GroupBy(x => x.WorkshopId)
+            .Select(x => new WorkshopWithEmployeeDocumentsViewModel()
             {
-                SubmittedItemsCount = x.Count(y => y.DocumentStatus == DocumentStatus.SubmittedByAdmin || y.DocumentStatus == DocumentStatus.SubmittedByClient),
+                SubmittedItemsCount = x
+                    .Count(y => y.DocumentStatus == DocumentStatus.SubmittedByAdmin 
+                                || y.DocumentStatus == DocumentStatus.SubmittedByClient),
                 WorkshopId = x.Key,
                 WorkshopFullName = x.First().EmployeeDocuments.Workshop.WorkshopName,
                 EmployerName = x.First().EmployeeDocuments.Workshop.WorkshopEmployers.First().Employer.FullName

CompanyManagment.EFCore/Repository/LoanRepository.cs

@@ -171,22 +171,29 @@ public class LoanRepository : RepositoryBase<long, Loan>, ILoanRepository
             query = query.Where(x => x.StartInstallmentPayment >= startDate && x.StartInstallmentPayment <= endDate);
         }
 
-        result.LoanListViewModel = query.OrderByDescending(x => x.StartInstallmentPayment).Skip(searchModel.PageIndex)
-            .Take(30).ToList()
-            .Select(x => new LoanViewModel()
-            {
-                EmployeeFullName = employees.FirstOrDefault(e => e.id == x.EmployeeId).FullName,
-                PersonnelCode = personnelCodes.FirstOrDefault(p => p.EmployeeId == x.EmployeeId).PersonnelCode.ToString(),
-                Amount = x.Amount.ToMoney(),
-                AmountPerMonth = x.AmountPerMonth.ToMoney(),
-                StartDateTime = x.StartInstallmentPayment.ToFarsi(),
-                Count = x.Count,
-                Id = x.id,
-                WorkshopId = x.WorkshopId,
-                EmployeeId = x.EmployeeId,
-                YearFa = pc.GetYear(x.StartInstallmentPayment).ToString(),
+        result.LoanListViewModel = new PagedResult<LoanViewModel>()
+        {
+            TotalCount = query.Count(),
+            List = query.OrderByDescending(x => x.StartInstallmentPayment)
+                .ApplyPagination(searchModel.PageIndex, searchModel.PageSize)
+                .Take(30).ToList()
+                .Select(x => new LoanViewModel()
+                {
+                    EmployeeFullName = employees.FirstOrDefault(e => e.id == x.EmployeeId).FullName,
+                    PersonnelCode = personnelCodes.FirstOrDefault(p => p.EmployeeId == x.EmployeeId).PersonnelCode
+                        .ToString(),
+                    Amount = x.Amount.ToMoney(),
+                    AmountPerMonth = x.AmountPerMonth.ToMoney(),
+                    StartDateTime = x.StartInstallmentPayment.ToFarsi(),
+                    Count = x.Count,
+                    Id = x.id,
+                    WorkshopId = x.WorkshopId,
+                    EmployeeId = x.EmployeeId,
+                    YearFa = pc.GetYear(x.StartInstallmentPayment).ToString(),
+
+                }).ToList()
+        };
 
-            }).ToList();
         return result;
     }
 

CompanyManagment.EFCore/Repository/PersonalContractingPartyRepository.cs

@@ -245,7 +245,7 @@ public class PersonalContractingPartyRepository : RepositoryBase<long, PersonalC
             return new();
         }
 
-        return _accountContext.Accounts.Where(x => x.id == accId && x.IsActiveString == "true").Select(x =>
+        return _accountContext.Accounts.Where(x => x.id == accId).Select(x =>
             new AccountViewModel()
             {
                 Id = x.id,
@@ -845,8 +845,7 @@ public class PersonalContractingPartyRepository : RepositoryBase<long, PersonalC
     public async Task<OperationResult> ActiveAllAsync(long id)
     {
         OperationResult result = new OperationResult();
-        await using var transaction =await _context.Database.BeginTransactionAsync();
-        await using var accountTransaction = await _accountContext.Database.BeginTransactionAsync();
+        
         try
         {
             var personel = _context.PersonalContractingParties
@@ -890,15 +889,12 @@ public class PersonalContractingPartyRepository : RepositoryBase<long, PersonalC
             }
             
             await _context.SaveChangesAsync();
-            await transaction.CommitAsync();
-            await accountTransaction.CommitAsync();
+            
             result.Succcedded();
         }
         catch (Exception)
         {
             result.Failed("فعال کردن طرف حساب با خطا مواجه شد");
-            await transaction.RollbackAsync();
-            await accountTransaction.RollbackAsync();
         }
 
         return result;

CompanyManagment.EFCore/Repository/ReportClientRepository.cs

@@ -74,7 +74,7 @@ public class ReportClientRepository : IReportClientRepository
             TotalClaims = x.TotalClaims,
             TotalDeductions = x.TotalDeductions,
             TotalPayment = x.TotalPayment.ToMoney(),
-            RewardPay = x.RewardPay.ToMoneyNullable(),
+            RewardPay = x.RewardPay.ToMoney(),
             MarriedAllowance = x.MarriedAllowance.ToMoney(),
         }).Where(x => x.WorkshopId == workshopId);
 
@@ -448,7 +448,7 @@ public class ReportClientRepository : IReportClientRepository
             TotalClaims = x.TotalClaims,
             TotalDeductions = x.TotalDeductions,
             TotalPayment = x.TotalPayment.ToMoney(),
-            RewardPay = x.RewardPay.ToMoneyNullable(),
+            RewardPay = x.RewardPay.ToMoney(),
             MarriedAllowance = x.MarriedAllowance.ToMoney(),
         }).Where(x => x.WorkshopId == workshopId);
 

CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs

@@ -82,25 +82,45 @@ public class RollCallEmployeeRepository : RepositoryBase<long, RollCallEmployee>
 
         var service = _rollCallServiceRepository.GetAllServiceByWorkshopId(workshopId);
 
+        //اگر سرویس حضور غیاب نداشت
         if (!service.Any(x => x.StartService.Date <= contractStart.Date && x.EndService.Date >= contractEnd.Date))
             return false;
         //var rollCallEmployee = GetByEmployeeIdAndWorkshopId(employeeId, workshopId);
 
         //if (rollCallEmployee == null)
         //    return false;
-        var rollCallEmployee = _context.RollCallEmployees
-            .Where(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId)
-            .Include(x => x.EmployeesStatus);
-        if (!rollCallEmployee.Any())
+        var rollCallEmployee = _context.RollCallEmployees.Include(xs => xs.EmployeesStatus)
+            .FirstOrDefault(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId);
+        //اگر تنظیمات حضور غیاب نداشت  
+        if (rollCallEmployee == null)
+            return false;
+        
+        //اگر استاتوس نداشت
+        if (!rollCallEmployee.EmployeesStatus.Any())
             return false;
 
-        var a = rollCallEmployee.Any(x => x.EmployeesStatus.Any(s =>
-            (s.StartDate <= contractStart.Date && s.EndDate.Date >= contractEnd.Date) ||
-            (s.StartDate.Date <= contractStart.Date && s.EndDate.Date > contractStart.Date)));
-        //var result = _employeeRollCallStatusRepository.w(x => x.RollCallEmployeeId == rollCallEmployee.Id &&
-        //                                                     (x.StartDate.Date <= contractStart.Date && x.EndDate.Date >= contractEnd.Date) || 
-        //                                                     (x.StartDate.Date <= contractStart.Date && x.EndDate.Date > contractStart.Date));
-        return a;
+        var leftWork =
+            _context.LeftWorkList.FirstOrDefault(x =>
+                x.StartWorkDate <= contractEnd.Date && x.LeftWorkDate > contractStart);
+        if (leftWork == null)
+            return false;
+
+        var status = rollCallEmployee.EmployeesStatus.FirstOrDefault(s => 
+            (s.StartDate <= contractStart.Date && s.EndDate.Date >= contractEnd.Date));
+        //اگر استاتوس کامل پوشش داد
+        if (status != null)
+            return true;
+
+
+        status = rollCallEmployee.EmployeesStatus.FirstOrDefault(s =>
+            (s.StartDate.Date <= contractStart.Date && s.EndDate.Date > contractStart.Date &&
+             s.EndDate.Date < contractEnd.Date));
+        //اگر قبل از پایان فیس استاتوس قطع شده ولی ترک کار داره
+        if (status != null && leftWork.HasLeft)
+            return true;
+
+
+        return false;
     }
     public List<RollCallEmployeeViewModel> GetByWorkshopId(long workshopId)
     {

CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs

@@ -5199,10 +5199,10 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
         };
     }
 
-    private List<RewardViewModel> RewardForCheckout(long employeeId, long workshopId, DateTime checkoutEnd,
+    public List<RewardViewModel> RewardForCheckout(long employeeId, long workshopId, DateTime checkoutEnd,
         DateTime checkoutStart)
     {
-        return _context.Rewards.Where(x =>
+        var result = _context.Rewards.Where(x =>
             x.WorkshopId == workshopId && x.EmployeeId == employeeId && x.GrantDate <= checkoutEnd &&
             x.GrantDate >= checkoutStart).Select(x => new RewardViewModel
         {
@@ -5215,6 +5215,8 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
             IsActive = x.IsActive,
             Id = x.id
         }).ToList();
+
+        return result;
     }
 
     private List<FineViewModel> FinesForCheckout(long employeeId, long workshopId, DateTime contractStart,

CompanyManagment.EFCore/Repository/SalaryAidRepository.cs

@@ -146,7 +146,7 @@ public class SalaryAidRepository : RepositoryBase<long, SalaryAid>, ISalaryAidRe
                     {
                         YearFa = x.Key.YearFa,
                         MonthFa = x.Key.MonthFa,
-                        SalaryAidViewModels = x.Select(s => new SalaryAidGroupedByDateViewModelItems()
+                        Items = x.Select(s => new SalaryAidGroupedByDateViewModelItems()
                         {
                             Amount = s.Amount,
                             EmployeeName = s.EmployeeFullName,
@@ -175,7 +175,7 @@ public class SalaryAidRepository : RepositoryBase<long, SalaryAid>, ISalaryAidRe
                         EmployeeId = x.Key,
                         TotalAmount = x.Sum(s => s.Amount).ToMoney(),
                         EmployeeName = employees.FirstOrDefault(e => e.id == x.Key).FullName,
-                        SalaryAidViewModels = x.Select(s => new SalaryAidGroupedByEmployeeViewModelItems()
+                        Items = x.Select(s => new SalaryAidGroupedByEmployeeViewModelItems()
                         {
                             Amount = s.Amount.ToMoney(),
                             Id = s.id,
@@ -197,23 +197,28 @@ public class SalaryAidRepository : RepositoryBase<long, SalaryAid>, ISalaryAidRe
             query = query.Where(x => x.SalaryAidDateTime >= startDate && x.SalaryAidDateTime <= endDate);
         }
 
-        result.SalaryAidListViewModels = query.OrderByDescending(x => x.SalaryAidDateTime).Skip(searchModel.PageIndex).Take(30).ToList().Select(
-            x => new SalaryAidViewModel()
-            {
-                Amount = x.Amount.ToMoney(),
-                CreationDate = x.CreationDate.ToFarsi(),
-                Id = x.id,
-                EmployeeId = x.EmployeeId,
-                SalaryAidDateTimeFa = x.SalaryAidDateTime.ToFarsi(),
-                SalaryAidDateTimeGe = x.SalaryAidDateTime,
-                WorkshopId = x.WorkshopId,
-                YearFa = x.SalaryAidDateTime.ToFarsi().Substring(0, 4),
-                MonthFa = x.SalaryAidDateTime.ToFarsi().Substring(5, 2),
-                PersonnelCode = personnelCodes.FirstOrDefault(p => p.EmployeeId == x.EmployeeId).PersonnelCode.ToString(),
-                EmployeeFullName = employees.FirstOrDefault(e => e.id == x.EmployeeId).FullName,
-                AmountDouble = x.Amount,
-            }).ToList();
-
+        result.List = new PagedResult<SalaryAidViewModel>()
+        {
+            TotalCount = query.Count(),
+            List = query.OrderByDescending(x => x.SalaryAidDateTime).ApplyPagination(searchModel.PageIndex,searchModel.PageSize).ToList()
+                .Select(x => new SalaryAidViewModel()
+                {
+                    Amount = x.Amount.ToMoney(),
+                    CreationDate = x.CreationDate.ToFarsi(),
+                    Id = x.id,
+                    EmployeeId = x.EmployeeId,
+                    SalaryAidDateTimeFa = x.SalaryAidDateTime.ToFarsi(),
+                    SalaryAidDateTimeGe = x.SalaryAidDateTime,
+                    WorkshopId = x.WorkshopId,
+                    YearFa = x.SalaryAidDateTime.ToFarsi().Substring(0, 4),
+                    MonthFa = x.SalaryAidDateTime.ToFarsi().Substring(5, 2),
+                    PersonnelCode = personnelCodes.FirstOrDefault(p => p.EmployeeId == x.EmployeeId).PersonnelCode
+                        .ToString(),
+                    EmployeeFullName = employees.FirstOrDefault(e => e.id == x.EmployeeId).FullName,
+                    AmountDouble = x.Amount,
+                }).ToList()
+        };
+        
         return result;
     }
 

CompanyManagment.EFCore/Repository/SmsResultRepository.cs

@@ -1,13 +1,20 @@
-using System.Collections.Generic;
-using System.Linq;
-using _0_Framework.Application;
+using _0_Framework.Application;
 using _0_Framework.InfraStructure;
 using Company.Domain.SmsResultAgg;
 using CompanyManagment.App.Contracts.SmsResult;
+using CompanyManagment.App.Contracts.SmsResult.Dto;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using _0_Framework.Application.Enums;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
 
 namespace CompanyManagment.EFCore.Repository;
 
-public class SmsResultRepository : RepositoryBase<long, SmsResult> , ISmsResultRepository
+public class SmsResultRepository : RepositoryBase<long, SmsResult>, ISmsResultRepository
 {
     private readonly CompanyContext _context;
     public SmsResultRepository(CompanyContext context) : base(context)
@@ -15,9 +22,238 @@ public class SmsResultRepository : RepositoryBase<long, SmsResult> , ISmsResultR
         _context = context;
     }
 
+    #region ForApi
+
+
+
+    public async Task<List<SmsReportDto>> GetSmsReportList(SmsReportSearchModel searchModel)
+    {
+
+        // مرحله 1: همه رکوردها را با projection ساده بگیرید
+        var rawQuery = await _context.SmsResults
+            .Select(x => new
+            {
+                x.id,
+                x.ContractingPatyId,
+                x.Mobile,
+                x.Status,
+                x.TypeOfSms,
+                x.CreationDate,
+                DateOnly = x.CreationDate.Date // فقط تاریخ بدون ساعت
+            })
+            .AsNoTracking()
+            .ToListAsync(); // اینجا SQL اجرا می‌شود و همه داده‌ها به client می‌آیند
+
+        if (searchModel.ContractingPatyId > 0)
+        {
+            rawQuery = rawQuery.Where(x => x.ContractingPatyId == searchModel.ContractingPatyId).ToList();
+        }
+
+        if (!string.IsNullOrWhiteSpace(searchModel.Mobile))
+        {
+            rawQuery = rawQuery.Where(x => x.Mobile.Contains(searchModel.Mobile)).ToList();
+        }
+       
+        if (searchModel.TypeOfSms != TypeOfSmsSetting.All && searchModel.TypeOfSms != TypeOfSmsSetting.Warning)
+        {
+            var typeOfSms = "All";
+            switch (searchModel.TypeOfSms)
+            {
+                case TypeOfSmsSetting.InstitutionContractDebtReminder:
+                    typeOfSms = "یادآور بدهی ماهانه";
+                    break;
+                case TypeOfSmsSetting.MonthlyInstitutionContract:
+                    typeOfSms = "صورت حساب ماهانه";
+                    break;
+                case TypeOfSmsSetting.BlockContractingParty:
+                    typeOfSms = "اعلام مسدودی طرف حساب";
+                    break;
+                case TypeOfSmsSetting.LegalAction:
+                    typeOfSms = "اقدام قضایی";
+                    break;
+                case TypeOfSmsSetting.InstitutionContractConfirm:
+                    typeOfSms = "یادآور تایید قرارداد مالی";
+                    break;
+                case TypeOfSmsSetting.SendInstitutionContractConfirmationCode:
+                    typeOfSms = "کد تاییدیه قرارداد مالی";
+                    break;
+                case TypeOfSmsSetting.SendInstitutionContractConfirmationLink:
+                    typeOfSms = "لینک تاییدیه ایجاد قرارداد مالی";
+                    break;
+                case TypeOfSmsSetting.TaskReminder:
+                    typeOfSms = "یادآور وظایف";
+                    break;
+            }
+
+            rawQuery = rawQuery.Where(x => x.TypeOfSms == typeOfSms).ToList();
+        }
+
+        if (searchModel.TypeOfSms == TypeOfSmsSetting.Warning)
+        {
+            rawQuery = rawQuery.Where(x => x.TypeOfSms.Contains("هشدار")).ToList();
+        }
+
+        if (searchModel.SendStatus != SendStatus.All)
+        {
+            var status = "All";
+
+            switch (searchModel.SendStatus)
+            {
+                case SendStatus.Success: status = "موفق";
+                    break;
+                case SendStatus.Failed: status = "ناموفق";
+                    break;
+
+            
+            }
+
+            rawQuery = rawQuery.Where(x => x.Status == status).ToList();
+
+        }
+        #region searchByDate
+
+        if (!string.IsNullOrWhiteSpace(searchModel.StartDateFa) &&
+            !string.IsNullOrWhiteSpace(searchModel.EndDateFa))
+        {
+            if (searchModel.StartDateFa.TryToGeorgianDateTime(out var startGr) == false ||
+                searchModel.EndDateFa.TryToGeorgianDateTime(out var endGr) == false)
+                return new List<SmsReportDto>();
+
+            rawQuery = rawQuery.Where(x => x.CreationDate.Date >= startGr.Date && x.CreationDate.Date <= endGr.Date).ToList();
+
+        }
+        else
+        {
+            if (!string.IsNullOrWhiteSpace(searchModel.Year) && !string.IsNullOrWhiteSpace(searchModel.Month))
+            {
+                var start = searchModel.Year + "/" + searchModel.Month + "/01";
+                var end = start.FindeEndOfMonth();
+                var startGr = start.ToGeorgianDateTime();
+                var endGr = end.ToGeorgianDateTime();
+                rawQuery = rawQuery.Where(x => x.CreationDate.Date >= startGr.Date && x.CreationDate.Date <= endGr.Date).ToList();
+
+
+            }
+            else if (!string.IsNullOrWhiteSpace(searchModel.Year) && string.IsNullOrWhiteSpace(searchModel.Month))
+            {
+                var start = searchModel.Year + "/01/01";
+                var findEndOfYear = searchModel.Year + "/12/01";
+                var end = findEndOfYear.FindeEndOfMonth();
+                var startGr = start.ToGeorgianDateTime();
+                var endGr = end.ToGeorgianDateTime();
+                rawQuery = rawQuery.Where(x => x.CreationDate.Date >= startGr.Date && x.CreationDate.Date <= endGr.Date).ToList();
+
+            }
+        }
+
+        #endregion
+
+        // مرحله 2: گروه‌بندی و انتخاب آخرین رکورد هر روز روی Client
+        var grouped = rawQuery
+            .GroupBy(x => (x.DateOnly, x.TypeOfSms))
+            .Select(g => g.OrderByDescending(x => x.CreationDate).First())
+            .OrderByDescending(x => x.CreationDate)
+            .ToList();
+
+        // مرحله 3: تبدیل به DTO و ToFarsi
+        var result = grouped.Select(x => new SmsReportDto
+        {
+            SentDate = x.CreationDate.ToFarsi(),
+            TypeOfSms = x.TypeOfSms
+        }).ToList();
+        return result;
+    }
+
+
+    public async Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date, string typeOfSmsSetting)
+    {
+        if(string.IsNullOrWhiteSpace(date) || string.IsNullOrWhiteSpace(typeOfSmsSetting))
+            return new List<SmsReportListDto>();
+
+        if (date.TryToGeorgianDateTime(out var searchDate) == false)
+            return new List<SmsReportListDto>();
+
+        var query = await _context.SmsResults.Where(x => x.CreationDate.Date == searchDate.Date)
+            .Select(x =>
+                new
+                {
+                    x.id,
+                    x.MessageId,
+                    x.Status,
+                    x.TypeOfSms,
+                    x.ContractingPartyName,
+                    x.Mobile,
+                    x.ContractingPatyId,
+                    x.InstitutionContractId,
+                    x.CreationDate,
+                    x.CreationDate.Hour,
+                    x.CreationDate.Minute
+
+                }).AsNoTracking()
+            .ToListAsync(); ;
+
+        if (searchModel.ContractingPatyId > 0)
+        {
+            query = query.Where(x => x.ContractingPatyId == searchModel.ContractingPatyId).ToList();
+        }
+
+        if (!string.IsNullOrWhiteSpace(searchModel.Mobile))
+        {
+            query = query.Where(x => x.Mobile.Contains(searchModel.Mobile)).ToList();
+        }
+
+
+        if (typeOfSmsSetting.Contains("هشدار"))
+        {
+            query = query.Where(x => x.TypeOfSms.Contains("هشدار")).ToList();
+        }
+        query = query.Where(x => x.TypeOfSms == typeOfSmsSetting).ToList();
+
+        if (searchModel.SendStatus != SendStatus.All)
+        {
+            var status = "All";
+
+            switch (searchModel.SendStatus)
+            {
+                case SendStatus.Success:
+                    status = "موفق";
+                    break;
+                case SendStatus.Failed:
+                    status = "ناموفق";
+                    break;
+
+
+            }
+
+            query = query.Where(x => x.Status == status).ToList();
+
+        }
+
+        if (query.Count == 0)
+            return new List<SmsReportListDto>();
+
+        var result =  query.OrderByDescending(x => x.CreationDate.Hour)
+            .ThenByDescending(x => x.CreationDate.Minute).Select(x =>
+                new SmsReportListDto()
+                {
+                    Id = x.id,
+                    MessageId = x.MessageId,
+                    Status = x.Status,
+                    TypeOfSms = x.TypeOfSms,
+                    ContractingPartyName = x.ContractingPartyName,
+                    Mobile = x.Mobile,
+                    HourAndMinute = x.CreationDate.TimeOfDay.ToString(@"hh\:mm"),
+                }).ToList();
+
+        return result;
+
+    }
+
+    #endregion
+
     public List<App.Contracts.SmsResult.SmsResultViewModel> Search(SmsResultSearchModel searchModel)
     {
-       
+
         var query = _context.SmsResults.Select(x => new App.Contracts.SmsResult.SmsResultViewModel()
         {
             Id = x.id,
@@ -64,7 +300,7 @@ public class SmsResultRepository : RepositoryBase<long, SmsResult> , ISmsResultR
                 var endGr = end.ToGeorgianDateTime();
                 query = query.Where(x => x.CreationDate.Date >= startGr.Date && x.CreationDate.Date <= endGr.Date);
 
-                  
+
             }
             else if (!string.IsNullOrWhiteSpace(searchModel.Year) && string.IsNullOrWhiteSpace(searchModel.Month))
             {
@@ -74,7 +310,7 @@ public class SmsResultRepository : RepositoryBase<long, SmsResult> , ISmsResultR
                 var startGr = start.ToGeorgianDateTime();
                 var endGr = end.ToGeorgianDateTime();
                 query = query.Where(x => x.CreationDate.Date >= startGr.Date && x.CreationDate.Date <= endGr.Date);
-               
+
             }
         }
 
@@ -82,12 +318,12 @@ public class SmsResultRepository : RepositoryBase<long, SmsResult> , ISmsResultR
 
 
         query = query.OrderByDescending(x => x.CreationDate)
-            .ThenByDescending(x=>x.CreationDate.Hour).ThenByDescending(x=>x.CreationDate.Minute);
-          
+            .ThenByDescending(x => x.CreationDate.Hour).ThenByDescending(x => x.CreationDate.Minute);
+
         return query.Skip(searchModel.PageIndex).Take(30).ToList();
-            
-              
+
+
     }
 
-       
+
 }

CompanyManagment.EFCore/Repository/SmsSettingsRepository.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using _0_Framework.Application.Enums;
 using _0_Framework.InfraStructure;
@@ -68,4 +69,48 @@ public class SmsSettingsRepository : RepositoryBase<long, SmsSetting>, ISmsSetti
          _context.SmsSettings.Remove(removeItem);
          await _context.SaveChangesAsync();
     }
+
+
+    #region ForApi
+    /// <summary>
+    /// دریافت لیست پیامک های خودکار بر اساس نوع آن
+    /// Api
+    /// </summary>
+    /// <param name="typeOfSmsSetting"></param>
+    /// <returns></returns>
+    public async Task<List<SmsSettingDto>> GetSmsSettingList(TypeOfSmsSetting typeOfSmsSetting)
+    {
+      
+        var data = await _context.SmsSettings
+            .Where(x => x.TypeOfSmsSetting == typeOfSmsSetting)
+            .OrderBy(x => x.DayOfMonth).ThenBy(x => x.TimeOfDay)
+            .Select(x =>
+                new SmsSettingDto()
+                { 
+                    Id = x.id,
+                    DayOfMonth = x.DayOfMonth,
+                    TimeOfDayDisplay = x.TimeOfDay.ToString(@"hh\:mm")
+                }).ToListAsync();
+
+        return data;
+    }
+
+    public async Task<SmsSettingDto> GetSmsSettingDataToEdit(long id)
+    {
+        var edit = new SmsSettingDto();
+        var getItem = await _context.SmsSettings.FirstOrDefaultAsync(x => x.id == id);
+
+        if (getItem != null)
+        {
+            edit.Id = getItem.id;
+            edit.TimeOfDayDisplay = getItem.TimeOfDay.ToString(@"hh\:mm");
+            edit.DayOfMonth = getItem.DayOfMonth;
+         
+        }
+
+        return edit;
+    }
+
+
+    #endregion
 }

CompanyManagment.EFCore/Repository/WorkshopRepository.cs

@@ -160,7 +160,9 @@ public class WorkshopRepository : RepositoryBase<long, Company.Domain.WorkshopAg
     public EditWorkshop GetDetails(long id)
     {
         var emp = _context.WorkshopEmployers.Where(x => x.WorkshopId == id)
-            .Select(x => x.EmployerId).ToList();
+            .Select(x => x.Employer).ToList();
+        var contractingPart = emp.Select(x => x.ContractingPartyId).ToList();
+        bool rewardCompute = contractingPart.Any(x=>x == 30804);
         return _context.Workshops.Select(x => new EditWorkshop
         {
             Id = x.id,
@@ -193,7 +195,7 @@ public class WorkshopRepository : RepositoryBase<long, Company.Domain.WorkshopAg
             BonusesOptions = string.IsNullOrWhiteSpace(x.BonusesOptions) ? "EndOfContract1402leftWork1403" : x.BonusesOptions,
             YearsOptions = x.YearsOptions,
             IsOldContract = x.IsOldContract,
-            EmployerIdList = emp,
+            EmployerIdList = emp.Select(e=>e.id).ToList(),
             HasRollCallFreeVip = x.HasRollCallFreeVip,
             WorkshopHolidayWorking = x.WorkshopHolidayWorking,
             InsuranceCheckoutOvertime = x.InsuranceCheckoutOvertime,
@@ -205,6 +207,7 @@ public class WorkshopRepository : RepositoryBase<long, Company.Domain.WorkshopAg
             SignCheckout = x.SignCheckout,
             RotatingShiftCompute = x.RotatingShiftCompute,
             IsStaticCheckout = x.IsStaticCheckout,
+            RewardComputeOnCheckout = rewardCompute
 
         }).FirstOrDefault(x => x.Id == id);
     }

CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs

@@ -2859,7 +2859,7 @@ public class YearlySalaryRepository : RepositoryBase<long, YearlySalary>, IYearl
         var contactCanToleaveList = new List<ContractsCanToLeave>();
         var allContractsBetween = _context.Contracts.AsSplitQuery().Include(x => x.WorkingHoursList)
                       .Where(x => x.WorkshopIds == workshopId && x.EmployeeId == employeeId &&
-                                  x.ContractEnd >= startDate && x.ContarctStart <= endDate).ToList();
+                                  x.ContractEnd >= startDate && x.ContarctStart <= endDate).OrderBy(x=>x.ContarctStart).ToList();
         var isWorkshopStaticCheckout = _context.Workshops.FirstOrDefault(x => x.id == workshopId)!.IsStaticCheckout;
         int mandatoryDays = 0;
         double allCanToLeave = 0;

CompanyManagment.EFCore/Services/SmsService.cs

@@ -205,18 +205,33 @@ public class SmsService : ISmsService
         };
         return appendData;
     }
+
+    public async Task<SmsDetailsDto> GetSmsDetailsByMessageId(int messId, string fullName)
+    {
+
+        SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+        var response = await smsIr.GetReportAsync(messId);
+        MessageReportResult messages = response.Data;
+
+        var appendData = new SmsDetailsDto()
+        {
+            Mobile = messages.Mobile,
+            MessageText = messages.MessageText,
+            SendUnixTime = UnixTimeStampToDateTime(messages.SendDateTime),
+            DeliveryState = DeliveryStatus(messages.DeliveryState),
+            DeliveryUnixTime = UnixTimeStampToDateTime(messages.DeliveryDateTime),
+            DeliveryColor = DeliveryColorStatus(messages.DeliveryState),
+            FullName = fullName
+        };
+        return appendData;
+    }
     public async Task<List<ApiResultViewModel>> GetApiResult(string startDate, string endDate)
     {
-        var st = new DateTime(2024, 6, 2);
-        var ed = new DateTime(2024, 7, 1);
-        if (!string.IsNullOrWhiteSpace(startDate) && startDate.Length == 10)
-        {
-            st = startDate.ToGeorgianDateTime();
-        }
-        if (!string.IsNullOrWhiteSpace(endDate) && endDate.Length == 10)
-        {
-            ed = endDate.ToGeorgianDateTime();
-        }
+
+
+        if(startDate.TryToGeorgianDateTime(out var st) == false || endDate.TryToGeorgianDateTime(out var ed) == false)
+            return new List<ApiResultViewModel>();
+
         var res = new List<ApiResultViewModel>();
         Int32 unixTimestamp = (int)st.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
         Int32 unixTimestamp2 = (int)ed.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
@@ -248,6 +263,44 @@ public class SmsService : ISmsService
         return res;
     }
 
+    public async Task<List<ApiReportDto>> GetApiReport(string startDate, string endDate)
+    {
+
+
+        if (startDate.TryToGeorgianDateTime(out var st) == false || endDate.TryToGeorgianDateTime(out var ed) == false)
+            return new List<ApiReportDto>();
+
+        var res = new List<ApiReportDto>();
+        Int32 unixTimestamp = (int)st.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
+        Int32 unixTimestamp2 = (int)ed.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
+        //   int? fromDateUnixTime = null; // unix time - for instance: 1700598600
+        //int? toDateUnixTime = null; // unix time - for instance: 1703190600
+        int pageNumber = 2;
+        int pageSize = 100; // max: 100
+        SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+        var response = await smsIr.GetArchivedReportAsync(pageNumber, pageSize, unixTimestamp, unixTimestamp2);
+
+        MessageReportResult[] messages = response.Data;
+        foreach (var message in messages)
+        {
+            var appendData = new ApiReportDto()
+            {
+                MessageId = message.MessageId,
+    
+                Mobile = message.Mobile,
+
+                SendUnixTime = UnixTimeStampToDateTime(message.SendDateTime),
+                DeliveryState = DeliveryStatus(message.DeliveryState),
+                DeliveryUnixTime = UnixTimeStampToDateTime(message.DeliveryDateTime),
+                DeliveryColor = DeliveryColorStatus(message.DeliveryState),
+            };
+            res.Add(appendData);
+        }
+
+
+        return res;
+    }
+
     public string DeliveryStatus(byte? dv)
     {
         string mess = "";

PersonalContractingParty.Config/PersonalBootstrapper.cs

@@ -61,6 +61,7 @@ using Company.Domain.HolidayItemAgg;
 using Company.Domain.InstitutionContractAgg;
 using Company.Domain.InstitutionContractContactInfoAgg;
 using Company.Domain.InstitutionContractExtensionTempAgg;
+using Company.Domain.InstitutionContractSendFlagAgg;
 using Company.Domain.InstitutionPlanAgg;
 using Company.Domain.InsuranceAgg;
 using Company.Domain.InsuranceEmployeeInfoAgg;
@@ -123,6 +124,7 @@ using Company.Domain.ZoneAgg;
 using CompanyManagement.Infrastructure.Excel.SalaryAid;
 using CompanyManagement.Infrastructure.Mongo.EmployeeFaceEmbeddingRepo;
 using CompanyManagement.Infrastructure.Mongo.InstitutionContractInsertTempRepo;
+using CompanyManagement.Infrastructure.Mongo.InstitutionContractSendFlagRepo;
 using CompanyManagment.App.Contracts.AdminMonthlyOverview;
 using CompanyManagment.App.Contracts.AndroidApkVersion;
 using CompanyManagment.App.Contracts.AuthorizedPerson;
@@ -561,6 +563,7 @@ public class PersonalBootstrapper
         services.AddTransient<ISmsSettingsRepository, SmsSettingsRepository>();
         services.AddTransient<ISmsSettingApplication, SmsSettingApplication>();
 
+        services.AddTransient<IInstitutionContractSmsServiceRepository, InstitutionContractSmsServiceRepository>();
         #endregion
 
 
@@ -658,6 +661,9 @@ public class PersonalBootstrapper
         services.AddTransient<ICameraBugReportApplication, CameraBugReportApplication>();
         services.AddTransient<ICameraBugReportRepository, CameraBugReportRepository>(); // MongoDB Implementation
 
+        // InstitutionContractSendFlag - MongoDB
+        services.AddTransient<IInstitutionContractSendFlagRepository, InstitutionContractSendFlagRepository>();
+
         services.AddDbContext<CompanyContext>(x => x.UseSqlServer(connectionString));
     }
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Checkouts/Commands/CreateCheckout/CreateOrEditCheckoutCommandHandler.cs

@@ -209,22 +209,38 @@ public class CreateOrEditCheckoutCommandHandler : IBaseCommandHandler<CreateOrEd
             }
 
         }
-        //حقوق نهایی
-        var monthlySalaryPay = (totalHoursWorked * monthlySalaryDefined) / mandatoryHours;
-        // اگر اضافه کار داشت حقوق تعین شده به عنوان حقوق نهایی در نظر گرفته میشود
-        monthlySalaryPay = monthlySalaryPay > monthlySalaryDefined ? monthlySalaryDefined : monthlySalaryPay;
+        ////حقوق نهایی
+        //var monthlySalaryPay = (totalHoursWorked * monthlySalaryDefined) / mandatoryHours;
+        //// اگر اضافه کار داشت حقوق تعین شده به عنوان حقوق نهایی در نظر گرفته میشود
+        //monthlySalaryPay = monthlySalaryPay > monthlySalaryDefined ? monthlySalaryDefined : monthlySalaryPay;
 
-        //حقوق کسر شده
-        var deductionFromSalary = monthlySalaryDefined - monthlySalaryPay;
+        ////حقوق کسر شده
+        //var deductionFromSalary = monthlySalaryDefined - monthlySalaryPay;
+
+        //new chang salary compute
+        var monthlySalaryPay = totalHoursWorked * monthlySalaryDefined;
 
         //زمان باقی مانده
         var remainingTime = totalHoursWorked - mandatoryHours;
 
+
+        //تناسب به دقیقه
+        #region MyRegion
+
+        //var monthlySalaryDefinedTest = monthlySalaryDefined * mandatoryHours;
+        //var monthlySalaryPayTest = totalHoursWorked * monthlySalaryDefined;
+        ////// اگر اضافه کار داشت حقوق تعین شده به عنوان حقوق نهایی در نظر گرفته میشود
+        //monthlySalaryPayTest = monthlySalaryPayTest > monthlySalaryDefinedTest ? monthlySalaryDefinedTest : monthlySalaryPayTest;
+        //////حقوق کسر شده
+        //var deductionFromSalaryTest = monthlySalaryDefinedTest - monthlySalaryPayTest;
+
+        #endregion
+
         var computeResult = new ComputeResultDto
         {
             MandatoryHours = mandatoryHours,
             MonthlySalaryPay = monthlySalaryPay,
-            DeductionFromSalary = deductionFromSalary,
+            DeductionFromSalary = 0 /*deductionFromSalary*/,
             RemainingHours = remainingTime
         };
         Console.WriteLine(mandatoryHours);

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Checkouts/Queries/GetUserToGropCreate/GetUserToGroupCreatingQueryHandler.cs

@@ -1,10 +1,11 @@
-using GozareshgirProgramManager.Application._Common.Interfaces;
+using DNTPersianUtils.Core;
+using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Application.Modules.SalaryPaymentSettings.Queries.GetUserListWhoHaveSettings;
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.CheckoutAgg.Enums;
 using Microsoft.EntityFrameworkCore;
-using PersianTools.Core;
+using PersianDateTime = PersianTools.Core.PersianDateTime;
 
 namespace GozareshgirProgramManager.Application.Modules.Checkouts.Queries.GetUserToGropCreate;
 
@@ -45,8 +46,8 @@ public class GetUserToGroupCreatingQueryHandler : IBaseQueryHandler<GetUserToGro
                 "ایجاد فیش فقط برای ماه های گذشته امکان پذیر است");
 
 
-        var lastMonthStart = lastMonth; 
-        var lastMonthEnd = lastMonth;  
+        //var lastMonthStart = lastMonth; 
+        var lastMonthEnd = ((selectedDate.ToFarsi().FindeEndOfMonth())).ToGeorgianDateTime();  
 
         var query =
             await (from u in _context.Users
@@ -60,8 +61,8 @@ public class GetUserToGroupCreatingQueryHandler : IBaseQueryHandler<GetUserToGro
                     // LEFT JOIN 
                     //فیش
                     join ch in _context.Checkouts
-                            .Where(x => x.CheckoutStartDate < lastMonthStart
-                                        && x.CheckoutEndDate >= lastMonthStart)
+                            .Where(x => x.CheckoutStartDate < lastMonthEnd
+                                        && x.CheckoutEndDate > selectedDate)
                         on u.Id equals ch.UserId into chJoin
                     from ch in chJoin.DefaultIfEmpty()
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/AddTaskToPhase/AddTaskToPhaseCommand.cs

@@ -1,16 +0,0 @@
-using GozareshgirProgramManager.Application._Common.Interfaces;
-using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
-
-namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.AddTaskToPhase;
-
-/// <summary>
-/// Command to add a task to an existing phase
-/// </summary>
-public record AddTaskToPhaseCommand(
-    Guid PhaseId,
-    string Name,
-    string? Description = null,
-    TaskPriority Priority = TaskPriority.Medium,
-    int OrderIndex = 0,
-    DateTime? DueDate = null
-) : IBaseCommand;

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/AddTaskToPhase/AddTaskToPhaseCommandHandler.cs

@@ -1,53 +0,0 @@
-using GozareshgirProgramManager.Application._Common.Interfaces;
-using GozareshgirProgramManager.Application._Common.Models;
-using GozareshgirProgramManager.Domain._Common;
-using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
-using MediatR;
-
-namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.AddTaskToPhase;
-
-public class AddTaskToPhaseCommandHandler : IRequestHandler<AddTaskToPhaseCommand, OperationResult>
-{
-    private readonly IProjectPhaseRepository _phaseRepository;
-    private readonly IUnitOfWork _unitOfWork;
-
-    public AddTaskToPhaseCommandHandler(
-        IProjectPhaseRepository phaseRepository,
-        IUnitOfWork unitOfWork)
-    {
-        _phaseRepository = phaseRepository;
-        _unitOfWork = unitOfWork;
-    }
-
-    public async Task<OperationResult> Handle(AddTaskToPhaseCommand request, CancellationToken cancellationToken)
-    {
-        try
-        {
-            // Get phase
-            var phase = await _phaseRepository.GetByIdAsync(request.PhaseId);
-            if (phase == null)
-            {
-                return OperationResult.NotFound("فاز یافت نشد");
-            }
-
-            // Add task
-            var task = phase.AddTask(request.Name, request.Description);
-            task.SetPriority(request.Priority);
-            task.SetOrderIndex(request.OrderIndex);
-            
-            if (request.DueDate.HasValue)
-            {
-                task.SetDates(dueDate: request.DueDate);
-            }
-
-            // Save changes
-            await _unitOfWork.SaveChangesAsync(cancellationToken);
-
-            return OperationResult.Success();
-        }
-        catch (Exception ex)
-        {
-            return OperationResult.Failure($"خطا در افزودن تسک: {ex.Message}");
-        }
-    }
-}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/AutoPendingFullTimeTaskSections/AutoPendingFullTimeTaskSectionsCommand.cs

@@ -0,0 +1,62 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.AutoPendingFullTimeTaskSections;
+
+public record AutoPendingFullTimeTaskSectionsCommand : IBaseCommand;
+
+public class AutoPendingFullTimeTaskSectionsCommandHandler : IBaseCommandHandler<AutoPendingFullTimeTaskSectionsCommand>
+{
+    private readonly ITaskSectionRepository _taskSectionRepository;
+    private readonly IUnitOfWork _unitOfWork;
+
+    public AutoPendingFullTimeTaskSectionsCommandHandler(
+        ITaskSectionRepository taskSectionRepository,
+        IUnitOfWork unitOfWork)
+    {
+        _taskSectionRepository = taskSectionRepository;
+        _unitOfWork = unitOfWork;
+    }
+
+    public async Task<OperationResult> Handle(AutoPendingFullTimeTaskSectionsCommand request, CancellationToken cancellationToken)
+    {
+        try
+        {
+            // تمام سکشن‌هایی که هنوز Pending یا Completed نشده‌اند را دریافت کن
+            var taskSections = await _taskSectionRepository.GetAllNotCompletedOrPendingIncludeAllAsync(cancellationToken);
+
+            foreach (var section in taskSections)
+            {
+                var totalSpent = section.GetTotalTimeSpent();
+                var estimate = section.FinalEstimatedHours;
+
+                if (estimate.TotalMinutes <= 0)
+                    continue; // تسک بدون تخمین را نادیده بگیر
+
+                if (totalSpent >= estimate)
+                {
+                    // مهم: وضعیت را مستقل از فعال/غیرفعال بودن فعالیت‌ها PendingForCompletion کنیم
+                    if (section.IsInProgress())
+                    {
+                        // اگر فعالیت فعال دارد، با وضعیت جدید متوقف شود
+                        section.StopWork(TaskSectionStatus.PendingForCompletion, "اتمام خودکار - رسیدن به ۱۰۰٪ زمان تخمینی");
+                    }
+                    else
+                    {
+                        section.UpdateStatus(TaskSectionStatus.PendingForCompletion);
+                    }
+                }
+            }
+
+            await _unitOfWork.SaveChangesAsync(cancellationToken);
+            return OperationResult.Success();
+        }
+        catch (Exception ex)
+        {
+            return OperationResult.Failure($"خطا در در انتظار تکمیل قرار دادن خودکار تسک‌ها: {ex.Message}");
+        }
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/ChangeTaskPriority/ChangeTaskPriorityCommand.cs

@@ -0,0 +1,109 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.ChangeTaskPriority;
+
+public record ChangeTaskPriorityCommand(
+    Guid Id,
+    ProjectHierarchyLevel Level,
+    ProjectTaskPriority Priority
+) : IBaseCommand;
+
+public class ChangeTaskPriorityCommandHandler : IBaseCommandHandler<ChangeTaskPriorityCommand>
+{
+    private readonly IProjectTaskRepository _taskRepository;
+    private readonly IProjectPhaseRepository _phaseRepository;
+    private readonly IProjectRepository _projectRepository;
+    private readonly IUnitOfWork _unitOfWork;
+
+    public ChangeTaskPriorityCommandHandler(
+        IProjectTaskRepository taskRepository,
+        IProjectPhaseRepository phaseRepository,
+        IProjectRepository projectRepository,
+        IUnitOfWork unitOfWork)
+    {
+        _taskRepository = taskRepository;
+        _phaseRepository = phaseRepository;
+        _projectRepository = projectRepository;
+        _unitOfWork = unitOfWork;
+    }
+
+    public async Task<OperationResult> Handle(ChangeTaskPriorityCommand request, CancellationToken cancellationToken)
+    {
+        switch (request.Level)
+        {
+            case ProjectHierarchyLevel.Task:
+                return await HandleTaskLevelAsync(request.Id, request.Priority, cancellationToken);
+            case ProjectHierarchyLevel.Phase:
+                return await HandlePhaseLevelAsync(request.Id, request.Priority, cancellationToken);
+            case ProjectHierarchyLevel.Project:
+                return await HandleProjectLevelAsync(request.Id, request.Priority, cancellationToken);
+            default:
+                return OperationResult.Failure("سطح نامعتبر است");
+        }
+    }
+
+    // Task-level priority update
+    private async Task<OperationResult> HandleTaskLevelAsync(Guid taskId, ProjectTaskPriority priority, CancellationToken ct)
+    {
+        var task = await _taskRepository.GetByIdAsync(taskId, ct);
+        if (task is null)
+            return OperationResult.NotFound("تسک یافت نشد");
+
+        if (task.Priority != priority)
+        {
+            task.SetPriority(priority);
+        }
+
+        await _unitOfWork.SaveChangesAsync(ct);
+        return OperationResult.Success();
+    }
+
+    // Phase-level bulk priority update
+    private async Task<OperationResult> HandlePhaseLevelAsync(Guid phaseId, ProjectTaskPriority priority, CancellationToken ct)
+    {
+        var phase = await _phaseRepository.GetWithTasksAsync(phaseId);
+        if (phase is null)
+            return OperationResult.NotFound("فاز یافت نشد");
+
+        var tasks = phase.Tasks?.ToList() ?? new List<Domain.ProjectAgg.Entities.ProjectTask>();
+        foreach (var t in tasks)
+        {
+            if (t.Priority != priority)
+            {
+                t.SetPriority(priority);
+            }
+        }
+
+        await _unitOfWork.SaveChangesAsync(ct);
+        return OperationResult.Success();
+    }
+
+    // Project-level bulk priority update across all phases
+    private async Task<OperationResult> HandleProjectLevelAsync(Guid projectId, ProjectTaskPriority priority, CancellationToken ct)
+    {
+        var project = await _projectRepository.GetWithFullHierarchyAsync(projectId);
+        if (project is null)
+            return OperationResult.NotFound("پروژه یافت نشد");
+
+        var phases = project.Phases?.ToList() ?? new List<Domain.ProjectAgg.Entities.ProjectPhase>();
+        foreach (var phase in phases)
+        {
+            var tasks = phase.Tasks?.ToList() ?? new List<Domain.ProjectAgg.Entities.ProjectTask>();
+            foreach (var t in tasks)
+            {
+                if (t.Priority != priority)
+                {
+                    t.SetPriority(priority);
+                }
+            }
+        }
+
+        await _unitOfWork.SaveChangesAsync(ct);
+        return OperationResult.Success();
+    }
+}
+

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

@@ -4,4 +4,5 @@ using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.CreateProject;
 
 public record CreateProjectCommand(string Name,ProjectHierarchyLevel Level,
+    ProjectTaskPriority? Priority,
     Guid? ParentId):IBaseCommand;

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

@@ -16,7 +16,8 @@ public class CreateProjectCommandHandler : IBaseCommandHandler<CreateProjectComm
     private readonly IUnitOfWork _unitOfWork;
 
 
-    public CreateProjectCommandHandler(IProjectRepository projectRepository, IUnitOfWork unitOfWork, IProjectTaskRepository projectTaskRepository, IProjectPhaseRepository projectPhaseRepository)
+    public CreateProjectCommandHandler(IProjectRepository projectRepository, IUnitOfWork unitOfWork,
+        IProjectTaskRepository projectTaskRepository, IProjectPhaseRepository projectPhaseRepository)
     {
         _projectRepository = projectRepository;
         _unitOfWork = unitOfWork;
@@ -55,8 +56,8 @@ public class CreateProjectCommandHandler : IBaseCommandHandler<CreateProjectComm
     {
         if (!request.ParentId.HasValue)
             throw new BadRequestException("برای ایجاد فاز، شناسه پروژه الزامی است");
-        
-        if(!_projectRepository.Exists(x=>x.Id == request.ParentId.Value))
+
+        if (!_projectRepository.Exists(x => x.Id == request.ParentId.Value))
         {
             throw new BadRequestException("والد پروژه یافت نشد");
         }
@@ -69,14 +70,15 @@ public class CreateProjectCommandHandler : IBaseCommandHandler<CreateProjectComm
     {
         if (!request.ParentId.HasValue)
             throw new BadRequestException("برای ایجاد تسک، شناسه فاز الزامی است");
-        
-        if(!_projectPhaseRepository.Exists(x=>x.Id == request.ParentId.Value))
+
+        if (!_projectPhaseRepository.Exists(x => x.Id == request.ParentId.Value))
         {
             throw new BadRequestException("والد پروژه یافت نشد");
         }
 
-        var projectTask = new ProjectTask(request.Name, request.ParentId.Value);
+        var priority = request.Priority ?? ProjectTaskPriority.Low;
+
+        var projectTask = new ProjectTask(request.Name, request.ParentId.Value, priority);
         await _projectTaskRepository.CreateAsync(projectTask);
     }
-}
-   
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/SetTimeProject/SetTimeProjectCommand.cs

@@ -12,6 +12,7 @@ public record SetTimeProjectCommand(
 
 public class SetTimeSectionTime
 {
+    public Guid? Id { get; set; }
     public string Description { get; set; }
     public int Hours { get; set; }
     public int Minutes { get; set; }

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/SetTimeProject/SetTimeProjectCommandHandler.cs

@@ -349,10 +349,20 @@ public class SetTimeProjectCommandHandler : IBaseCommandHandler<SetTimeProjectCo
         return OperationResult.Success();
     }
 
+    private void ValidateTotalTimeNotLessThanSpent(TimeSpan newTotalTime, TimeSpan currentTotalSpent)
+    {
+        if (newTotalTime < currentTotalSpent)
+        {
+            throw new BadRequestException(
+                $"تایم کل سکشن نمی‌تواند کمتر از زمان مصرف شده ({currentTotalSpent.TotalHours:F2} ساعت) باشد");
+        }
+    }
+
     private void SetSectionTime(TaskSection section, SetTimeProjectSkillItem sectionItem, long? addedByUserId)
     {
         var initData = sectionItem.InitData;
-        var initialTime = TimeSpan.FromHours(initData.Hours);
+        var initialTime = TimeSpan.FromHours(initData.Hours)
+            .Add(TimeSpan.FromMinutes(initData.Minutes));
         
         if (initialTime <= TimeSpan.Zero)
         {
@@ -362,12 +372,72 @@ public class SetTimeProjectCommandHandler : IBaseCommandHandler<SetTimeProjectCo
         // تنظیم زمان اولیه
         section.UpdateInitialEstimatedHours(initialTime, initData.Description);
 
-        section.ClearAdditionalTimes();
-        // افزودن زمان‌های اضافی
-        foreach (var additionalTime in sectionItem.AdditionalTime)
+        // مدیریت هوشمند زمان‌های اضافی
+        var existingAdditionalTimes = section.AdditionalTimes.ToList();
+        var incomingAdditionalTimes = sectionItem.AdditionalTime ?? [];
+        
+        bool hasRealChange = false;
+
+        // حذف آیتم‌هایی که دیگر در لیست نیستند
+        foreach (var existingTime in existingAdditionalTimes)
         {
-            var additionalTimeSpan = TimeSpan.FromHours(additionalTime.Hours).Add(TimeSpan.FromMinutes(additionalTime.Minutes));
-            section.AddAdditionalTime(additionalTimeSpan, additionalTime.Description, addedByUserId);
+            var stillExists = incomingAdditionalTimes.Any(x => x.Id == existingTime.Id);
+            if (!stillExists)
+            {
+                section.RemoveAdditionalTime(existingTime.Id);
+                hasRealChange = true;
+            }
+        }
+
+        // ویرایش یا اضافه کردن آیتم‌های جدید
+        foreach (var additionalTime in incomingAdditionalTimes)
+        {
+            var additionalTimeSpan = TimeSpan.FromHours(additionalTime.Hours)
+                .Add(TimeSpan.FromMinutes(additionalTime.Minutes));
+
+            if (additionalTimeSpan <= TimeSpan.Zero)
+                continue;
+
+            var existingAdditionalTime = existingAdditionalTimes.FirstOrDefault(x => x.Id == additionalTime.Id);
+            
+            if (existingAdditionalTime != null)
+            {
+                // اگر آیتم با این ID وجود دارد، بررسی کن اگر تغییر کرده باشد
+                if (existingAdditionalTime.HasChanged(additionalTimeSpan, additionalTime.Description))
+                {
+                    // ویرایش بدون حذف و ایجاد دوباره
+                    existingAdditionalTime.Update(additionalTimeSpan, additionalTime.Description);
+                    hasRealChange = true;
+                }
+            }
+            else
+            {
+                // اگر ID نداشت یا ID جدید بود، اضافه کن
+                if (additionalTime.Id == null || additionalTime.Id == Guid.Empty)
+                {
+                    section.AddAdditionalTime(additionalTimeSpan, additionalTime.Description, addedByUserId);
+                    hasRealChange = true;
+                }
+            }
+        }
+        
+        // اعتبارسنجی بعد از اعمال تمام تغییرات
+        var currentTotalSpent = section.GetTotalTimeSpent();
+        var newTotalTime = section.FinalEstimatedHours;
+        ValidateTotalTimeNotLessThanSpent(newTotalTime, currentTotalSpent);
+        
+        // تغییر status به Incomplete فقط اگر تغییری واقعی اعمال شده باشد و در وضعیتی غیر از ReadyToStart باشد
+        if (hasRealChange && section.Status != TaskSectionStatus.ReadyToStart)
+        {
+            // اگر سکشن درحال انجام است، باید متوقف شود قبل از تغییر status
+            if (section.Status == TaskSectionStatus.InProgress)
+            {
+                section.StopWork(TaskSectionStatus.Incomplete);
+            }
+            else
+            {
+                section.UpdateStatus(TaskSectionStatus.Incomplete);
+            }
         }
     }
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/DTOs/ProjectHierarchyDtos.cs

@@ -89,6 +89,7 @@ public class ProjectSectionDto
     
     public TimeSpan FinalEstimatedHours { get; set; }
     public TimeSpan TotalTimeSpent { get; set; }
+    public double ProgressPercentage { get; set; }
     public bool IsCompleted { get; set; }
     public bool IsInProgress { get; set; }
     

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Extensions/ProjectMappingExtensions.cs

@@ -166,6 +166,7 @@ public static class ProjectMappingExtensions
             CreationDate = section.CreationDate,
             FinalEstimatedHours = section.FinalEstimatedHours,
             TotalTimeSpent = section.GetTotalTimeSpent(),
+            ProgressPercentage = section.GetProgressPercentage(),
             IsCompleted = section.IsCompleted(),
             IsInProgress = section.IsInProgress(),
             Activities = section.Activities.Select(a => a.ToDto()).ToList(),
@@ -188,6 +189,7 @@ public static class ProjectMappingExtensions
             CreationDate = section.CreationDate,
             FinalEstimatedHours = section.FinalEstimatedHours,
             TotalTimeSpent = section.GetTotalTimeSpent(),
+            ProgressPercentage = section.GetProgressPercentage(),
             IsCompleted = section.IsCompleted(),
             IsInProgress = section.IsInProgress()
             // No activities or additional times for summary

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetProjectListDto.cs

@@ -1,20 +1,30 @@
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectsList;
-public record GetProjectListDto
+
+// Base DTO shared across project, phase, and task
+public class GetProjectItemDto
 {
     public Guid Id { get; init; }
     public string Name { get; init; } = string.Empty;
     public int Percentage { get; init; }
     public ProjectHierarchyLevel Level { get; init; }
     public Guid? ParentId { get; init; }
-    public bool HasFront { get; set; }
-    public bool HasBackend { get; set; }
-    public bool HasDesign { get; set; }
-    public int TotalHours { get; set; }
-    public int Minutes { get; set; }
-        
+    
+    public TimeSpan TotalTime { get; init; }
+    
+    public TimeSpan RemainingTime { get; init; }
+    public AssignmentStatus Front { get; set; }
+    public AssignmentStatus Backend { get; set; }
+    public AssignmentStatus Design { get; set; }
 }
 
+// Project DTO (no extra fields; inherits from base)
+public class GetProjectDto : GetProjectItemDto
+{
+}
 
-
+// Phase DTO (no extra fields; inherits from base)
+public class GetPhaseDto : GetProjectItemDto
+{
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetProjectsListQueryHandler.cs

@@ -3,6 +3,7 @@ using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using Microsoft.EntityFrameworkCore;
+using System.Linq;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectsList;
 
@@ -15,301 +16,421 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
         _context = context;
     }
 
-    public async Task<OperationResult<GetProjectsListResponse>> Handle(GetProjectsListQuery request, CancellationToken cancellationToken)
+    public async Task<OperationResult<GetProjectsListResponse>> Handle(GetProjectsListQuery request,
+        CancellationToken cancellationToken)
     {
-        List<GetProjectListDto> projects;
+        var projects = new List<GetProjectDto>();
+        var phases = new List<GetPhaseDto>();
+        var tasks = new List<GetTaskDto>();
 
         switch (request.HierarchyLevel)
         {
             case ProjectHierarchyLevel.Project:
                 projects = await GetProjects(request.ParentId, cancellationToken);
+                await SetSkillFlags(projects, cancellationToken);
                 break;
             case ProjectHierarchyLevel.Phase:
-                projects = await GetPhases(request.ParentId, cancellationToken);
+                phases = await GetPhases(request.ParentId, cancellationToken);
+                await SetSkillFlags(phases, cancellationToken);
                 break;
             case ProjectHierarchyLevel.Task:
-                projects = await GetTasks(request.ParentId, cancellationToken);
+                tasks = await GetTasks(request.ParentId, cancellationToken);
+                // Tasks don't need SetSkillFlags because they have Sections list
                 break;
             default:
                 return OperationResult<GetProjectsListResponse>.Failure("سطح سلسله مراتب نامعتبر است");
         }
-        await SetSkillFlags(projects, cancellationToken);
 
-        var response = new GetProjectsListResponse(projects);
+        var response = new GetProjectsListResponse(projects, phases, tasks);
         return OperationResult<GetProjectsListResponse>.Success(response);
     }
 
-    private async Task<List<GetProjectListDto>> GetProjects(Guid? parentId, CancellationToken cancellationToken)
+    private async Task<List<GetProjectDto>> GetProjects(Guid? parentId, CancellationToken cancellationToken)
     {
         var query = _context.Projects.AsQueryable();
-
-        // پروژه‌ها سطح بالا هستند و parentId ندارند، فقط در صورت null بودن parentId نمایش داده می‌شوند
         if (parentId.HasValue)
         {
-            return new List<GetProjectListDto>(); // پروژه‌ها parent ندارند
+            return new List<GetProjectDto>();
         }
 
-        var projects = await query
+        var entities = await query
             .OrderByDescending(p => p.CreationDate)
             .ToListAsync(cancellationToken);
-        var result = new List<GetProjectListDto>();
-        
-        foreach (var project in projects)
+        var result = new List<GetProjectDto>();
+        foreach (var project in entities)
         {
-            var (percentage, totalTime) = await CalculateProjectPercentage(project, cancellationToken);
-            result.Add(new GetProjectListDto
+            var (percentage, totalTime,remainingTime) = await CalculateProjectPercentage(project, cancellationToken);
+            result.Add(new GetProjectDto
             {
                 Id = project.Id,
                 Name = project.Name,
                 Level = ProjectHierarchyLevel.Project,
                 ParentId = null,
                 Percentage = percentage,
-                TotalHours = (int)totalTime.TotalHours,
-                Minutes = totalTime.Minutes,
+                TotalTime = totalTime,
+                RemainingTime = remainingTime
             });
         }
 
+        result = result.OrderByDescending(x => x.Percentage).ToList();
         return result;
     }
 
-    private async Task<List<GetProjectListDto>> GetPhases(Guid? parentId, CancellationToken cancellationToken)
+    private async Task<List<GetPhaseDto>> GetPhases(Guid? parentId, CancellationToken cancellationToken)
     {
         var query = _context.ProjectPhases.AsQueryable();
-
         if (parentId.HasValue)
         {
             query = query.Where(x => x.ProjectId == parentId);
         }
 
-        var phases = await query
+        var entities = await query
             .OrderByDescending(p => p.CreationDate)
             .ToListAsync(cancellationToken);
-        var result = new List<GetProjectListDto>();
-
-        foreach (var phase in phases)
+        var result = new List<GetPhaseDto>();
+        foreach (var phase in entities)
         {
-            var (percentage, totalTime) = await CalculatePhasePercentage(phase, cancellationToken);
-            result.Add(new GetProjectListDto
+            var (percentage, totalTime,remainingTime) = await CalculatePhasePercentage(phase, cancellationToken);
+            result.Add(new GetPhaseDto
             {
                 Id = phase.Id,
                 Name = phase.Name,
                 Level = ProjectHierarchyLevel.Phase,
                 ParentId = phase.ProjectId,
                 Percentage = percentage,
-                TotalHours = (int)totalTime.TotalHours,
-                Minutes = totalTime.Minutes,
+                TotalTime = totalTime,
+                RemainingTime = remainingTime
             });
         }
+        result = result.OrderByDescending(x => x.Percentage).ToList();
 
         return result;
     }
 
-    private async Task<List<GetProjectListDto>> GetTasks(Guid? parentId, CancellationToken cancellationToken)
+    private async Task<List<GetTaskDto>> GetTasks(Guid? parentId, CancellationToken cancellationToken)
     {
         var query = _context.ProjectTasks.AsQueryable();
-
         if (parentId.HasValue)
         {
             query = query.Where(x => x.PhaseId == parentId);
         }
 
-        var tasks = await query
+        var entities = await query
             .OrderByDescending(t => t.CreationDate)
             .ToListAsync(cancellationToken);
-        var result = new List<GetProjectListDto>();
+        var result = new List<GetTaskDto>();
+        // دریافت تمام Skills
+        var allSkills = await _context.Skills
+            .Select(s => new { s.Id, s.Name })
+            .ToListAsync(cancellationToken);
 
-        foreach (var task in tasks)
+        foreach (var task in entities)
         {
-            var (percentage, totalTime) = await CalculateTaskPercentage(task, cancellationToken);
-            result.Add(new GetProjectListDto
+            var (percentage, totalTime,remainingTime) = await CalculateTaskPercentage(task, cancellationToken);
+            var sections = await _context.TaskSections
+                .Include(s => s.Activities)
+                .Include(s => s.Skill)
+                .Where(s => s.TaskId == task.Id)
+                .ToListAsync(cancellationToken);
+
+            // جمع‌آوری تمام userId های مورد نیاز
+            var userIds = sections
+                .Where(s => s.CurrentAssignedUserId > 0)
+                .Select(s => s.CurrentAssignedUserId)
+                .Distinct()
+                .ToList();
+
+            // دریافت اطلاعات کاربران
+            var users = await _context.Users
+                .Where(u => userIds.Contains(u.Id))
+                .Select(u => new { u.Id, u.FullName })
+                .ToDictionaryAsync(u => u.Id, u => u.FullName, cancellationToken);
+
+            // محاسبه SpentTime و RemainingTime
+            var spentTime = TimeSpan.FromTicks(sections.Sum(s => s.Activities.Sum(a => a.GetTimeSpent().Ticks)));
+
+            // ساخت section DTOs برای تمام Skills
+            var sectionDtos = allSkills.Select(skill =>
+            {
+                var section = sections.FirstOrDefault(s => s.SkillId == skill.Id);
+
+                if (section == null)
+                {
+                    // اگر section وجود نداشت، یک DTO با وضعیت Unassigned برمی‌گردانیم
+                    return new GetTaskSectionDto
+                    {
+                        Id = Guid.Empty,
+                        SkillName = skill.Name ?? string.Empty,
+                        SpentTime = TimeSpan.Zero,
+                        TotalTime = TimeSpan.Zero,
+                        Percentage = 0,
+                        UserFullName = string.Empty,
+                        AssignmentStatus = AssignmentStatus.Unassigned
+                    };
+                }
+
+                // اگر section وجود داشت
+                return new GetTaskSectionDto
+                {
+                    Id = section.Id,
+                    SkillName = skill.Name ?? string.Empty,
+                    SpentTime = TimeSpan.FromTicks(section.Activities.Sum(a => a.GetTimeSpent().Ticks)),
+                    TotalTime = section.FinalEstimatedHours,
+                    Percentage = (int)section.GetProgressPercentage(),
+                    UserFullName = section.CurrentAssignedUserId > 0 && users.ContainsKey(section.CurrentAssignedUserId)
+                        ? users[section.CurrentAssignedUserId]
+                        : string.Empty,
+                    AssignmentStatus = GetAssignmentStatus(section)
+                };
+            }).ToList();
+
+            result.Add(new GetTaskDto
             {
                 Id = task.Id,
                 Name = task.Name,
                 Level = ProjectHierarchyLevel.Task,
                 ParentId = task.PhaseId,
                 Percentage = percentage,
-                TotalHours = (int)totalTime.TotalHours,
-                Minutes = totalTime.Minutes
+                TotalTime = totalTime,
+                SpentTime = spentTime,
+                RemainingTime = remainingTime,
+                Sections = sectionDtos,
+                Priority = task.Priority
             });
         }
+        result = result.OrderByDescending(x => x.Percentage).ToList();
 
         return result;
     }
 
-    private async Task SetSkillFlags(List<GetProjectListDto> projects, CancellationToken cancellationToken)
+    private async Task SetSkillFlags<TItem>(List<TItem> items, CancellationToken cancellationToken)
+        where TItem : GetProjectItemDto
     {
-        if (!projects.Any())
+        if (!items.Any())
             return;
-
-        var projectIds = projects.Select(x => x.Id).ToList();
-        var hierarchyLevel = projects.First().Level;
-
+        var ids = items.Select(x => x.Id).ToList();
+        var hierarchyLevel = items.First().Level;
         switch (hierarchyLevel)
         {
             case ProjectHierarchyLevel.Project:
-                await SetSkillFlagsForProjects(projects, projectIds, cancellationToken);
+                await SetSkillFlagsForProjects(items, ids, cancellationToken);
                 break;
-                
             case ProjectHierarchyLevel.Phase:
-                await SetSkillFlagsForPhases(projects, projectIds, cancellationToken);
-                break;
-                
-            case ProjectHierarchyLevel.Task:
-                await SetSkillFlagsForTasks(projects, projectIds, cancellationToken);
+                await SetSkillFlagsForPhases(items, ids, cancellationToken);
                 break;
         }
     }
 
-    private async Task SetSkillFlagsForProjects(List<GetProjectListDto> projects, List<Guid> projectIds, CancellationToken cancellationToken)
+
+    private async Task SetSkillFlagsForProjects<TItem>(List<TItem> items, List<Guid> projectIds,
+        CancellationToken cancellationToken) where TItem : GetProjectItemDto
     {
-        var projectSections = await _context.ProjectSections
-            .Include(x => x.Skill)
-            .Where(s => projectIds.Contains(s.ProjectId))
+        // For projects: gather all phases, then tasks, then sections
+        var phases = await _context.ProjectPhases
+            .Where(ph => projectIds.Contains(ph.ProjectId))
+            .Select(ph => new { ph.Id, ph.ProjectId })
             .ToListAsync(cancellationToken);
-
-        if (!projectSections.Any())
-            return;
-
-        foreach (var project in projects)
-        {
-            var sections = projectSections.Where(s => s.ProjectId == project.Id).ToList();
-            project.HasBackend = sections.Any(x => x.Skill?.Name == "Backend");
-            project.HasFront = sections.Any(x => x.Skill?.Name == "Frontend");
-            project.HasDesign = sections.Any(x => x.Skill?.Name == "UI/UX Design");
-        }
-    }
-
-    private async Task SetSkillFlagsForPhases(List<GetProjectListDto> projects, List<Guid> phaseIds, CancellationToken cancellationToken)
-    {
-        var phaseSections = await _context.PhaseSections
-            .Include(x => x.Skill)
-            .Where(s => phaseIds.Contains(s.PhaseId))
+        var phaseIds = phases.Select(ph => ph.Id).ToList();
+        var tasks = await _context.ProjectTasks
+            .Where(t => phaseIds.Contains(t.PhaseId))
+            .Select(t => new { t.Id, t.PhaseId })
             .ToListAsync(cancellationToken);
-
-        if (!phaseSections.Any())
-            return;
-
-        foreach (var phase in projects)
-        {
-            var sections = phaseSections.Where(s => s.PhaseId == phase.Id).ToList();
-            phase.HasBackend = sections.Any(x => x.Skill?.Name == "Backend");
-            phase.HasFront = sections.Any(x => x.Skill?.Name == "Frontend");
-            phase.HasDesign = sections.Any(x => x.Skill?.Name == "UI/UX Design");
-        }
-    }
-
-    private async Task SetSkillFlagsForTasks(List<GetProjectListDto> projects, List<Guid> taskIds, CancellationToken cancellationToken)
-    {
-        var taskSections = await _context.TaskSections
-            .Include(x => x.Skill)
+        var taskIds = tasks.Select(t => t.Id).ToList();
+        var sections = await _context.TaskSections
+            .Include(s => s.Skill)
             .Where(s => taskIds.Contains(s.TaskId))
             .ToListAsync(cancellationToken);
 
-        if (!taskSections.Any())
-            return;
+        // Convert to tuple list for AggregatePhaseStatuses
+        var tasksList = tasks.Select(t => (t.Id, t.PhaseId)).ToList();
 
-        foreach (var task in projects)
+        foreach (var item in items)
         {
-            var sections = taskSections.Where(s => s.TaskId == task.Id).ToList();
-            task.HasBackend = sections.Any(x => x.Skill?.Name == "Backend");
-            task.HasFront = sections.Any(x => x.Skill?.Name == "Frontend");
-            task.HasDesign = sections.Any(x => x.Skill?.Name == "UI/UX Design");
+            var projectPhaseIds = phases.Where(ph => ph.ProjectId == item.Id).Select(ph => ph.Id).ToList();
+            
+            // برای هر Skill، وضعیت‌های تمام Phases را تجمیع کنیم
+            item.Backend = AggregatePhaseStatuses(projectPhaseIds, tasksList, sections, "Backend");
+            item.Front = AggregatePhaseStatuses(projectPhaseIds, tasksList, sections, "Frontend");
+            item.Design = AggregatePhaseStatuses(projectPhaseIds, tasksList, sections, "UI/UX Design");
         }
     }
 
-    private async Task<(int Percentage, TimeSpan TotalTime)> CalculateProjectPercentage(Project project, CancellationToken cancellationToken)
+    private async Task SetSkillFlagsForPhases<TItem>(List<TItem> items, List<Guid> phaseIds,
+        CancellationToken cancellationToken) where TItem : GetProjectItemDto
+    {
+        // For phases: gather tasks, then sections
+        var tasks = await _context.ProjectTasks
+            .Where(t => phaseIds.Contains(t.PhaseId))
+            .Select(t => new { t.Id, t.PhaseId })
+            .ToListAsync(cancellationToken);
+        var taskIds = tasks.Select(t => t.Id).ToList();
+        var sections = await _context.TaskSections
+            .Include(s => s.Skill)
+            .Where(s => taskIds.Contains(s.TaskId))
+            .ToListAsync(cancellationToken);
+
+        foreach (var item in items)
+        {
+            var phaseTaskIds = tasks.Where(t => t.PhaseId == item.Id).Select(t => t.Id).ToList();
+            var itemSections = sections.Where(s => phaseTaskIds.Contains(s.TaskId));
+
+            item.Backend = AggregateAssignmentStatus(itemSections.Where(x => x.Skill?.Name == "Backend"));
+            item.Front = AggregateAssignmentStatus(itemSections.Where(x => x.Skill?.Name == "Frontend"));
+            item.Design = AggregateAssignmentStatus(itemSections.Where(x => x.Skill?.Name == "UI/UX Design"));
+        }
+    }
+
+    private async Task<(int Percentage, TimeSpan TotalTime,TimeSpan RemainingTime)> CalculateProjectPercentage(Project project,
+        CancellationToken cancellationToken)
     {
-        // گرفتن تمام فازهای پروژه
         var phases = await _context.ProjectPhases
             .Where(ph => ph.ProjectId == project.Id)
             .ToListAsync(cancellationToken);
-
         if (!phases.Any())
-            return (0, TimeSpan.Zero);
-
-        // محاسبه درصد هر فاز و میانگین‌گیری
+            return (0, TimeSpan.Zero,TimeSpan.Zero);
         var phasePercentages = new List<int>();
         var totalTime = TimeSpan.Zero;
-        
+        var  remainingTime = TimeSpan.Zero;
         foreach (var phase in phases)
         {
-            var (phasePercentage, phaseTime) = await CalculatePhasePercentage(phase, cancellationToken);
+            var (phasePercentage, phaseTime,phaseRemainingTime) = await CalculatePhasePercentage(phase, cancellationToken);
             phasePercentages.Add(phasePercentage);
             totalTime += phaseTime;
+            remainingTime += phaseRemainingTime;
         }
 
         var averagePercentage = phasePercentages.Any() ? (int)phasePercentages.Average() : 0;
-        return (averagePercentage, totalTime);
+        return (averagePercentage, totalTime,remainingTime);
     }
 
-    private async Task<(int Percentage, TimeSpan TotalTime)> CalculatePhasePercentage(ProjectPhase phase, CancellationToken cancellationToken)
+    private async Task<(int Percentage, TimeSpan TotalTime,TimeSpan RemainingTime)> CalculatePhasePercentage(ProjectPhase phase,
+        CancellationToken cancellationToken)
     {
-        // گرفتن تمام تسک‌های فاز
         var tasks = await _context.ProjectTasks
             .Where(t => t.PhaseId == phase.Id)
             .ToListAsync(cancellationToken);
-
         if (!tasks.Any())
-            return (0, TimeSpan.Zero);
-
-        // محاسبه درصد هر تسک و میانگین‌گیری
+            return (0, TimeSpan.Zero,TimeSpan.Zero);
         var taskPercentages = new List<int>();
         var totalTime = TimeSpan.Zero;
-        
+        var remainingTime =  TimeSpan.Zero;
         foreach (var task in tasks)
         {
-            var (taskPercentage, taskTime) = await CalculateTaskPercentage(task, cancellationToken);
+            var (taskPercentage, taskTime,taskRemainingTime) = await CalculateTaskPercentage(task, cancellationToken);
             taskPercentages.Add(taskPercentage);
             totalTime += taskTime;
+            remainingTime += taskRemainingTime;
         }
 
         var averagePercentage = taskPercentages.Any() ? (int)taskPercentages.Average() : 0;
-        return (averagePercentage, totalTime);
+        return (averagePercentage, totalTime,remainingTime);
     }
 
-    private async Task<(int Percentage, TimeSpan TotalTime)> CalculateTaskPercentage(ProjectTask task, CancellationToken cancellationToken)
+    private async Task<(int Percentage, TimeSpan TotalTime, TimeSpan RemainingTime)> CalculateTaskPercentage(
+        ProjectTask task, CancellationToken cancellationToken)
     {
-        // گرفتن تمام سکشن‌های تسک با activities
         var sections = await _context.TaskSections
             .Include(s => s.Activities)
-            .Include(x=>x.AdditionalTimes)
+            .Include(x => x.AdditionalTimes)
             .Where(s => s.TaskId == task.Id)
             .ToListAsync(cancellationToken);
-
         if (!sections.Any())
-            return (0, TimeSpan.Zero);
-
-        // محاسبه درصد هر سکشن و میانگین‌گیری
+            return (0, TimeSpan.Zero, TimeSpan.Zero);
         var sectionPercentages = new List<int>();
         var totalTime = TimeSpan.Zero;
-        
+        var spentTime = TimeSpan.Zero;
         foreach (var section in sections)
         {
             var (sectionPercentage, sectionTime) = CalculateSectionPercentage(section);
+            var sectionSpent = TimeSpan.FromTicks(section.Activities.Sum(x => x.GetTimeSpent().Ticks));
             sectionPercentages.Add(sectionPercentage);
             totalTime += sectionTime;
+            spentTime += sectionSpent;
         }
-
+        var remainingTime = totalTime - spentTime;
         var averagePercentage = sectionPercentages.Any() ? (int)sectionPercentages.Average() : 0;
-        return (averagePercentage, totalTime);
+        return (averagePercentage, totalTime, remainingTime);
     }
 
     private static (int Percentage, TimeSpan TotalTime) CalculateSectionPercentage(TaskSection section)
     {
-        // محاسبه کل زمان تخمین زده شده (اولیه + اضافی)
-        var totalEstimatedHours = section.FinalEstimatedHours.TotalHours;
+        return ((int)section.GetProgressPercentage(), section.FinalEstimatedHours);
+    }
 
-        // محاسبه کل زمان صرف شده از activities
-        var totalSpentTime = TimeSpan.FromHours(section.Activities.Sum(a => a.GetTimeSpent().TotalHours));
+    private static AssignmentStatus GetAssignmentStatus(TaskSection? section)
+    {
+        // تعیین تکلیف نشده: section وجود ندارد
+        if (section == null)
+            return AssignmentStatus.Unassigned;
 
-        if (totalEstimatedHours <= 0)
-            return (0, section.FinalEstimatedHours);
+        // بررسی وجود user
+        bool hasUser = section.CurrentAssignedUserId > 0;
 
-        var totalSpentHours = totalSpentTime.TotalHours;
+        // بررسی وجود time (InitialEstimatedHours بزرگتر از صفر باشد)
+        bool hasTime = section.InitialEstimatedHours > TimeSpan.Zero;
 
-        // محاسبه درصد (حداکثر 100%)
-        var percentage = (totalSpentHours / totalEstimatedHours) * 100;
-        return (Math.Min((int)Math.Round(percentage), 100), section.FinalEstimatedHours);
+        // تعیین تکلیف شده: هم user و هم time تعیین شده
+        if (hasUser && hasTime)
+            return AssignmentStatus.Assigned;
+
+        // فقط کاربر تعیین شده: user دارد ولی time ندارد
+        if (hasUser && !hasTime)
+            return AssignmentStatus.UserOnly;
+
+        // تعیین تکلیف نشده: نه user دارد نه time
+        return AssignmentStatus.Unassigned;
+    }
+
+    private static AssignmentStatus AggregatePhaseStatuses(
+        List<Guid> phaseIds,
+        List<(Guid Id, Guid PhaseId)> tasks,
+        List<TaskSection> sections,
+        string skillName)
+    {
+        var phaseStatuses = new List<AssignmentStatus>();
+        
+        foreach (var phaseId in phaseIds)
+        {
+            var phaseTaskIds = tasks.Where(t => t.PhaseId == phaseId).Select(t => t.Id).ToList();
+            var phaseSections = sections.Where(s => phaseTaskIds.Contains(s.TaskId) && s.Skill?.Name == skillName);
+            var phaseStatus = AggregateAssignmentStatus(phaseSections);
+            phaseStatuses.Add(phaseStatus);
+        }
+
+        // الآن تجمیع وضعیت‌های Phases
+        if (!phaseStatuses.Any())
+            return AssignmentStatus.Unassigned;
+
+        // اگر هر یکی Unassigned باشد → Unassigned
+        if (phaseStatuses.Any(s => s == AssignmentStatus.Unassigned))
+            return AssignmentStatus.Unassigned;
+        
+        // اگر Unassigned نیست و هر یکی UserOnly باشد → UserOnly
+        if (phaseStatuses.Any(s => s == AssignmentStatus.UserOnly))
+            return AssignmentStatus.UserOnly;
+        
+        // فقط اگر همه Assigned باشند → Assigned
+        return AssignmentStatus.Assigned;
+    }
+
+    private static AssignmentStatus AggregateAssignmentStatus(IEnumerable<TaskSection> sections)
+    {
+        var sectionList = sections.ToList();
+        if (!sectionList.Any())
+            return AssignmentStatus.Unassigned;
+
+        var statuses = sectionList.Select(GetAssignmentStatus).ToList();
+        
+        // اگر هر یکی Unassigned باشد → Unassigned (بدترین وضعیت)
+        if (statuses.Any(s => s == AssignmentStatus.Unassigned))
+            return AssignmentStatus.Unassigned;
+        
+        // اگر Unassigned نیست و هر یکی UserOnly باشد → UserOnly (وضعیت متوسط)
+        if (statuses.Any(s => s == AssignmentStatus.UserOnly))
+            return AssignmentStatus.UserOnly;
+        
+        // فقط اگر همه Assigned باشند → Assigned (بهترین وضعیت)
+        return AssignmentStatus.Assigned;
     }
 }
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetProjectsListResponse.cs

@@ -1,5 +1,6 @@
 namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectsList;
 
 public record GetProjectsListResponse(
-    List<GetProjectListDto> Projects);
-
+    List<GetProjectDto> Projects,
+    List<GetPhaseDto> Phases,
+    List<GetTaskDto> Tasks);

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetTaskListDto.cs

@@ -0,0 +1,32 @@
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectsList;
+
+public class GetTaskDto
+{
+    public Guid Id { get; init; }
+    public string Name { get; init; } = string.Empty;
+    public int Percentage { get; init; }
+    public ProjectHierarchyLevel Level { get; init; }
+    public Guid? ParentId { get; init; }
+    
+    public TimeSpan TotalTime { get; set; }
+    
+    // Task-specific fields
+    public TimeSpan SpentTime { get; init; }
+    public TimeSpan RemainingTime { get; init; }
+    public ProjectTaskPriority Priority { get; set; }
+    public List<GetTaskSectionDto> Sections { get;  init; }
+}
+
+public class GetTaskSectionDto
+{
+    public Guid Id { get; init; }
+    public string SkillName { get; init; } = string.Empty;
+    public TimeSpan SpentTime { get; init; }
+    public TimeSpan TotalTime { get; init; }
+    public int Percentage { get; init; }
+    public string UserFullName{ get; init; } = string.Empty;
+    public AssignmentStatus AssignmentStatus { get; set; }
+    
+}

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

@@ -6,5 +6,7 @@ namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.Project
 
 public record ProjectBoardListQuery: IBaseQuery<List<ProjectBoardListResponse>>
 {
+    public long? UserId { get; set; }
+    public string? ProjectName { get; set; }
     public TaskSectionStatus? Status { get; set; }
 }

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

@@ -3,7 +3,6 @@ using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Query.Internal;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectBoardList;
 
@@ -24,7 +23,8 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
         var currentUserId = _authHelper.GetCurrentUserId();
         
         var queryable = _programManagerDbContext.TaskSections.AsNoTracking()
-            .Where(x => x.InitialEstimatedHours > TimeSpan.Zero && x.Status != TaskSectionStatus.Completed)
+            .Where(x => x.InitialEstimatedHours > TimeSpan.Zero 
+                        && x.Status != TaskSectionStatus.Completed)
             .Include(x => x.Task)
             .ThenInclude(x => x.Phase)
             .ThenInclude(x => x.Project)
@@ -40,10 +40,23 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
         {
             queryable = queryable.Where(x => x.Status == request.Status);
         }
+
+        if (request.UserId is > 0)
+        {
+            queryable = queryable.Where(x => x.CurrentAssignedUserId == request.UserId);
+        }
+
+        if (!string.IsNullOrWhiteSpace(request.ProjectName))
+        {
+            queryable = queryable.Where(x=>x.Task.Name.Contains(request.ProjectName)
+            || x.Task.Phase.Name.Contains(request.ProjectName)
+            || x.Task.Phase.Project.Name.Contains(request.ProjectName));
+        }
         
         var data = await queryable.ToListAsync(cancellationToken);
 
-        var activityUserIds = data.SelectMany(x => x.Activities).Select(a => a.UserId).Distinct().ToList();
+        var activityUserIds = data.SelectMany(x => x.Activities)
+            .Select(a => a.UserId).Distinct().ToList();
         var assignedUser = data.Select(x => x.CurrentAssignedUserId)
             .Concat(data.Select(x => x.OriginalAssignedUserId)).ToList(); 
         var allUserIds = activityUserIds.Concat(assignedUser).Distinct().ToList();
@@ -54,6 +67,12 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
         
 
         var result = data
+            .OrderByDescending(x => x.CurrentAssignedUserId == currentUserId)
+            .ThenByDescending(x=>x.Task.Priority)
+            .ThenBy(x => GetStatusOrder(x.Status))
+            .ThenBy(x=>x.Task.Phase.ProjectId)
+            .ThenBy(x=>x.Task.PhaseId)
+            .ThenBy(x=>x.TaskId)
             .Select(x =>
             {
                 // محاسبه یکبار برای هر Activity و Cache کردن نتیجه
@@ -64,7 +83,7 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
                     {
                         Activity = a,
                         TimeSpent = timeSpent,
-                        TotalSeconds = timeSpent.TotalSeconds,
+                        timeSpent.TotalSeconds,
                         FormattedTime = timeSpent.ToString(@"hh\:mm")
                     };
                 }).ToList();
@@ -95,9 +114,6 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
                         });
                     }
                 }
-
-                mergedHistories = mergedHistories.OrderByDescending(h => h.IsCurrentUser).ToList();
-
                 return new ProjectBoardListResponse()
                 {
                     Id = x.Id,
@@ -105,9 +121,11 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
                     ProjectName = x.Task.Phase.Project.Name,
                     TaskName = x.Task.Name,
                     SectionStatus = x.Status,
+                    TaskPriority = x.Task.Priority,
                     Progress = new ProjectProgressDto()
                     {
                         CompleteSecond = x.FinalEstimatedHours.TotalSeconds,
+                        Percentage = (int)x.GetProgressPercentage(),
                         CurrentSecond = activityTimeData.Sum(a => a.TotalSeconds),
                         Histories = mergedHistories
                     },
@@ -117,19 +135,21 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
                     SkillName =  x.Skill?.Name??"-",
                     TaskId = x.TaskId
                 };
-            })
-            .OrderByDescending(r => 
-            {
-                // اگر AssignedUser null نباشد، بررسی کن که برابر current user هست یا نه
-                if (r.AssignedUser != null)
-                {
-                    return users.FirstOrDefault(u => u.Value == r.AssignedUser).Key == currentUserId;
-                }
-                // اگر AssignedUser null بود، از OriginalUser بررسی کن
-                return users.FirstOrDefault(u => u.Value == r.OriginalUser).Key == currentUserId;
-            })
-            .ToList();
+            }).ToList();
 
         return OperationResult<List<ProjectBoardListResponse>>.Success(result);
     }
+
+    private static int GetStatusOrder(TaskSectionStatus status)
+    {
+        return status switch
+        {
+            TaskSectionStatus.InProgress => 0,
+            TaskSectionStatus.Incomplete => 1,
+            TaskSectionStatus.NotAssigned => 2,
+            TaskSectionStatus.ReadyToStart => 2,
+            TaskSectionStatus.PendingForCompletion => 3,
+            _ => 99
+        };
+    }
 }

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

@@ -13,13 +13,14 @@ public class ProjectBoardListResponse
     public string? AssignedUser { get; set; }
     public string OriginalUser { get; set; }
     public string SkillName { get; set; }
-
+    public ProjectTaskPriority TaskPriority { get; set; }
     public Guid TaskId { get; set; }
     
 }
 public class ProjectProgressDto
 {
     public double CurrentSecond { get; set; }
+    public int Percentage { get; set; }
     public double CompleteSecond { get; set; }
     public List<ProjectProgressHistoryDto> Histories { get; set; }
 }

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

@@ -12,14 +12,16 @@ public record ProjectDeployBoardDetailsResponse(
 public record ProjectDeployBoardDetailPhaseItem(
     string Name,
     TimeSpan TotalTimeSpan,
-    TimeSpan DoneTimeSpan);
+    TimeSpan DoneTimeSpan,
+    int Percentage);
 
 public record ProjectDeployBoardDetailTaskItem(
     string Name,
     TimeSpan TotalTimeSpan,
     TimeSpan DoneTimeSpan,
+    int Percentage,
     List<ProjectDeployBoardDetailItemSkill> Skills)
-    : ProjectDeployBoardDetailPhaseItem(Name, TotalTimeSpan, DoneTimeSpan);
+    : ProjectDeployBoardDetailPhaseItem(Name, TotalTimeSpan, DoneTimeSpan, Percentage);
 
 public record ProjectDeployBoardDetailItemSkill(string OriginalUserFullName, string SkillName, int TimePercentage);
 
@@ -71,6 +73,7 @@ public class
 
             var doneTime = t.Sections.Aggregate(TimeSpan.Zero,
                 (sum, next) => sum.Add(next.GetTotalTimeSpent()));
+
             var skills = t.Sections
                 .Select(s =>
                 {
@@ -79,22 +82,30 @@ public class
 
                     var skillName = s.Skill?.Name ?? "بدون مهارت";
 
-                    var totalTimeSpent = s.GetTotalTimeSpent();
-                    
-                    var timePercentage = s.FinalEstimatedHours.Ticks > 0
-                        ? (int)((totalTimeSpent.Ticks / (double)s.FinalEstimatedHours.Ticks) * 100)
-                        : 0;
-                    
+                    var timePercentage = (int)s.GetProgressPercentage();
+
                     return new ProjectDeployBoardDetailItemSkill(
                         originalUserFullName,
                         skillName,
                         timePercentage);
                 }).ToList();
 
+            int taskPercentage;
+
+            if (skills.Count == 0)
+            {
+                taskPercentage = 0;
+            }
+            else
+            {
+                taskPercentage = (int)Math.Round(skills.Average(x => x.TimePercentage));
+            }
+
             return new ProjectDeployBoardDetailTaskItem(
                 t.Name,
                 totalTime,
                 doneTime,
+                taskPercentage,
                 skills);
         }).ToList();
 
@@ -104,7 +115,10 @@ public class
         var doneTimeSpan = tasksRes.Aggregate(TimeSpan.Zero,
             (sum, next) => sum.Add(next.DoneTimeSpan));
 
-        var phaseRes = new ProjectDeployBoardDetailPhaseItem(phase.Name, totalTimeSpan, doneTimeSpan);
+        var phasePercentage = tasksRes.Average(x => x.Percentage);
+
+        var phaseRes = new ProjectDeployBoardDetailPhaseItem(phase.Name, totalTimeSpan, doneTimeSpan,
+            (int)phasePercentage);
 
         var res = new ProjectDeployBoardDetailsResponse(phaseRes, tasksRes);
 

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

@@ -17,6 +17,7 @@ public record ProjectDeployBoardListItem()
     public int DoneTasks { get; set; }
     public TimeSpan TotalTimeSpan { get; set; }
     public TimeSpan DoneTimeSpan { get; set; }
+    public int Percentage { get; set; }
     public ProjectDeployStatus DeployStatus { get; set; }
 }
 public record GetProjectsDeployBoardListResponse(List<ProjectDeployBoardListItem> Items);
@@ -66,7 +67,8 @@ public class ProjectDeployBoardListQueryHandler:IBaseQueryHandler<GetProjectDepl
                 .Select(x => x.TaskId).Distinct().Count(),
             TotalTimeSpan = TimeSpan.FromTicks(g.Sum(x => x.InitialEstimatedHours.Ticks)),
             DoneTimeSpan = TimeSpan.FromTicks(g.Sum(x=>x.GetTotalTimeSpent().Ticks)),
-            DeployStatus = g.First().Task.Phase.DeployStatus
+            DeployStatus = g.First().Task.Phase.DeployStatus,
+            Percentage = (int)Math.Round(g.Average(x => x.GetProgressPercentage()))
         }).ToList();
         var response = new GetProjectsDeployBoardListResponse(list);
         return OperationResult<GetProjectsDeployBoardListResponse>.Success(response);

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectSetTimeDetails/ProjectSetTimeDetailsQuery.cs

@@ -26,6 +26,7 @@ public record ProjectSetTimeResponseSkill
 
 public class ProjectSetTimeResponseSectionAdditionalTime
 {
+    public Guid Id { get; set; }
     public int Hours { get; init; }
     public int Minutes { get; init; }
     public string Description { get; init; }

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectSetTimeDetails/ProjectSetTimeDetailsQueryHandler.cs

@@ -56,6 +56,7 @@ public class ProjectSetTimeDetailsQueryHandler
         
         var skills = await _context.Skills
             .AsNoTracking()
+            .OrderBy(x=>x.CreationDate)
             .ToListAsync(cancellationToken);
 
         var res = new ProjectSetTimeResponse(
@@ -69,6 +70,7 @@ public class ProjectSetTimeDetailsQueryHandler
                     AdditionalTimes = section?.AdditionalTimes
                         .Select(x => new ProjectSetTimeResponseSectionAdditionalTime
                         {
+                            Id = x.Id,
                             Description = x.Reason ?? "",
                             Hours = (int)x.Hours.TotalHours,
                             Minutes = x.Hours.Minutes,
@@ -84,7 +86,7 @@ public class ProjectSetTimeDetailsQueryHandler
                     UserId = section?.OriginalAssignedUserId ?? 0,
                     SkillId = skill.Id,
                 };
-            }).OrderBy(x => x.SkillId).ToList(),
+            }).ToList(),
             task.Id,
             level);
 
@@ -114,6 +116,7 @@ public class ProjectSetTimeDetailsQueryHandler
 
         var skills = await _context.Skills
             .AsNoTracking()
+            .OrderBy(x=>x.CreationDate)
             .ToListAsync(cancellationToken);
 
         var res = new ProjectSetTimeResponse(
@@ -135,7 +138,7 @@ public class ProjectSetTimeDetailsQueryHandler
                     UserId = section?.UserId ?? 0,
                     SkillId = skill.Id,
                 };
-            }).OrderBy(x => x.SkillId).ToList(),
+            }).ToList(),
             phase.Id,
             level);
 
@@ -165,6 +168,7 @@ public class ProjectSetTimeDetailsQueryHandler
 
         var skills = await _context.Skills
             .AsNoTracking()
+            .OrderBy(x=>x.CreationDate)
             .ToListAsync(cancellationToken);
 
         var res = new ProjectSetTimeResponse(
@@ -186,7 +190,7 @@ public class ProjectSetTimeDetailsQueryHandler
                     UserId = section?.UserId ?? 0,
                     SkillId = skill.Id,
                 };
-            }).OrderBy(x => x.SkillId).ToList(),
+            }).ToList(),
             project.Id,
             level);
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Commands/SendMessage/SendMessageCommand.cs

@@ -28,26 +28,25 @@ public class SendMessageCommandHandler : IBaseCommandHandler<SendMessageCommand,
     private readonly ITaskChatMessageRepository _messageRepository;
     private readonly IUploadedFileRepository _fileRepository;
     private readonly IProjectTaskRepository _taskRepository;
-    private readonly IFileStorageService _fileStorageService;
-    private readonly IThumbnailGeneratorService _thumbnailService;
+    private readonly IFileUploadService _fileUploadService;
     private readonly IAuthHelper _authHelper;
 
     public SendMessageCommandHandler(
         ITaskChatMessageRepository messageRepository,
         IUploadedFileRepository fileRepository,
-        IProjectTaskRepository taskRepository,
-        IFileStorageService fileStorageService,
-        IThumbnailGeneratorService thumbnailService, IAuthHelper authHelper)
+        IProjectTaskRepository taskRepository, 
+        IAuthHelper authHelper,
+        IFileUploadService fileUploadService)
     {
         _messageRepository = messageRepository;
         _fileRepository = fileRepository;
         _taskRepository = taskRepository;
-        _fileStorageService = fileStorageService;
-        _thumbnailService = thumbnailService;
         _authHelper = authHelper;
+        _fileUploadService = fileUploadService;
     }
 
-    public async Task<OperationResult<MessageDto>> Handle(SendMessageCommand request, CancellationToken cancellationToken)
+    public async Task<OperationResult<MessageDto>> Handle(SendMessageCommand request,
+        CancellationToken cancellationToken)
     {
         var currentUserId = _authHelper.GetCurrentUserId()
                             ?? throw new UnAuthorizedException("کاربر احراز هویت نشده است");
@@ -57,75 +56,21 @@ public class SendMessageCommandHandler : IBaseCommandHandler<SendMessageCommand,
         {
             return OperationResult<MessageDto>.NotFound("تسک یافت نشد");
         }
-        
+
         Guid? uploadedFileId = null;
         if (request.File != null)
         {
-            if (request.File.Length == 0)
-            {
-                return OperationResult<MessageDto>.ValidationError("فایل خالی است");
-            }
-
-            const long maxFileSize = 100 * 1024 * 1024;
-            if (request.File.Length > maxFileSize)
-            {
-                return OperationResult<MessageDto>.ValidationError("حجم فایل بیش از حد مجاز است (حداکثر 100MB)");
-            }
-
-            var fileType = DetectFileType(request.File.ContentType, Path.GetExtension(request.File.FileName));
-
-            var uploadedFile = new UploadedFile(
-                originalFileName: request.File.FileName,
-                fileSizeBytes: request.File.Length,
-                mimeType: request.File.ContentType,
-                fileType: fileType,
-                category: FileCategory.TaskChatMessage,
-                uploadedByUserId: currentUserId,
-                storageProvider: StorageProvider.LocalFileSystem
+           var uploadedFile =  await _fileUploadService.UploadFileAsync
+            (
+                request.File,
+                FileCategory.TaskChatMessage,
+                currentUserId
             );
-
-            await _fileRepository.AddAsync(uploadedFile);
-            await _fileRepository.SaveChangesAsync();
-
-            try
+            if (!uploadedFile.IsSuccess)
             {
-                using var stream = request.File.OpenReadStream();
-                var uploadResult = await _fileStorageService.UploadAsync(
-                    stream,
-                    uploadedFile.UniqueFileName,
-                    "TaskChatMessage"
-                );
-
-                uploadedFile.CompleteUpload(uploadResult.StoragePath, uploadResult.StorageUrl);
-
-                if (fileType == FileType.Image)
-                {
-                    var dimensions = await _thumbnailService.GetImageDimensionsAsync(uploadResult.StoragePath);
-                    if (dimensions.HasValue)
-                    {
-                        uploadedFile.SetImageDimensions(dimensions.Value.Width, dimensions.Value.Height);
-                    }
-
-                    var thumbnail = await _thumbnailService
-                        .GenerateImageThumbnailAsync(uploadResult.StoragePath, category: "TaskChatMessage");
-                    if (thumbnail.HasValue)
-                    {
-                        uploadedFile.SetThumbnail(thumbnail.Value.ThumbnailUrl);
-                    }
-                }
-
-                await _fileRepository.UpdateAsync(uploadedFile);
-                await _fileRepository.SaveChangesAsync();
-
-                uploadedFileId = uploadedFile.Id;
-            }
-            catch (Exception ex)
-            {
-                await _fileRepository.DeleteAsync(uploadedFile);
-                await _fileRepository.SaveChangesAsync();
-
-                return OperationResult<MessageDto>.ValidationError($"خطا در آپلود فایل: {ex.Message}");
+                return OperationResult<MessageDto>.Failure(uploadedFile.ErrorMessage ?? "خطا در آپلود فایل");
             }
+            uploadedFileId = uploadedFile.FileId!.Value;
         }
 
         var message = new TaskChatMessage(
@@ -209,4 +154,4 @@ public class SendMessageCommandHandler : IBaseCommandHandler<SendMessageCommand,
 
         return FileType.Document;
     }
-}
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Queries/GetMessages/GetMessagesQuery.cs

@@ -27,6 +27,39 @@ public class GetMessagesQueryHandler : IBaseQueryHandler<GetMessagesQuery, Pagin
         _authHelper = authHelper;
     }
 
+    private List<MessageDto> CreateAdditionalTimeNotes(
+        IEnumerable<Domain.ProjectAgg.Entities.TaskSectionAdditionalTime> additionalTimes,
+        Dictionary<long, string> users,
+        Guid taskId)
+    {
+        var notes = new List<MessageDto>();
+        
+        foreach (var additionalTime in additionalTimes)
+        {
+            var addedByUserName = additionalTime.AddedByUserId.HasValue && users.TryGetValue(additionalTime.AddedByUserId.Value, out var user)
+                ? user
+                : "سیستم";
+
+            var noteContent = $"⏱️ زمان اضافی: {additionalTime.Hours.TotalHours.ToString("F2")} ساعت - {(string.IsNullOrWhiteSpace(additionalTime.Reason) ? "بدون علت" : additionalTime.Reason)} - توسط {addedByUserName}";
+
+            var noteDto = new MessageDto
+            {
+                Id = Guid.NewGuid(),
+                TaskId = taskId,
+                SenderUserId = 0,
+                SenderName = "سیستم",
+                MessageType = "Note",
+                TextContent = noteContent,
+                CreationDate = additionalTime.CreationDate,
+                IsMine = false
+            };
+
+            notes.Add(noteDto);
+        }
+
+        return notes;
+    }
+
     public async Task<OperationResult<PaginationResult<MessageDto>>> Handle(GetMessagesQuery request, CancellationToken cancellationToken)
     {
         var currentUserId = _authHelper.GetCurrentUserId();
@@ -51,36 +84,52 @@ public class GetMessagesQueryHandler : IBaseQueryHandler<GetMessagesQuery, Pagin
             .ToListAsync(cancellationToken);
 
         // ✅ گرفتن تمامی کاربران برای نمایش نام کامل فرستنده به جای "کاربر"
-        // این بخش تمام UserId هایی که در پیام‌ها استفاده شده را جمع‌آوری می‌کند
-        // و یک Dictionary ایجاد می‌کند که UserId را به FullName نگاشت می‌کند
         var senderUserIds = messages.Select(m => m.SenderUserId).Distinct().ToList();
         var users = await _context.Users
             .Where(u => senderUserIds.Contains(u.Id))
             .ToDictionaryAsync(u => u.Id, u => u.FullName, cancellationToken);
 
         // ✅ گرفتن تمامی زمان‌های اضافی (Additional Times) برای نمایش به صورت نوت
-        // در اینجا تمامی TaskSections مربوط به این تسک را می‌گیریم
-        // و برای هر کدام تمام AdditionalTimes آن را بارگذاری می‌کنیم
         var taskSections = await _context.TaskSections
             .Where(ts => ts.TaskId == request.TaskId)
             .Include(ts => ts.AdditionalTimes)
             .ToListAsync(cancellationToken);
 
+        // ✅ تمام زمان‌های اضافی را یکجا بگیر و مرتب کن
+        var allAdditionalTimes = taskSections
+            .SelectMany(ts => ts.AdditionalTimes)
+            .OrderBy(at => at.CreationDate)
+            .ToList();
+
         var messageDtos = new List<MessageDto>();
 
+        // ✅ ابتدا زمان‌های اضافی قبل از اولین پیام را اضافه کن (اگر پیامی وجود داشته باشد)
+        if (messages.Any())
+        {
+            var firstMessageDate = messages.First().CreationDate;
+            var additionalTimesBeforeFirstMessage = allAdditionalTimes
+                .Where(at => at.CreationDate < firstMessageDate)
+                .ToList();
+
+            messageDtos.AddRange(CreateAdditionalTimeNotes(additionalTimesBeforeFirstMessage, users, request.TaskId));
+        }
+        else
+        {
+            // ✅ اگر هیچ پیامی وجود ندارد، همه زمان‌های اضافی را نمایش بده
+            messageDtos.AddRange(CreateAdditionalTimeNotes(allAdditionalTimes, users, request.TaskId));
+        }
+
         foreach (var message in messages)
         {
             // ✅ نام فرستنده را از Dictionary Users بگیر، در صورت عدم وجود "کاربر ناشناس" نمایش بده
-            var senderName = users.ContainsKey(message.SenderUserId) 
-                ? users[message.SenderUserId] 
-                : "کاربر ناشناس";
+            var senderName = users.GetValueOrDefault(message.SenderUserId, "کاربر ناشناس");
 
             var dto = new MessageDto
             {
                 Id = message.Id,
                 TaskId = message.TaskId,
                 SenderUserId = message.SenderUserId,
-                SenderName = senderName, // ✅ از User واقعی استفاده می‌کنیم
+                SenderName = senderName,
                 MessageType = message.MessageType.ToString(),
                 TextContent = message.TextContent,
                 ReplyToMessageId = message.ReplyToMessageId,
@@ -95,10 +144,7 @@ public class GetMessagesQueryHandler : IBaseQueryHandler<GetMessagesQuery, Pagin
 
             if (message.ReplyToMessage != null)
             {
-                // ✅ برای پیام‌های Reply نیز نام فرستنده را درست نمایش بده
-                var replySenderName = users.ContainsKey(message.ReplyToMessage.SenderUserId)
-                    ? users[message.ReplyToMessage.SenderUserId]
-                    : "کاربر ناشناس";
+                var replySenderName = users.GetValueOrDefault(message.ReplyToMessage.SenderUserId, "کاربر ناشناس");
 
                 dto.ReplyToMessage = new MessageDto
                 {
@@ -132,55 +178,31 @@ public class GetMessagesQueryHandler : IBaseQueryHandler<GetMessagesQuery, Pagin
 
             messageDtos.Add(dto);
 
-            // ✅ اینجا بخش جدید است: نوت‌های زمان اضافی را بین پیام‌ها اضافه کن
-            // این بخش تمام AdditionalTimes را که بعد از این پیام اضافه شده‌اند را پیدا می‌کند
-            var additionalTimesAfterMessage = taskSections
-                .SelectMany(ts => ts.AdditionalTimes)
-                .Where(at => at.AddedAt > message.CreationDate) // ✅ تغییر به AddedAt (زمان واقعی اضافه شدن)
-                .OrderBy(at => at.AddedAt)
-                .FirstOrDefault();
+            // ✅ پیدا کردن پیام بعدی (اگر وجود داشته باشد)
+            var currentIndex = messages.IndexOf(message);
+            var nextMessage = currentIndex < messages.Count - 1 ? messages[currentIndex + 1] : null;
 
-            if (additionalTimesAfterMessage != null)
+            if (nextMessage != null)
             {
-                // ✅ تمام AdditionalTimes بین این پیام و پیام قبلی را بگیر
-                var additionalTimesByDate = taskSections
-                    .SelectMany(ts => ts.AdditionalTimes)
-                    .Where(at => at.AddedAt <= message.CreationDate && 
-                                 (messageDtos.Count == 1 || at.AddedAt > messageDtos[messageDtos.Count - 2].CreationDate))
-                    .OrderBy(at => at.AddedAt)
+                // ✅ زمان‌های اضافی بین این پیام و پیام بعدی
+                var additionalTimesBetween = allAdditionalTimes
+                    .Where(at => at.CreationDate > message.CreationDate && at.CreationDate < nextMessage.CreationDate)
                     .ToList();
 
-                foreach (var additionalTime in additionalTimesByDate)
-                {
-                    // ✅ نام کاربری که این زمان اضافی را اضافه کرد
-                    var addedByUserName = additionalTime.AddedByUserId.HasValue && users.TryGetValue(additionalTime.AddedByUserId.Value, out var user)
-                        ? user
-                        : "سیستم";
+                messageDtos.AddRange(CreateAdditionalTimeNotes(additionalTimesBetween, users, request.TaskId));
+            }
+            else
+            {
+                // ✅ این آخرین پیام است، زمان‌های اضافی بعد از آن را اضافه کن
+                var additionalTimesAfterLastMessage = allAdditionalTimes
+                    .Where(at => at.CreationDate > message.CreationDate)
+                    .ToList();
 
-                    // ✅ محتوای نوت را با اطلاعات کامل ایجاد کن
-                    // نمایش می‌دهد: مقدار زمان + علت + نام کسی که اضافه کرد
-                    var noteContent = $"⏱️ زمان اضافی: {additionalTime.Hours.TotalHours:F2} ساعت - {(string.IsNullOrWhiteSpace(additionalTime.Reason) ? "بدون علت" : additionalTime.Reason)} - توسط {addedByUserName}";
-
-                    // ✅ نوت را به عنوان MessageDto خاصی ایجاد کن
-                    var noteDto = new MessageDto
-                    {
-                        Id = Guid.NewGuid(),
-                        TaskId = request.TaskId,
-                        SenderUserId = 0, // ✅ سیستم برای نشان دادن اینکه یک پیام خودکار است
-                        SenderName = "سیستم",
-                        MessageType = "Note", // ✅ نوع پیام: Note (یادداشت سیستم)
-                        TextContent = noteContent,
-                        CreationDate = additionalTime.AddedAt, // ✅ تاریخ اضافه شدن زمان اضافی
-                        IsMine = false
-                    };
-
-                    messageDtos.Add(noteDto);
-                }
+                messageDtos.AddRange(CreateAdditionalTimeNotes(additionalTimesAfterLastMessage, users, request.TaskId));
             }
         }
 
         // ✅ مرتب کردن نهایی تمام پیام‌ها (معمولی + نوت‌ها) بر اساس زمان ایجاد
-        // اینطور که نوت‌های زمان اضافی در جای درست خود قرار می‌گیرند
         messageDtos = messageDtos.OrderBy(m => m.CreationDate).ToList();
 
         var response = new PaginationResult<MessageDto>()

ProgramManager/src/Application/GozareshgirProgramManager.Application/Services/FileManagement/IFileUploadService.cs

@@ -0,0 +1,69 @@
+using GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
+using Microsoft.AspNetCore.Http;
+
+namespace GozareshgirProgramManager.Application.Services.FileManagement;
+
+/// <summary>
+/// سرویس آپلود و مدیریت کامل فایل
+/// این سرویس تمام مراحل آپلود، ذخیره، تولید thumbnail و... را انجام می‌دهد
+/// </summary>
+public interface IFileUploadService
+{
+    /// <summary>
+    /// آپلود فایل با تمام مراحل پردازش
+    /// </summary>
+    /// <param name="file">فایل برای آپلود</param>
+    /// <param name="category">دسته‌بندی فایل</param>
+    /// <param name="uploadedByUserId">شناسه کاربر آپلودکننده</param>
+    /// <param name="maxFileSizeBytes">حداکثر حجم مجاز فایل (پیش‌فرض: 100MB)</param>
+    /// <returns>شناسه فایل آپلود شده یا null در صورت خطا</returns>
+    Task<FileUploadResult> UploadFileAsync(
+        IFormFile file,
+        FileCategory category,
+        long uploadedByUserId,
+        long maxFileSizeBytes = 100 * 1024 * 1024);
+    
+    /// <summary>
+    /// آپلود فایل با Stream
+    /// </summary>
+    Task<FileUploadResult> UploadFileFromStreamAsync(
+        Stream fileStream,
+        string fileName,
+        string contentType,
+        FileCategory category,
+        long uploadedByUserId,
+        long maxFileSizeBytes = 100 * 1024 * 1024);
+}
+
+/// <summary>
+/// نتیجه عملیات آپلود فایل
+/// </summary>
+public class FileUploadResult
+{
+    public bool IsSuccess { get; set; }
+    public Guid? FileId { get; set; }
+    public string? ErrorMessage { get; set; }
+    public string? StorageUrl { get; set; }
+    public string? ThumbnailUrl { get; set; }
+
+    public static FileUploadResult Success(Guid fileId, string storageUrl, string? thumbnailUrl = null)
+    {
+        return new FileUploadResult
+        {
+            IsSuccess = true,
+            FileId = fileId,
+            StorageUrl = storageUrl,
+            ThumbnailUrl = thumbnailUrl
+        };
+    }
+
+    public static FileUploadResult Failed(string errorMessage)
+    {
+        return new FileUploadResult
+        {
+            IsSuccess = false,
+            ErrorMessage = errorMessage
+        };
+    }
+}
+

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

@@ -149,6 +149,22 @@ public static class ProgramManagerPermissionCode
         {
             public const int Code = 990111;
         }
+
+        /// <summary>
+        /// اولویت بندی
+        /// </summary>
+        public static class Priority
+        {
+            public const int Code = 990112;
+        }
+
+        /// <summary>
+        /// ایجاد تسک باگ
+        /// </summary>
+        public static class CreateBug
+        {
+            public const int Code = 990113;
+        }
     }
 
     #endregion
@@ -226,11 +242,26 @@ public static class ProgramManagerPermissionCode
         {
             public const int Code = 990208;
         }
+
+        /// <summary>
+        /// رد با تایید اتمام اجرا
+        /// </summary>
+        public static class RejectOrApproveTaskComplete
+        {
+            public const int Code = 990209;
+        }
+    }
+
+    #endregion
+
+    #region Workflow[تب کارپوشه]
+    public static class Workflow
+    {
+        public const int Code = 9903;
     }
 
     #endregion
 
-   
     public static Dictionary<string, object> GetAllCodes()
     {
         var result = new Dictionary<string, object>();

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

@@ -41,15 +41,7 @@ public class ProjectPhase : ProjectHierarchyNode
     public ProjectDeployStatus DeployStatus { get; set; }
 
     #region Task Management
-
-    public ProjectTask AddTask(string name, string? description = null)
-    {
-        var task = new ProjectTask(name, Id, description);
-        _tasks.Add(task);
-        AddDomainEvent(new TaskAddedEvent(task.Id, Id, name));
-        return task;
-    }
-
+    
     public void RemoveTask(Guid taskId)
     {
         var task = _tasks.FirstOrDefault(t => t.Id == taskId);

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

@@ -16,11 +16,11 @@ public class ProjectTask : ProjectHierarchyNode
         _sections = new List<TaskSection>();
     }
 
-    public ProjectTask(string name, Guid phaseId, string? description = null) : base(name, description)
+    public ProjectTask(string name, Guid phaseId,ProjectTaskPriority priority, string? description = null) : base(name, description)
     {
         PhaseId = phaseId;
         _sections = new List<TaskSection>();
-        Priority = TaskPriority.Medium;
+        Priority = priority;
         AddDomainEvent(new TaskCreatedEvent(Id, phaseId, name));
     }
     
@@ -30,7 +30,7 @@ public class ProjectTask : ProjectHierarchyNode
 
     // Task-specific properties
     public Enums.TaskStatus Status { get; private set; } = Enums.TaskStatus.NotStarted;
-    public TaskPriority Priority { get; private set; }
+    public ProjectTaskPriority Priority { get; private set; }
     public DateTime? StartDate { get; private set; }
     public DateTime? EndDate { get; private set; }
     public DateTime? DueDate { get; private set; }
@@ -119,7 +119,7 @@ public class ProjectTask : ProjectHierarchyNode
         AddDomainEvent(new TaskStatusUpdatedEvent(Id, status));
     }
 
-    public void SetPriority(TaskPriority priority)
+    public void SetPriority(ProjectTaskPriority priority)
     {
         Priority = priority;
         AddDomainEvent(new TaskPriorityUpdatedEvent(Id, priority));