Merge branch 'Feature/loan/client-api'

.gitignore

@@ -368,3 +368,6 @@ MigrationBackup/
 # Storage folder - ignore all uploaded files, thumbnails, and temporary files
 ServiceHost/Storage
 
+.env
+.env.*
+

0_Framework/Application/Enums/TypeOfSmsSetting.cs

@@ -45,6 +45,11 @@ public enum TypeOfSmsSetting
     /// </summary>
     SendInstitutionContractConfirmationCode,
 
+    /// <summary>
+    /// لینک تاییدیه ایجاد قرارداد مالی
+    /// </summary>
+    SendInstitutionContractConfirmationLink,
+
     /// <summary>
     /// یادآور وظایف
     /// </summary>

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

@@ -30,5 +30,22 @@ public class ApiReportDto
     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,15 +16,21 @@ 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);
-
-#endregion
+    /// <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);
@@ -33,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);
 
@@ -68,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>

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/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,4 +1,5 @@
-using _0_Framework.Domain;
+using _0_Framework.Application.Enums;
+using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.SmsResult;
 using CompanyManagment.App.Contracts.SmsResult.Dto;
 using System.Collections.Generic;
@@ -22,8 +23,9 @@ public interface ISmsResultRepository : IRepository<long, SmsResult>
     /// </summary>
     /// <param name="searchModel"></param>
     /// <param name="date"></param>
+    /// <param name="typeOfSmsSetting"></param>
     /// <returns></returns>
-    Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date);
+    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)

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/IInstitutionContractApplication.cs

@@ -324,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/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/SmsReportDto.cs

@@ -9,6 +9,11 @@ public class SmsReportDto
     /// </summary>
     public string SentDate { get; set; }
 
+    /// <summary>
+    /// نوع پیامک
+    /// </summary>
+    public string TypeOfSms { get; set; }
+
 
 }
 

CompanyManagment.App.Contracts/SmsResult/ISmsResultApplication.cs

@@ -1,4 +1,5 @@
 using _0_Framework.Application;
+using _0_Framework.Application.Enums;
 using CompanyManagment.App.Contracts.SmsResult.Dto;
 using System;
 using System.Collections.Generic;
@@ -24,8 +25,9 @@ public interface ISmsResultApplication
     /// </summary>
     /// <param name="searchModel"></param>
     /// <param name="date"></param>
+    /// <param name="typeOfSmsSetting"></param>
     /// <returns></returns>
-    Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date);
+    Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date, string typeOfSmsSetting);
 
     #endregion
 

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

@@ -1516,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))
@@ -1569,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();
     }

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,26 @@
-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 _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;
     }
 
 
@@ -25,9 +31,9 @@ public class SmsResultApplication : ISmsResultApplication
         return await _smsResultRepository.GetSmsReportList(searchModel);
     }
 
-    public async Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date)
+    public async Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date, string typeOfSmsSetting)
     {
-        return await _smsResultRepository.GetSmsReportExpandList(searchModel, date);
+        return await _smsResultRepository.GetSmsReportExpandList(searchModel, date, typeOfSmsSetting);
     }
 
     #endregion
@@ -67,4 +73,6 @@ public class SmsResultApplication : ISmsResultApplication
         }).ToList();
         return result;
     }
+
+
 }

CompanyManagment.Application/SmsSettingApplication.cs

@@ -9,6 +9,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Hosting;
 
 namespace CompanyManagment.Application;
 
@@ -17,12 +19,15 @@ 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, IInstitutionContractSmsServiceRepository institutionContractSmsServiceRepository)
+    public SmsSettingApplication(ISmsSettingsRepository smsSettingsRepository, IInstitutionContractRepository institutionContractRepository, IInstitutionContractSmsServiceRepository institutionContractSmsServiceRepository, IHostEnvironment hostEnvironment)
     {
         _smsSettingsRepository = smsSettingsRepository;
         _institutionContractRepository = institutionContractRepository;
         _institutionContractSmsServiceRepository = institutionContractSmsServiceRepository;
+        _hostEnvironment = hostEnvironment;
+
     }
 
 
@@ -131,6 +136,12 @@ public class SmsSettingApplication : ISmsSettingApplication
     public async Task<OperationResult> InstantSendReminderSms(List<SmsListData> command)
     {
         var op = new OperationResult();
+        if (_hostEnvironment.IsDevelopment())
+        {
+
+            return op.Failed(" در محیط توسعه امکان ارسال وجود ندارد ");
+
+        }
         string typeOfSms = "یادآور بدهی ماهانه";
         string sendMessStart = "شروع یادآور آنی";
         string sendMessEnd = "پایان یادآور آنی";
@@ -151,6 +162,13 @@ 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 = "پایان مسدودی آنی ";
@@ -165,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/InstitutionContractRepository.cs

@@ -124,69 +124,69 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
     public EditInstitutionContract GetDetails(long id)
     {
         return _context.InstitutionContractSet.Select(x => new EditInstitutionContract()
-        {
-            Id = x.id,
-            ContractNo = x.ContractNo,
-            ContractStartGr = x.ContractStartGr,
-            ContractStartFa = x.ContractStartFa,
-            ContractEndGr = x.ContractEndGr,
-            ContractEndFa = x.ContractEndFa,
-            RepresentativeName = x.RepresentativeName,
-            ContractingPartyName = x.ContractingPartyName,
-            RepresentativeId = x.RepresentativeId,
-            ContractingPartyId = x.ContractingPartyId,
-            ContractDateFa = x.ContractDateFa,
-            State = x.State,
-            City = x.City,
-            Address = x.Address,
-            Description = x.Description,
-            WorkshopManualCount = x.WorkshopManualCount,
-            EmployeeManualCount = x.EmployeeManualCount,
-            ContractAmountString = x.ContractAmount.ToMoney(),
-            ContractAmount = x.ContractAmount,
-            DailyCompenseationString = x.DailyCompenseation.ToMoney(),
-            ObligationString = x.Obligation.ToMoney(),
-            TotalAmountString = x.TotalAmount.ToMoney(),
-            ExtensionNo = x.ExtensionNo,
-            OfficialCompany = x.OfficialCompany,
-            TypeOfContract = x.TypeOfContract,
-            Signature = x.Signature,
-            HasValueAddedTax = x.HasValueAddedTax,
-            ValueAddedTax = x.ValueAddedTax,
-        })
+            {
+                Id = x.id,
+                ContractNo = x.ContractNo,
+                ContractStartGr = x.ContractStartGr,
+                ContractStartFa = x.ContractStartFa,
+                ContractEndGr = x.ContractEndGr,
+                ContractEndFa = x.ContractEndFa,
+                RepresentativeName = x.RepresentativeName,
+                ContractingPartyName = x.ContractingPartyName,
+                RepresentativeId = x.RepresentativeId,
+                ContractingPartyId = x.ContractingPartyId,
+                ContractDateFa = x.ContractDateFa,
+                State = x.State,
+                City = x.City,
+                Address = x.Address,
+                Description = x.Description,
+                WorkshopManualCount = x.WorkshopManualCount,
+                EmployeeManualCount = x.EmployeeManualCount,
+                ContractAmountString = x.ContractAmount.ToMoney(),
+                ContractAmount = x.ContractAmount,
+                DailyCompenseationString = x.DailyCompenseation.ToMoney(),
+                ObligationString = x.Obligation.ToMoney(),
+                TotalAmountString = x.TotalAmount.ToMoney(),
+                ExtensionNo = x.ExtensionNo,
+                OfficialCompany = x.OfficialCompany,
+                TypeOfContract = x.TypeOfContract,
+                Signature = x.Signature,
+                HasValueAddedTax = x.HasValueAddedTax,
+                ValueAddedTax = x.ValueAddedTax,
+            })
             .FirstOrDefault(x => x.Id == id);
     }
 
     public EditInstitutionContract GetFirstContract(long contractingPartyId, string typeOfContract)
     {
         return _context.InstitutionContractSet.Select(x => new EditInstitutionContract()
-        {
-            Id = x.id,
-            ContractNo = x.ContractNo,
-            ContractStartGr = x.ContractStartGr,
-            ContractStartFa = x.ContractStartFa,
-            ContractEndGr = x.ContractEndGr,
-            ContractEndFa = x.ContractEndFa,
-            RepresentativeName = x.RepresentativeName,
-            ContractingPartyName = x.ContractingPartyName,
-            RepresentativeId = x.RepresentativeId,
-            ContractingPartyId = x.ContractingPartyId,
-            ContractDateFa = x.ContractDateFa,
-            State = x.State,
-            City = x.City,
-            Address = x.Address,
-            Description = x.Description,
-            WorkshopManualCount = x.WorkshopManualCount,
-            EmployeeManualCount = x.EmployeeManualCount,
-            ContractAmountString = x.ContractAmount.ToMoney(),
-            DailyCompenseationString = x.DailyCompenseation.ToMoney(),
-            ObligationString = x.Obligation.ToMoney(),
-            TotalAmountString = x.TotalAmount.ToMoney(),
-            ExtensionNo = x.ExtensionNo,
-            OfficialCompany = x.OfficialCompany,
-            TypeOfContract = x.TypeOfContract,
-            Signature = x.Signature
-        })
+            {
+                Id = x.id,
+                ContractNo = x.ContractNo,
+                ContractStartGr = x.ContractStartGr,
+                ContractStartFa = x.ContractStartFa,
+                ContractEndGr = x.ContractEndGr,
+                ContractEndFa = x.ContractEndFa,
+                RepresentativeName = x.RepresentativeName,
+                ContractingPartyName = x.ContractingPartyName,
+                RepresentativeId = x.RepresentativeId,
+                ContractingPartyId = x.ContractingPartyId,
+                ContractDateFa = x.ContractDateFa,
+                State = x.State,
+                City = x.City,
+                Address = x.Address,
+                Description = x.Description,
+                WorkshopManualCount = x.WorkshopManualCount,
+                EmployeeManualCount = x.EmployeeManualCount,
+                ContractAmountString = x.ContractAmount.ToMoney(),
+                DailyCompenseationString = x.DailyCompenseation.ToMoney(),
+                ObligationString = x.Obligation.ToMoney(),
+                TotalAmountString = x.TotalAmount.ToMoney(),
+                ExtensionNo = x.ExtensionNo,
+                OfficialCompany = x.OfficialCompany,
+                TypeOfContract = x.TypeOfContract,
+                Signature = x.Signature
+            })
             .Where(x => x.ContractingPartyId == contractingPartyId && x.TypeOfContract == typeOfContract)
             .OrderBy(x => x.ExtensionNo).FirstOrDefault();
     }
@@ -604,40 +604,40 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 }).ToList(),
         }).ToList();
         listQuery = listQuery.Select(x => new InstitutionContractViewModel()
-        {
-            Id = x.Id,
-            ContractNo = x.ContractNo,
-            ContractStartGr = x.ContractStartGr,
-            ContractStartFa = x.ContractStartFa,
-            ContractEndGr = x.ContractEndGr,
-            ContractEndFa = x.ContractEndFa,
-            RepresentativeId = x.RepresentativeId,
-            RepresentativeName = x.RepresentativeName,
-            ContractingPartyName = x.ContractingPartyName,
-            ContractingPartyId = x.ContractingPartyId,
-            ContractAmount = x.ContractAmount,
-            TotalAmount = x.TotalAmount,
-            SearchAmount = x.SearchAmount,
-            IsActiveString = x.IsActiveString,
-            OfficialCompany = x.OfficialCompany,
-            TypeOfContract = x.TypeOfContract,
-            Signature = x.Signature,
-            ExpireColor = x.ExpireColor,
-            IsExpier = x.IsExpier,
-            BalanceDouble = x.BalanceDouble,
-            BalanceStr = x.BalanceStr,
-            EmployerViewModels = x.EmployerViewModels,
-            EmployerNo = x.EmployerNo,
-            EmployerName = x.EmployerViewModels.Select(n => n.FullName).FirstOrDefault(),
-            WorkshopViewModels = x.WorkshopViewModels,
-            WorkshopCount = x.WorkshopCount,
-            IsContractingPartyBlock = x.IsContractingPartyBlock,
-            BlockTimes = x.BlockTimes,
-            EmployeeCount =
+            {
+                Id = x.Id,
+                ContractNo = x.ContractNo,
+                ContractStartGr = x.ContractStartGr,
+                ContractStartFa = x.ContractStartFa,
+                ContractEndGr = x.ContractEndGr,
+                ContractEndFa = x.ContractEndFa,
+                RepresentativeId = x.RepresentativeId,
+                RepresentativeName = x.RepresentativeName,
+                ContractingPartyName = x.ContractingPartyName,
+                ContractingPartyId = x.ContractingPartyId,
+                ContractAmount = x.ContractAmount,
+                TotalAmount = x.TotalAmount,
+                SearchAmount = x.SearchAmount,
+                IsActiveString = x.IsActiveString,
+                OfficialCompany = x.OfficialCompany,
+                TypeOfContract = x.TypeOfContract,
+                Signature = x.Signature,
+                ExpireColor = x.ExpireColor,
+                IsExpier = x.IsExpier,
+                BalanceDouble = x.BalanceDouble,
+                BalanceStr = x.BalanceStr,
+                EmployerViewModels = x.EmployerViewModels,
+                EmployerNo = x.EmployerNo,
+                EmployerName = x.EmployerViewModels.Select(n => n.FullName).FirstOrDefault(),
+                WorkshopViewModels = x.WorkshopViewModels,
+                WorkshopCount = x.WorkshopCount,
+                IsContractingPartyBlock = x.IsContractingPartyBlock,
+                BlockTimes = x.BlockTimes,
+                EmployeeCount =
                     ((x.WorkshopViewModels.Sum(w => w.LeftWorkIds.Count)) + (x.WorkshopViewModels.Sum(w =>
                         w.InsuranceLeftWorkIds.Count(c => !w.LeftWorkIds.Contains(c))))).ToString(),
-            ArchiveCode = x.WorkshopViewModels.Count > 0 ? ArchiveCodeFinder(x.WorkshopViewModels) : 0,
-        }).OrderBy(x => x.WorkshopCount != "0" && string.IsNullOrWhiteSpace(x.ExpireColor))
+                ArchiveCode = x.WorkshopViewModels.Count > 0 ? ArchiveCodeFinder(x.WorkshopViewModels) : 0,
+            }).OrderBy(x => x.WorkshopCount != "0" && string.IsNullOrWhiteSpace(x.ExpireColor))
             .ThenBy(x => x.WorkshopCount == "0" && string.IsNullOrWhiteSpace(x.ExpireColor))
             .ThenBy(x => x.IsExpier == "true")
             .ThenBy(x => x.ExpireColor == "purple")
@@ -1474,7 +1474,8 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     IsInPersonContract = workshopGroup?.CurrentWorkshops
                         .Any(y => y.Services.ContractInPerson) ?? true,
                     IsOldContract = x.contract.SigningType == InstitutionContractSigningType.Legacy,
-                    InstitutionContractIsSentFlag = sendFlags.ContainsKey(x.contract.id) ? sendFlags[x.contract.id] : false
+                    InstitutionContractIsSentFlag =
+                        sendFlags.ContainsKey(x.contract.id) ? sendFlags[x.contract.id] : false
                 };
             }).ToList()
         };
@@ -2268,7 +2269,8 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             extenstionTemp
         );
 
-        var workshopIds = prevInstitutionContracts.WorkshopGroup.CurrentWorkshops.Select(x => x.WorkshopId.Value);
+        var workshopIds = prevInstitutionContracts.WorkshopGroup?.CurrentWorkshops?.Select(x => x.WorkshopId.Value) ??
+                          [];
 
         var workshopsNotInInstitution = employerWorkshopIds.Where(x => !workshopIds.Contains(x)).ToList();
 
@@ -2276,7 +2278,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
             .Where(x => workshopIds.Contains(x.id) || employerWorkshopIds.Contains(x.id))
             .ToListAsync();
 
-        var workshopDetails = prevInstitutionContracts.WorkshopGroup.CurrentWorkshops
+        var workshopDetails = prevInstitutionContracts.WorkshopGroup?.CurrentWorkshops?
             .Select(x =>
             {
                 var workshop = workshops.FirstOrDefault(w => w.id == x.WorkshopId);
@@ -2316,7 +2318,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     WorkshopId = workshop?.id ?? 0,
                     RollCallInPerson = service.RollCallInPerson
                 };
-            }).ToList();
+            }).ToList() ?? [];
         var notIncludeWorskhopsLeftWork = await _context.LeftWorkList
             .Where(x => workshopsNotInInstitution.Contains(x.WorkshopId) && x.StartWorkDate <= DateTime.Now &&
                         x.LeftWorkDate >= DateTime.Now)
@@ -2958,8 +2960,11 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
         await SaveChangesAsync();
 
-        await _smsService.SendInstitutionCreationVerificationLink(contractingParty.Phone, contractingPartyFullName,
-            entity.PublicId, contractingParty.id, entity.id);
+        if (!request.CancelSendVerificationSms)
+        {
+            await _smsService.SendInstitutionCreationVerificationLink(contractingParty.Phone, contractingPartyFullName,
+                entity.PublicId, contractingParty.id, entity.id);
+        }
 
 
         await SaveChangesAsync();
@@ -3358,9 +3363,17 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 OneMonthPrice = institution.ContractAmountWithTax.ToMoney(),
                 OneMonthWithoutTax = institution.ContractAmount.ToMoney(),
                 OneMonthTax = institution.ContractAmountTax.ToMoney(),
-                VerifierFullName = institution.VerifierFullName,
-                VerifierPhoneNumber = institution.VerifierPhoneNumber,
-                VerifyCode = institution.VerifyCode,
+                VerifierFullName =
+                    institution.VerificationStatus == InstitutionContractVerificationStatus.PendingForVerify
+                        ? null
+                        : institution.VerifierFullName,
+                VerifierPhoneNumber =
+                    institution.VerificationStatus == InstitutionContractVerificationStatus.PendingForVerify
+                        ? null
+                        : institution.VerifierPhoneNumber,
+                VerifyCode = institution.VerificationStatus == InstitutionContractVerificationStatus.PendingForVerify
+                    ? null
+                    : institution.VerifyCode,
                 VerifyDate = institution.VerifyCodeCreation.ToFarsi(),
                 VerifyTime = institution.VerifyCodeCreation.ToString("HH:mm:ss"),
                 Workshops = institution.WorkshopGroup.InitialWorkshops
@@ -3563,10 +3576,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
     #endregion
 
 
-
-
- 
-
     #region PrivateMetods
 
     /// <summary>
@@ -3611,11 +3620,8 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
     #endregion
 
 
- 
-
-
-
     //ایجاد سند مالی ماهانه
+
     #region CreateMontlyTransaction
 
     /// <summary>
@@ -3625,7 +3631,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
     public async Task CreateTransactionForInstitutionContracts(DateTime endOfMonthGr, string endOfMonthFa,
         string description)
     {
-        
         #region FindeNextMonth 1th
 
         var firstDayOfMonthGr = ($"{endOfMonthFa.Substring(0, 8)}01").ToGeorgianDateTime();
@@ -3656,7 +3661,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 SigningType = x.SigningType,
                 InstallmentList = x.Installments
                     .Select(ins => new InstitutionContractInstallmentViewModel
-                    { AmountDouble = ins.Amount, InstallmentDateGr = ins.InstallmentDateGr })
+                        { AmountDouble = ins.Amount, InstallmentDateGr = ins.InstallmentDateGr })
                     .OrderBy(ins => ins.InstallmentDateGr).Skip(1).ToList(),
             }).Where(x =>
                 x.ContractStartGr < endOfMonthGr && x.ContractEndGr >= endOfMonthGr && x.ContractAmountDouble > 0 &&
@@ -3703,7 +3708,7 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                     SigningType = x.SigningType,
                     InstallmentList = x.Installments
                         .Select(ins => new InstitutionContractInstallmentViewModel
-                        { AmountDouble = ins.Amount, InstallmentDateGr = ins.InstallmentDateGr })
+                            { AmountDouble = ins.Amount, InstallmentDateGr = ins.InstallmentDateGr })
                         .OrderBy(ins => ins.InstallmentDateGr).Skip(1).ToList(),
                 }).ToListAsync();
 
@@ -4008,8 +4013,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
     }
 
 
- 
-
     public async Task<long> GetIdByInstallmentId(long installmentId)
     {
         return await _context.InstitutionContractSet.Include(x => x.Installments)
@@ -4364,10 +4367,11 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         var creationTemp = await _institutionContractCreationTemp.Find(x => x.Id == request.TempId)
             .FirstOrDefaultAsync();
         // creationTemp.SetContractingPartyInfo(request.LegalType,request.RealParty,request.LegalParty);
-
+        bool tempCreated = false;
         if (creationTemp == null)
         {
-            throw new BadRequestException("دیتای درخواست شده نامعتبر است");
+            creationTemp = new InstitutionContractCreationTemp();
+            await _institutionContractCreationTemp.InsertOneAsync(creationTemp);
         }
 
         List<WorkshopTempViewModel> workshopDetails = [];
@@ -4445,7 +4449,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
                 Id = 0,
                 IdNumberSerial = "",
                 IdNumberSeri = "",
-
             };
             creationTemp.SetContractingPartyInfo(request.LegalType, real, legal);
         }
@@ -4462,7 +4465,8 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
         var res = new InstitutionContractCreationWorkshopsResponse()
         {
             TotalAmount = workshopDetails.Sum(x => x.WorkshopServicesAmount).ToMoney(),
-            WorkshopTemps = workshopDetails
+            WorkshopTemps = workshopDetails,
+            TempId = creationTemp.Id
         };
         return res;
     }
@@ -5109,9 +5113,11 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
 
         await SaveChangesAsync();
 
-        await _smsService.SendInstitutionCreationVerificationLink(contractingParty.Phone, contractingPartyFullName,
-            entity.PublicId, contractingParty.id, entity.id);
-
+        if (!request.CancelSendVerificationSms)
+        {
+            await _smsService.SendInstitutionCreationVerificationLink(contractingParty.Phone, contractingPartyFullName,
+                entity.PublicId, contractingParty.id, entity.id);
+        }
 
         await SaveChangesAsync();
         await transaction.CommitAsync();
@@ -5221,11 +5227,6 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
     #endregion
 
 
-
-  
-
-
-
     #region CustomViewModels
 
     public class WorkshopsAndEmployeeViewModel

CompanyManagment.EFCore/Repository/InstitutionContractSmsServiceRepository.cs

@@ -2109,11 +2109,24 @@ public class InstitutionContractSmsServiceRepository : RepositoryBase<long, Inst
             int successProcess = 1;
             int countList = smsListData.Count;
 
+            #region Test
+
+
+            //for (int i = 0; i < 100; i++)
+            //{
+            //    var percent = (successProcess / (double)countList) * 100;
+            //    await _hubContext.Clients.Group(SendSmsHub.GetGroupName(7))
+            //        .SendAsync("showStatus", (int)percent);
+            //    Thread.Sleep(1000);
+            //    successProcess += 1;
+            //}
+            #endregion
 
             foreach (var item in smsListData)
             {
                 try
                 {
+      
                     if (item.TypeOfSmsMethod == "MonthlyBill")
                     {
                         var res = await _smsService.MonthlyBill(item.PhoneNumber, item.TemplateId, item.PartyName,

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

@@ -77,6 +77,9 @@ public class SmsResultRepository : RepositoryBase<long, SmsResult>, ISmsResultRe
                 case TypeOfSmsSetting.SendInstitutionContractConfirmationCode:
                     typeOfSms = "کد تاییدیه قرارداد مالی";
                     break;
+                case TypeOfSmsSetting.SendInstitutionContractConfirmationLink:
+                    typeOfSms = "لینک تاییدیه ایجاد قرارداد مالی";
+                    break;
                 case TypeOfSmsSetting.TaskReminder:
                     typeOfSms = "یادآور وظایف";
                     break;
@@ -147,7 +150,7 @@ public class SmsResultRepository : RepositoryBase<long, SmsResult>, ISmsResultRe
 
         // مرحله 2: گروه‌بندی و انتخاب آخرین رکورد هر روز روی Client
         var grouped = rawQuery
-            .GroupBy(x => x.DateOnly)
+            .GroupBy(x => (x.DateOnly, x.TypeOfSms))
             .Select(g => g.OrderByDescending(x => x.CreationDate).First())
             .OrderByDescending(x => x.CreationDate)
             .ToList();
@@ -155,15 +158,16 @@ public class SmsResultRepository : RepositoryBase<long, SmsResult>, ISmsResultRe
         // مرحله 3: تبدیل به DTO و ToFarsi
         var result = grouped.Select(x => new SmsReportDto
         {
-            SentDate = x.CreationDate.ToFarsi()
+            SentDate = x.CreationDate.ToFarsi(),
+            TypeOfSms = x.TypeOfSms
         }).ToList();
         return result;
     }
 
 
-    public async Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date)
+    public async Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date, string typeOfSmsSetting)
     {
-        if(string.IsNullOrWhiteSpace(date))
+        if(string.IsNullOrWhiteSpace(date) || string.IsNullOrWhiteSpace(typeOfSmsSetting))
             return new List<SmsReportListDto>();
 
         if (date.TryToGeorgianDateTime(out var searchDate) == false)
@@ -198,41 +202,12 @@ public class SmsResultRepository : RepositoryBase<long, SmsResult>, ISmsResultRe
             query = query.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.TaskReminder:
-                    typeOfSms = "یادآور وظایف";
-                    break;
-            }
 
-            query = query.Where(x => x.TypeOfSms == typeOfSms).ToList();
-        }
-
-        if (searchModel.TypeOfSms == TypeOfSmsSetting.Warning)
+        if (typeOfSmsSetting.Contains("هشدار"))
         {
             query = query.Where(x => x.TypeOfSms.Contains("هشدار")).ToList();
         }
+        query = query.Where(x => x.TypeOfSms == typeOfSmsSetting).ToList();
 
         if (searchModel.SendStatus != SendStatus.All)
         {

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,6 +205,26 @@ 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)
     {
 

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,
-    ProjectTaskPriority Priority = ProjectTaskPriority.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/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,6 +349,15 @@ 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;
@@ -363,18 +372,62 @@ public class SetTimeProjectCommandHandler : IBaseCommandHandler<SetTimeProjectCo
         // تنظیم زمان اولیه
         section.UpdateInitialEstimatedHours(initialTime, initData.Description);
 
-        section.ClearAdditionalTimes();
-        // افزودن زمان‌های اضافی
-        bool hasAdditionalTime = false;
-        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);
-            hasAdditionalTime = true;
+            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;
+                }
+            }
         }
         
-        // تغییر status به Incomplete فقط اگر زمان اضافی اضافه شده باشد و در وضعیتی غیر از ReadyToStart باشد
-        if (hasAdditionalTime && section.Status != TaskSectionStatus.ReadyToStart)
+        // اعتبارسنجی بعد از اعمال تمام تغییرات
+        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)

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

@@ -10,8 +10,10 @@ public class GetProjectItemDto
     public int Percentage { get; init; }
     public ProjectHierarchyLevel Level { get; init; }
     public Guid? ParentId { get; init; }
-    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; }

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

@@ -16,7 +16,8 @@ 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)
     {
         var projects = new List<GetProjectDto>();
         var phases = new List<GetPhaseDto>();
@@ -51,13 +52,14 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
         {
             return new List<GetProjectDto>();
         }
+
         var entities = await query
             .OrderByDescending(p => p.CreationDate)
             .ToListAsync(cancellationToken);
         var result = new List<GetProjectDto>();
         foreach (var project in entities)
         {
-            var (percentage, totalTime) = await CalculateProjectPercentage(project, cancellationToken);
+            var (percentage, totalTime,remainingTime) = await CalculateProjectPercentage(project, cancellationToken);
             result.Add(new GetProjectDto
             {
                 Id = project.Id,
@@ -65,10 +67,12 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
                 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;
     }
 
@@ -79,13 +83,14 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
         {
             query = query.Where(x => x.ProjectId == parentId);
         }
+
         var entities = await query
             .OrderByDescending(p => p.CreationDate)
             .ToListAsync(cancellationToken);
         var result = new List<GetPhaseDto>();
         foreach (var phase in entities)
         {
-            var (percentage, totalTime) = await CalculatePhasePercentage(phase, cancellationToken);
+            var (percentage, totalTime,remainingTime) = await CalculatePhasePercentage(phase, cancellationToken);
             result.Add(new GetPhaseDto
             {
                 Id = phase.Id,
@@ -93,10 +98,12 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
                 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;
     }
 
@@ -107,6 +114,7 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
         {
             query = query.Where(x => x.PhaseId == parentId);
         }
+
         var entities = await query
             .OrderByDescending(t => t.CreationDate)
             .ToListAsync(cancellationToken);
@@ -118,7 +126,7 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
 
         foreach (var task in entities)
         {
-            var (percentage, totalTime) = await CalculateTaskPercentage(task, cancellationToken);
+            var (percentage, totalTime,remainingTime) = await CalculateTaskPercentage(task, cancellationToken);
             var sections = await _context.TaskSections
                 .Include(s => s.Activities)
                 .Include(s => s.Skill)
@@ -140,13 +148,12 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
 
             // محاسبه SpentTime و RemainingTime
             var spentTime = TimeSpan.FromTicks(sections.Sum(s => s.Activities.Sum(a => a.GetTimeSpent().Ticks)));
-            var remainingTime = totalTime - spentTime;
 
             // ساخت section DTOs برای تمام Skills
             var sectionDtos = allSkills.Select(skill =>
             {
                 var section = sections.FirstOrDefault(s => s.SkillId == skill.Id);
-                
+
                 if (section == null)
                 {
                     // اگر section وجود نداشت، یک DTO با وضعیت Unassigned برمی‌گردانیم
@@ -184,18 +191,20 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
                 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<TItem>(List<TItem> items, CancellationToken cancellationToken) where TItem : GetProjectItemDto
+    private async Task SetSkillFlags<TItem>(List<TItem> items, CancellationToken cancellationToken)
+        where TItem : GetProjectItemDto
     {
         if (!items.Any())
             return;
@@ -213,124 +222,139 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
     }
 
 
-    private async Task SetSkillFlagsForProjects<TItem>(List<TItem> items, List<Guid> projectIds, CancellationToken cancellationToken) where TItem : GetProjectItemDto
+    private async Task SetSkillFlagsForProjects<TItem>(List<TItem> items, List<Guid> projectIds,
+        CancellationToken cancellationToken) where TItem : GetProjectItemDto
     {
         // For projects: gather all phases, then tasks, then sections
         var phases = await _context.ProjectPhases
             .Where(ph => projectIds.Contains(ph.ProjectId))
-            .Select(ph => ph.Id)
+            .Select(ph => new { ph.Id, ph.ProjectId })
             .ToListAsync(cancellationToken);
+        var phaseIds = phases.Select(ph => ph.Id).ToList();
         var tasks = await _context.ProjectTasks
-            .Where(t => phases.Contains(t.PhaseId))
-            .Select(t => t.Id)
+            .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 => tasks.Contains(s.TaskId))
+            .Where(s => taskIds.Contains(s.TaskId))
             .ToListAsync(cancellationToken);
 
+        // Convert to tuple list for AggregatePhaseStatuses
+        var tasksList = tasks.Select(t => (t.Id, t.PhaseId)).ToList();
+
         foreach (var item in items)
         {
-            var relatedPhases = phases; // used for filtering tasks by project
-            var relatedTasks = await _context.ProjectTasks
-                .Where(t => t.PhaseId != Guid.Empty && relatedPhases.Contains(t.PhaseId))
-                .Select(t => t.Id)
-                .ToListAsync(cancellationToken);
-            var itemSections = sections.Where(s => relatedTasks.Contains(s.TaskId));
-            item.Backend = GetAssignmentStatus(itemSections.FirstOrDefault(x => x.Skill?.Name == "Backend"));
-            item.Front = GetAssignmentStatus(itemSections.FirstOrDefault(x => x.Skill?.Name == "Frontend"));
-            item.Design = GetAssignmentStatus(itemSections.FirstOrDefault(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 SetSkillFlagsForPhases<TItem>(List<TItem> items, List<Guid> phaseIds, CancellationToken cancellationToken) where TItem : GetProjectItemDto
+    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 => t.Id)
+            .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 => tasks.Contains(s.TaskId))
+            .Where(s => taskIds.Contains(s.TaskId))
             .ToListAsync(cancellationToken);
 
         foreach (var item in items)
         {
-            // Filter tasks for this phase
-            var phaseTaskIds = await _context.ProjectTasks
-                .Where(t => t.PhaseId == item.Id)
-                .Select(t => t.Id)
-                .ToListAsync(cancellationToken);
+            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 = GetAssignmentStatus(itemSections.FirstOrDefault(x => x.Skill?.Name == "Backend"));
-            item.Front = GetAssignmentStatus(itemSections.FirstOrDefault(x => x.Skill?.Name == "Frontend"));
-            item.Design = GetAssignmentStatus(itemSections.FirstOrDefault(x => x.Skill?.Name == "UI/UX Design"));
+
+            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)> CalculateProjectPercentage(Project project, CancellationToken cancellationToken)
+    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)
     {
         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)
     {
-        return ((int)section.GetProgressPercentage(),section.FinalEstimatedHours);
+        return ((int)section.GetProgressPercentage(), section.FinalEstimatedHours);
     }
 
     private static AssignmentStatus GetAssignmentStatus(TaskSection? section)
@@ -341,7 +365,7 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
 
         // بررسی وجود user
         bool hasUser = section.CurrentAssignedUserId > 0;
-        
+
         // بررسی وجود time (InitialEstimatedHours بزرگتر از صفر باشد)
         bool hasTime = section.InitialEstimatedHours > TimeSpan.Zero;
 
@@ -356,5 +380,57 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
         // تعیین تکلیف نشده: نه 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/GetTaskListDto.cs

@@ -9,8 +9,8 @@ public class GetTaskDto
     public int Percentage { get; init; }
     public ProjectHierarchyLevel Level { get; init; }
     public Guid? ParentId { get; init; }
-    public int TotalHours { get; set; }
-    public int Minutes { get; set; }
+    
+    public TimeSpan TotalTime { get; set; }
     
     // Task-specific fields
     public TimeSpan SpentTime { get; init; }

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

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

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

@@ -46,11 +46,11 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
             queryable = queryable.Where(x => x.CurrentAssignedUserId == request.UserId);
         }
 
-        if (!string.IsNullOrWhiteSpace(request.SearchText))
+        if (!string.IsNullOrWhiteSpace(request.ProjectName))
         {
-            queryable = queryable.Where(x=>x.Task.Name.Contains(request.SearchText)
-            || x.Task.Phase.Name.Contains(request.SearchText)
-            || x.Task.Phase.Project.Name.Contains(request.SearchText));
+            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);
@@ -70,6 +70,9 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
             .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 کردن نتیجه

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

@@ -70,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,

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/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 = ProjectTaskPriority.Low;
+        Priority = priority;
         AddDomainEvent(new TaskCreatedEvent(Id, phaseId, name));
     }
     

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

@@ -26,4 +26,15 @@ public class TaskSectionAdditionalTime : EntityBase<Guid>
     {
         Reason = reason;
     }
+
+    public void Update(TimeSpan hours, string? reason = null)
+    {
+        Hours = hours;
+        Reason = reason;
+    }
+
+    public bool HasChanged(TimeSpan newHours, string? newReason)
+    {
+        return Hours != newHours || Reason != newReason;
+    }
 }

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/DependencyInjection.cs

@@ -92,6 +92,7 @@ public static class DependencyInjection
         // File Storage Services
         services.AddScoped<IFileStorageService, Services.FileManagement.LocalFileStorageService>();
         services.AddScoped<IThumbnailGeneratorService, Services.FileManagement.ThumbnailGeneratorService>();
+        services.AddScoped<IFileUploadService, Services.FileManagement.FileUploadService>();
 
         // JWT Settings
         services.Configure<JwtSettings>(configuration.GetSection("JwtSettings"));

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Services/FileManagement/FileUploadService.cs

@@ -0,0 +1,231 @@
+using GozareshgirProgramManager.Application.Services.FileManagement;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Repositories;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+
+namespace GozareshgirProgramManager.Infrastructure.Services.FileManagement;
+
+/// <summary>
+/// پیاده‌سازی سرویس آپلود کامل فایل
+/// </summary>
+public class FileUploadService : IFileUploadService
+{
+    private readonly IUploadedFileRepository _fileRepository;
+    private readonly IFileStorageService _fileStorageService;
+    private readonly IThumbnailGeneratorService _thumbnailService;
+    private readonly ILogger<FileUploadService> _logger;
+
+    public FileUploadService(
+        IUploadedFileRepository fileRepository,
+        IFileStorageService fileStorageService,
+        IThumbnailGeneratorService thumbnailService,
+        ILogger<FileUploadService> logger)
+    {
+        _fileRepository = fileRepository;
+        _fileStorageService = fileStorageService;
+        _thumbnailService = thumbnailService;
+        _logger = logger;
+    }
+
+    public async Task<FileUploadResult> UploadFileAsync(
+        IFormFile file,
+        FileCategory category,
+        long uploadedByUserId,
+        long maxFileSizeBytes = 100 * 1024 * 1024)
+    {
+        try
+        {
+            // اعتبارسنجی ورودی
+            if (file.Length == 0)
+            {
+                return FileUploadResult.Failed("فایل خالی است");
+            }
+
+            if (file.Length > maxFileSizeBytes)
+            {
+                var maxSizeMb = maxFileSizeBytes / (1024 * 1024);
+                return FileUploadResult.Failed($"حجم فایل بیش از حد مجاز است (حداکثر {maxSizeMb}MB)");
+            }
+
+            using var stream = file.OpenReadStream();
+            return await UploadFileFromStreamAsync(
+                stream,
+                file.FileName,
+                file.ContentType,
+                category,
+                uploadedByUserId,
+                maxFileSizeBytes);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "خطا در آپلود فایل {FileName}", file.FileName);
+            return FileUploadResult.Failed($"خطا در آپلود فایل: {ex.Message}");
+        }
+    }
+
+    public async Task<FileUploadResult> UploadFileFromStreamAsync(
+        Stream fileStream,
+        string fileName,
+        string contentType,
+        FileCategory category,
+        long uploadedByUserId,
+        long maxFileSizeBytes = 100 * 1024 * 1024)
+    {
+        UploadedFile? uploadedFile = null;
+
+        try
+        {
+            // تشخیص نوع فایل
+            var fileType = DetectFileType(contentType, Path.GetExtension(fileName));
+
+            // ایجاد رکورد فایل در دیتابیس
+            uploadedFile = new UploadedFile(
+                originalFileName: fileName,
+                fileSizeBytes: fileStream.Length,
+                mimeType: contentType,
+                fileType: fileType,
+                category: category,
+                uploadedByUserId: uploadedByUserId,
+                storageProvider: StorageProvider.LocalFileSystem
+            );
+
+            await _fileRepository.AddAsync(uploadedFile);
+            await _fileRepository.SaveChangesAsync();
+
+            // آپلود فایل به استوریج
+            var categoryFolder = category.ToString();
+            var uploadResult = await _fileStorageService.UploadAsync(
+                fileStream,
+                uploadedFile.UniqueFileName,
+                categoryFolder
+            );
+
+            // به‌روزرسانی اطلاعات آپلود
+            uploadedFile.CompleteUpload(uploadResult.StoragePath, uploadResult.StorageUrl);
+
+            // پردازش‌های خاص بر اساس نوع فایل
+            string? thumbnailUrl = null;
+            if (fileType == FileType.Image)
+            {
+                thumbnailUrl = await ProcessImageAsync(uploadedFile, uploadResult.StoragePath, categoryFolder);
+            }
+            else if (fileType == FileType.Video)
+            {
+                thumbnailUrl = await ProcessVideoAsync(uploadedFile, uploadResult.StoragePath, categoryFolder);
+            }
+
+            // ذخیره تغییرات نهایی
+            await _fileRepository.UpdateAsync(uploadedFile);
+            await _fileRepository.SaveChangesAsync();
+
+            _logger.LogInformation(
+                "فایل {FileName} با شناسه {FileId} با موفقیت آپلود شد",
+                fileName,
+                uploadedFile.Id);
+
+            return FileUploadResult.Success(uploadedFile.Id, uploadResult.StorageUrl, thumbnailUrl);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "خطا در آپلود فایل {FileName}", fileName);
+
+            // در صورت خطا، فایل آپلود شده را حذف کنیم
+            if (uploadedFile != null)
+            {
+                try
+                {
+                    await _fileRepository.DeleteAsync(uploadedFile);
+                    await _fileRepository.SaveChangesAsync();
+                }
+                catch (Exception deleteEx)
+                {
+                    _logger.LogError(deleteEx, "خطا در حذف فایل ناموفق {FileId}", uploadedFile.Id);
+                }
+            }
+
+            return FileUploadResult.Failed($"خطا در آپلود فایل: {ex.Message}");
+        }
+    }
+
+    /// <summary>
+    /// پردازش تصویر (ابعاد و thumbnail)
+    /// </summary>
+    private async Task<string?> ProcessImageAsync(UploadedFile file, string storagePath, string categoryFolder)
+    {
+        try
+        {
+            // دریافت ابعاد تصویر
+            var dimensions = await _thumbnailService.GetImageDimensionsAsync(storagePath);
+            if (dimensions.HasValue)
+            {
+                file.SetImageDimensions(dimensions.Value.Width, dimensions.Value.Height);
+            }
+
+            // تولید thumbnail
+            var thumbnail = await _thumbnailService.GenerateImageThumbnailAsync(
+                storagePath,
+                category: categoryFolder);
+
+            if (thumbnail.HasValue)
+            {
+                file.SetThumbnail(thumbnail.Value.ThumbnailUrl);
+                return thumbnail.Value.ThumbnailUrl;
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "خطا در پردازش تصویر {FileId}", file.Id);
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// پردازش ویدیو (thumbnail)
+    /// </summary>
+    private async Task<string?> ProcessVideoAsync(UploadedFile file, string storagePath, string categoryFolder)
+    {
+        try
+        {
+            // تولید thumbnail از ویدیو
+            var thumbnail = await _thumbnailService.GenerateVideoThumbnailAsync(
+                storagePath,
+                category: categoryFolder);
+
+            if (thumbnail.HasValue)
+            {
+                file.SetThumbnail(thumbnail.Value.ThumbnailUrl);
+                return thumbnail.Value.ThumbnailUrl;
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "خطا در پردازش ویدیو {FileId}", file.Id);
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// تشخیص نوع فایل از روی MIME type و extension
+    /// </summary>
+    private FileType DetectFileType(string mimeType, string extension)
+    {
+        if (mimeType.StartsWith("image/", StringComparison.OrdinalIgnoreCase))
+            return FileType.Image;
+
+        if (mimeType.StartsWith("video/", StringComparison.OrdinalIgnoreCase))
+            return FileType.Video;
+
+        if (mimeType.StartsWith("audio/", StringComparison.OrdinalIgnoreCase))
+            return FileType.Audio;
+
+        if (new[] { ".zip", ".rar", ".7z", ".tar", ".gz" }.Contains(extension.ToLower()))
+            return FileType.Archive;
+
+        return FileType.Document;
+    }
+}
+

ServiceHost/Areas/Admin/Controllers/SmsReportController.cs

@@ -1,4 +1,7 @@
-using _0_Framework.Application.Sms;
+using _0_Framework.Application;
+using _0_Framework.Application.Enums;
+using _0_Framework.Application.Sms;
+using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.SmsResult;
 using CompanyManagment.App.Contracts.SmsResult.Dto;
 using Microsoft.AspNetCore.Mvc;
@@ -9,12 +12,14 @@ namespace ServiceHost.Areas.Admin.Controllers;
 public class SmsReportController : AdminBaseController
 {
     private readonly ISmsResultApplication _smsResultApplication;
+    private readonly ISmsSettingApplication _smsSettingApplication;
     private readonly ISmsService _smsService;
 
-    public SmsReportController(ISmsResultApplication smsResultApplication, ISmsService smsService)
+    public SmsReportController(ISmsResultApplication smsResultApplication, ISmsService smsService, ISmsSettingApplication smsSettingApplication)
     {
         _smsResultApplication = smsResultApplication;
         _smsService = smsService;
+        _smsSettingApplication = smsSettingApplication;
     }
 
     /// <summary>
@@ -35,11 +40,25 @@ public class SmsReportController : AdminBaseController
     /// </summary>
     /// <param name="searchModel"></param>
     /// <param name="date"></param>
+    /// <param name="typeOfSmsSetting"></param>
     /// <returns></returns>
     [HttpGet("GetExpandedList")]
-    public async Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date)
+    public async Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date, string typeOfSmsSetting)
     {
-        var result =await _smsResultApplication.GetSmsReportExpandList(searchModel, date);
+        var result =await _smsResultApplication.GetSmsReportExpandList(searchModel, date, typeOfSmsSetting);
+        return result;
+    }
+
+    /// <summary>
+    /// دریافت جزئیات پیامک
+    /// </summary>
+    /// <param name="messId"></param>
+    /// <param name="fullName"></param>
+    /// <returns></returns>
+    [HttpGet("GetSmsDetails")]
+    public async Task<SmsDetailsDto> GetSmsDetails(int messId, string fullName)
+    {
+        var result =await _smsService.GetSmsDetailsByMessageId(messId, fullName);
         return result;
     }
 
@@ -56,4 +75,207 @@ public class SmsReportController : AdminBaseController
         return result;
     }
 
+    //تنظیمات پیامک خودکار
+    #region SmsSettings
+    
+    /// <summary>
+    /// لیست تنظیمات پیامک - یادآور
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("ReminderSmsSettingList")]
+    public async Task<List<SmsSettingDto>> ReminderSmsSettingList()
+    {
+        var result = await _smsSettingApplication.GetSmsSettingList(TypeOfSmsSetting.InstitutionContractDebtReminder);
+        return result;
+    }
+
+
+    /// <summary>
+    /// لیست تنظیمات پیامک - مسدودی
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("BlockSmsSettingList")]
+    public async Task<List<SmsSettingDto>> BlockSmsSettingList()
+    {
+        var result = await _smsSettingApplication.GetSmsSettingList(TypeOfSmsSetting.BlockContractingParty);
+        return result;
+    }
+
+    /// <summary>
+    /// لیست تنظیمات پیامک - هشدار قضایی
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("WarningSmsSettingList")]
+    public async Task<List<SmsSettingDto>> WarningSmsSettingList()
+    {
+        var result = await _smsSettingApplication.GetSmsSettingList(TypeOfSmsSetting.Warning);
+        return result;
+    }
+
+
+    /// <summary>
+    /// لیست تنظیمات پیامک - اقدام قضایی
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("LegalActionSmsSettingList")]
+    public async Task<List<SmsSettingDto>> LegalActionSmsSettingList()
+    {
+        var result = await _smsSettingApplication.GetSmsSettingList(TypeOfSmsSetting.LegalAction);
+        return result;
+    }
+
+    /// <summary>
+    /// لیست تنظیمات پیامک - تایید قراداد مالی
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("ContractConfirmSmsSettingList")]
+    public async Task<List<SmsSettingDto>> ContractConfirmSmsSettingList()
+    {
+        var result = await _smsSettingApplication.GetSmsSettingList(TypeOfSmsSetting.InstitutionContractConfirm);
+        return result;
+    }
+
+    //=====================Create=========================
+
+    /// <summary>
+    /// ایجاد پیامک یادآور
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("CreateReminderSmsSetting")]
+    public async Task<ActionResult<OperationResult>> CreateReminderSmsSetting([FromBody] CreateSmsSettingDto command)
+    {
+        var result = await _smsSettingApplication.CreateSmsSetting(command.DayOfMonth, command.TimeOfDayDisplay, TypeOfSmsSetting.InstitutionContractDebtReminder);
+        return result;
+    }
+
+    /// <summary>
+    /// ایجاد پیامک مسدودی
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("CreateBlockSmsSetting")]
+    public async Task<ActionResult<OperationResult>> CreateBlockSmsSetting([FromBody] CreateSmsSettingDto command)
+    {
+        var result = await _smsSettingApplication.CreateSmsSetting(command.DayOfMonth, command.TimeOfDayDisplay, TypeOfSmsSetting.BlockContractingParty);
+        return result;
+    }
+
+    /// <summary>
+    /// ایجاد پیامک هشدار قضایی
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("CreateWarningSmsSetting")]
+    public async Task<ActionResult<OperationResult>> CreateWarningSmsSetting([FromBody] CreateSmsSettingDto command)
+    {
+        var result = await _smsSettingApplication.CreateSmsSetting(command.DayOfMonth, command.TimeOfDayDisplay, TypeOfSmsSetting.Warning);
+        return result;
+    }
+
+
+    /// <summary>
+    /// ایجاد پیامک اقدام قضایی
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("CreateLegalActionSmsSetting")]
+    public async Task<ActionResult<OperationResult>> CreateLegalActionSmsSetting([FromBody] CreateSmsSettingDto command)
+    {
+        var result = await _smsSettingApplication.CreateSmsSetting(command.DayOfMonth, command.TimeOfDayDisplay, TypeOfSmsSetting.LegalAction);
+        return result;
+    }
+
+
+    /// <summary>
+    /// ایجاد پیامک تایید قرارداد مالی
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("CreateContractConfirmSmsSetting")]
+    public async Task<ActionResult<OperationResult>> CreateContractConfirmSmsSetting([FromBody] CreateSmsSettingDto command)
+    {
+        var result = await _smsSettingApplication.CreateSmsSetting(command.DayOfMonth, command.TimeOfDayDisplay, TypeOfSmsSetting.InstitutionContractConfirm);
+        return result;
+    }
+    //=====================Edit=========================
+
+    /// <summary>
+    /// دریافت اطلاعات ویرایش تنظیمات پیامک
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpGet("GetEditData")]
+    public async Task<SmsSettingDto> GetEditData(long id)
+    {
+        return await _smsSettingApplication.GetSmsSettingDataToEdit(id);
+    }
+
+    /// <summary>
+    /// ویرایش تنظیمات پیامک
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    [HttpPut("EditSmsSetting")]
+    public async Task<ActionResult<OperationResult>> EditSmsSetting([FromBody] SmsSettingDto command)
+    {
+        var result =await _smsSettingApplication.EditSmsSetting(command);
+        return result;
+    }
+
+    //=====================Remove=========================
+
+    /// <summary>
+    /// حذف تنظیمات پیامک
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpDelete]
+    public async Task<ActionResult<OperationResult>> RemoveSmsSetting(long id)
+    {
+         await _smsSettingApplication.RemoveSetting(id);
+         return Ok(new OperationResult().Succcedded());
+    }
+
+    /// <summary>
+    /// دریافت لیست ارسال آنی یادآور
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("GetInstantReminderSmsListData")]
+    public async Task<List<InstantReminderSendSms>> GetInstantReminderSmsListData()
+    {
+        var result =await _smsSettingApplication.GetInstantReminderSmsListData(TypeOfSmsSetting.InstitutionContractDebtReminder);
+        return result;
+    }
+
+    /// <summary>
+    /// دریافت لیست ارسال آنی مسدودی
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("GetInstantBlockSmsListData")]
+    public async Task<List<InstantReminderSendSms>> GetInstantBlockSmsListData()
+    {
+        var result = await _smsSettingApplication.GetInstantReminderSmsListData(TypeOfSmsSetting.BlockContractingParty);
+        return result;
+    }
+
+    /// <summary>
+    /// ارسال پیامک آنی یادآور
+    /// </summary>
+    /// <param name="phoneNumbers"></param>
+    /// <returns></returns>
+    [HttpPost("InstantReminderSmsSend")]
+    public async Task<ActionResult<OperationResult>> InstantReminderSmsSend([FromBody] List<string> phoneNumbers)
+    {
+        var result = await _smsSettingApplication.InstantSmsSendApi(TypeOfSmsSetting.InstitutionContractDebtReminder, phoneNumbers);
+        return result;
+    }
+
+    /// <summary>
+    /// ارسال پیامک آنی مسدودی
+    /// </summary>
+    /// <param name="phoneNumbers"></param>
+    /// <returns></returns>
+    [HttpPost("InstantBlockSmsSend")]
+    public async Task<ActionResult<OperationResult>> InstantBlockSmsSend([FromBody] List<string> phoneNumbers)
+    {
+        var result = await _smsSettingApplication.InstantSmsSendApi(TypeOfSmsSetting.BlockContractingParty, phoneNumbers);
+        return result;
+    }
+    #endregion
 }

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

@@ -1216,10 +1216,31 @@
                                     <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
                                         <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
                                     </label>
-									<label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990111" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد بخش فرعی </span> </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990111" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد بخش فرعی </span> </label>
 
                                   
                                 </div>
+								
+                                <!-- اولویت بندی-->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990112" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> اولویت بندی </span> </label>
+
+                                  
+                                </div>
+								
+                                <!-- ایجاد تسک باگ-->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990113" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد تسک باگ </span> </label>
+
+                                  
+                                </div>
+
                             </div>
                            
                             <!--=================================================-->
@@ -1310,8 +1331,28 @@
 
 									
                                 </div>
-                            </div>
+								
+                                <!-- تایید یا رد اتمام اجرا -->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990209" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative">  تایید یا رد اتمام اجرا </span> </label>
 
+									
+                                </div>
+
+                            </div>
+                            <!--=================================================-->
+                            <!--#### کارپوشه ####-->
+                            <div class="child-check level2">
+                                <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                    <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                </label>
+                                <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="9903" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> کارپوشه </span> </label>
+                                <!-----------------------Sub Menu------------------->
+                          
+                            </div>
 							
 						</div>
 						

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

@@ -1202,15 +1202,35 @@
 
 
 								<!-- ایجاد بخش فرعی -->
-								<div class="child-check level3">
-									<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
-										<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
-									</label>
-									<label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990111" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد بخش فرعی </span> </label>
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990111" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد بخش فرعی </span> </label>
 
 
-								</div>
-							</div>
+                                </div>
+								
+                                <!-- اولویت بندی-->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990112" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> اولویت بندی </span> </label>
+
+                                  
+                                </div>
+								
+                                <!-- ایجاد تسک باگ-->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990113" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد تسک باگ </span> </label>
+
+                                  
+                                </div>
+                            </div>
 
 							<!--=================================================-->
 							<!--#### تب اجرا ####-->
@@ -1292,17 +1312,36 @@
 								</div>
 
 								<!-- چت -->
-								<div class="child-check level3">
-									<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
-										<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
-									</label>
-									<label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990208" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative">  چت </span> </label>
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990208" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative">  چت </span> </label>
 
 
-								</div>
+                                </div>
+								
+                                <!-- تایید یا رد اتمام اجرا -->
+                                <div class="child-check level3">
+                                    <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                                        <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+                                    </label>
+                                    <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="990209" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative">  تایید یا رد اتمام اجرا </span> </label>
+
+									
+                                </div>
+                            </div>
+							<!--=================================================-->
+							<!--#### کارپوشه ####-->
+							<div class="child-check level2">
+								<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+									<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn" />
+								</label>
+								<label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="9903" class="check-btn" data-pm=""> &nbsp;<span style="bottom: 2px;position: relative"> کارپوشه </span> </label>
+								<!-----------------------Sub Menu------------------->
+                          
 							</div>
 
-
 						</div>
 
 </fieldset>

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

@@ -794,13 +794,19 @@ public class IndexModel : PageModel
                 watch.Stop();
             #endregion
 
-
-
+            var firstContract = _contractApplication.GetDetails(ContractsId[0]);
+            var workshop = _workshopApplication.GetDetails(firstContract.WorkshopIds);
+          
             //int i = 0;
             foreach (var item in ContractsId)
             {
                 var contract = _contractApplication.GetDetails(item);
-                
+
+                //=============== استثنا علی خادم دهقان - میز اداری پویا========
+                if (workshop.Id == 482 && contract.EmployeeId == 7175)
+                    workshop.IsOldContract = false;
+                //==============================================================
+
                 //var workingHours = _workingHoursApplication.GetByContractId(contract.Id);
                 var workingHours = _workingHoursTempApplication.GetByContractIdConvertToShiftwork4(contract.Id);
                 var separation = _contractApplication.contractSeparation(ConvertYear, ConvertMonth,
@@ -809,7 +815,7 @@ public class IndexModel : PageModel
                 if (separation.checker)
                 {
                     //workshopInfo
-                    var workshop = _workshopApplication.GetDetails(contract.WorkshopIds);
+                  
 
                     var employeeOptions =
                         _employeeComputeOptionsApplication.GetAllByWorkshopId(contract.WorkshopIds);
@@ -1212,7 +1218,7 @@ public class IndexModel : PageModel
 
                         #endregion
 
-
+                        RewardPayCompute = workshop.RewardComputeOnCheckout,
 
                     };
                     _checkoutApplication.Create(command);

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

@@ -190,7 +190,7 @@
                                     بانک ها </a>
                             </li>
                             <li permission="314">
-                                <a class="clik3" asp-page="/Company/SmsResult/Index">
+                                <a class="clik3" href="https://admin@(AppSetting.Value.Domain)/automatic-sms-reporting">
                                     <svg width="13" height="13" viewBox="0 0 13 13" fill="none" xmlns="http://www.w3.org/2000/svg" style="width: 7px;margin: 0 6px;">
                                         <circle cx="6.5" cy="6.5" r="6.5" fill="white"/>
                                     </svg>

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

@@ -253,7 +253,7 @@
                                         بانک ها </a>
                                 </li>
                                 <li permission="314">
-                                    <a class="clik3" asp-area="Admin" asp-page="/Company/SmsResult/Index">
+                                <a class="clik3" href="https://admin@(AppSetting.Value.Domain)/automatic-sms-reporting">
                                         <svg width="13" height="13" viewBox="0 0 13 13" fill="none" xmlns="http://www.w3.org/2000/svg" style="width: 7px;margin: 0 6px;">
                                             <circle cx="6.5" cy="6.5" r="6.5" fill="white" />
                                         </svg>

ServiceHost/Areas/Client/Controllers/LoanController.cs

@@ -0,0 +1,59 @@
+using _0_Framework.Application;
+using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
+using CompanyManagment.App.Contracts.Loan;
+using Microsoft.AspNetCore.Mvc;
+using ServiceHost.BaseControllers;
+
+namespace ServiceHost.Areas.Client.Controllers;
+
+public class LoanController: ClientBaseController
+{
+    private readonly ILoanApplication _loanApplication;
+    private readonly long _workshopId;
+
+    public LoanController(ILoanApplication loanApplication, IAuthHelper authHelper)
+    {
+        _loanApplication = loanApplication;
+        _workshopId= authHelper.GetWorkshopId();
+    }
+    [HttpGet]
+    public ActionResult<LoanGroupedViewModel> GetList(LoanSearchViewModel searchModel)
+    {
+        searchModel.WorkshopId = _workshopId;
+        var loans = _loanApplication.GetSearchListAsGrouped(searchModel);
+        return loans;
+    }
+    
+    [HttpGet("{id}")]
+    public async Task<ActionResult<LoanDetailsViewModel>> GetDetails(long id)
+    {
+        var loan = await _loanApplication.GetDetails(id);
+        return loan;
+    }
+
+    [HttpPost]
+    public ActionResult<OperationResult> Create([FromBody] CreateLoanViewModel command)
+    {
+        var result = _loanApplication.Create(command);
+        return result;
+    }
+
+    [HttpGet("create/installments")]
+    public ActionResult<List<LoanInstallmentViewModel>> CalculateLoanInstallment(string amount,
+        int installmentCount, string loanStartDate, bool getRounded)
+    {
+        var installments =
+            _loanApplication.CalculateLoanInstallment(amount, installmentCount, loanStartDate, getRounded);
+        return installments;
+    }
+
+    [HttpDelete("{id}")]
+    public ActionResult<OperationResult> Remove(long id)
+    {
+        var result = _loanApplication.Remove(id);
+        return result;
+    }
+    
+    
+
+}

ServiceHost/Areas/Client/Controllers/RollCall/RollCallCaseHistoryController.cs

@@ -0,0 +1,200 @@
+using _0_Framework.Application;
+using CompanyManagement.Infrastructure.Excel.RollCall;
+using CompanyManagment.App.Contracts.RollCall;
+using CompanyManagment.App.Contracts.RollCallEmployee;
+using CompanyManagment.App.Contracts.Workshop;
+using Microsoft.AspNetCore.Mvc;
+using ServiceHost.BaseControllers;
+
+namespace ServiceHost.Areas.Client.Controllers.RollCall;
+
+public class RollCallCaseHistoryController : ClientBaseController
+{
+    private readonly IRollCallApplication _rollCallApplication;
+    private readonly long _workshopId;
+    private readonly IWorkshopApplication _workshopApplication;
+    private readonly IRollCallEmployeeApplication _rollCallEmployeeApplication;
+    public RollCallCaseHistoryController(IRollCallApplication rollCallApplication,
+        IAuthHelper authHelper, IWorkshopApplication workshopApplication,
+        IRollCallEmployeeApplication rollCallEmployeeApplication)
+    {
+        _rollCallApplication = rollCallApplication;
+        _workshopApplication = workshopApplication;
+        _rollCallEmployeeApplication = rollCallEmployeeApplication;
+        _workshopId = authHelper.GetWorkshopId();
+    }
+
+    [HttpGet]
+    public async Task<ActionResult<PagedResult<RollCallCaseHistoryTitleDto>>> GetTitles(
+        RollCallCaseHistorySearchModel searchModel)
+    {
+        return await _rollCallApplication.GetCaseHistoryTitles(_workshopId, searchModel);
+    }
+
+    [HttpGet("details")]
+    public async Task<ActionResult<List<RollCallCaseHistoryDetail>>> GetDetails(string titleId,
+        RollCallCaseHistorySearchModel searchModel)
+    {
+        return await _rollCallApplication.GetCaseHistoryDetails(_workshopId, titleId, searchModel);
+    }
+
+    /// <summary>
+    /// ایجاد و ویرایش
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    [HttpPost]
+    public ActionResult<OperationResult> Upsert(CreateOrEditEmployeeRollCall command)
+    {
+        command.WorkshopId = _workshopId;
+        return _rollCallApplication.ManualEdit(command);
+    }
+
+    [HttpGet("print")]
+    public async Task<ActionResult<List<RollCallCaseHistoryDetail>>> GetPrintDetails(string titleId,
+        RollCallCaseHistorySearchModel searchModel)
+    {
+        return await _rollCallApplication.GetCaseHistoryDetails(_workshopId, titleId, searchModel);
+    }
+    
+    [HttpGet("total-working")]
+    public ActionResult<OperationResult<string>> OnGetTotalWorking(
+        string startDate, 
+        string startTime, 
+        string endDate, 
+        string endTime)
+    {
+        var op = new OperationResult<string>();
+        const string emptyValue = "-";
+    
+        if (!TryParseDateTime(startDate, startTime, out var start) || 
+            !TryParseDateTime(endDate, endTime, out var end))
+        {
+            return op.Succcedded(emptyValue);
+        }
+
+        if (start >= end)
+        {
+            return op.Succcedded(emptyValue);
+        }
+
+        var duration = (end - start).ToFarsiHoursAndMinutes(emptyValue);
+        return op.Succcedded(duration);
+    }
+    
+
+
+    [HttpGet("excel")]
+    public async Task<IActionResult> GetDownload(string titleId, RollCallCaseHistorySearchModel searchModel)
+    {
+        var res =await _rollCallApplication.DownloadCaseHistoryExcel(_workshopId, titleId, searchModel);
+        
+        return File(res.Bytes,
+            res.MimeType,
+            res.FileName);
+    
+    }
+
+    [HttpGet("edit")]
+    public ActionResult<EditRollCallDetailsResult> GetEditDetails(string date, long employeeId)
+    {
+        var result = _rollCallApplication.GetWorkshopEmployeeRollCallsForDate(_workshopId, employeeId, date);
+        //var dates = _rollCallApplication.GetEditableDatesForManualEdit(date.ToGeorgianDateTime());
+        var name = _rollCallEmployeeApplication.GetByEmployeeIdAndWorkshopId(employeeId, _workshopId);
+        
+        var total = new TimeSpan(result.Sum(x =>
+            (x.EndDate!.Value.Ticks - x.StartDate!.Value.Ticks)));
+        
+        var res = new EditRollCallDetailsResult()
+        {
+            EmployeeFullName = name.EmployeeFullName,
+            EmployeeId = employeeId,
+            DateFa = date,
+            //EditableDates = dates,
+            Records = result.Select(x=>new EmployeeRollCallRecord()
+            {
+                Date = x.DateGr,
+                EndDate = x.EndDateFa,
+                EndTime = x.EndTimeString,
+                RollCallId = x.Id,
+                StartDate = x.StartDateFa,
+                StartTime = x.StartTimeString
+            }).ToList(),
+            TotalRollCallsDuration = total.ToFarsiHoursAndMinutes("-")
+        };
+
+        return res;
+    }
+    [HttpPost("edit")]
+    public ActionResult<OperationResult> Edit(CreateOrEditEmployeeRollCall command)
+    {
+        command.WorkshopId = _workshopId;
+        var result = _rollCallApplication.ManualEdit(command);
+        return result;
+    }
+    [HttpDelete("delete")]
+    public IActionResult OnPostRemoveEmployeeRollCallsInDate(RemoveEmployeeRollCallRequest request)
+    {
+        var result = _rollCallApplication.RemoveEmployeeRollCallsInDate(_workshopId, request.EmployeeId, request.Date);
+
+        return new JsonResult(new
+        {
+            success = result.IsSuccedded,
+            message = result.Message,
+        });
+    }
+    
+    // [HttpGet("edit")]
+    // public ActionResult<> GetEditDetails(string date,long employeeId)
+    // {
+    //     var result = _rollCallApplication.GetWorkshopEmployeeRollCallsForDate(_workshopId, employeeId, date);
+    //     //var dates = _rollCallApplication.GetEditableDatesForManualEdit(date.ToGeorgianDateTime());
+    //     var name = _rollCallEmployeeApplication.GetByEmployeeIdAndWorkshopId(employeeId, _workshopId);
+    //
+    //     var total = new TimeSpan(result.Sum(x =>
+    //         (x.EndDate!.Value.Ticks - x.StartDate!.Value.Ticks)));
+    //
+    //     var command = new EmployeeRollCallsViewModel()
+    //     {
+    //         EmployeeFullName = name.EmployeeFullName,
+    //         EmployeeId = employeeId,
+    //         DateFa = date,
+    //         //EditableDates = dates,
+    //         RollCalls = result,
+    //         TotalRollCallsDuration = total.ToFarsiHoursAndMinutes("-")
+    //     };
+    // }
+    
+    
+    private static bool TryParseDateTime(string date, string time, out DateTime result)
+    {
+        result = default;
+    
+        try
+        {
+            var dateTime = date.ToGeorgianDateTime();
+            var timeOnly = TimeOnly.Parse(time);
+            result = dateTime.AddTicks(timeOnly.Ticks);
+            return true;
+        }
+        catch
+        {
+            return false;
+        }
+    }
+}
+
+public class EditRollCallDetailsResult
+{
+    public string EmployeeFullName { get; set; }
+    public long EmployeeId { get; set; }
+    public string DateFa { get; set; }
+    public string TotalRollCallsDuration { get; set; }
+    public List<EmployeeRollCallRecord> Records { get; set; }
+}
+
+public class RemoveEmployeeRollCallRequest
+{
+    public long EmployeeId { get; set; }
+    public string Date { get; set; }
+}

ServiceHost/Areas/Client/Controllers/SalaryAidController.cs

@@ -0,0 +1,138 @@
+using _0_Framework.Application;
+using CompanyManagement.Infrastructure.Excel.SalaryAid;
+using CompanyManagment.App.Contracts.SalaryAid;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Build.Evaluation;
+using ServiceHost.BaseControllers;
+
+namespace ServiceHost.Areas.Client.Controllers;
+
+public class SalaryAidController:ClientBaseController
+{
+    private readonly ISalaryAidApplication _salaryAidApplication;
+    private readonly long _workshopId;
+    private readonly SalaryAidImportExcel _salaryAidImportExcel;
+
+    public SalaryAidController(ISalaryAidApplication salaryAidApplication,IAuthHelper authHelper, SalaryAidImportExcel salaryAidImportExcel)
+    {
+        _salaryAidApplication = salaryAidApplication;
+        _salaryAidImportExcel = salaryAidImportExcel;
+        _workshopId = authHelper.GetWorkshopId();
+    }
+
+    [HttpGet]
+    public ActionResult<SalaryAidsGroupedViewModel> GetList([FromQuery]SalaryAidSearchViewModel searchModel)
+    {
+        searchModel.WorkshopId = _workshopId;
+        var result = _salaryAidApplication.GetSearchListAsGrouped(searchModel);
+        return Ok(result);
+    }
+
+    [HttpPost]
+    public ActionResult<OperationResult> Create([FromBody]CreateSalaryAidRequest request)
+    {
+        var command = new CreateSalaryAidViewModel()
+        {
+            Amount = request.Amount.ToMoney(),
+            CalculationMonth = request.CalculationMonth,
+            CalculationYear = request.CalculationYear,
+            EmployeeIds = request.EmployeeIds,
+            WorkshopId = _workshopId,
+            SalaryDateTime = request.SalaryDateTime,
+
+        };
+        var result = _salaryAidApplication.Create(command);
+        return result;
+    }
+
+    [HttpPut]
+    public ActionResult<OperationResult> Edit([FromBody]EditSalaryAidRequest request)
+    {
+        var command = new EditSalaryAidViewModel()
+        {
+            Id = request.Id,
+            Amount = request.Amount.ToMoney(),
+            CalculationMonth = request.CalculationMonth,
+            CalculationYear = request.CalculationYear,
+            SalaryDateTime =  request.SalaryDateTime,
+            WorkshopId =  _workshopId,
+        };
+        var result = _salaryAidApplication.Edit(command);
+        return result;
+    }
+
+    [HttpGet("{id}")]
+    public ActionResult<EditSalaryAidRequest> EditDetails(long id)
+    {
+			var data = _salaryAidApplication.GetDetails(id);
+            var res = new EditSalaryAidRequest()
+            {
+                Id = data.Id,
+                Amount = data.Amount.MoneyToDouble(),
+                CalculationMonth = data.CalculationMonth,
+                CalculationYear = data.CalculationYear,
+                SalaryDateTime =  data.SalaryDateTime,
+            };
+            return res;
+    }
+
+    [HttpDelete("{id:long}")]
+    public ActionResult<OperationResult> Delete(long id)
+    {
+        var result = _salaryAidApplication.Remove(id);
+        return result;
+    }
+    [HttpPost("validate-excel")]
+    public ActionResult<ExcelValidation<SalaryAidImportData>> ValidateExcel([FromForm]ValidateExcelRequest request)
+    {
+        var validation = _salaryAidImportExcel.ReadAndValidateExcel(request.Excel, _workshopId);
+			
+        return validation;
+    }
+    [HttpPost("create-from-excel")]
+    public async Task<ActionResult<OperationResult>> OnPostCreateFromExcelData(List<SalaryAidImportData> data)
+    {
+        var commands = data.Select(x => new CreateSalaryAidViewModel()
+        {
+            WorkshopId = x.WorkshopId,
+            Amount = x.Amount.ToMoney(),
+            EmployeeIds = [x.EmployeeId],
+            SalaryDateTime = x.SalaryAidDateTime,
+            NationalCode = x.NationalCode,
+            CalculationMonth = x.calculationMonth,
+            CalculationYear = x.calculationYear
+        }).ToList();
+        
+        OperationResult result = await _salaryAidApplication.CreateRangeAsync(commands);
+
+        return new JsonResult(new
+        {
+            result.IsSuccedded,
+            result.Message
+        });
+    }
+}
+
+public class ValidateExcelRequest
+{
+    public IFormFile Excel { get; set; }
+}
+
+public class EditSalaryAidRequest
+{
+    public long Id { get; set; }
+    public long EmployeeId { get; set; }
+    public double Amount { get; set; }
+    public string SalaryDateTime { get; set; }
+    public int CalculationMonth { get; set; }
+    public int CalculationYear { get; set; } 
+}
+
+public class CreateSalaryAidRequest
+{
+    public List<long> EmployeeIds { get; set; }
+    public double Amount { get; set; }
+    public string SalaryDateTime { get; set; }
+    public int CalculationMonth { get; set; }
+    public int CalculationYear { get; set; }
+}

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

@@ -250,9 +250,7 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall
                 var span = end - start;
                 var hours = (int)span.TotalHours;
                 var minutes = span.Minutes;
-
-
-
+                
                 if (hours > 0 && minutes > 0)
                 {
                     return new JsonResult(new

ServiceHost/BaseControllers/AdminBaseController.cs

@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+
 namespace ServiceHost.BaseControllers;
 
 [Authorize(Policy = "AdminArea")]

ServiceHost/Controllers/GeneralController.cs

@@ -42,6 +42,15 @@ public class GeneralController : GeneralBaseController
             currentDate
         });
     }
+    [HttpGet("persian-day-of-week")]
+    public ActionResult<OperationResult<string>> OnGetDayOfWeek(string dateFa)
+    {
+        var op = new OperationResult<string>();
+        if (!dateFa.TryToGeorgianDateTime(out DateTime date))
+            return op.Failed("تاریخ وارد شده نامعتبر است");
+        
+        return op.Succcedded(date.DayOfWeek.DayOfWeeKToPersian());
+    }
 
     // [HttpGet("pm-permissions")]
     // public IActionResult GetPMPermissions()
@@ -96,44 +105,8 @@ public class GeneralController : GeneralBaseController
         var statusCode = isSuccess ? "1" : "0";
         return $"{baseUrl}/callback?Status={statusCode}&transactionId={transactionId}";
     }
-}
-
-public class TokenReq
-{
-    public long Amount { get; set; }
-
-    public string CallbackUrl { get; set; }
-
-    [Display(Name = "شماره فاکتور")]
-    [MaxLength(100)]
-    [Required]
-    [Key]
-    // be ezaye har pazirande bayad yekta bashad
-    public string invoiceID { get; set; }
-
-    [Required] public long terminalID { get; set; }
-
-    /*
-     * JSON Bashad
-     * etelaate takmili site harchi
-     * nabayad char khas dashte bashe (*'"xp_%!+- ...)
-     */
-    public string Payload { get; set; } = "";
-    public string email { get; set; }
-}
-
-public class TokenResp
-{
-    // if 0 = success
-    public int Status { get; set; }
-    public string AccessToken { get; set; }
-}
-
-public class PayRequest
-{
-    [Required] [MaxLength(3000)] public string token { get; set; }
-    [Required] public long terminalID { get; set; }
-    public string nationalCode { get; set; }
+    
+    
 }
 
 public class SepehrGatewayPayResponse
@@ -169,10 +142,4 @@ public class SepehrGatewayPayResponse
     public string issuerbank { get; set; }
 
     [Display(Name = " شماره کارت ")] public string cardnumber { get; set; }
-}
-
-public class AdviceReq
-{
-    [Display(Name = " رسید دیجیتال ")] public string digitalreceipt { get; set; }
-    public long Tid { get; set; }
 }

ServiceHost/Properties/launchSettings.json

@@ -19,7 +19,7 @@
       "sqlDebugging": true,
       "dotnetRunMessages": "true",
       "nativeDebugging": true,
-      "applicationUrl": "https://localhost:5004;http://localhost:5003;",
+      "applicationUrl": "https://localhost:5004;http://localhost:5003;https://192.168.0.117:5005",
       "jsWebView2Debugging": false,
       "hotReloadEnabled": true
     },

WorkFlow/Application/WorkFlow.Application.Contracts/WorkFlow.Application.Contracts.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+	  <NuGetAudit>false</NuGetAudit>
   </PropertyGroup>
 
   <ItemGroup>