Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Browse Source
This commit is contained in:
dineshkumarkannan 2018-08-22 18:28:23 +05:30
commit 3b61d0f955
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Apollo/assets/js/controllers/examAttendanceCtrl.js
View File

@ -294,22 +294,25 @@ $scope.isLoaderTxt = "Loading...";
var headerAM = function(data) { var headerAM = function(data) {
var heading = $rootScope.pdfuname+' '+$rootScope.pdfbatch+' Examination'+' '+'Center'+' '+$rootScope.pdfcenter['CenterName']; 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.setFontSize(9);
doc1.setFontStyle('bold'); doc1.setFontStyle('bold');
//doc1.text(60,30,heading); //doc1.text(60,30,heading);
var heading_length = heading.length; var heading_length = heading.length;
console.log(heading_length);
var heading_start_point = 0; var heading_start_point = 0;
var heading1_start_point = 0; var heading1_start_point = 0;
if(heading_length <= 100) if(heading_length <= 100)
{ {
var heading_start_point = 200; var heading_start_point = 200;
var heading1_start_point = 225; var heading1_start_point = 350;
console.log('heading_length <= 100');
} }
else else
{ {
var heading_start_point = 100; var heading_start_point = 100;
var heading1_start_point = 150; var heading1_start_point = 300;
console.log('else');
} }
// console.log(heading_length); // console.log(heading_length);
// console.log((doc1.internal.pageSize.width/2)); // console.log((doc1.internal.pageSize.width/2));
@ -328,21 +331,24 @@ $scope.isLoaderTxt = "Loading...";
var headerPM = function(data) { var headerPM = function(data) {
var heading = $rootScope.pdfuname+' '+$rootScope.pdfbatch+' Examination'+' '+'Center'+' '+$rootScope.pdfcenter['CenterName']; 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.setFontSize(9);
doc2.setFontStyle('bold'); doc2.setFontStyle('bold');
var heading_length = heading.length; var heading_length = heading.length;
console.log(heading_length);
var heading_start_point = 0; var heading_start_point = 0;
var heading1_start_point = 0; var heading1_start_point = 0;
if(heading_length <= 100) if(heading_length <= 100)
{ {
var heading_start_point = 200; var heading_start_point = 200;
var heading1_start_point = 225; var heading1_start_point = 350;
console.log('heading_length <= 100');
} }
else else
{ {
var heading_start_point = 100; 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.text(heading_start_point,30,heading);
doc2.setFontSize(9); doc2.setFontSize(9);
@ -384,7 +390,7 @@ $scope.isLoaderTxt = "Loading...";
if(AttendanceTableID_PM != "") if(AttendanceTableID_PM != "")
{ {
console.log('AttendanceTableID_AM'); console.log('AttendanceTableID_PM');
doc2.autoTable(AttendanceTableID_PM.columns, AttendanceTableID_PM.data, options2); doc2.autoTable(AttendanceTableID_PM.columns, AttendanceTableID_PM.data, options2);
doc2.save(fileNamePM); doc2.save(fileNamePM);
} }

2
Apollo/assets/js/controllers/newreg_reportCtrl.js
View File

@ -203,7 +203,7 @@ $scope.tod = to_dt;
//console.log($scope.fullincomedetail); //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]);
}; };