init

.gitignore

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

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/BankAgg/IBankRepository.cs

@@ -8,6 +8,5 @@ namespace Company.Domain.BankAgg
 	{
 		public void Remove(Bank entity);
 		List<BankViewModel> Search(string name);
-		List<BankSelectList> GetBanksForSelectList();
 	}
 }

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/EmployeeBankInformationAgg/IEmployeeBankInformationRepository.cs

@@ -1,11 +1,7 @@
 
-using System;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.EmployeeBankInformation;
 using System.Collections.Generic;
-using System.Security.AccessControl;
-using System.Threading.Tasks;
-using CompanyManagment.App.Contracts.Workshop;
 
 namespace Company.Domain.EmployeeBankInformationAgg
 {
@@ -15,31 +11,14 @@ namespace Company.Domain.EmployeeBankInformationAgg
         void Remove(EmployeeBankInformation bankInformation);
         void RemoveRange(List<EmployeeBankInformation> entities);
 
-        [Obsolete("از متد async استفاده کنید")]
         List<GroupedEmployeeBankInformationViewModel> Search(long workshopId, EmployeeBankInformationSearchModel searchParams);
-        
-        Task<List<GroupedEmployeeBankInformationViewModel>> SearchAsync(long workshopId,
-            EmployeeBankInformationSearchModel searchParams);
-        
 
         GroupedEmployeeBankInformationViewModel GetByEmployeeId(long workshopId, long employeeId);
         List<EmployeeBankInformation> GetRangeByEmployeeId(long workshopId, long employeeId);
         EmployeeBankInformationViewModel GetDetails(long id);
         List<GroupedEmployeeBankInformationViewModel> GetAllByWorkshopId(long workshopId);
-        
-        List<EmployeeBankInformationViewModelForExcel> SearchForExcel(long workshopId,
-            EmployeeBankInformationSearchModel searchParams);
 
-        /// <summary>
-        ///  جزئیات اطلاعات بانکی بر اساس پرسنل
-        /// </summary>
-        /// <param name="workshopId"></param>
-        /// <param name="employeeId"></param>
-        /// <returns></returns>
-        Task<GetEmployeeBankInfoDetailsDto> GetDetailsByEmployeeIdAsync(long workshopId, long employeeId);
-        
-        
-        
+
+        List<EmployeeBankInformationViewModelForExcel> SearchForExcel(long workshopId, EmployeeBankInformationSearchModel searchParams);
     }
-
 }

Company.Domain/File1/File1.cs

@@ -66,4 +66,9 @@ public class File1 : EntityBase
         Description = description;
         Status = status;
     }
+    
+    public void ChangeStatus(int status)
+    {
+        Status = status;
+    }
 }

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

@@ -531,6 +531,11 @@ namespace Company.Domain.RollCallAgg
             FridayWorkTimeSpan = CalculateFridayWorkDuration(StartDate.Value, EndDate.Value);
         }
 
+        public void SetStartDate(DateTime start)
+        {
+            StartDate = start;
+        }
+
         /// <summary>
         /// جیزه
         /// </summary>

CompanyManagment.App.Contracts/Bank/IBankApplication.cs

@@ -10,12 +10,5 @@ namespace CompanyManagment.App.Contracts.Bank
 		OperationResult Create(CreateBank command);
 		OperationResult Edit(EditBank command);
 		List<BankViewModel> Search(string name);
-		List<BankSelectList> GetBanksForSelectList();
-		
-	}
-
-	public class BankSelectList:SelectListViewModel
-	{
-		
 	}
 }

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/EmployeeBankInformation/GetEmployeeBankInfoDetailsBankItemDto.cs

@@ -1,14 +0,0 @@
-namespace CompanyManagment.App.Contracts.EmployeeBankInformation;
-
-public class GetEmployeeBankInfoDetailsBankItemDto
-{
-    public long Id { get; set; }
-    public string CardNumber { get; set; }
-    public string ShebaNumber { get; set; }
-    public string BankAccountNumber { get; set; }
-    public string BankName { get; set; }
-    public string BankLogoPath { get; set; }
-    public bool IsDefault { get; set; }
-    public long BankId { get; set; }
-        
-}

CompanyManagment.App.Contracts/EmployeeBankInformation/GetEmployeeBankInfoDetailsDto.cs

@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-
-namespace CompanyManagment.App.Contracts.EmployeeBankInformation;
-
-public class GetEmployeeBankInfoDetailsDto
-{
-    public long EmployeeId { get; set; }
-    public string EmployeeFullName { get; set; }
-    public List<GetEmployeeBankInfoDetailsBankItemDto> BankItems { get; set; }
-}

CompanyManagment.App.Contracts/EmployeeBankInformation/IEmployeeBankInformationApplication.cs

@@ -1,7 +1,5 @@
-using System;
-using _0_Framework.Application;
+using _0_Framework.Application;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace CompanyManagment.App.Contracts.EmployeeBankInformation
 {
@@ -10,7 +8,6 @@ namespace CompanyManagment.App.Contracts.EmployeeBankInformation
 		OperationResult Create(CreateEmployeeInformation command);
         OperationResult GroupCreate(long workshopId, List<CreateEmployeeInformation> command);
         OperationResult Edit(EditEmployeeInformation command);
-        [Obsolete("از متد Async استفاده شود")]
 		List<GroupedEmployeeBankInformationViewModel> Search(long workshopId, EmployeeBankInformationSearchModel searchParams);
         List<EmployeeBankInformationViewModelForExcel> SearchForExcel(long workshopId,
             EmployeeBankInformationSearchModel searchParams);
@@ -20,22 +17,5 @@ namespace CompanyManagment.App.Contracts.EmployeeBankInformation
 		OperationResult RemoveByEmployeeId(long workshopId, long employeeId);
 		List<GroupedEmployeeBankInformationViewModel> GetAllByWorkshopId(long workshopId);
 		OperationResult SetDefault(long workshopId, long bankInfoId);
-
-		/// <summary>
-		/// گرفتن لیست اطلاعات بانکی
-		/// </summary>
-		/// <param name="workshopId"></param>
-		/// <param name="searchParams"></param>
-		/// <returns></returns>
-		Task<List<GroupedEmployeeBankInformationViewModel>> SearchAsync
-			(long workshopId, EmployeeBankInformationSearchModel searchParams);
-
-		/// <summary>
-		///  جزئیات اطلاعات بانکی بر اساس پرسنل
-		/// </summary>
-		/// <param name="workshopId"></param>
-		/// <param name="employeeId"></param>
-		/// <returns></returns>
-		Task<GetEmployeeBankInfoDetailsDto> GetDetailsByEmployeeIdAsync(long workshopId, long employeeId);
 	}
 }

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

@@ -104,10 +104,5 @@ namespace CompanyManagment.Application
 				Id = x.Id
 			}).ToList();
 		}
-
-		public List<BankSelectList> GetBanksForSelectList()
-		{
-			return _bankRepository.GetBanksForSelectList();
-		}
 	}
 }

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

@@ -4,7 +4,6 @@ using Company.Domain.EmployeeBankInformationAgg;
 using CompanyManagment.App.Contracts.EmployeeBankInformation;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace CompanyManagment.Application
 {
@@ -102,13 +101,7 @@ namespace CompanyManagment.Application
 
 		}
 
-        public async Task<List<GroupedEmployeeBankInformationViewModel>> SearchAsync(long workshopId,
-            EmployeeBankInformationSearchModel searchParams)
-        {
-            return await _employeeBankInformationRepository.SearchAsync(workshopId, searchParams);
-        }
-
-        
+		//todo: add CardNumber, BankAccountNumber, etc validations
 		public OperationResult Edit(EditEmployeeInformation command)
 		{
 			OperationResult op = new();
@@ -175,6 +168,9 @@ namespace CompanyManagment.Application
         {
             var entity = _employeeBankInformationRepository.GetByEmployeeId(workshopId, employeeId);
 
+            if (entity == null)
+                return new();
+
             return entity;
         }
 
@@ -215,12 +211,6 @@ namespace CompanyManagment.Application
 	        return _employeeBankInformationRepository.GetAllByWorkshopId(workshopId);
         }
 
-        
-        public async Task<GetEmployeeBankInfoDetailsDto> GetDetailsByEmployeeIdAsync(long workshopId, long employeeId)
-        {
-            return await _employeeBankInformationRepository.GetDetailsByEmployeeIdAsync(workshopId, employeeId);
-        }
-
         #region Private Methods
 
         private OperationResult ValidateCreateOperation(List<GroupedEmployeeBankInformationViewModel> workshopEmployeeBankInfoList, CreateEmployeeInformation command)
@@ -263,7 +253,8 @@ namespace CompanyManagment.Application
 	        return !workshopRecords.Exists(x =>
 		        x.WorkshopId == workshopId && x.EmployeeId == employeeId);
         }
-        
+
+
         #endregion
     }
 }

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

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

CompanyManagment.Application/RollCallApplication.cs

@@ -447,8 +447,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 +457,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 +489,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 +634,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 +641,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 +668,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);

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

@@ -31,13 +31,4 @@ public class BankRepository:RepositoryBase<long,Bank>,IBankRepository
             BankLogoPictureMediaId = x.BankLogoMediaId
         }).ToList();
     }
-
-    public List<BankSelectList> GetBanksForSelectList()
-    {
-        return context.Banks.Select(x => new BankSelectList()
-        {
-            Id = x.id,
-            Text = x.BankName
-        }).ToList();
-    }
 }

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

@@ -6,8 +6,6 @@ using CompanyManagment.App.Contracts.EmployeeBankInformation;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
-using _0_Framework.Exceptions;
 
 namespace CompanyManagment.EFCore.Repository;
 
@@ -78,76 +76,6 @@ public class EmployeeBankInformationRepository : RepositoryBase<long, EmployeeBa
         }).ToList();
     }
 
-    public async Task<List<GroupedEmployeeBankInformationViewModel>> SearchAsync(long workshopId, EmployeeBankInformationSearchModel searchParams)
-    {
-         var bankInfoQuery = _companyContext.EmployeeBankInformationSet
-             .Where(x => x.WorkshopId == workshopId)
-            .Select(x => new
-            {
-                x.BankId,
-                x.EmployeeId,
-                x.WorkshopId,
-            }).AsQueryable();
-
-        if (searchParams.BankId > 0)
-            bankInfoQuery = bankInfoQuery.Where(x => x.BankId == searchParams.BankId);
-
-        if (searchParams.EmployeeId > 0)
-            bankInfoQuery = bankInfoQuery.Where(x => x.EmployeeId == searchParams.EmployeeId);
-
-        var bankInfoList = await bankInfoQuery.ToListAsync();
-
-        var employeeIds = bankInfoList.Select(x => x.EmployeeId).Distinct().ToList();
-
-        var employees = await _companyContext.Employees
-            .Where(x => employeeIds.Contains(x.id)).ToListAsync();
-        
-        var personnelCodes = await _companyContext.PersonnelCodeSet
-            .Where(x=>employeeIds.Contains(x.EmployeeId) && x.WorkshopId == workshopId)
-            .ToDictionaryAsync(x=>x.EmployeeId,x=>x.PersonnelCode);
-        
-        var bankIds = bankInfoList.Select(x=>x.BankId).Distinct().ToList();
-
-        var banks =await _companyContext.Banks.Where(x => bankIds.Contains(x.id)).ToListAsync();
-        
-
-        //Get bank logos from account context
-        var mediaIds = banks.Select(x=>x.BankLogoMediaId).ToList();
-
-        var banksLogos = _accountContext.Medias.Where(y => mediaIds.Contains(y.id))
-            .Select(media => new { media.Path, MediaId = media.id }).ToList();
-
-        var banksWithLogo = banks.Select(x => new
-        {
-            Logo = banksLogos.FirstOrDefault(l => l.MediaId == x.BankLogoMediaId),
-            Bank = x
-        }).ToList();
-
-        return bankInfoList.GroupBy(x => x.EmployeeId).Select(x =>
-        {
-            var employee = employees.FirstOrDefault(e=>e.id == x.Key);
-            
-            var selectBankId = x.Select(b => b.BankId);
-            
-            var selectBanks = banksWithLogo
-                .Where(b => selectBankId.Contains(b.Bank.id)).ToList();
-            
-            return new GroupedEmployeeBankInformationViewModel()
-            {
-                BankPicturesList = 
-                    selectBanks.Select(y => y.Logo.Path).ToList(),
-                EmployeeId = x.Key,
-                WorkshopId = workshopId,
-                EmployeeName = employee?.FullName ?? "",
-                TotalBankAccountsCount = x.Count(),
-                PersonnelCode = personnelCodes.TryGetValue(x.Key,out var value)?
-                    value.ToString() :
-                    "",
-                BankNamesList = selectBanks.Select(y => y.Bank.BankName).ToList()
-            };
-        }).ToList();
-    }
-
 
     public void RemoveByEmployeeId(IEnumerable<EmployeeBankInformation> entities)
     {
@@ -337,55 +265,4 @@ public class EmployeeBankInformationRepository : RepositoryBase<long, EmployeeBa
             };
         }).ToList();
     }
-
-    public async  Task<GetEmployeeBankInfoDetailsDto> GetDetailsByEmployeeIdAsync(long workshopId, long employeeId)
-    {
-        var employeeBankInfos =await _companyContext.EmployeeBankInformationSet
-            .Where(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId).ToListAsync();
-
-        if (employeeBankInfos.Count == 0)
-        {
-            throw new NotFoundException("اطلاعات بانکی یافت نشد");
-        }
-        var employee = await _companyContext.Employees
-            .FirstOrDefaultAsync(x=>x.id ==  employeeId);
-
-        if (employee == null)
-        {
-            throw new NotFoundException("پرسنل مورد نظر یافت نشد");
-        }
-        
-        var employeeFullName = employee.FullName;
-        
-        var bankIds = employeeBankInfos.Select(x => x.BankId).Distinct().ToList();
-
-        var banks = await _companyContext.Banks.Where(x => bankIds.Contains(x.id)).ToListAsync();
-
-        var mediaIds = banks.Select(x => x.BankLogoMediaId).ToList();
-        
-        var bankLogos = await _accountContext.Medias.Where(x=>mediaIds.Contains(x.id)).ToListAsync();
-
-        var res = new GetEmployeeBankInfoDetailsDto()
-        {
-            EmployeeId = employeeId,
-            EmployeeFullName = employeeFullName,
-            BankItems = employeeBankInfos.Select(x =>
-            {
-                var bank = banks.FirstOrDefault(y => y.id == x.BankId);
-                var bankLogo = bankLogos.FirstOrDefault(l => bank?.BankLogoMediaId == l.id);
-                return new GetEmployeeBankInfoDetailsBankItemDto()
-                {
-                    BankId = x.BankId,
-                    BankAccountNumber = x.BankAccountNumber,
-                    BankLogoPath = bankLogo?.Path ?? "",
-                    BankName = bank?.BankName ?? "",
-                    CardNumber = x.CardNumber,
-                    ShebaNumber = x.ShebaNumber,
-                    IsDefault = x.IsDefault,
-                    Id = x.id
-                };
-            }).ToList()
-        };
-        return res;
-    }
 }

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

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

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

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

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

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

@@ -1,16 +0,0 @@
-using GozareshgirProgramManager.Application._Common.Interfaces;
-using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
-
-namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.AddTaskToPhase;
-
-/// <summary>
-/// Command to add a task to an existing phase
-/// </summary>
-public record AddTaskToPhaseCommand(
-    Guid PhaseId,
-    string Name,
-    string? Description = null,
-    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/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,7 +222,8 @@ 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
@@ -243,7 +253,8 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
         }
     }
 
-    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
@@ -269,68 +280,81 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
         }
     }
 
-    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,4 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
         // تعیین تکلیف نشده: نه user دارد نه time
         return AssignmentStatus.Unassigned;
     }
-}
-
+}

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

@@ -62,8 +62,7 @@ public class ProjectSetTimeDetailsQueryHandler
         var res = new ProjectSetTimeResponse(
             skills.Select(skill =>
             {
-                var section = task
-                    .Sections
+                var section = task.Sections
                     .FirstOrDefault(x => x.SkillId == skill.Id);
                 var user = users.FirstOrDefault(x => x.Id == section?.OriginalAssignedUserId);
                 return new ProjectSetTimeResponseSkill

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/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/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,7 +794,8 @@ 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)
@@ -809,7 +810,7 @@ public class IndexModel : PageModel
                 if (separation.checker)
                 {
                     //workshopInfo
-                    var workshop = _workshopApplication.GetDetails(contract.WorkshopIds);
+                  
 
                     var employeeOptions =
                         _employeeComputeOptionsApplication.GetAllByWorkshopId(contract.WorkshopIds);
@@ -1212,7 +1213,7 @@ public class IndexModel : PageModel
 
                         #endregion
 
-
+                        RewardPayCompute = workshop.RewardComputeOnCheckout,
 
                     };
                     _checkoutApplication.Create(command);

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

@@ -0,0 +1,157 @@
+@page
+@model ServiceHost.Areas.AdminNew.Pages.Company.ExcelUpload.IndexModel
+@{
+    ViewData["Title"] = "بارگذاری فایل اکسل";
+}
+
+<div class="container-fluid">
+    <div class="row">
+        <div class="col-12">
+            <div class="card">
+                <div class="card-header">
+                    <h3 class="card-title">بارگذاری و بررسی فایل اکسل</h3>
+                </div>
+                <div class="card-body">
+                    <form method="post" enctype="multipart/form-data">
+                        <div class="form-group">
+                            <label for="ExcelFile">انتخاب فایل اکسل (ستون B و C از ردیف 2 به بعد خوانده می‌شود):</label>
+                            <input type="file" class="form-control" id="ExcelFile" name="ExcelFile" accept=".xlsx,.xls" required />
+                        </div>
+                        <button type="submit" asp-page-handler="UploadExcel" class="btn btn-primary">بارگذاری و پردازش</button>
+                    </form>
+
+                    @if (!string.IsNullOrEmpty(Model.Message))
+                    {
+                        <div class="alert alert-info mt-3" role="alert">
+                            @Model.Message
+                        </div>
+                    }
+                </div>
+            </div>
+        </div>
+    </div>
+
+    @if (Model.HasProcessed)
+    {
+        <div class="row mt-4">
+            <!-- دسته اول: فایل‌هایی که در اکسل هستند -->
+            <div class="col-md-6">
+                <div class="card">
+                    <div class="card-header bg-success text-white">
+                        <h4 class="card-title mb-0">فایل‌های موجود در اکسل (@Model.FoundInExcel.Count مورد)</h4>
+                    </div>
+                    <div class="card-body" style="max-height: 600px; overflow-y: auto;">
+                        @if (Model.FoundInExcel.Any())
+                        {
+                            <table class="table table-striped table-hover">
+                                <thead>
+                                    <tr>
+                                        <th>ردیف</th>
+                                        <th>شناسه</th>
+                                        <th>شماره بایگانی</th>
+                                        <th>رده پرونده</th>
+                                        <th>وضعیت</th>
+                                        <th>عملیات</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @{
+                                        int index = 1;
+                                    }
+                                    @foreach (var item in Model.FoundInExcel)
+                                    {
+                                        <tr>
+                                            <td>@index</td>
+                                            <td>@item.ArchiveNo</td>
+                                            <td>@item.FileClass</td>
+                                            <td>@(item.Status == 2 ? "فعال" : "غیرفعال")</td>
+                                            <td>
+                                                <button class="btn btn-sm btn-primary">ویرایش</button>
+                                            </td>
+                                        </tr>
+                                        index++;
+                                    }
+                                </tbody>
+                            </table>
+                        }
+                        else
+                        {
+                            <p class="text-muted">هیچ موردی یافت نشد.</p>
+                        }
+                    </div>
+                </div>
+            </div>
+
+            <!-- دسته دوم: فایل‌هایی که در اکسل نیستند -->
+            <div class="col-md-6">
+                <div class="card">
+                    <div class="card-header bg-warning text-dark">
+                        <h4 class="card-title mb-0">فایل‌های غیرموجود در اکسل (@Model.NotFoundInExcel.Count مورد)</h4>
+                    </div>
+                    <div class="card-body" style="max-height: 600px; overflow-y: auto;">
+                        @if (Model.NotFoundInExcel.Any())
+                        {
+                            <table class="table table-striped table-hover">
+                                <thead>
+                                    <tr>
+                                        <th>ردیف</th>
+                                        <th>شناسه</th>
+                                        <th>شماره بایگانی</th>
+                                        <th>رده پرونده</th>
+                                        <th>وضعیت</th>
+                                        <th>عملیات</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @{
+                                        int index2 = 1;
+                                    }
+                                    @foreach (var item in Model.NotFoundInExcel)
+                                    {
+                                        <tr>
+                                            <td>@index2</td>
+                                            <td>@item.ArchiveNo</td>
+                                            <td>@item.FileClass</td>
+                                            <td>@(item.Status == 2 ? "فعال" : "غیرفعال")</td>
+                                            <td>
+                                                <button class="btn btn-sm btn-primary">ویرایش</button>
+                                            </td>
+                                        </tr>
+                                        index2++;
+                                    }
+                                </tbody>
+                            </table>
+                        }
+                        else
+                        {
+                            <p class="text-muted">هیچ موردی یافت نشد.</p>
+                        }
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
+</div>
+
+<style>
+    .card {
+        box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+        border-radius: 8px;
+    }
+    
+    .card-header {
+        border-radius: 8px 8px 0 0;
+    }
+    
+    .table {
+        margin-bottom: 0;
+    }
+    
+    .table thead th {
+        position: sticky;
+        top: 0;
+        background-color: #f8f9fa;
+        z-index: 10;
+    }
+</style>
+

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

@@ -0,0 +1,156 @@
+using Company.Domain.File1;
+using Company.Domain.RollCallAgg;
+using Company.Domain.RollCallAgg.DomainService;
+using CompanyManagment.EFCore;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using OfficeOpenXml;
+
+namespace ServiceHost.Areas.AdminNew.Pages.Company.ExcelUpload;
+
+public class ExcelRowData
+{
+    public string ColumnB { get; set; }
+    public string ColumnC { get; set; }
+}
+
+public class IndexModel : PageModel
+{
+    private readonly CompanyContext _dbContext;
+    private readonly IRollCallDomainService _rollCallDomainService;
+
+    [BindProperty]
+    public IFormFile ExcelFile { get; set; }
+    
+    public string Message { get; set; }
+    public List<File1> FoundInExcel { get; set; } = new List<File1>();
+    public List<File1> NotFoundInExcel { get; set; } = new List<File1>();
+    public List<ExcelRowData> ExcelData { get; set; } = new List<ExcelRowData>();
+    public bool HasProcessed { get; set; }
+    
+    public IndexModel(CompanyContext dbContext, IRollCallDomainService rollCallDomainService)
+    {
+        _dbContext = dbContext;
+        _rollCallDomainService = rollCallDomainService;
+    }
+
+    public void OnGet()
+    {
+    }
+
+    public async Task<IActionResult> OnPostUploadExcel()
+    {
+        if (ExcelFile == null || ExcelFile.Length == 0)
+        {
+            Message = "لطفا یک فایل اکسل انتخاب کنید.";
+            return Page();
+        }
+
+        //await NewMethod();
+
+        // var rollcall = _dbContext.RollCalls.Where(x => x.id > 361628 && x.id < 362119).ToList();
+        //
+        // var diffTime = TimeSpan.FromHours(8) + TimeSpan.FromMinutes(30);
+        // var NoneRollCalls = rollcall
+        //     .Where(x => x.RollCallModifyType == RollCallModifyType.None && x.EndDate == null).ToList();
+        // foreach (var noneRollCall in NoneRollCalls)
+        // {
+        //     noneRollCall.SetStartDate(noneRollCall.StartDate!.Value.Add(diffTime));
+        // }
+        // var rollcallIds = NoneRollCalls.Select(x => x.id).ToList();
+        // var editedRollCall = rollcall.Where(x=>!rollcallIds.Contains(x.id) && x.RollCallModifyType != RollCallModifyType.EditByEmployer).ToList();
+        //
+        // foreach (var rollCall in editedRollCall)
+        // {
+        //     rollCall.Edit(rollCall.StartDate.Value.Add(diffTime),
+        //         rollCall.EndDate.Value.Add(diffTime),_rollCallDomainService);
+        // }
+        //
+        // await _dbContext.SaveChangesAsync();
+        return Page();
+    }
+
+    private async System.Threading.Tasks.Task NewMethod()
+    {
+        try
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("Gozareshgir Noncommercial organization");
+            
+            using (var stream = new MemoryStream())
+            {
+                await ExcelFile.CopyToAsync(stream);
+                stream.Position = 0;
+
+                using (var package = new ExcelPackage(stream))
+                {
+                    var worksheet = package.Workbook.Worksheets[0];
+                    int rowCount = worksheet.Dimension?.Rows ?? 0;
+
+                    // خواندن مقادیر از ستون B و C از ردیف 2 به بعد
+                    for (int row = 2; row <= rowCount; row++)
+                    {
+                        var columnB = worksheet.Cells[row, 2].Value?.ToString()?.Trim();
+                        var columnC = worksheet.Cells[row, 3].Value?.ToString()?.Trim();
+                        
+                        if (!string.IsNullOrWhiteSpace(columnB) || !string.IsNullOrWhiteSpace(columnC))
+                        {
+                            ExcelData.Add(new ExcelRowData
+                            {
+                                ColumnB = columnB ?? "",
+                                ColumnC = columnC ?? ""
+                            });
+                        }
+                    }
+                }
+            }
+
+            // ساخت HashSet برای سرچ سریع - هر جفت (B, C) رو با هم نگه داری
+            var excelPairs = new HashSet<(string B, string C)>(
+                ExcelData.Select(x => (
+                    B: (x.ColumnB ?? "").Trim(), 
+                    C: (x.ColumnC ?? "").Trim()
+                )));
+
+            // دریافت تمام داده‌های موجود در دیتابیس
+            var allFiles = _dbContext.Files.ToList();
+            
+            // دسته‌بندی: فایل‌هایی که در اکسل هستند و نیستند
+            foreach (var file in allFiles)
+            {
+                var fileB = file.ArchiveNo.ToString();
+                var fileC = (file.FileClass ?? "").Trim();
+                
+                // بررسی آیا جفت (B, C) این فایل در اکسل وجود دارد
+                bool foundInExcel = excelPairs.Contains((fileB, fileC));
+                
+                if (foundInExcel)
+                {
+                    FoundInExcel.Add(file);
+                }
+                else
+                {
+                    NotFoundInExcel.Add(file);
+                }
+            }
+
+            foreach (var file1 in FoundInExcel)
+            {
+                file1.ChangeStatus(2);
+            }
+
+            foreach (var file1 in NotFoundInExcel)
+            {
+                file1.ChangeStatus(1);
+            }
+
+            await _dbContext.SaveChangesAsync();
+            HasProcessed = true;
+            Message = $"پردازش با موفقیت انجام شد. تعداد ردیف‌های اکسل: {ExcelData.Count} | فایل‌های موجود در اکسل: {FoundInExcel.Count} | فایل‌های غیرموجود در اکسل: {NotFoundInExcel.Count}";
+        }
+        catch (Exception ex)
+        {
+            Message = $"خطا در پردازش فایل: {ex.Message}";
+        }
+    }
+}
+

ServiceHost/Areas/Client/Controllers/EmployeeBankInfoController.cs

@@ -1,106 +0,0 @@
-using _0_Framework.Application;
-using CompanyManagment.App.Contracts.EmployeeBankInformation;
-using CompanyManagement.Infrastructure.Excel.EmployeeBankInfo;
-using Microsoft.AspNetCore.Mvc;
-using ServiceHost.BaseControllers;
-
-namespace ServiceHost.Areas.Client.Controllers;
-
-public class EmployeeBankInfoController : ClientBaseController
-{
-    private readonly IEmployeeBankInformationApplication _employeeBankInformationApplication;
-    private readonly long _workshopId;
-
-    public EmployeeBankInfoController(IEmployeeBankInformationApplication employeeBankInformationApplication,
-        IAuthHelper authHelper)
-    {
-        _employeeBankInformationApplication = employeeBankInformationApplication;
-        _workshopId = authHelper.GetWorkshopId();
-    }
-
-    [HttpGet]
-    public async Task<ActionResult<List<GroupedEmployeeBankInformationViewModel>>> GetList(
-        EmployeeBankInformationSearchModel searchModel)
-    {
-        return await _employeeBankInformationApplication.SearchAsync(_workshopId, searchModel);
-    }
-
-    [HttpGet("{employeeId:long}")]
-    public async Task<ActionResult<GetEmployeeBankInfoDetailsDto>> GetDetails(long employeeId)
-    {
-        return await _employeeBankInformationApplication.GetDetailsByEmployeeIdAsync(_workshopId, employeeId);
-    }
-
-    [HttpPost]
-    public ActionResult<OperationResult> Create([FromBody]CreateEmployeeInformation command)
-    {
-        command.WorkshopId = _workshopId;
-        return _employeeBankInformationApplication.Create(command);
-    }
-    [HttpPut]
-    public ActionResult<OperationResult> Edit([FromBody]EditEmployeeInformation command)
-    {
-        command.WorkshopId = _workshopId;
-        return _employeeBankInformationApplication.Edit(command);
-    }
-    [HttpDelete("delete-by-employee/{employeeId:long}")]
-    public ActionResult<OperationResult> Remove(long employeeId)
-    {
-         return _employeeBankInformationApplication.RemoveByEmployeeId(_workshopId, employeeId);
-       
-    }
-    
-    [HttpDelete("delete-one/{id:long}")]
-    public IActionResult OnPostDelete(long id)
-    {
-        var result = _employeeBankInformationApplication.Remove(id);
-        return new JsonResult(new
-        {
-            success = result.IsSuccedded,
-            message = result.Message,
-        });
-    }
-
-    [HttpPost("excel")]
-    public ActionResult DownloadExcel([FromBody]DownloadExcelRequest request)
-    {
-
-        var employeeBankInformationViewModelForExcels = _employeeBankInformationApplication.SearchForExcel(_workshopId,
-            new EmployeeBankInformationSearchModel() { EmployeeBankInfoIds = request.Ids });
-
-        var resultViewModel = employeeBankInformationViewModelForExcels.Select(x => new EmployeeBankInfoExcelViewModel
-        {
-            Name = x.EmployeeName,
-            BankAccounts = x.BankInformationList.Select(b => new BankInfoExcelViewModel()
-            {
-                IsDefault = b.IsDefault,
-                ShebaNumber = b.ShebaNumber,
-                AccountNumber = b.BankAccountNumber,
-                BankName = b.BankName,
-                CardNumber = b.CardNumber
-            }).ToList()
-        }).ToList();
-
-        var bytes = EmployeeBankInfoExcelGenerator.Generate(resultViewModel);
-        return File(bytes,
-            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-            $"اطلاعات بانکی پرسنل.xlsx");
-    }
-    
-    [HttpPost("set-default/{bankId:long}")]
-    public IActionResult SetDefault(long bankId)
-    {
-        var result = _employeeBankInformationApplication.SetDefault(_workshopId, bankId);
-        return new JsonResult(new
-        {
-            success = result.IsSuccedded,
-            message = result.Message,
-            id = result.SendId
-        });
-    }
-
-}
-public class DownloadExcelRequest
-{
-    public List<long> Ids { get; set; }
-}

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

@@ -8,8 +8,6 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using System.Security.Claims;
 using CompanyManagement.Infrastructure.Excel.EmployeeBankInfo;
-using CompanyManagment.App.Contracts.Bank;
-using CompanyManagement.Infrastructure.Excel.EmployeeBankInfo;
 
 namespace ServiceHost.Areas.Client.Pages.Company.EmployeesBankInfo
 {
@@ -30,11 +28,7 @@ namespace ServiceHost.Areas.Client.Pages.Company.EmployeesBankInfo
         private readonly IWebHostEnvironment _hostEnvironment;
 
 
-		public IndexModel(IPasswordHasher passwordHasher, IWorkshopApplication workshopApplication,
-            IHttpContextAccessor contextAccessor, IAuthHelper authHelper,
-            IEmployeeBankInformationApplication employeeBankInformationApplication,
-            IEmployeeApplication employeeApplication, IBankApplication bankApplication,
-            IWebHostEnvironment hostEnvironment)
+		public IndexModel(IPasswordHasher passwordHasher, IWorkshopApplication workshopApplication, IHttpContextAccessor contextAccessor, IAuthHelper authHelper, IEmployeeBankInformationApplication employeeBankInformationApplication, IEmployeeApplication employeeApplication, IBankApplication bankApplication, IWebHostEnvironment hostEnvironment)
         {
             _passwordHasher = passwordHasher;
             _workshopApplication = workshopApplication;
@@ -70,8 +64,7 @@ namespace ServiceHost.Areas.Client.Pages.Company.EmployeesBankInfo
 
         public IActionResult OnGetEmployeeBankInfoListAjax(EmployeeBankInformationSearchModel searchModel)
         {
-            var resultData = _employeeBankInformationApplication
-                .Search(_workshopId, searchModel);
+            var resultData = _employeeBankInformationApplication.Search(_workshopId, searchModel);
             return new JsonResult(new
             {
                 success = true,
@@ -249,4 +242,4 @@ namespace ServiceHost.Areas.Client.Pages.Company.EmployeesBankInfo
 				$"اطلاعات بانکی پرسنل.xlsx");
 		}
 	}
-}
+}

ServiceHost/Controllers/BankController.cs

@@ -1,25 +0,0 @@
-using CompanyManagment.App.Contracts.Bank;
-using Microsoft.AspNetCore.Mvc;
-using ServiceHost.BaseControllers;
-
-namespace ServiceHost.Controllers;
-
-public class BankController : GeneralBaseController
-{
-    private readonly IBankApplication _bankApplication;
-
-    public BankController(IBankApplication bankApplication)
-    {
-        _bankApplication = bankApplication;
-    }
-
-    /// <summary>
-    /// دریافت لیست بانک‌ها برای SelectList
-    /// </summary>
-    /// <returns></returns>
-    [HttpGet]
-    public ActionResult<List<BankSelectList>> GetBankList()
-    {
-        return _bankApplication.GetBanksForSelectList();
-    }
-}

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>