diff --git a/Apollo/api/application/config/database.php b/Apollo/api/application/config/database.php index 3f18384a..20ed4d6f 100755 --- a/Apollo/api/application/config/database.php +++ b/Apollo/api/application/config/database.php @@ -75,10 +75,17 @@ $query_builder = TRUE; $db['default'] = array( 'dsn' => '', +<<<<<<< HEAD + // 'hostname' => 'apollodec.com', + // 'username' => 'apollod4_SIT', + // 'password' => 'apollosit1234', + // 'database' => 'apollod4_ApolloDECNEWSIT', +======= 'hostname' => 'apollodec.com', // 'username' => 'apollod4_SIT', // 'password' => 'apollosit1234', // 'database' => 'apollod4_ApolloDECNEWSIT', +>>>>>>> 3f287c92a22bb6528c89be19aabcde2ec3393f70 'username' => 'apollod4_DEV', 'password' => 'apollo1234', 'database' => 'apollod4_ApolloDECDev', diff --git a/Apollo/assets/js/controllers/examAttendanceCtrl.js b/Apollo/assets/js/controllers/examAttendanceCtrl.js index f17df514..6145664a 100644 --- a/Apollo/assets/js/controllers/examAttendanceCtrl.js +++ b/Apollo/assets/js/controllers/examAttendanceCtrl.js @@ -293,18 +293,31 @@ $scope.isLoaderTxt = "Loading..."; var headerAM = function(data) { - var heading = $rootScope.pdfuname+' '+$rootScope.pdfbatch+' Examination'+' '+'Center'+' '+$rootScope.pdfcenter['CenterName']+" - "+ 'Attendance of '+$scope.pdfExamDateToDisplay+'Fore Noon Session'; + 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'; doc1.setFontSize(9); doc1.setFontStyle('bold'); - doc1.text(50,30,heading); + doc1.text(60,30,heading); + //doc1.textAlign('CENTER',50,30,heading); + doc1.setFontSize(9); + doc1.setFontStyle('bold'); + doc1.text(70,45,heading1); + }; - + // ctx.textAlign = "right"; +//ctx.fillText("textAlign=right",150, 140); var headerPM = function(data) { - var heading = $rootScope.pdfuname+' '+$rootScope.pdfbatch+' Examination'+' '+'Center'+' '+$rootScope.pdfcenter['CenterName']+" - "+ 'Attendance of '+$scope.pdfExamDateToDisplay+'After Noon Session'; + 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'; doc2.setFontSize(9); doc2.setFontStyle('bold'); + doc2.text(50,30,heading); + doc2.setFontSize(9); + doc2.setFontStyle('bold'); + doc2.text(70,45,heading1); + }; diff --git a/Apollo/assets/js/controllers/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js index 705ec048..32eee39c 100755 --- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js +++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js @@ -478,15 +478,15 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun doc.setTextColor(40); doc.setFontStyle('normal'); - doc.addImage(dataURL, 'jpeg', 75, 35, 50, 50);//university logo location + doc.addImage(dataURL, 'jpeg', 50, 35, 50, 50);//university logo location doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location - doc.setFontSize(16); + doc.setFontSize(10); doc.text(150,50,$scope.universityNamePDF); doc.setFontSize(8); - doc.text(160,65,$scope.universityAddressPDF); + doc.text(170,65,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text(160,88,$scope.universityEmailPDF); + doc.text(280,80,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); @@ -702,15 +702,15 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun doc.setTextColor(40); doc.setFontStyle('normal'); - doc.addImage(dataURL, 'jpeg', 75, 35, 50, 50);//university logo location + doc.addImage(dataURL, 'jpeg', 50, 35, 50, 50);//university logo location doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location - doc.setFontSize(16); + doc.setFontSize(10); doc.text(150,50,$scope.universityNamePDF); doc.setFontSize(8); - doc.text(160,65,$scope.universityAddressPDF); + doc.text(170,65,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text(160,88,$scope.universityEmailPDF); + doc.text(280,80,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); @@ -879,15 +879,15 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun doc.setTextColor(40); doc.setFontStyle('normal'); - doc.addImage(dataURL, 'jpeg', 75, 35, 50, 50);//university logo location + doc.addImage(dataURL, 'jpeg', 50, 35, 50, 50);//university logo location doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location - doc.setFontSize(17); + doc.setFontSize(10); doc.text(150,50,$scope.universityNamePDF); doc.setFontSize(8); - doc.text(160,65,$scope.universityAddressPDF); + doc.text(170,65,$scope.universityAddressPDF); doc.setFontSize(8); - doc.text(160,88,$scope.universityEmailPDF); + doc.text(280,80,$scope.universityEmailPDF); doc.rect(45, 100, 400, 60); doc.rect(445, 100, 100, 60); diff --git a/Apollo/assets/views/hallticket/examAttendancePDF.html b/Apollo/assets/views/hallticket/examAttendancePDF.html index 5817053e..7506ef6d 100644 --- a/Apollo/assets/views/hallticket/examAttendancePDF.html +++ b/Apollo/assets/views/hallticket/examAttendancePDF.html @@ -5,7 +5,7 @@ -
+
@@ -33,7 +33,7 @@ - + @@ -46,7 +46,7 @@
SNO STUDENT NAME COURSE SEM/YEAR ENROLLMENT NO SUBJECT CODE SUBJECT NAMEBOOKLET NO STU SIGN
SNO
STUDENT NAME
COURSE
SEM/YEAR
ENROLLMENT NO
SUBJECT CODE
SUBJECT NAME
BOOKLET NO
STUDENT SIGN
- + diff --git a/Apollo/assets/views/hallticket/generatehallticket.html b/Apollo/assets/views/hallticket/generatehallticket.html index 25644140..82b36bd7 100755 --- a/Apollo/assets/views/hallticket/generatehallticket.html +++ b/Apollo/assets/views/hallticket/generatehallticket.html @@ -85,11 +85,7 @@ -
- -
- -
+
@@ -106,12 +102,11 @@
-
- -
- - -
+
+ +
+ +
@@ -165,6 +160,12 @@ +
+ +
+ + +
SNO STUDENT NAME COURSE SEM/YEAR ENROLLMENT NO SUBJECT CODE SUBJECT NAMEBOOKLET NO STU SIGN
SNO
STUDENT NAME
COURSE
SEM/YEAR
ENROLLMENT NO
SUBJECT CODE
SUBJECT NAME
BOOKLET NO
STUDENT SIGN
{{($index+1)}} {{student.Firstname}} {{student.Lastname}} {{student.CourseName}}{{student.Sem_Year}}{{student.EnrollmentID}}{{student.SubjectCode}}{{student.SubjectName}} GENERATED
@@ -174,6 +175,7 @@
+ diff --git a/Apollo/assets/views/hallticket/hallTicketPDF.html b/Apollo/assets/views/hallticket/hallTicketPDF.html index 40fed859..87143cf7 100755 --- a/Apollo/assets/views/hallticket/hallTicketPDF.html +++ b/Apollo/assets/views/hallticket/hallTicketPDF.html @@ -5,7 +5,7 @@ -
+
@@ -18,14 +18,14 @@ - - + + - + - + @@ -36,11 +36,11 @@
{{universityNamePDF}}
{{universityNamePDF}}
{{universityEmailPDF}}
{{universityEmailPDF}}
{{universityAddressPDF}}
{{universityAddressPDF}}
- + - + @@ -57,7 +57,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -109,7 +109,7 @@ - + diff --git a/Apollo/images/university/Dri_BUeFCvLAZXgf.jpeg b/Apollo/images/university/Dri_BUeFCvLAZXgf.jpeg new file mode 100644 index 00000000..02f013d3 Binary files /dev/null and b/Apollo/images/university/Dri_BUeFCvLAZXgf.jpeg differ diff --git a/Apollo/images/university/Dri_IBdWm4el5Ccf.jpeg b/Apollo/images/university/Dri_IBdWm4el5Ccf.jpeg new file mode 100644 index 00000000..a0fcfda4 Binary files /dev/null and b/Apollo/images/university/Dri_IBdWm4el5Ccf.jpeg differ diff --git a/Apollo/images/university/Dri_RWnpeVXBKMuD.jpeg b/Apollo/images/university/Dri_RWnpeVXBKMuD.jpeg deleted file mode 100644 index 6b802bae..00000000 Binary files a/Apollo/images/university/Dri_RWnpeVXBKMuD.jpeg and /dev/null differ diff --git a/Apollo/images/university/Dri_2uO9l1c7eBrA.jpeg b/Apollo/images/university/sample.jpeg similarity index 100% rename from Apollo/images/university/Dri_2uO9l1c7eBrA.jpeg rename to Apollo/images/university/sample.jpeg
ADMIT CARD : {{courseNamePDF}} EXAMINATION {{batchNamePDF}}
NAN
ADMIT CARD : {{courseNamePDF}} EXAMINATION {{batchNamePDF}}
NAN
Enrollment No :   {{studentObj.EnrollmentID}}         Student Name  :  {{studentObj.Firstname}} {{studentObj.Lastname}}
Center Name   :     {{centerNamePDF}}		Enrollment No :   {{studentObj.EnrollmentID}}         Student Name  :  {{studentObj.Firstname}} {{studentObj.Lastname}}
Center Name    :    {{centerNamePDF}}
Sem/YearPaper CodeSubject NameDateTimeInvigi.sign
Sem/Year
Paper Code
Subject Name
Date
Time
Inv.sign
Sem/YearPaper CodeSubject NameDateTimeInvigi.sign
Sem/Year
Paper Code
Subject Name
Date
Time
Inv.sign
Sem/YearPaper CodeSubject NameDateTimeInvigi.sign
Sem/Year
Paper Code
Subject Name
Date
Time
Inv.sign
Sem/YearPaper CodeSubject NameDateTimeInvigi.sign
Sem/Year
Paper Code
Subject Name
Date
Time
Inv.sign