diff --git a/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs b/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs index 1419fd36..9af13e1a 100644 --- a/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs +++ b/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs @@ -342,43 +342,7 @@ public class InsuranceListRepository : RepositoryBase, IIns var acountId = _authHelper.CurrentAccountId(); var workshopIds = _context.WorkshopAccounts.Where(x => x.AccountId == acountId).Select(x => x.WorkshopId); - - #region sample - - //var query = _context.InsuranceListSet - // .Where(x => workshopIds.Contains(x.WorkshopId)) - // .Join(_context.Workshops.Include(x => x.InsuranceWorkshopInfo), - // insurance => insurance.WorkshopId, - // workshop => workshop.id, - // (insurance, workshop) => new { insurance, workshop }) - // .Join(_context.WorkshopEmployers, - // result => result.workshop.id, - // employer => employer.WorkshopId, - // (result, employer) => new InsuranceListViewModel - // { - // Id = result.insurance.id, - // Year = result.insurance.Year, - // MonthNumber = result.insurance.Month, - // Month = result.insurance.Month.GetMonthByNumber(), - // WorkShopId = result.insurance.WorkshopId, - // WorkShopCode = result.workshop.InsuranceWorkshopInfo != null ? result.workshop.InsuranceWorkshopInfo.InsuranceCode : result.workshop.InsuranceCode, - // WorkShopName = result.workshop.InsuranceWorkshopInfo != null ? result.workshop.InsuranceWorkshopInfo.WorkshopName : result.workshop.WorkshopFullName, - // TypeOfInsuranceSend = result.workshop.TypeOfInsuranceSend == "NormalList" ? "عادی" : - // result.workshop.TypeOfInsuranceSend == "Govermentlist" ? "کمک دولت" : - // result.workshop.TypeOfInsuranceSend == "Familylist" ? "خانوادگی" : "", - // FixedSalary = result.workshop.FixedSalary, - // StrFixedSalary = result.workshop.FixedSalary ? "دارد" : "ندارد", - // EmployerName = result.workshop.InsuranceWorkshopInfo != null ? result.workshop.InsuranceWorkshopInfo.EmployerName : result.workshop.WorkshopFullName, - // Branch = "", - // City = "", - // ConfirmSentlist = result.insurance.ConfirmSentlist, - // IsBlockCantracingParty = "", - // EmployerId = employer.EmployerId, - - // }); - - - #endregion + var query = _context.InsuranceListSet .Where(x => workshopIds.Contains(x.WorkshopId)) diff --git a/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Index.cshtml b/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Index.cshtml index cc37be84..0191e276 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Index.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Index.cshtml @@ -320,6 +320,11 @@
+ + +
+
+ + +
+ +
+
+ بازرسی: + ${booleanSvgResponse(item.inspectionDone)} +
+ +
+ بدهی: + ${booleanSvgResponse(item.debtDone)} +
+
+ +
+
+ تاییده کارفرما: + ${booleanSvgResponse(item.employerApproved)} +
+ +
+ ارسال لیست: + ${booleanSvgResponse(item.confirmSentlist, item.employerApprovalStatus)} +
+
+ +
+
+ شعبه تامین اجتماعی: + ${item.branch === `` ? `-` : item.branch} +
+ +
+ لیست مقطوع: + ${item.strFixedSalary} +
+
+ +
+
+ شهرستان: + ${item.city === `` ? `-` : item.city} +
+ +
+ نوع ارسال لیست: + ${item.typeOfInsuranceSend} +
+
+ +
+
+ نام کافرما: + ${item.employerName} +
+
+ +
+ ${generateButtons(item, pathDSKKAR00, pathDSKWOR00)} +
+ +
+
`; + + pageIndexJs++; + }); + } else { + var emptyHtml = ``; + if (pageIndexJs === responseData.length) { + emptyHtml = ` +
+
+ +
اطلاعاتی وجود ندارد.
+
+
`; + } + + html += emptyHtml; + htmlMobile += emptyHtml; + hasMoreData = false; + } + + $("#load-data-html").append(html); + $("#load-data-html-mobile").append(htmlMobile); + }); + } + } $('.btn-search-click').click(function () { urlParamsSearch @@ -207,6 +470,7 @@ async function loadGetTabCounts() { try { var response = await ajaxService.get(ajaxGetTabCountsUrl, searchModel, true); + updateStatus('notStarted', response.notStarted); updateStatus('inProgress', response.inProgress); updateStatus('readyToSendList', response.readyToSendList); @@ -249,7 +513,7 @@ function loadSearchNew(status = 0) { var html = ""; var htmlMobile = ""; - + var paramsUrl = UrlParamsBuilder.readParams([ "year", "month", @@ -277,25 +541,26 @@ function loadSearchNew(status = 0) { }; var b = pageIndexJs % 30; - + if (b === 0 && hasMoreData) { ajaxService.get(ajaxSearchNewUrl, searchModel, false) .then(response => { var responseData = response.data; - if (responseData.length > 0) { + if (responseData.length > 0) { responseData.forEach(function (item) { + var n = pageIndexJs + 1; var pathDSKKAR00 = item.workShopId + "\\" + item.year + "_" + item.month + "\\DSKKAR00.dbf"; var pathDSKWOR00 = item.workShopId + "\\" + item.year + "_" + item.month + "\\DSKWOR00.dbf"; - + const rowBgClass = item.isBlockCantracingParty === "true" ? "tw-bg-[#b1c3c3] hover:tw-bg-[#bbc6c6]" : item.confirmSentlist - ? "tw-bg-[#d8f5d2] hover:tw-bg-[#c7ebc0]" - : (n % 2 === 0 - ? "tw-bg-[#ecffff] hover:tw-bg-[#C9F0F0]" - : "tw-bg-[#ddf4f4] hover:tw-bg-[#C9F0F0]"); + ? "tw-bg-[#d8f5d2] hover:tw-bg-[#c7ebc0]" + : (n % 2 === 0 + ? "tw-bg-[#ecffff] hover:tw-bg-[#C9F0F0]" + : "tw-bg-[#ddf4f4] hover:tw-bg-[#C9F0F0]"); html += `
@@ -307,7 +572,8 @@ function loadSearchNew(status = 0) {
${item.year}
${convertMonthToString(item.month)}
-
${item.archiveCode}
+
${item.archiveCode}
+
${item.workShopCode}
@@ -389,8 +655,9 @@ function loadSearchNew(status = 0) {
${item.year}
-
${convertMonthToString(item.month)}
-
${item.archiveCode}
+
${convertMonthToString(item.month)}
+
${item.archiveCode}
+
${item.workShopName}
@@ -505,7 +772,7 @@ function loadSearchNew(status = 0) { function generateButtons(item, pathDSKKAR00, pathDSKWOR00) { var html = ''; var htmlMobile = ''; - + var canShowActions = (currentAccountId === 1 && item.confirmSentlist) || !item.confirmSentlist; var isDisabled = item.isBlockCantracingParty === 'true' ? 'disable' : ''; @@ -548,11 +815,11 @@ function generateButtons(item, pathDSKKAR00, pathDSKWOR00) { } //if (item.inspectionDone && item.debtDone && item.employerApproved && item.confirmSentlist) { - //if (item.inspectionDone || item.debtDone || item.employerApproved || item.confirmSentlist) { + if (item.inspectionDone || item.debtDone || item.employerApproved || item.confirmSentlist) { // Confirm List and Print Button if (hasPermission_80215) { html += ` - + @@ -564,7 +831,7 @@ function generateButtons(item, pathDSKKAR00, pathDSKWOR00) { پرینت `; } - //} + } if (item.inspectionDone || item.debtDone || item.employerApproved || item.confirmSentlist) { // Summary List and Print Button @@ -627,7 +894,7 @@ function booleanSvgResponse(bool, employerApprovalStatus) { var isWrittenVerbal = employerApprovalStatus === 1; var svg = ``; - if (bool) { + if (bool) { svg = ` @@ -687,7 +954,7 @@ function convertMonthToString(value) { result = "بدون ماه"; break; } - + return result; } @@ -827,8 +1094,8 @@ searchBoxWorkshop.on('keyup keypress', function (e) { //keyboard Arrow Key Select And Enter liListWorkshop = $('#empWorkshop ul li'); mixContainerAndSerchResultWorkshop.animate({ - scrollTop: $(liListWorkshop.eq(0)).offset().top - containerWorkshop.offset().top + containerWorkshop.scrollTop() - }, + scrollTop: $(liListWorkshop.eq(0)).offset().top - containerWorkshop.offset().top + containerWorkshop.scrollTop() + }, 50); if (e.which === 40) {// if ArrowUp if (countWorkshop > 0 && countWorkshop <= liListWorkshop.length) { @@ -840,8 +1107,8 @@ searchBoxWorkshop.on('keyup keypress', function (e) { if (countWorkshop > 4) { //ScrollDown mixContainerAndSerchResultWorkshop.animate({ - scrollTop: $(liPointerWorkshop).offset().top - containerWorkshop.offset().top + containerWorkshop.scrollTop() - }, + scrollTop: $(liPointerWorkshop).offset().top - containerWorkshop.offset().top + containerWorkshop.scrollTop() + }, 50); } countWorkshop += 1; @@ -984,8 +1251,8 @@ searchBoxEmployer.on('keyup keypress', function (e) { //keyboard Arrow Key Select And Enter liListEmployer = $('#empEmployer ul li'); mixContainerAndSerchResultEmployer.animate({ - scrollTop: $(liListEmployer.eq(0)).offset().top - containerEmployer.offset().top + containerEmployer.scrollTop() - }, + scrollTop: $(liListEmployer.eq(0)).offset().top - containerEmployer.offset().top + containerEmployer.scrollTop() + }, 50); if (e.which === 40) {// if ArrowUp if (countEmployer > 0 && countEmployer <= liListEmployer.length) { @@ -997,8 +1264,8 @@ searchBoxEmployer.on('keyup keypress', function (e) { if (countEmployer > 4) { //ScrollDown mixContainerAndSerchResultEmployer.animate({ - scrollTop: $(liPointerEmployer).offset().top - containerEmployer.offset().top + containerEmployer.scrollTop() - }, + scrollTop: $(liPointerEmployer).offset().top - containerEmployer.offset().top + containerEmployer.scrollTop() + }, 50); } countEmployer += 1; @@ -1017,8 +1284,8 @@ searchBoxEmployer.on('keyup keypress', function (e) { liPointerEmployer = liListEmployer.eq(countEmployer); //ScrollUp mixContainerAndSerchResultEmployer.animate({ - scrollTop: $(liPointerEmployer).offset().top - containerEmployer.offset().top + containerEmployer.scrollTop() - }, + scrollTop: $(liPointerEmployer).offset().top - containerEmployer.offset().top + containerEmployer.scrollTop() + }, 50); } }