From 0b73102ef4e6065bb0ad37ab6c7ffde22b782577 Mon Sep 17 00:00:00 2001 From: SamSys Date: Mon, 10 Mar 2025 21:06:28 +0330 Subject: [PATCH] fixed employeeDocument search bugs --- .../EmployeesDocuments/EmployeeList.cshtml | 4 ++-- .../Company/EmployeesDocuments/Index.cshtml | 8 +++---- .../EmployeesDocument/js/EmployeeList.js | 22 ++++++++++--------- .../pages/EmployeesDocument/js/Index.js | 22 +++++++++++-------- 4 files changed, 31 insertions(+), 25 deletions(-) diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/EmployeesDocuments/EmployeeList.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/EmployeesDocuments/EmployeeList.cshtml index 684507df..b0bd7e36 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/EmployeesDocuments/EmployeeList.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/Company/EmployeesDocuments/EmployeeList.cshtml @@ -158,7 +158,7 @@
-
+
حذف جستجو
@@ -174,7 +174,7 @@
- +
diff --git a/ServiceHost/Areas/Client/Pages/Company/EmployeesDocuments/Index.cshtml b/ServiceHost/Areas/Client/Pages/Company/EmployeesDocuments/Index.cshtml index 87891b18..f18b01c8 100644 --- a/ServiceHost/Areas/Client/Pages/Company/EmployeesDocuments/Index.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/EmployeesDocuments/Index.cshtml @@ -23,7 +23,7 @@
- +

اطلاعات مدارک پرسنل

@Model.WorkshopFullName
@@ -40,7 +40,7 @@
-
+
@@ -158,7 +158,7 @@
-
+
حذف جستجو
@@ -174,7 +174,7 @@
- +
diff --git a/ServiceHost/wwwroot/AssetsAdminNew/EmployeesDocument/js/EmployeeList.js b/ServiceHost/wwwroot/AssetsAdminNew/EmployeesDocument/js/EmployeeList.js index 1630fd64..3eb7d49c 100644 --- a/ServiceHost/wwwroot/AssetsAdminNew/EmployeesDocument/js/EmployeeList.js +++ b/ServiceHost/wwwroot/AssetsAdminNew/EmployeesDocument/js/EmployeeList.js @@ -1,5 +1,5 @@ var pageIndexJs = 0; -var pageIndex = 0; +var indexPage = 0; var mode = 'active'; var searchName = ''; @@ -12,7 +12,8 @@ $(document).ready(function () { $(this).addClass('active'); $('.btn-clear-filter').addClass('disable'); pageIndexJs = 0; - pageIndex = 0; + indexPage = 0; + n = 1; $('#personnelDocumentsAjax').html(''); $('.employeeName').val(''); loadPersonnelDocuments(mode, searchName = ''); @@ -35,6 +36,8 @@ $(document).on('click', '.btn-uploadingPD, .btn-uploadingPD-mobile', function () $(document).on('click', '.btn-search-click, .btn-search-click-mobile', function () { pageIndexJs = 0; + indexPage = 0; + n = 1; $('#personnelDocumentsAjax').html(''); $('.btn-clear-filter').removeClass('disable'); searchName = $('.employeeName').val().trim(); @@ -46,6 +49,8 @@ $(document).on('click', '.btn-search-click, .btn-search-click-mobile', function }); $(document).on('click', '.btn-clear-filter', function () { pageIndexJs = 0; + indexPage = 0; + n = 1; $('#personnelDocumentsAjax').html(''); $('.btn-clear-filter').addClass('disable'); $('.employeeName').val(''); @@ -95,14 +100,15 @@ function loadPersonnelDocuments(mode, searchName) { dataType: 'json', type: 'GET', url: employeeDocumentsAjaxLoadData, - data: { workshopId: workshopId, searchMode: mode, employeeName: searchName, 'pageIndex': pageIndex }, + data: { workshopId: workshopId, searchMode: mode, employeeName: searchName, 'pageIndex': pageIndexJs }, headers: { "RequestVerificationToken": antiForgeryToken }, success: function (response) { var personnelDocumentsData = response.data; if (response.isSuccedded) { personnelDocumentsData.forEach(function (item) { - var n = pageIndexJs + 1; + var n = indexPage + 1; + indexPage++; html += `
`; - - pageIndexJs++; - }); - - pageIndexJs = pageIndex + response.pageIndex; - pageIndex = pageIndexJs; + + pageIndexJs += response.pageIndex; $('#personnelDocumentsAjax').append(html); } else { html += `
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/EmployeesDocument/js/Index.js b/ServiceHost/wwwroot/AssetsClient/pages/EmployeesDocument/js/Index.js index b5cd00b9..6d0a7791 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/EmployeesDocument/js/Index.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/EmployeesDocument/js/Index.js @@ -1,5 +1,5 @@ var pageIndexJs = 0; -var pageIndex = 0; +var indexPage = 0; var mode = 'active'; var searchName = ''; @@ -12,7 +12,8 @@ $(document).ready(function () { $(this).addClass('active'); $('.btn-clear-filter').addClass('disable'); pageIndexJs = 0; - pageIndex = 0; + indexPage = 0; + n = 1; $('#personnelDocumentsAjax').html(''); $('.employeeName').val(''); loadPersonnelDocuments(mode, searchName = ''); @@ -42,10 +43,12 @@ $(document).on('click', '.btn-uploadingPD, .btn-uploadingPD-mobile', function () $(document).on('click', '.btn-search-click, .btn-search-click-mobile', function () { pageIndexJs = 0; + indexPage = 0; + n = 1; $('#personnelDocumentsAjax').html(''); $('.btn-clear-filter').removeClass('disable'); searchName = $('.employeeName').val().trim(); - if (searchName == "") { + if (searchName === "") { $('.btn-clear-filter').addClass('disable'); } $('#searchModal').modal('hide'); @@ -53,6 +56,8 @@ $(document).on('click', '.btn-search-click, .btn-search-click-mobile', function }); $(document).on('click', '.btn-clear-filter', function () { pageIndexJs = 0; + indexPage = 0; + n = 1; $('#personnelDocumentsAjax').html(''); $('.btn-clear-filter').addClass('disable'); $('.employeeName').val(''); @@ -102,14 +107,15 @@ function loadPersonnelDocuments(mode, searchName) { dataType: 'json', type: 'GET', url: employeeDocumentsAjaxLoadData, - data: { searchMode: mode, employeeName: searchName, 'pageIndex': pageIndex }, + data: { searchMode: mode, employeeName: searchName, 'pageIndex': pageIndexJs }, headers: { "RequestVerificationToken": antiForgeryToken }, success: function (response) { var personnelDocumentsData = response.data; if (response.isSuccedded) { personnelDocumentsData.forEach(function (item) { - var n = pageIndexJs + 1; + var n = indexPage + 1; + indexPage++; html += `
- ${n} + ${n++}
${item.employeeId}
@@ -344,11 +350,9 @@ function loadPersonnelDocuments(mode, searchName) {
`; - pageIndexJs++; }); - pageIndexJs = pageIndex + response.pageIndex; - pageIndex = pageIndexJs; + pageIndexJs += response.pageIndex; $('#personnelDocumentsAjax').append(html); } else { html += `