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

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',

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

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

Apollo/assets/views/hallticket/examAttendancePDF.html

@@ -5,7 +5,7 @@
 </style>   
 
 
-<div class="container-fluid container-fullw bg-white" ng-controller="examAttendanceCtrl">
+<div class="container-fluid container-fullw bg-white"  style="width: 850px;" ng-controller="examAttendanceCtrl">
     
     
 		<div align="right">
@@ -33,7 +33,7 @@
 		<table width="100%" border="1" id = "attendanceTableAM" style="background-color:#fff;" ng-if="studentInfoAM_Length != 0">
 
 
-				<thead><tr> <th>SNO</th> <th>STUDENT NAME</th> <th>COURSE</th> <th>SEM/YEAR</th> <th>ENROLLMENT NO</th> <th>SUBJECT CODE</th> <th>SUBJECT NAME</th><th>BOOKLET NO</th> <th>STU SIGN</th> </tr></thead>
+				<thead><tr> <th width="5%"><center>SNO</center></th> <th width="10%"><center>STUDENT NAME</center></th> <th width="30%"><center>COURSE</center></th> <th width="5%"><center>SEM/YEAR</center></th> <th width="10%"><center>ENROLLMENT NO</center></th> <th width="5%"><center>SUBJECT CODE</center></th> <th width="15%"><center>SUBJECT NAME</center></th><th width="5%"><center>BOOKLET NO</center></th> <th width="5%"><center>STUDENT SIGN</center></th> </tr></thead>
 
 				<tbody>
 					<tr ng-repeat="student in dataForExamAttendanceAM" >
@@ -46,7 +46,7 @@
 		
 		<div id="student_list_PM">
 		<table width="100%" border="1" id = "attendanceTablePM" style="background-color:#fff;" ng-if="studentInfoPM_Length != 0">
-				<thead><tr> <th>SNO</th> <th>STUDENT NAME</th> <th>COURSE</th> <th>SEM/YEAR</th> <th>ENROLLMENT NO</th> <th>SUBJECT CODE</th> <th>SUBJECT NAME</th><th>BOOKLET NO</th> <th>STU SIGN</th> </tr></thead>
+				<thead><tr> <th width="5%"><center>SNO</center></th> <th width="10%"><center>STUDENT NAME</center></th> <th width="30%"><center>COURSE</center></th> <th width="5%"><center>SEM/YEAR</center></th> <th width="10%"><center>ENROLLMENT NO</center></th> <th width="5%"><center>SUBJECT CODE</center></th> <th width="15%"><center>SUBJECT NAME</center></th><th width="5%"><center>BOOKLET NO</center></th> <th width="5%"><center>STUDENT SIGN</center></th> </tr></thead>
 				<tbody>
 					<tr ng-repeat="student in dataForExamAttendancePM" >
 					<td>{{($index+1)}}</td> <td>{{student.Firstname}} {{student.Lastname}} </td><td>{{student.CourseName}}</td><td>{{student.Sem_Year}}</td><td>{{student.EnrollmentID}}</td><td>{{student.SubjectCode}}</td><td>{{student.SubjectName}}</td><td></td><td></td>

Apollo/assets/views/hallticket/generatehallticket.html

@@ -85,11 +85,7 @@
 					
 							
 							
-							<div class="col-md-2 form-group">
-						
-						                      <br>                   
-                                             <button type="button" ladda="ldloading1.zoom_in" tabindex="5" class="btn btn-wide btn-info" data-style="zoom-in" ng-click="getStudentDetails(Form,myModel);">GET STUDENTS</button>
-						                              </div>
+							
 				     </div>
 				    <div class="col-md-12 ">
 					
@@ -106,12 +102,11 @@
 							<!-- <pre>{{myModel.centerName | json}}</pre>  -->
 							</div>
 						
-						<div class="col-md-3 form-group">
-						<!-- <div class="pull-right"> -->
-						<br>                   
-                                             <button type="button" ladda="ldloading1.zoom_in" tabindex="6" class="btn btn-wide btn-success" data-style="zoom-in" ng-disabled = "generateButtonStatus" ng-click="generateHallTicket();">{{generateButtonTxt}}</button>
-						<!-- </div> -->
-							</div>
+						<div class="col-md-2 form-group">
+						
+						                      <br>                   
+                                             <button type="button" ladda="ldloading1.zoom_in" tabindex="5" class="btn btn-wide btn-info" data-style="zoom-in" ng-click="getStudentDetails(Form,myModel);">GET STUDENTS</button>
+						                              </div>
 							
 					</div>
 			
@@ -165,6 +160,12 @@
                                             <td> <span ng-if="p.isFlag != null" class="label label-sm label-success">GENERATED</span></td>
 											
 										</tr>
+                                         <div class="col-md-3 form-group">
+						<!-- <div class="pull-right"> -->
+						<br>                   
+                                             <button type="button" ladda="ldloading1.zoom_in" tabindex="6" class="btn btn-wide btn-success" data-style="zoom-in" ng-disabled = "generateButtonStatus" ng-click="generateHallTicket();">{{generateButtonTxt}}</button>
+						<!-- </div> -->
+							</div>
 										</tbody>
 
                                 </table>
@@ -174,6 +175,7 @@
                             </div>
 						</div>
 					</div>
+                   
 			</form>
 			</div>
         </div>

Apollo/assets/views/hallticket/hallTicketPDF.html

@@ -5,7 +5,7 @@
 </style>   
 
 
-<div class="container-fluid container-fullw bg-white" ng-controller="generateHallTicketCtrl">
+<div class="container-fluid container-fullw bg-white" style="width: 786px;" ng-controller="generateHallTicketCtrl">
     
     
 		<div align="right">
@@ -18,14 +18,14 @@
 		<table width="100%" border="1" id = "" style="background-color:#fff;">
 				<tbody>
 					<tr>
-					<td rowspan="3" width="20%"><img src="images/{{universityLogoPDF}}" id="logo" alt="NAN" height="100" width="100"/></td>
-					<td><center>{{universityNamePDF}}</center></td>
+					<td rowspan="3" width="14%"><img src="images/{{universityLogoPDF}}" id="logo" alt="NAN" height="100" width="100"/></td>
+					<td><center><strong style="font-size:16px;">{{universityNamePDF}}</strong></center></td>
 					</tr>
 					<tr>
-					<td><center>{{universityEmailPDF}}</center></td>
+					<td><center><strong style="font-size:14px;">{{universityEmailPDF}}</strong></center></td>
 					</tr>
 					<tr>
-					<td ><center>{{universityAddressPDF}}</center></td>
+					<td><center><strongstyle="font-size:14px;">{{universityAddressPDF}}</strong></center></td>
 					</tr>
 				</tbody>
 			
@@ -36,11 +36,11 @@
 		<table width="100%" border="1" id = "" style="background-color:#fff;">
 				<tbody>
 					<tr>
-					<td><center>ADMIT CARD : {{courseNamePDF}}  EXAMINATION  {{batchNamePDF}}</center></td><td rowspan="2" width="20%"><img src="images/{{studentObj.ProfilePicPath}}" id="sprofile" alt="NAN" height="100" width="100"/></td>
+					<td><center><strong>ADMIT CARD :</strong> {{courseNamePDF}}  EXAMINATION  {{batchNamePDF}}</center></td><td rowspan="2" width="20%"><img src="images/{{studentObj.ProfilePicPath}}" id="sprofile" alt="NAN" height="100" width="100"/></td>
 					
 					</tr>
 					<tr>
-					<td>Enrollment No&nbsp;:&nbsp;&nbsp;&nbsp;{{studentObj.EnrollmentID}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Student Name&nbsp;&nbsp;:&nbsp;&nbsp;{{studentObj.Firstname}}&nbsp;{{studentObj.Lastname}}</br>Center Name&nbsp;&nbsp;&nbsp;:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{centerNamePDF}}</td>
+					<td><strong style="font-size:14px;" >Enrollment No</strong>&nbsp;:&nbsp;&nbsp;&nbsp;{{studentObj.EnrollmentID}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<strong style="font-size:14px;" >Student Name</strong>&nbsp;&nbsp;:&nbsp;&nbsp;{{studentObj.Firstname}}&nbsp;{{studentObj.Lastname}}</br><strong style="font-size:14px;" >Center Name</strong>&nbsp;&nbsp;&nbsp;&nbsp;:&nbsp;&nbsp;&nbsp;&nbsp;{{centerNamePDF}}</td>
 					</tr>
 					<!-- <tr> -->
 					<!-- <td >{{universityAddressPDF}}</td> -->
@@ -57,7 +57,7 @@
 					<!-- <th colspan="6">SEMESTER</th> -->
 				<!-- </tr> -->
 				<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="15%"><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>
@@ -75,7 +75,7 @@
 			<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>
@@ -92,7 +92,7 @@
 			<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="15%"><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>
@@ -109,7 +109,7 @@
 			<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="15%"><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>