From 9067637d4d6dfb54959ebfa906fb3cf1fdcc9946 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Aug 2018 10:53:56 +0530 Subject: [PATCH 01/14] drop down issues in report --- .../js/controllers/report_ans_bookletCtrl.js | 13 ++++++++++ .../js/controllers/report_app_pendingCtrl.js | 14 ++++++++++ .../js/controllers/report_balfeeCtrl.js | 13 ++++++++++ .../js/controllers/report_doc_pendingCtrl.js | 14 ++++++++++ .../js/controllers/report_examfeeCtrl.js | 13 ++++++++++ .../report_markcard_certificateCtrl.js | 26 ------------------- .../controllers/report_waiver_referalCtrl.js | 12 +++++++++ 7 files changed, 79 insertions(+), 26 deletions(-) diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js index 1f0e9b59..21ed7cad 100755 --- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js +++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js @@ -82,6 +82,19 @@ 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) { var firstError = null; 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..f8a92377 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -90,6 +90,19 @@ 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 = []; diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js index 13e268ad..b1b0906e 100755 --- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js @@ -82,6 +82,20 @@ 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) { 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..af4fe036 100755 --- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js @@ -83,32 +83,6 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco } }); } - /* watch university model for bind batch objects*/ - - $scope.$watchCollection('univModel.university', function (newValue,oldValue) { - if(newValue==undefined || newValue==''){ - $scope.filterBatchDetails=""; - $scope.disableSubmit=true; - } - else{ - if(angular.isString(newValue)){ - $scope.filterBatchDetails=angular.fromJson(newValue); - $scope.disableSubmit=false; - } - } - - }); - // disable submit - $scope.$watchCollection('filters.from_date', function (newValue,oldValue) { - if(newValue==undefined || newValue=='' || newValue==null){ - $scope.disableSubmit=true; - } - else{ - $scope.disableSubmit=false; - - } - - }); $scope.onSubmit = function () { //alert($scope.batch.name); 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; From eb0c4ed749fb8f3bcc970fc1089b1dd0a98f0af7 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Aug 2018 05:35:55 +0000 Subject: [PATCH 02/14] report_markcard_certificateCtrl.js edited online with Bitbucket --- .../report_markcard_certificateCtrl.js | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js index af4fe036..740b6bb6 100755 --- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js @@ -83,7 +83,32 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco } }); } + /* watch university model for bind batch objects*/ + $scope.$watchCollection('univModel.university', function (newValue,oldValue) { + if(newValue==undefined || newValue==''){ + $scope.filterBatchDetails=""; + $scope.disableSubmit=true; + } + else{ + if(angular.isString(newValue)){ + $scope.filterBatchDetails=angular.fromJson(newValue); + $scope.disableSubmit=false; + } + } + + }); + // disable submit + $scope.$watchCollection('filters.from_date', function (newValue,oldValue) { + if(newValue==undefined || newValue=='' || newValue==null){ + $scope.disableSubmit=true; + } + else{ + $scope.disableSubmit=false; + + } + + }); $scope.onSubmit = function () { //alert($scope.batch.name); $scope.mark_cert_data = ''; From ef78090513a38bd8ad127a5ddc02ec2dd0b30fce Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 22 Aug 2018 11:15:51 +0530 Subject: [PATCH 03/14] receiptnumber active deacive --- Apollo/api/application/models/Fees_status_model.php | 1 + 1 file changed, 1 insertion(+) 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!"; From 9b5b877adb215807f82b7dd87620fe7f1108c044 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Aug 2018 11:41:26 +0530 Subject: [PATCH 04/14] report changes --- Apollo/assets/js/controllers/report_doc_pendingCtrl.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js index b1b0906e..c0b254c7 100755 --- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js @@ -98,7 +98,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod //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; @@ -126,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 } From 283e6b62fd56e8556d88f2910f4b1e17a2dd82f0 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Aug 2018 11:41:34 +0530 Subject: [PATCH 05/14] report changes --- Apollo/assets/js/controllers/report_ans_bookletCtrl.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js index 21ed7cad..2ab1a193 100755 --- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js +++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js @@ -97,6 +97,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod }); $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 +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 } From 6a4d9facc5f4bb56713ffe6e804a7f3bf0ee46a5 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Aug 2018 11:41:43 +0530 Subject: [PATCH 06/14] report changes --- Apollo/assets/js/controllers/report_balfeeCtrl.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js index f8a92377..1d018b55 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -107,6 +107,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", $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) { @@ -134,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 } From 9e8b83b6eb56509010683604bf8d8afc6cfc503f Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Aug 2018 11:41:55 +0530 Subject: [PATCH 07/14] report changes --- .../assets/js/controllers/report_study_material_statusCtrl.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 } From c39096e8c865f188a7d5b8117d83cfce1117ab67 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Aug 2018 11:42:03 +0530 Subject: [PATCH 08/14] report changes --- Apollo/assets/js/controllers/report_certificateCtrl.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 From 4236dd12a1abaf7a9eae35296193ab997aa465b4 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Aug 2018 11:42:20 +0530 Subject: [PATCH 09/14] report changes --- .../assets/js/controllers/report_markcard_certificateCtrl.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js index 740b6bb6..62636564 100755 --- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js @@ -110,6 +110,7 @@ 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 = ''; @@ -121,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 From d1e9715e564b0382a717590a91cb25a36e124eec Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 22 Aug 2018 11:42:31 +0530 Subject: [PATCH 10/14] report changes --- Apollo/assets/js/controllers/report_markcard_statusCtrl.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 } From b093c73615fac34c5efc958242bb81572efa0e20 Mon Sep 17 00:00:00 2001 From: velz Date: Wed, 22 Aug 2018 12:00:12 +0530 Subject: [PATCH 11/14] 1314,1320 ISSUES FIXED --- .../js/controllers/examAttendanceCtrl.js | 43 ++++++++++++++++--- .../js/controllers/generateHallTicketCtrl.js | 26 +++++------ .../views/hallticket/hallTicketPDF.html | 10 ++--- 3 files changed, 56 insertions(+), 23 deletions(-) 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..0550476f 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,7 +475,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'); @@ -482,11 +484,11 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location doc.setFontSize(10); - doc.text(150,50,$scope.universityNamePDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+120),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,7 +699,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'); @@ -706,11 +708,11 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location doc.setFontSize(10); - doc.text(150,50,$scope.universityNamePDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+120),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 +876,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'); @@ -883,11 +885,11 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location doc.setFontSize(10); - doc.text(150,50,$scope.universityNamePDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+120),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/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 @@ -
+
- + From e577bd3b2caaa11652ebfa0795970635f1dc3373 Mon Sep 17 00:00:00 2001 From: velz Date: Wed, 22 Aug 2018 13:30:26 +0530 Subject: [PATCH 12/14] HALL ALIGN ISSUE FIXED --- .../js/controllers/generateHallTicketCtrl.js | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/Apollo/assets/js/controllers/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js index 0550476f..c477ebcf 100755 --- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js +++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js @@ -482,9 +482,16 @@ 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((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+120),45,$scope.universityNamePDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF); doc.setFontSize(8); doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF); doc.setFontSize(8); @@ -706,9 +713,16 @@ 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((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+120),45,$scope.universityNamePDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF); doc.setFontSize(8); doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF); doc.setFontSize(8); @@ -884,8 +898,16 @@ 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((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+120),45,$scope.universityNamePDF); + doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF); doc.setFontSize(8); doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF); doc.setFontSize(8); From c033446b2e5fea661a7ff4e0e6d6a958235c0fbe Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 22 Aug 2018 15:14:08 +0530 Subject: [PATCH 13/14] new reg report field order --- Apollo/assets/views/newreg_report.html | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) 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 @@ + - - - - + + From 4c6215827fabcdc3e0723158815612aafee2733b Mon Sep 17 00:00:00 2001 From: sriramv Date: Wed, 22 Aug 2018 15:43:24 +0530 Subject: [PATCH 14/14] ReRegister Issues Fixed By Sriram --- .../views/reregistration/reregistrationformpdf.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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}}