Merge branch 'master' into Main

CompanyManagment.EFCore/Repository/PaymentTransactionRepository.cs

@@ -57,7 +57,7 @@ public class PaymentTransactionRepository : RepositoryBase<long, PaymentTransact
         }
 
       // 1. گرفتن تراکنش‌ها
-var paymentTransactionsData = await query
+var paymentTransactionsData = await query.OrderByDescending(x => x.CreationDate)
     .AsNoTracking()
     .Skip(searchModel.PageIndex)
     .Take(30)
@@ -83,7 +83,6 @@ var matchedBankAccounts = (await _companyContext.ContractingPartyBankAccounts.Wh
 
 // 4. ساختن خروجی
 var result = paymentTransactionsData
-    .OrderByDescending(x => x.CreationDate)
     .Select(x =>
     {
         var prefix = x.CardNumber?.Substring(0, 4);

ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/CaseHistory.js

@@ -295,6 +295,8 @@ $(".date").on('input', function () {
 }).mask("0000/00/00");
 
 function caseHistoryLoadAjax() {
+    debugger;
+    console.log(hasData +"111");
 
     var filterEmployeeId = 0;
     var filterStart = "";
@@ -342,10 +344,10 @@ function caseHistoryLoadAjax() {
         data: data,
         headers: { "RequestVerificationToken": antiForgeryToken },
         success: function (response) {
+            debugger;
             var caseHistoryData = response.data;
             var caseHistoryEmployeeData = response.dataEmployee;
-
-
+            
             if (response.isSuccedded) {
                 if (caseHistoryData == null) {
                     
@@ -674,7 +676,7 @@ function caseHistoryLoadAjax() {
                         hasData = false;
                     }
                 } else {
-                    if (caseHistoryData.dateFa !== null) {
+                    if (caseHistoryData?.dateFa !== null&&caseHistoryData.activeEmployees.length>0) {
                         $('#dateFaEmployee').hide();
 
                         html += `
@@ -959,7 +961,8 @@ function caseHistoryLoadAjax() {
                         hasData = false;
                     }
                 }
-            } else {
+            }
+            else {
                 hasData = false;
             }
 
@@ -981,6 +984,7 @@ function loadUntilHeightExceeds() {
 }
 
 if (hasData) {
+    console.log(hasData);
     loadUntilHeightExceeds();
 }