From 1915dc056511a30c4fd34a26ba047d5a12c08cb2 Mon Sep 17 00:00:00 2001
From: MahanCh <www.mahan.13831012c@gmail.com>
Date: Wed, 16 Apr 2025 15:30:20 +0330
Subject: [PATCH 1/2] fix rollcall bug and reward desc bug

---
 CompanyManagment.EFCore/Repository/RewardRepository.cs     | 4 ++--
 .../Repository/RollCallEmployeeRepository.cs               | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CompanyManagment.EFCore/Repository/RewardRepository.cs b/CompanyManagment.EFCore/Repository/RewardRepository.cs
index 1e78eb05..cfecb44f 100644
--- a/CompanyManagment.EFCore/Repository/RewardRepository.cs
+++ b/CompanyManagment.EFCore/Repository/RewardRepository.cs
@@ -50,7 +50,7 @@ public class RewardRepository : RepositoryBase<long, Reward>, IRewardRepository
 			Title = x.Title,
 			Amount = x.Amount,
 			CreationDate = x.CreationDate,
-			Description = x.Description,
+			Description = x.Description??"",
 			GrantDateFa = x.GrantDateFa,
 			EmployeeFullName = employees.FirstOrDefault(e => e.id == x.EmployeeId).FullName,
 			Id = x.Id,
@@ -203,7 +203,7 @@ public class RewardRepository : RepositoryBase<long, Reward>, IRewardRepository
 			WorkshopId = x.WorkshopId,
 			Amount = x.Amount.ToMoney(),
 			AmountDouble = x.Amount,
-			Description = x.Description,
+			Description = x.Description??"",
 			EmployeeFullName = employees.FirstOrDefault(e => e.id == x.EmployeeId).FullName,
 			EmployeeId = x.EmployeeId,
 			GrantDateFa = x.GrantDate.ToFarsi(),
diff --git a/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs b/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs
index 2f290277..7b8b4a79 100644
--- a/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs
+++ b/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs
@@ -72,7 +72,12 @@ public class RollCallEmployeeRepository : RepositoryBase<long, RollCallEmployee>
                 EmployeeLName = x.LName,
                 EmployeeFullName = x.EmployeeFullName,
                 IsActiveString = x.IsActiveString,
-                HasUploadedImage = x.HasUploadedImage
+                HasUploadedImage = x.HasUploadedImage,
+                Statuses = x.EmployeesStatus.Select(x => new RollCallEmployeeStatusViewModel()
+                {
+                    StartDateGr = x.StartDate,
+                    EndDateGr = x.EndDate
+                })
             }).FirstOrDefault();
     }
 

From ff153071607f76f8c15009550916c043eaf9160a Mon Sep 17 00:00:00 2001
From: MahanCh <www.mahan.13831012c@gmail.com>
Date: Wed, 16 Apr 2025 17:27:49 +0330
Subject: [PATCH 2/2] fix salaryAid color bug

---
 CompanyManagment.Application/RewardApplication.cs            | 3 ++-
 ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/Index.js | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CompanyManagment.Application/RewardApplication.cs b/CompanyManagment.Application/RewardApplication.cs
index 0d441e22..946e2b52 100644
--- a/CompanyManagment.Application/RewardApplication.cs
+++ b/CompanyManagment.Application/RewardApplication.cs
@@ -20,11 +20,12 @@ public class RewardApplication : IRewardApplication
     private readonly ICustomizeCheckoutRepository _customizeCheckoutRepository;
     private readonly ICustomizeCheckoutTempRepository _customizeCheckoutTempRepository;
 
-    public RewardApplication(IRewardRepository rewardRepository, IAuthHelper authHelper, ICustomizeCheckoutRepository customizeCheckoutRepository)
+    public RewardApplication(IRewardRepository rewardRepository, IAuthHelper authHelper, ICustomizeCheckoutRepository customizeCheckoutRepository, ICustomizeCheckoutTempRepository customizeCheckoutTempRepository)
     {
         _rewardRepository = rewardRepository;
         _authHelper = authHelper;
         _customizeCheckoutRepository = customizeCheckoutRepository;
+        _customizeCheckoutTempRepository = customizeCheckoutTempRepository;
     }
 
     public List<RewardViewModel> GetSearchList(RewardSearchModel searchModel)
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/Index.js b/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/Index.js
index e6d94e51..6002e8a4 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/Index.js
+++ b/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/Index.js
@@ -557,7 +557,8 @@ function htmlLoadWithEmployeeDataByDate(loadSalaryAidListData) {
     if (loadSalaryAidListData.length > 0) {
         loadSalaryAidListData.forEach(function (itemSalaryAids) {
             n = 1;
-            html += `<div></div>
+            //<div></div>
+            html += `
             <div class="salaryAid-grid-list personal-grid-row d-grid gap-2 grid-cols-12 w-100">
              <div class="Rtable-row align-items-center col-span-2">
                  <div class="Rtable-cell width1">
@@ -689,7 +690,7 @@ function htmlLoadWithEmployeeDataByDate(loadSalaryAidListData) {
 
             });
 
-            html += `</div>`
+            html += `</div>`;
             html += `
             <div class="Rtable-row align-items-center col-span-2">
                 <div class="Rtable-cell width1 ">