diff --git a/Apollo/api/application/models/Hallticket_model.php b/Apollo/api/application/models/Hallticket_model.php
index 055c008c..7248a4ea 100755
--- a/Apollo/api/application/models/Hallticket_model.php
+++ b/Apollo/api/application/models/Hallticket_model.php
@@ -810,7 +810,7 @@ class Hallticket_model extends CI_Model
}
- array_splice($id['FeeDetails'][$key2],0,6,$in1);
+ array_splice($id['FeeDetails'][$key2],0,6,$in1[0]);
}
@@ -832,7 +832,7 @@ class Hallticket_model extends CI_Model
// }
- array_splice($id['FeeDetails'][$key2],0,6,$in2);
+ array_splice($id['FeeDetails'][$key2],0,6,$in2[0]);
}
@@ -854,7 +854,7 @@ class Hallticket_model extends CI_Model
// }
- array_splice($id['FeeDetails'][$key2],0,6,$in3);
+ array_splice($id['FeeDetails'][$key2],0,6,$in3[0]);
}
@@ -876,7 +876,7 @@ class Hallticket_model extends CI_Model
// }
- array_splice($id['FeeDetails'][$key2],0,6,$in4);
+ array_splice($id['FeeDetails'][$key2],0,6,$in4[0]);
}
$studentIDs['NUMTYPE'] = 'YEAR';
@@ -1031,8 +1031,10 @@ class Hallticket_model extends CI_Model
{
foreach($studentIDs as $student)
{
+
if(!empty($student['FeeDetails']))
{
+
foreach($student['FeeDetails'][0] as $key => $fees)
{
@@ -1045,16 +1047,13 @@ class Hallticket_model extends CI_Model
$HallTicketStudentID = $this->db->insert_id();
$this->db->trans_complete();
- foreach($fees as $subject)
- {
-
- $tempSubjectArray = array('HallTicket_Student_ID'=>$HallTicketStudentID,'SubjectCode'=>$subject->SubjectID,'ExamDate'=>$subject->ScheduleDate,'FromTime'=>$subject->FromTime,'EndTime'=>$subject->ToTime);
+ $tempSubjectArray = array('HallTicket_Student_ID'=>$HallTicketStudentID,'SubjectCode'=>$fees->SubjectID,'ExamDate'=>$fees->ScheduleDate,'FromTime'=>$fees->FromTime,'EndTime'=>$fees->ToTime);
$this->db->trans_start();
$this->db->insert('T_Hallticket_Subject_Details',$tempSubjectArray);
$this->db->trans_complete();
- }
+
}
}
}
diff --git a/Apollo/assets/js/controllers/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js
index 32eee39c..8007c128 100755
--- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js
+++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js
@@ -638,28 +638,28 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
switch(i)
{
case 0:
- var firstTableID = tableid+'year10';
+ var firstTableID = tableid+'year1'+key;
//var SecTableID = tableid+'year11';
semName = 'YEAR1';
break;
case 1:
- var firstTableID = tableid+'year20';
+ var firstTableID = tableid+'year2'+key;
//var SecTableID = tableid+'year21';
semName = 'YEAR2';
break;
case 2:
- var firstTableID = tableid+'year30';
+ var firstTableID = tableid+'year3'+key;
//var SecTableID = tableid+'year31';
semName = 'YEAR3';
break;
case 4:
- var firstTableID = tableid+'year40';
+ var firstTableID = tableid+'year4'+key;
//var SecTableID = tableid+'year41';
semName = 'YEAR4';
diff --git a/Apollo/assets/views/hallticket/hallTicketPDF.html b/Apollo/assets/views/hallticket/hallTicketPDF.html
index 87143cf7..45633dc3 100755
--- a/Apollo/assets/views/hallticket/hallTicketPDF.html
+++ b/Apollo/assets/views/hallticket/hallTicketPDF.html
@@ -71,7 +71,7 @@
-
+
@@ -79,8 +79,8 @@
-
- | 0{{sub.SemesterID}} | 0{{sub.SemesterID-1}} | {{sub.SubjectCode}} | {{sub.SubjectName}} | {{sub.ScheduleDate | date: "dd-MM-y" }} | {{sub.FromTime}} - {{sub.ToTime}} | |
+
+ | 0{{sub.SemesterID}} | {{sub.SubjectCode}} | {{sub.SubjectName}} | {{sub.ScheduleDate | date: "dd-MM-y" }} | {{sub.FromTime}} - {{sub.ToTime}} | |
@@ -88,16 +88,16 @@
-
+
- | Sem/Year | Paper Code | Subject Name | Date | Time | Inv.sign |
+ Sem/Year | Paper Code | Subject Name | Date | Time | Inv.sign |
-
- | 0{{sub.SemesterID-1}} | 0{{sub.SemesterID-2}} | {{sub.SubjectCode}} | {{sub.SubjectName}} | {{sub.ScheduleDate | date: "dd-MM-y" }} | {{sub.FromTime }} - {{sub.ToTime }} | |
+
+ | 0{{sub.SemesterID-1}} | {{sub.SubjectCode}} | {{sub.SubjectName}} | {{sub.ScheduleDate | date: "dd-MM-y" }} | {{sub.FromTime }} - {{sub.ToTime }} | |
@@ -105,16 +105,16 @@
-
+
- | Sem/Year | Paper Code | Subject Name | Date | Time | Inv.sign |
+ Sem/Year | Paper Code | Subject Name | Date | Time | Inv.sign |
-
- | 0{{sub.SemesterID-2}} | 0{{sub.SemesterID-3}} | {{sub.SubjectCode}} | {{sub.SubjectName}} | {{sub.ScheduleDate | date: "dd-MM-y" }} | {{sub.FromTime}} - {{sub.ToTime | date :"hh:mm: a"}} | |
+
+ | 0{{sub.SemesterID-2}} | {{sub.SubjectCode}} | {{sub.SubjectName}} | {{sub.ScheduleDate | date: "dd-MM-y" }} | {{sub.FromTime}} - {{sub.ToTime | date :"hh:mm: a"}} | |
@@ -122,7 +122,7 @@
-
+
@@ -130,8 +130,8 @@
-
- | 0{{sub.SemesterID-3}} | 0{{sub.SemesterID-4}} | {{sub.SubjectCode}} | {{sub.SubjectName}} | {{sub.ScheduleDate | date: "dd-MM-y" }} | {{sub.FromTime }} - {{sub.ToTime}} | |
+
+ | 0{{sub.SemesterID-3}} | {{sub.SubjectCode}} | {{sub.SubjectName}} | {{sub.ScheduleDate | date: "dd-MM-y" }} | {{sub.FromTime }} - {{sub.ToTime}} | |