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

1314,1320 ISSUES FIXED

Browse Source
This commit is contained in:
velz 2018-08-22 12:00:12 +05:30
parent e42624dfc6
commit b093c73615
3 changed files with 56 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);
};

26
Apollo/assets/js/controllers/generateHallTicketCtrl.js
View File

@ -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);

10
Apollo/assets/views/hallticket/hallTicketPDF.html
View File

@ -71,7 +71,7 @@
<!-- END OF SEMESTER TYPE STUDENTS-->
<!-- FOR YEAR TYPE STUDENTS-->
<table width="100%" border="1" ng-if="studentObj.FeeDetails[0]" ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year1{{$index}}">
<table width="100%" border="1" ng-if="studentObj.FeeDetails[0] && semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year1{{$index}}">
<thead>
<tr>
@ -88,7 +88,7 @@
<table width="100%" border="1" ng-if = "studentObj.FeeDetails[1]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year2{{$index}}">
<table width="100%" border="1" ng-if = "studentObj.FeeDetails[1] && semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year2{{$index}}">
<thead>
<tr>
@ -105,7 +105,7 @@
<table width="100%" border="1" ng-if ="studentObj.FeeDetails[2]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year3{{$index}}">
<table width="100%" border="1" ng-if ="studentObj.FeeDetails[2] && semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year3{{$index}}">
<thead>
<tr>
@ -122,11 +122,11 @@
<table width="100%" border="1" ng-if = "studentObj.FeeDetails[3]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year4{{$index}}">
<table width="100%" border="1" ng-if = "studentObj.FeeDetails[3] && semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year4{{$index}}">
<thead>
<tr>
<th width="5%">Sem/Year</th><th width="10%">Paper Code</th><th>Subject Name</th><th width="5%">Date</th><th width="15%">Time</th><th width="5%">Invigi.sign</th>
<th width="5%"><center>Sem/Year</center></th><th width="10%"><center>Paper Code</center></th><th><center>Subject Name</center></th><th width="15%"><center>Date</center></th><th width="20%"><center>Time</center></th><th width="5%"><center>Inv.sign</center></th>
</tr>
</thead>
<tbody>