admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed employeeDocument search bugs

Browse Source
This commit is contained in:
SamSys
2025-03-10 21:06:28 +03:30
parent 61440c2a1b
commit 0b73102ef4
4 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ServiceHost/Areas/AdminNew/Pages/Company/EmployeesDocuments/EmployeeList.cshtml
View File

@@ -158,7 +158,7 @@
<div><input type="text" name="employeeName" class="form-control employeeName" placeholder="نام پرسنل"></div>
</div>
<div class="col-12">
<div class="btn-clear-filter py-2 text-center d-block w-100 mt-2">
<div class="btn-clear-filter py-2 text-center d-block w-100 disable mt-2">
<span class="w-100">حذف جستجو</span>
</div>
</div>
@@ -174,7 +174,7 @@
<button type="button" class="btn-cancel w-100" data-bs-dismiss="modal">بستن</button>
</div>
<div class="col-6 text-start">
<button type="submit" class="btn-search btn-search-click w-100">جستجو</button>
<button type="submit" class="btn-search btn-search-click-mobile w-100">جستجو</button>
</div>
</div>
</div>

8
ServiceHost/Areas/Client/Pages/Company/EmployeesDocuments/Index.cshtml
View File

@@ -23,7 +23,7 @@
<div class="row p-2">
<div class="col p-0 m-0 d-flex align-items-center justify-content-between">
<div class="col d-flex align-items-center justify-content-start">
<img src="~/AssetsClient/images/icons/list-info-personnel.png" alt="" class="img-fluid me-2" style="width: 45px;" />
<img src="~/AssetsClient/images/icons/documents-upload.png" alt="" class="img-fluid me-2" style="width: 45px;" />
<div>
<h4 class="title d-flex align-items-center">اطلاعات مدارک پرسنل</h4>
<div>@Model.WorkshopFullName</div>
@@ -40,7 +40,7 @@
<div class="container-fluid">
<div class="row p-2">
<div class="row py-2">
<div class="align-items-center d-flex">
<button data-mode="active" class="btnTabPD active">پرسنل های فعال</button>
<button data-mode="deactive" class="btnTabPD">پرسنل های غیر فعال</button>
@@ -158,7 +158,7 @@
<div><input type="text" name="employeeName" class="form-control employeeName" placeholder="نام پرسنل"></div>
</div>
<div class="col-12">
<div class="btn-clear-filter py-2 text-center d-block w-100 mt-2">
<div class="btn-clear-filter py-2 text-center disable d-block w-100 mt-2">
<span class="w-100">حذف جستجو</span>
</div>
</div>
@@ -174,7 +174,7 @@
<button type="button" class="btn-cancel w-100" data-bs-dismiss="modal">بستن</button>
</div>
<div class="col-6 text-start">
<button type="submit" class="btn-search btn-search-click w-100">جستجو</button>
<button type="submit" class="btn-search btn-search-click-mobile w-100">جستجو</button>
</div>
</div>
</div>

22
ServiceHost/wwwroot/AssetsAdminNew/EmployeesDocument/js/EmployeeList.js
View File

@@ -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 += `<div></div>
<div class="Rtable-row align-items-center openAction ${item.isBlack === "true"
? `withdraw`
@@ -338,13 +344,9 @@ function loadPersonnelDocuments(mode, searchName) {
</div>
</div>
</div>`;
pageIndexJs++;
});
pageIndexJs = pageIndex + response.pageIndex;
pageIndex = pageIndexJs;
pageIndexJs += response.pageIndex;
$('#personnelDocumentsAjax').append(html);
} else {
html += `<div class="text-center bg-white d-flex align-items-center justify-content-center">

22
ServiceHost/wwwroot/AssetsClient/pages/EmployeesDocument/js/Index.js
View File

@@ -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 += `<div></div>
<div class="Rtable-row align-items-center openAction ${item.isBlack === "true"
? `withdraw`
@@ -117,7 +123,7 @@ function loadPersonnelDocuments(mode, searchName) {
<div class="Rtable-cell width1" style="margin-left:3px; ">
<div class="Rtable-cell--content">
<span class="d-flex justify-content-center">
${n}
${n++}
<div class="d-none idPersonnel">${item.employeeId}</div>
</span>
</div>
@@ -344,11 +350,9 @@ function loadPersonnelDocuments(mode, searchName) {
</div>
</div>
</div>`;
pageIndexJs++;
});
pageIndexJs = pageIndex + response.pageIndex;
pageIndex = pageIndexJs;
pageIndexJs += response.pageIndex;
$('#personnelDocumentsAjax').append(html);
} else {
html += `<div class="text-center bg-white d-flex align-items-center justify-content-center">