From 6168d18fb0924e0e1ec1311a55078c320a0955de Mon Sep 17 00:00:00 2001 From: velz Date: Wed, 22 Aug 2018 16:25:54 +0530 Subject: [PATCH 1/2] examAttenCtrl modified --- .../js/controllers/examAttendanceCtrl.js | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Apollo/assets/js/controllers/examAttendanceCtrl.js b/Apollo/assets/js/controllers/examAttendanceCtrl.js index f1882ca4..dee07d07 100644 --- a/Apollo/assets/js/controllers/examAttendanceCtrl.js +++ b/Apollo/assets/js/controllers/examAttendanceCtrl.js @@ -294,22 +294,25 @@ $scope.isLoaderTxt = "Loading..."; var headerAM = function(data) { var heading = $rootScope.pdfuname+' '+$rootScope.pdfbatch+' Examination'+' '+'Center'+' '+$rootScope.pdfcenter['CenterName']; - var heading1='Attendance of '+$scope.pdfExamDateToDisplay+'After Noon Session'+" - "+ 'Attendance of '+$scope.pdfExamDateToDisplay+'Fore Noon Session'; + var heading1='Attendance of '+$scope.pdfExamDateToDisplay+'Fore Noon Session'; doc1.setFontSize(9); doc1.setFontStyle('bold'); //doc1.text(60,30,heading); var heading_length = heading.length; + console.log(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; + var heading1_start_point = 350; + console.log('heading_length <= 100'); } else { var heading_start_point = 100; - var heading1_start_point = 150; + var heading1_start_point = 300; + console.log('else'); } // console.log(heading_length); // console.log((doc1.internal.pageSize.width/2)); @@ -328,21 +331,24 @@ $scope.isLoaderTxt = "Loading..."; var headerPM = function(data) { var heading = $rootScope.pdfuname+' '+$rootScope.pdfbatch+' Examination'+' '+'Center'+' '+$rootScope.pdfcenter['CenterName']; - var heading1='Attendance of '+$scope.pdfExamDateToDisplay+'After Noon Session'+" - "+ 'Attendance of '+$scope.pdfExamDateToDisplay+'Fore Noon Session'; + var heading1='Attendance of '+$scope.pdfExamDateToDisplay+'After Noon Session'; doc2.setFontSize(9); doc2.setFontStyle('bold'); var heading_length = heading.length; + console.log(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; + var heading1_start_point = 350; + console.log('heading_length <= 100'); } else { var heading_start_point = 100; - var heading1_start_point = 150; + var heading1_start_point = 300; + console.log('else'); } doc2.text(heading_start_point,30,heading); doc2.setFontSize(9); @@ -384,7 +390,7 @@ $scope.isLoaderTxt = "Loading..."; if(AttendanceTableID_PM != "") { - console.log('AttendanceTableID_AM'); + console.log('AttendanceTableID_PM'); doc2.autoTable(AttendanceTableID_PM.columns, AttendanceTableID_PM.data, options2); doc2.save(fileNamePM); } From 1c52e5ad5926b418605f0981981fcd9d2cf7f088 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 22 Aug 2018 17:33:05 +0530 Subject: [PATCH 2/2] new reg excel --- Apollo/assets/js/controllers/newreg_reportCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/newreg_reportCtrl.js b/Apollo/assets/js/controllers/newreg_reportCtrl.js index d193bc8b..471b1f27 100644 --- a/Apollo/assets/js/controllers/newreg_reportCtrl.js +++ b/Apollo/assets/js/controllers/newreg_reportCtrl.js @@ -203,7 +203,7 @@ $scope.tod = to_dt; //console.log($scope.fullincomedetail); - alasql('SELECT Firstname as Name,Fathername,CourseName,BatchName,UniversityName,DOJ as RegistrationDate,MobileNumber INTO XLS("New Registration report.xls",?) FROM ?',[mystyle,$scope.newreglist]); + alasql('SELECT DOJ as RegistrationDate,Firstname as Name,Fathername,UniversityName,BatchName,CourseName,MobileNumber INTO XLS("New Registration report.xls",?) FROM ?',[mystyle,$scope.newreglist]); };