diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index 4b6896d3..9b330645 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -507,6 +507,7 @@ class Fees_status_model extends CI_Model $this->db->select('ReceiptNo'); $this->db->where('ReceiptNo', $feesPaidDetails['ReceiptNo']); + $this->db->where('IsActive', '1'); if($this->db->get(STUDENTS_FEES_PAID)->first_row() AND $feesPaidDetails['ReceiptNo']!=''){ $result['paidStatus'] = false; $result['message'] = "This receipt number is already exist!"; diff --git a/Apollo/assets/js/controllers/examAttendanceCtrl.js b/Apollo/assets/js/controllers/examAttendanceCtrl.js index 6145664a..f1882ca4 100644 --- a/Apollo/assets/js/controllers/examAttendanceCtrl.js +++ b/Apollo/assets/js/controllers/examAttendanceCtrl.js @@ -297,11 +297,30 @@ $scope.isLoaderTxt = "Loading..."; var heading1='Attendance of '+$scope.pdfExamDateToDisplay+'After Noon Session'+" - "+ 'Attendance of '+$scope.pdfExamDateToDisplay+'Fore Noon Session'; doc1.setFontSize(9); doc1.setFontStyle('bold'); - doc1.text(60,30,heading); - //doc1.textAlign('CENTER',50,30,heading); + //doc1.text(60,30,heading); + var heading_length = heading.length; + var heading_start_point = 0; + var heading1_start_point = 0; + if(heading_length <= 100) + { + var heading_start_point = 200; + var heading1_start_point = 225; + } + else + { + var heading_start_point = 100; + var heading1_start_point = 150; + } + // console.log(heading_length); + // console.log((doc1.internal.pageSize.width/2)); + // console.log((doc1.internal.pageSize.width/2)-(heading_length)); + + + doc1.text(heading_start_point,30,heading); doc1.setFontSize(9); doc1.setFontStyle('bold'); - doc1.text(70,45,heading1); + //doc1.text(70,45,heading1); + doc1.text(heading1_start_point,45,heading1); }; // ctx.textAlign = "right"; @@ -312,11 +331,23 @@ $scope.isLoaderTxt = "Loading..."; var heading1='Attendance of '+$scope.pdfExamDateToDisplay+'After Noon Session'+" - "+ 'Attendance of '+$scope.pdfExamDateToDisplay+'Fore Noon Session'; doc2.setFontSize(9); doc2.setFontStyle('bold'); - - doc2.text(50,30,heading); + var heading_length = heading.length; + var heading_start_point = 0; + var heading1_start_point = 0; + if(heading_length <= 100) + { + var heading_start_point = 200; + var heading1_start_point = 225; + } + else + { + var heading_start_point = 100; + var heading1_start_point = 150; + } + doc2.text(heading_start_point,30,heading); doc2.setFontSize(9); doc2.setFontStyle('bold'); - doc2.text(70,45,heading1); + doc2.text(heading1_start_point,45,heading1); }; diff --git a/Apollo/assets/js/controllers/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js index 8007c128..c477ebcf 100755 --- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js +++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js @@ -357,6 +357,8 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun console.log('child'); $scope.localPdfUniverityDetails = pdfitems.universityDetails; $scope.universityNamePDF = $scope.localPdfUniverityDetails[0].UniversityName; + $scope.length_of_universityNamePDF = $scope.universityNamePDF.length/2; + console.log('$scope.length_of_universityNamePDF'+$scope.length_of_universityNamePDF); $scope.universityAddressPDF = $scope.localPdfUniverityDetails[0].Address; $scope.universityEmailPDF = $scope.localPdfUniverityDetails[0].EmailID; $scope.universityLogoPDF = $scope.localPdfUniverityDetails[0].ProfilePicPath; @@ -473,20 +475,27 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun fileName = value.EnrollmentID+'-'+value.Firstname+value.Lastname+$scope.courseNamePDF+semName+'.pdf'; doc.setDrawColor(0); doc.setFillColor(245, 245, 240); - doc.rect(150, 30, 395, 60,'FD'); + doc.rect(120, 30, 425, 67,'FD'); doc.setFontSize(12); doc.setTextColor(40); doc.setFontStyle('normal'); doc.addImage(dataURL, 'jpeg', 50, 35, 50, 50);//university logo location doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location - + var uni_add_position = 0; + if($scope.length_of_universityNamePDF >= 20 ){ + + uni_add_position = 110;console.log(uni_add_position); + } + else{ + uni_add_position = 10;console.log(uni_add_position); + } doc.setFontSize(10); - doc.text(150,50,$scope.universityNamePDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF); doc.setFontSize(8); - doc.text(170,65,$scope.universityAddressPDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text(280,80,$scope.universityEmailPDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); @@ -697,20 +706,27 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun fileName = value.EnrollmentID+'-'+value.Firstname+value.Lastname+$scope.courseNamePDF+semName+'.pdf'; doc.setDrawColor(0); doc.setFillColor(245, 245, 240); - doc.rect(150, 30, 395, 60,'FD'); + doc.rect(120, 30, 425, 67,'FD'); doc.setFontSize(12); doc.setTextColor(40); doc.setFontStyle('normal'); doc.addImage(dataURL, 'jpeg', 50, 35, 50, 50);//university logo location doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location - + var uni_add_position = 0; + if($scope.length_of_universityNamePDF >= 20 ){ + + uni_add_position = 110;console.log(uni_add_position); + } + else{ + uni_add_position = 10;console.log(uni_add_position); + } doc.setFontSize(10); - doc.text(150,50,$scope.universityNamePDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF); doc.setFontSize(8); - doc.text(170,65,$scope.universityAddressPDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text(280,80,$scope.universityEmailPDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); @@ -874,7 +890,7 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun fileName = value.EnrollmentID+'-'+value.Firstname+value.Lastname+$scope.courseNamePDF+semName+'.pdf'; doc.setDrawColor(0); doc.setFillColor(245, 245, 240); - doc.rect(150, 30, 395, 60,'FD'); + doc.rect(120, 30, 425, 67,'FD'); doc.setFontSize(12); doc.setTextColor(40); doc.setFontStyle('normal'); @@ -882,12 +898,20 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun doc.addImage(dataURL, 'jpeg', 50, 35, 50, 50);//university logo location doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location + var uni_add_position = 0; + if($scope.length_of_universityNamePDF >= 20 ){ + + uni_add_position = 110;console.log(uni_add_position); + } + else{ + uni_add_position = 10;console.log(uni_add_position); + } doc.setFontSize(10); - doc.text(150,50,$scope.universityNamePDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF); doc.setFontSize(8); - doc.text(170,65,$scope.universityAddressPDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text(280,80,$scope.universityEmailPDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js index 1f0e9b59..2ab1a193 100755 --- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js +++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js @@ -82,8 +82,22 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod } }); } + //For batch dropdown + $scope.$watch('univModel.university', function (newValue,oldValue) { + if(newValue==undefined || newValue==''){ + $scope.filterBatchDetails=""; + console.log($scope.filterBatchDetails); + } + else{ + if(angular.isString(newValue)){ + $scope.filterBatchDetails=angular.fromJson(newValue); + } + } + + }); $scope.show = false; $scope.onSubmit = function (form) { + $scope.filterUniv = angular.fromJson($scope.univModel.university); var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -111,7 +125,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.univModel.university.universityID, + university: $scope.filterUniv.universityID, batch: $scope.univModel.batch } diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js index 4a860046..8d68f3e1 100755 --- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js @@ -82,6 +82,20 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod } }); } + //For batch dropdown + $scope.$watch('univModel.university', function (newValue,oldValue) { + if(newValue==undefined || newValue==''){ + $scope.filterBatchDetails=""; + console.log($scope.filterBatchDetails); + } + else{ + if(angular.isString(newValue)){ + $scope.filterBatchDetails=angular.fromJson(newValue); + } + } + + }); + //Response data $scope.show = false; $scope.onSubmit = function (form) { var firstError = null; diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js index 01ed7ef8..1d018b55 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -90,10 +90,24 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", } }); } + //For batch dropdown + $scope.$watch('univModel.university', function (newValue,oldValue) { + if(newValue==undefined || newValue==''){ + $scope.filterBatchDetails=""; + console.log($scope.filterBatchDetails); + } + else{ + if(angular.isString(newValue)){ + $scope.filterBatchDetails=angular.fromJson(newValue); + } + } + + }); // response data $scope.show = false; $scope.returnResultData = []; $scope.onSubmit = function (form) { + $scope.filterUniv = angular.fromJson($scope.univModel.university); $scope.returnResultData.length=0; var firstError = null; if (form.$invalid) { @@ -121,7 +135,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.univModel.university.universityID, + university: $scope.filterUniv.universityID, batch: $scope.univModel.batch } diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js index ab4cd9c0..93fe25ad 100755 --- a/Apollo/assets/js/controllers/report_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_certificateCtrl.js @@ -110,6 +110,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod }); $scope.onSubmit = function () { + $scope.filterUniv = angular.fromJson($scope.univModel.university); //alert($scope.batch.name); $scope.cert_data = ''; $scope.message = ''; @@ -121,7 +122,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.univModel.university.universityID, + university: $scope.filterUniv.universityID, batch: $scope.univModel.batch, from : $scope.univModel.from_date, to : $scope.univModel.to_date diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js index 13e268ad..c0b254c7 100755 --- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js @@ -82,9 +82,23 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod } }); } + //For batch dropdown + $scope.$watch('univModel.university', function (newValue,oldValue) { + if(newValue==undefined || newValue==''){ + $scope.filterBatchDetails=""; + console.log($scope.filterBatchDetails); + } + else{ + if(angular.isString(newValue)){ + $scope.filterBatchDetails=angular.fromJson(newValue); + } + } + + }); + //Response data $scope.show = false; $scope.onSubmit = function (form) { - + $scope.filterUniv = angular.fromJson($scope.univModel.university); var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -112,7 +126,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.univModel.university.universityID, + university: $scope.filterUniv.universityID, batch: $scope.univModel.batch } diff --git a/Apollo/assets/js/controllers/report_examfeeCtrl.js b/Apollo/assets/js/controllers/report_examfeeCtrl.js index 66bca916..a66e6e88 100755 --- a/Apollo/assets/js/controllers/report_examfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_examfeeCtrl.js @@ -82,6 +82,19 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal", } }); } + //For batch dropdown + $scope.$watch('univModel.university', function (newValue,oldValue) { + if(newValue==undefined || newValue==''){ + $scope.filterBatchDetails=""; + console.log($scope.filterBatchDetails); + } + else{ + if(angular.isString(newValue)){ + $scope.filterBatchDetails=angular.fromJson(newValue); + } + } + + }); $scope.show = false; $scope.onSubmit = function (form) { diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js index cd1bc23e..62636564 100755 --- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js @@ -83,7 +83,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco } }); } - /* watch university model for bind batch objects*/ + /* watch university model for bind batch objects*/ $scope.$watchCollection('univModel.university', function (newValue,oldValue) { if(newValue==undefined || newValue==''){ @@ -109,8 +109,8 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco } }); - $scope.onSubmit = function () { + $scope.filterUniv = angular.fromJson($scope.univModel.university); //alert($scope.batch.name); $scope.mark_cert_data = ''; $scope.message = ''; @@ -122,7 +122,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.univModel.university.universityID, + university: $scope.filterUniv.universityID, batch: $scope.univModel.batch, from : $scope.univModel.from_date, to : $scope.univModel.to_date diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js index 93bf760d..477c6bee 100755 --- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js @@ -97,6 +97,8 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope", $scope.show = false; $scope.onSubmit = function (form) { + + $scope.filterUniv = angular.fromJson($scope.univModel.university); var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -124,7 +126,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope", }, data: { branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, - university: $scope.univModel.university.universityID, + university: $scope.filterUniv.universityID, batch: $scope.univModel.batch } diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js index ff76c9af..0794ccee 100755 --- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js @@ -89,6 +89,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc $scope.show = false; $scope.onSubmit = function (form) { + $scope.filterUniv = angular.fromJson($scope.univModel.university); var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -116,7 +117,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc }, data: { branch : JSON.parse(localStorage.getItem('localObj')).localBranchID, - university : $scope.univModel.university.universityID, + university : $scope.filterUniv.universityID, batch : $scope.univModel.batch } diff --git a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js index d668ee2e..8d1ff908 100755 --- a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js +++ b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js @@ -49,7 +49,19 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S } }); } + //For batch dropdown + $scope.$watch('univModel.university', function (newValue,oldValue) { + if(newValue==undefined || newValue==''){ + $scope.filterBatchDetails=""; + console.log($scope.filterBatchDetails); + } + else{ + if(angular.isString(newValue)){ + $scope.filterBatchDetails=angular.fromJson(newValue); + } + } + }); $scope.show = false; $scope.onSubmit = function (form) { var firstError = null; diff --git a/Apollo/assets/views/hallticket/hallTicketPDF.html b/Apollo/assets/views/hallticket/hallTicketPDF.html index 45633dc3..51e3850e 100755 --- a/Apollo/assets/views/hallticket/hallTicketPDF.html +++ b/Apollo/assets/views/hallticket/hallTicketPDF.html @@ -71,7 +71,7 @@ - +
@@ -88,7 +88,7 @@ -
+
@@ -105,7 +105,7 @@ -
+
@@ -122,11 +122,11 @@ -
+
- + diff --git a/Apollo/assets/views/newreg_report.html b/Apollo/assets/views/newreg_report.html index d9564c94..6dc076f9 100644 --- a/Apollo/assets/views/newreg_report.html +++ b/Apollo/assets/views/newreg_report.html @@ -164,13 +164,12 @@
Sem/YearPaper CodeSubject NameDateTimeInvigi.sign
Sem/Year
Paper Code
Subject Name
Date
Time
Inv.sign
+ - - - - + + @@ -178,13 +177,12 @@ + - - - - + + diff --git a/Apollo/assets/views/reregistration/reregistrationformpdf.html b/Apollo/assets/views/reregistration/reregistrationformpdf.html index 1bf0516f..7068ef50 100755 --- a/Apollo/assets/views/reregistration/reregistrationformpdf.html +++ b/Apollo/assets/views/reregistration/reregistrationformpdf.html @@ -6,10 +6,10 @@
Date Of Registration Student Name Father NameCourseBatchUniversityDate Of RegistrationBatchCourse Mobile
{{p.DOJ}} {{p.Firstname}} {{p.Fathername}}{{p.CourseName}}{{p.BatchName}}{{p.UniversityName}}{{p.DOJ}}{{p.BatchName}}{{p.CourseName}} {{p.MobileNumber}}
- - +
-

{{Course.UniversityName}}

-

{{Course.Address}}

+ 		+

{{Course.UniversityName}}

+

{{Course.Address}}