From 2716923a83b0ae30be3dfafe24bc8ca8cf1d5b48 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Fri, 22 Feb 2019 12:03:06 +0530
Subject: [PATCH] issue no :1680

---
 .../views/hallticket/examAttendancePDF.html   | 55 +++++++++++++++++--
 .../views/hallticket/hallTicketPDF.html       | 27 +++++++--
 2 files changed, 73 insertions(+), 9 deletions(-)

diff --git a/Apollo/assets/views/hallticket/examAttendancePDF.html b/Apollo/assets/views/hallticket/examAttendancePDF.html
index a2fc74ec..b4d11e47 100644
--- a/Apollo/assets/views/hallticket/examAttendancePDF.html
+++ b/Apollo/assets/views/hallticket/examAttendancePDF.html
@@ -2,7 +2,14 @@
 .table{
 	border: 1px solid #000 !important;
 }
-</style>   
+</style> 
+
+<style>
+.table, th, td {
+  border: 1px solid #000 !important;
+  border-collapse: collapse;
+}
+</style> 
 
 
 <div class="container-fluid container-fullw bg-white"  style="width: 850px;" ng-controller="examAttendanceCtrl">
@@ -34,11 +41,29 @@
 		<table width="100%" border="1" id = "attendanceTableAM" style="background-color:#fff;" ng-if="studentInfoAM_Length != 0">
 
 
-				<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>
+				<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="10%"><center>BOOKLET NO</center></th> 
+						<th width="30%"><center>STUDENT SIGN</center></th> 
+					</tr>
+				</thead>
 
 				<tbody>
 					<tr ng-repeat="student in dataForExamAttendanceAM" >
-					<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>
+						<td height="50">{{($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>
 					</tr>
 				</tbody>
 			
@@ -62,10 +87,30 @@
 		
 		<div id="student_list_PM">
 		<table width="100%" border="1" id = "attendanceTablePM" style="background-color:#fff;" ng-if="studentInfoPM_Length != 0">
-				<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>
+				<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="10%"><center>BOOKLET NO</center></th> 
+						<th width="30%"><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>
+						<td height="50">{{($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>
 					</tr>
 				</tbody>
 			
diff --git a/Apollo/assets/views/hallticket/hallTicketPDF.html b/Apollo/assets/views/hallticket/hallTicketPDF.html
index c1e90d0c..ccf9ad23 100755
--- a/Apollo/assets/views/hallticket/hallTicketPDF.html
+++ b/Apollo/assets/views/hallticket/hallTicketPDF.html
@@ -1,8 +1,17 @@
 <style>
 .table{
+	border: 1px solid #ffffff !important;
 	border-collapse: collapse;
 }
 </style>   
+<style>
+.table#table1 th, td {
+  border: 1px solid #000 !important;
+  border-collapse: collapse;
+}
+</style>
+
+
 
 
 <div class="container-fluid container-fullw bg-white" style="width: 786px;" ng-controller="generateHallTicketCtrl">
@@ -17,7 +26,7 @@
 	<div ng-repeat="studentObj in localPdfStudentDetails" and ng-if="studentObj.Firstname">
 		<div id="university_header">
 			
-		<table width="100%" border="1" cellpadding="0" cellspacing="0" id = "" style="background-color:#fff;">
+		<table width="100%" border="1" cellpadding="0" cellspacing="0" id = "tablehead" style="background-color:#fff;">
 				<tbody>
 					<tr>
 					<td rowspan="3" width="14%"><img src="images/{{universityLogoPDF}}" id="logo" alt="NAN" height="100" width="100"/></td>
@@ -60,18 +69,28 @@
 		
 		
 		<!-- FOR SEMESTER TYPE STUDENTS-->
-		<table width="100%" border="1" cellpadding="0" cellspacing="0"  ng-repeat ="subjects in studentObj.FeeDetails" and ng-if="semDataTypePDF == 'SEM' && subjects.sem == SemIDPDF" id = "{{studentObj.StudentID}}{{$index}}">
+		<table width="100%" border="1" id="table1" cellpadding="0" cellspacing="0"  ng-repeat ="subjects in studentObj.FeeDetails" and ng-if="semDataTypePDF == 'SEM' && subjects.sem == SemIDPDF" id = "{{studentObj.StudentID}}{{$index}}">
 			<thead>
 				<!-- <tr> -->
 					<!-- <th colspan="6">SEMESTER</th> -->
 				<!-- </tr> -->
 				<tr > 
-					<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>
+					<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="15%"><center>Inv.sign</center></th>
 				</tr>
 				</thead>
 				<tbody>
 					<tr ng-repeat="sub in subjects.sub" >
-						<td>0{{sub.SemesterID}}</td><td style="padding-left:3px;">{{sub.SubjectCode}}</td><td style="padding-left:3px;">{{sub.SubjectName}}</td><td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td><td>{{sub.FromTime}} - {{sub.ToTime }}</td><td >&nbsp;</td>
+						<td height="50">0{{sub.SemesterID}}</td>
+						<td style="padding-left:3px;">{{sub.SubjectCode}}</td>
+						<td style="padding-left:3px;">{{sub.SubjectName}}</td>
+						<td >{{sub.ScheduleDate | date: "dd-MM-y" }}</td>
+						<td>{{sub.FromTime}} - {{sub.ToTime }}</td>
+						<td >&nbsp;</td>
 					</tr>
 				</tbody>