diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php
index 5e900608..686eb061 100755
--- a/Apollo/api/application/models/Reports_model.php
+++ b/Apollo/api/application/models/Reports_model.php
@@ -240,7 +240,9 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
        $sql ="SELECT sms.sid AS Student_id,sms.cid,ifnull(sms.status,'-') AS STATUS,ifnull(sms.adate,'-') AS adate,ifnull(sms.acmts,'-') AS acmts,ifnull(sms.ctype,'-') AS ctype,ifnull(sms.certname,'-') AS certname,ifnull(balance,'-') AS balance,ifnull(sfb.bdate,'-') AS initialPaid,ifnull(scd.eid,'-') AS Enrollment_id,ifnull(std.name,'-') AS Student_name,ifnull(std.father,'-') AS Father_name,ifnull(std.phone,'-') AS Phone_number,ifnull(cm.course,'-') AS Course_name,ifnull(cm.uname,'-') AS University,cm.uid AS univID,ifnull(std.address,'-') AS address,ifnull(std.AlternateNumber,'') AS AlternateNumber
 FROM 
 (  
-SELECT app.ID,app.StudentID AS sid,app.CourseID AS cid,app.BranchCode AS branch,app.ListCode AS lcode,p.ListName AS STATUS,AppDate AS adate,app.Comments AS acmts,CertificationType AS ctype,app.CertificationType AS certname,sum(bal.balpayable) AS balance
+SELECT app.ID,app.StudentID AS sid,app.CourseID AS cid,app.BranchCode AS branch,app.ListCode AS lcode,p.ListName AS STATUS,STR_TO_DATE('AppDate', '%d-%m-%Y' 
+)
+AS adate,app.Comments AS acmts,CertificationType AS ctype,app.CertificationType AS certname,sum(bal.balpayable) AS balance
 		FROM T_ApplicationStatus AS app
         LEFT JOIN T_PickListDetails p ON p.ListCode = app.ListCode
         LEFT JOIN BalFees bal ON bal.student=app.StudentID AND bal.course=app.CourseID AND bal.feestype = app.CertificationType
@@ -252,7 +254,7 @@ LEFT JOIN
         GROUP BY sid,cid,fid) 
     AS sfs ON sfs.sid=sms.sid AND sfs.cid=sms.cid AND sfs.ftype=sms.ctype
 LEFT JOIN
-        (SELECT sfp.StudentID AS sid,sfp.FeesId AS fid,sfs.CourseID AS cid,BillDate AS bdate,sum(BillAmount) AS bamount,BillNO AS billno  FROM T_Students_Fees_PaidDetails sfp
+        (SELECT sfp.StudentID AS sid,sfp.FeesId AS fid,sfs.CourseID AS cid,STR_TO_DATE(BillDate,'%d-%m-%Y') AS bdate,sum(BillAmount) AS bamount,BillNO AS billno  FROM T_Students_Fees_PaidDetails sfp
 LEFT JOIN T_Students_Fees_Status sfs ON sfs.FeesId=sfp.FeesId       
 WHERE IsActive = 1
         GROUP BY sid,cid,fid) 
@@ -287,21 +289,21 @@ LEFT JOIN
             $fromd= date("Y-m-d",strtotime($from));
            
             
-            $sql.="and STR_TO_DATE(sfb.bdate,'%d-%m-%Y') >= '".$fromd."'
+            $sql.="and sfb.bdate >= '".$fromd."'
                 ";
         
         }
         if ($to != ''){
              $tod=date("Y-m-d",strtotime($to));
             
-            $sql.=" and STR_TO_DATE(sfb.bdate,'%d-%m-%Y') <= '".$tod."'";
+            $sql.=" and sfb.bdate <= '".$tod."'";
         
         }
           $sql.=" group by Student_id,cid,ctype";
-		  $sql.=" ORDER BY adate ASC";
+		  $sql.=" ORDER BY sfb.bdate ASC";
           //echo $sql;
 		 
-		//print_r($sql);
+		// print_r($sql);
 		
         $leadDet=$this->db->query($sql);
         $cert_statusDetails = $leadDet->result();
diff --git a/Apollo/assets/js/controllers/examAttendanceCtrl.js b/Apollo/assets/js/controllers/examAttendanceCtrl.js
index 0912a67b..32bea9ff 100644
--- a/Apollo/assets/js/controllers/examAttendanceCtrl.js
+++ b/Apollo/assets/js/controllers/examAttendanceCtrl.js
@@ -278,23 +278,44 @@ $scope.isLoaderTxt = "Loading...";
 			  top: 70,
 			  bottom: 40,
 			  left: 30,
-			   width: 550
+			   width: 500,
+			   
 			};
-			  var doc1 = new jsPDF('l', 'pt');
+			var pdfSize = 'a4';
+			  var doc1 = new jsPDF('l', 'pt',pdfSize);
 			      // doc1.setPage(10);
 				  doc1.autoTableSetDefaults({
 					   // 
-						   columnWidth: 'wrap',
-				  styles: {cellPadding: 5.0, fontSize: 8, height:70, overflow: 'linebreak',columnWidth: 'wrap'},
+						   
+				  // styles: {cellPadding: 5.0, fontSize: 8, height:70, overflow: 'linebreak'
+				 
+				   // },
+				    styles: {overflow: 'linebreak', font: 'arial', fontSize: 8, cellPadding: 5, columnwidth: 'auto'},
+				   
+				  
+				   // columStyles:{
+					   
+			  	      // 0:{columnWidth:20},
+					  // 1:{columnWidth:50},
+					  // 2:{columnWidth:50},
+					  // 3:{columnWidth:20},
+					  // 4:{columnWidth:50},
+					  // 5:{columnWidth:50},
+					  // 6:{columnWidth:40},
+					  // 7:{columnWidth:50},
+					  // 8:{columnWidth:40},
+					  // 9:{columnWidth:50}
+				  // },
 					headerStyles: {fillColor: [245, 245, 240], textColor: 0}
 					 	  });
-						  
-						  var doc2 = new jsPDF('l', 'pt');
+						  var pdfSize = 'a4';
+						  var doc2 = new jsPDF('l', 'pt',pdfSize);
 						  // doc2.setPage(10);
 				  doc2.autoTableSetDefaults({
 					    // rowWidth: 'wrap',
-						   columnWidth: 'wrap',
-				  styles: {cellPadding: 5.0, fontSize: 8, height:70,overflow: 'linebreak',columnWidth: 'wrap'},
+						   // columnWidth: 'wrap',
+				  // styles: {cellPadding: 5.0, fontSize: 8, height:70,overflow: 'linebreak',columnWidth: 'wrap'},
+				   styles: {overflow: 'linebreak', font: 'arial', fontSize: 8, cellPadding: 5, columnwidth: 'auto'},
 					headerStyles: {fillColor: [245, 245, 240], textColor: 0}
 					 	  });
 						
diff --git a/Apollo/assets/js/controllers/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js
index e590fdf9..3bf4ca1d 100644
--- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js
+++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js
@@ -100,10 +100,10 @@ $scope.generateButtonStatus = false;
 			return false;
 		}
 		
-		// if(myModel.courseName == '' || myModel.courseName == null || myModel.courseName == undefined){
-  //           swal('Select Course','','warning');
-		// 	return false;
-		// }
+		if(myModel.courseName == '' || myModel.courseName == null || myModel.courseName == undefined){
+            swal('Select Course','','warning');
+			return false;
+		}
 		
 		if(myModel.batchName == null || myModel.batchName == '' || myModel.batchName == undefined){
             swal('Select Batch','','warning');
diff --git a/Apollo/assets/views/hallticket/examAttendancePDF.html b/Apollo/assets/views/hallticket/examAttendancePDF.html
index 1b8f1e70..54f0f02f 100644
--- a/Apollo/assets/views/hallticket/examAttendancePDF.html
+++ b/Apollo/assets/views/hallticket/examAttendancePDF.html
@@ -43,10 +43,10 @@
 
 				<thead>
 					<tr> 
-						<th width="5%"><center>SNO</center></th> 
+						<th width="5%"><center>Sl</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="5%"><center>SEM YEAR</center></th> 
 						<th width="10%"><center>ENROLLMENT NO</center></th> 
 						<th width="10"><center>Roll NO</center></th>
 						<th width="5%"><center>SUBJECT CODE</center></th> 
@@ -93,10 +93,10 @@
 		<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="5%"><center>Sl</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="5%"><center>SEM YEAR</center></th> 
 						<th width="7%"><center>ENROLLMENT NO</center></th> 
 						<th width="13"><center>Roll NO</center></th>
 						<th width="5%"><center>SUBJECT CODE</center></th> 
diff --git a/Apollo/assets/views/report_certificate_status.html b/Apollo/assets/views/report_certificate_status.html
index a8022adb..ac3fd9dd 100755
--- a/Apollo/assets/views/report_certificate_status.html
+++ b/Apollo/assets/views/report_certificate_status.html
@@ -159,7 +159,7 @@ td,th {
                     <tr  dir-paginate="p in cert_data|filter:search:strict|itemsPerPage:10" current-page="currentPage">
                             <td><input type="checkbox" ng-checked="myModel.all" id="{{p.Student_id}}" name="{{p.Student_id}}" class="form-control" ng-click="isClick($event);" /></td>
                         <td>{{10 * (currentPage-1)+$index+1}}</td>
-                        <td>{{p.initialPaid || "-"}}</td>
+                        <td>{{p.initialPaid | date :'dd-MM-yyyy'}}</td>
                         <td>{{p.Enrollment_id || "-"}}</td>
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td>
                         <td>{{p.Father_name}}</td>