From 8dc998ae4b4dcd58d93aba6807a9e9e5488b4e41 Mon Sep 17 00:00:00 2001 From: sriramv Date: Sat, 15 Dec 2018 11:50:09 +0530 Subject: [PATCH] all report search value in serialno is order sequence --- Apollo/assets/js/controllers/report_ans_bookletCtrl.js | 1 + Apollo/assets/js/controllers/report_app_pendingCtrl.js | 1 + .../assets/js/controllers/report_app_pending_oldDataCtrl.js | 1 + Apollo/assets/js/controllers/report_balfeeCtrl.js | 1 + Apollo/assets/js/controllers/report_certificateCtrl.js | 1 + Apollo/assets/js/controllers/report_doc_pendingCtrl.js | 1 + Apollo/assets/js/controllers/report_examfeeCtrl.js | 1 + Apollo/assets/js/controllers/report_expenseCtrl.js | 1 + Apollo/assets/js/controllers/report_leadCtrl.js | 1 + .../assets/js/controllers/report_markcard_certificateCtrl.js | 1 + Apollo/assets/js/controllers/report_markcard_statusCtrl.js | 1 + .../assets/js/controllers/report_study_material_statusCtrl.js | 1 + Apollo/assets/js/controllers/report_waiver_referalCtrl.js | 1 + Apollo/assets/views/report_answer_booklets.html | 4 ++-- Apollo/assets/views/report_application_pending.html | 4 ++-- Apollo/assets/views/report_application_pending_oldData.html | 4 ++-- Apollo/assets/views/report_balance_fee.html | 4 ++-- Apollo/assets/views/report_certificate_status.html | 4 ++-- Apollo/assets/views/report_document_pending.html | 4 ++-- Apollo/assets/views/report_exam_writing_fee.html | 4 ++-- Apollo/assets/views/report_expense.html | 4 ++-- Apollo/assets/views/report_lead.html | 4 ++-- Apollo/assets/views/report_mark_certificate_status.html | 4 ++-- Apollo/assets/views/report_markcardstatus.html | 4 ++-- Apollo/assets/views/report_studymaterialstatus.html | 4 ++-- Apollo/assets/views/report_waiver_referal.html | 4 ++-- 26 files changed, 39 insertions(+), 26 deletions(-) diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js index ae69ea78..7eebd3ab 100755 --- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js +++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js @@ -14,6 +14,7 @@ $scope.isLoaderShow1 =false; $scope.isLoaderTxt = "Loading..."; $scope.generateButtonTxt = "GENERATE"; $scope.generateButtonStatus = false; + $scope.currentPage = 1; $scope.myModel = { "date": new Date(), diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js index e6d27905..ccc27c50 100755 --- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js @@ -14,6 +14,7 @@ $scope.isLoaderShow1 =false; $scope.isLoaderTxt = "Loading..."; $scope.generateButtonTxt = "GENERATE"; $scope.generateButtonStatus = false; + $scope.currentPage = 1; $scope.myModel = { "date": new Date(), diff --git a/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js b/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js index 9aed01f5..47421eb2 100644 --- a/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js @@ -14,6 +14,7 @@ $scope.isLoaderShow1 =false; $scope.isLoaderTxt = "Loading..."; $scope.generateButtonTxt = "GENERATE"; $scope.generateButtonStatus = false; + $scope.currentPage = 1; $scope.myModel = { "date": new Date(), diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js index fdf1df59..a96c13a6 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -14,6 +14,7 @@ $scope.isLoaderShow1 =false; $scope.isLoaderTxt = "Loading..."; $scope.generateButtonTxt = "GENERATE"; $scope.generateButtonStatus = false; + $scope.currentPage = 1; $scope.myModel = { "date": new Date(), diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js index 4d71a22c..5c3d2bb5 100755 --- a/Apollo/assets/js/controllers/report_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_certificateCtrl.js @@ -14,6 +14,7 @@ $scope.isLoaderTxt = "Loading..."; $scope.isLoaderTxt1 ="Selected Date Range is wrong"; $scope.generateButtonTxt = "GENERATE"; $scope.generateButtonStatus = false; + $scope.currentPage = 1; $scope.myModel = { diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js index 965d139f..2a818f51 100755 --- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js @@ -14,6 +14,7 @@ $scope.isLoaderShow1 =false; $scope.isLoaderTxt = "Loading..."; $scope.generateButtonTxt = "GENERATE"; $scope.generateButtonStatus = false; + $scope.currentPage = 1; $scope.myModel = { "date": new Date(), diff --git a/Apollo/assets/js/controllers/report_examfeeCtrl.js b/Apollo/assets/js/controllers/report_examfeeCtrl.js index db6f9898..c8744603 100755 --- a/Apollo/assets/js/controllers/report_examfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_examfeeCtrl.js @@ -14,6 +14,7 @@ $scope.isLoaderShow1 =false; $scope.isLoaderTxt = "Loading..."; $scope.generateButtonTxt = "GENERATE"; $scope.generateButtonStatus = false; + $scope.currentPage = 1; $scope.myModel = { "date": new Date(), diff --git a/Apollo/assets/js/controllers/report_expenseCtrl.js b/Apollo/assets/js/controllers/report_expenseCtrl.js index 48c4673e..a686a3c5 100755 --- a/Apollo/assets/js/controllers/report_expenseCtrl.js +++ b/Apollo/assets/js/controllers/report_expenseCtrl.js @@ -25,6 +25,7 @@ $scope.isLoaderTxt = "Loading..."; $scope.isLoaderTxt1 ="Selected Date Range is wrong"; $scope.generateButtonTxt = "GENERATE"; $scope.generateButtonStatus = false; + $scope.currentPage = 1; const LOCALTYPE = localDetail.localType; //console.log(LOCALTYPE) diff --git a/Apollo/assets/js/controllers/report_leadCtrl.js b/Apollo/assets/js/controllers/report_leadCtrl.js index c52ee6be..e47f8d89 100644 --- a/Apollo/assets/js/controllers/report_leadCtrl.js +++ b/Apollo/assets/js/controllers/report_leadCtrl.js @@ -15,6 +15,7 @@ $scope.isLoaderTxt = "Loading..."; $scope.isLoaderTxt1 ="Selected Date Range is wrong"; $scope.generateButtonTxt = "GENERATE"; $scope.generateButtonStatus = false; + $scope.currentPage = 1; $scope.myModel = { "date": new Date(), diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js index 6b29f02f..16a12d7f 100755 --- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js @@ -15,6 +15,7 @@ $scope.isLoaderTxt = "Loading..."; $scope.isLoaderTxt1 ="Selected Date Range is wrong"; $scope.generateButtonTxt = "GENERATE"; $scope.generateButtonStatus = false; + $scope.currentPage = 1; $scope.myModel = { diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js index 8f30d8e0..691a2253 100755 --- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js @@ -13,6 +13,7 @@ $scope.isLoaderShow1 =false; $scope.isLoaderTxt = "Loading..."; $scope.generateButtonTxt = "GENERATE"; $scope.generateButtonStatus = false; + $scope.currentPage = 1; $scope.myModel = { "date": new Date(), diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js index 5d133168..3eefff8c 100755 --- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js @@ -15,6 +15,7 @@ $scope.isLoaderShow1 =false; $scope.isLoaderTxt = "Loading..."; $scope.generateButtonTxt = "GENERATE"; $scope.generateButtonStatus = false; + $scope.currentPage = 1; $scope.myModel = { diff --git a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js index d265f21e..f94d622d 100755 --- a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js +++ b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js @@ -21,6 +21,7 @@ $scope.isLoaderShow1 =false; $scope.isLoaderTxt = "Loading..."; $scope.generateButtonTxt = "GENERATE"; $scope.generateButtonStatus = false; + $scope.currentPage = 1; $scope.filters = function () { var filterlist = { diff --git a/Apollo/assets/views/report_answer_booklets.html b/Apollo/assets/views/report_answer_booklets.html index 7919e7fa..401d4eaa 100755 --- a/Apollo/assets/views/report_answer_booklets.html +++ b/Apollo/assets/views/report_answer_booklets.html @@ -114,9 +114,9 @@ td,th { - + - {{p.SL_NO}} + {{10 * (currentPage-1)+$index+1}} {{p.Enrollment_id}} {{p.Student_name}} {{p.Father_name}} diff --git a/Apollo/assets/views/report_application_pending.html b/Apollo/assets/views/report_application_pending.html index 9109e3cc..4407aeae 100755 --- a/Apollo/assets/views/report_application_pending.html +++ b/Apollo/assets/views/report_application_pending.html @@ -119,9 +119,9 @@ - + - {{p.SL_NO}} + {{10 * (currentPage-1)+$index+1}} {{p.InitialPayDate}} {{p.EnrollmentNumber}} {{p.StudentRollNo}} diff --git a/Apollo/assets/views/report_application_pending_oldData.html b/Apollo/assets/views/report_application_pending_oldData.html index 9a52c0d0..c96a0a1e 100644 --- a/Apollo/assets/views/report_application_pending_oldData.html +++ b/Apollo/assets/views/report_application_pending_oldData.html @@ -113,9 +113,9 @@ - + - {{p.SL_NO}} + {{10 * (currentPage-1)+$index+1}} {{p.init_date}} {{p.eid}} {{p.Student_name}} diff --git a/Apollo/assets/views/report_balance_fee.html b/Apollo/assets/views/report_balance_fee.html index 8a3be074..ebea7e39 100755 --- a/Apollo/assets/views/report_balance_fee.html +++ b/Apollo/assets/views/report_balance_fee.html @@ -167,9 +167,9 @@ - + - {{p.SL_NO}} + {{itemsPerPage * (currentPage-1)+$index+1}} {{p.eid}} {{p.Student_name}} {{p.Father_name}} diff --git a/Apollo/assets/views/report_certificate_status.html b/Apollo/assets/views/report_certificate_status.html index 0ed43d67..298fc2cd 100755 --- a/Apollo/assets/views/report_certificate_status.html +++ b/Apollo/assets/views/report_certificate_status.html @@ -154,9 +154,9 @@ td,th { - + - {{p.SL_NO}} + {{10 * (currentPage-1)+$index+1}} {{p.initialPaid || "-"}} {{p.Enrollment_id || "-"}} {{p.Student_name}} diff --git a/Apollo/assets/views/report_document_pending.html b/Apollo/assets/views/report_document_pending.html index c16fa2d6..0505345e 100755 --- a/Apollo/assets/views/report_document_pending.html +++ b/Apollo/assets/views/report_document_pending.html @@ -114,9 +114,9 @@ td,th { - + - {{p.SL_NO}} + {{10 * (currentPage-1)+$index+1}} {{p.Admission_date}} {{p.Enrollment_id}} {{p.Student_name}} diff --git a/Apollo/assets/views/report_exam_writing_fee.html b/Apollo/assets/views/report_exam_writing_fee.html index cb3ab087..ef5e94bd 100755 --- a/Apollo/assets/views/report_exam_writing_fee.html +++ b/Apollo/assets/views/report_exam_writing_fee.html @@ -119,9 +119,9 @@ - + - {{p.SL_NO}} + {{10 * (currentPage-1)+$index+1}} {{p.Enrollment_id}} {{p.Student_name}} {{p.Father_name}} diff --git a/Apollo/assets/views/report_expense.html b/Apollo/assets/views/report_expense.html index 64a77399..e820c86f 100755 --- a/Apollo/assets/views/report_expense.html +++ b/Apollo/assets/views/report_expense.html @@ -117,8 +117,8 @@ - - {{p.SL_NO}} + + {{10 * (currentPage-1)+$index+1}} {{p.Expense_name}} {{p.January}} {{p.February}} diff --git a/Apollo/assets/views/report_lead.html b/Apollo/assets/views/report_lead.html index 6c5466ae..db550ca8 100644 --- a/Apollo/assets/views/report_lead.html +++ b/Apollo/assets/views/report_lead.html @@ -182,9 +182,9 @@ td,th { - + - {{p.SL_NO}} + {{10 * (currentPage-1)+$index+1}} {{p.date}} {{p.tid}} {{p.fup}} diff --git a/Apollo/assets/views/report_mark_certificate_status.html b/Apollo/assets/views/report_mark_certificate_status.html index a011cdb1..4ffc80a8 100755 --- a/Apollo/assets/views/report_mark_certificate_status.html +++ b/Apollo/assets/views/report_mark_certificate_status.html @@ -156,9 +156,9 @@ td,th { - + - {{p.SL_NO}} + {{10 * (currentPage-1)+$index+1}} {{p.Student_name}} {{p.Father_name}} {{p.University}} diff --git a/Apollo/assets/views/report_markcardstatus.html b/Apollo/assets/views/report_markcardstatus.html index af11ce1a..1db230d0 100755 --- a/Apollo/assets/views/report_markcardstatus.html +++ b/Apollo/assets/views/report_markcardstatus.html @@ -115,9 +115,9 @@ - + - {{p.SL_NO}} + {{10 * (currentPage-1)+$index+1}} {{p.Initial_paid_date}} {{p.Enrollment_id}} {{p.Roll_NO}} diff --git a/Apollo/assets/views/report_studymaterialstatus.html b/Apollo/assets/views/report_studymaterialstatus.html index 3cab7faa..46ace8fa 100755 --- a/Apollo/assets/views/report_studymaterialstatus.html +++ b/Apollo/assets/views/report_studymaterialstatus.html @@ -105,9 +105,9 @@ - + - {{p.SL_NO}} + {{10 * (currentPage-1)+$index+1}} {{p.Initial_paid_date}} {{p.Enrollment_id || '-'}} {{p.Student_name}} diff --git a/Apollo/assets/views/report_waiver_referal.html b/Apollo/assets/views/report_waiver_referal.html index 831ee7ae..12b02068 100755 --- a/Apollo/assets/views/report_waiver_referal.html +++ b/Apollo/assets/views/report_waiver_referal.html @@ -115,8 +115,8 @@ - - {{p.SL_NO}} + + {{10 * (currentPage-1)+$index+1}} {{p.Enrollment_id}} {{p.Student_name}} {{p.Father_name}}