Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YEAR HALLTICKET ISEEUE FIXED:VELZ

Browse Source
This commit is contained in:
velz 2018-08-21 11:57:36 +05:30
parent 088e626eb0
commit 2df91944f1
3 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Apollo/api/application/models/Hallticket_model.php
View File

@ -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();
}
}
}
}

8
Apollo/assets/js/controllers/generateHallTicketCtrl.js
View File

@ -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';

28
Apollo/assets/views/hallticket/hallTicketPDF.html
View File

@ -71,7 +71,7 @@
<!-- END OF SEMESTER TYPE STUDENTS-->
<!-- FOR YEAR TYPE STUDENTS-->
<table width="100%" border="1" ng-repeat = "sem in studentObj.FeeDetails[0]" ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year1{{$index}}">
<table width="100%" border="1" ng-if="studentObj.FeeDetails[0]" ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year1{{$index}}">
<thead>
<tr>
@ -79,8 +79,8 @@
</tr>
</thead>
<tbody>
<tr ng-repeat="sub in sem">
<td ng-if="$parent.$index == 0">0{{sub.SemesterID}}</td><td ng-if="$parent.$index == 1">0{{sub.SemesterID-1}}</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 ng-repeat="sub in studentObj.FeeDetails[0]">
<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>
</tr>
</tbody>
@ -88,16 +88,16 @@
<table width="100%" border="1" ng-repeat = "sem in studentObj.FeeDetails[1]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year2{{$index}}">
<table width="100%" border="1" ng-if = "studentObj.FeeDetails[1]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year2{{$index}}">
<thead>
<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="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>
<tr ng-repeat="sub in sem">
<td ng-if="$parent.$index == 0">0{{sub.SemesterID-1}}</td><td ng-if="$parent.$index == 1">0{{sub.SemesterID-2}}</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 ng-repeat="sub in studentObj.FeeDetails[1]">
<td>0{{sub.SemesterID-1}}</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>
@ -105,16 +105,16 @@
<table width="100%" border="1" ng-repeat = "sem in studentObj.FeeDetails[2]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year3{{$index}}">
<table width="100%" border="1" ng-if ="studentObj.FeeDetails[2]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year3{{$index}}">
<thead>
<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="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>
<tr ng-repeat="sub in sem">
<td ng-if="$parent.$index == 0">0{{sub.SemesterID-2}}</td><td ng-if="$parent.$index == 1">0{{sub.SemesterID-3}}</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 | date :"hh:mm: a"}}</td><td >&nbsp;</td>
<tr ng-repeat="sub in studentObj.FeeDetails[2]">
<td>0{{sub.SemesterID-2}}</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 | date :"hh:mm: a"}}</td><td >&nbsp;</td>
</tr>
</tbody>
@ -122,7 +122,7 @@
<table width="100%" border="1" ng-repeat = "sem in studentObj.FeeDetails[3]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year4{{$index}}">
<table width="100%" border="1" ng-if = "studentObj.FeeDetails[3]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year4{{$index}}">
<thead>
<tr>
@ -130,8 +130,8 @@
</tr>
</thead>
<tbody>
<tr ng-repeat="sub in sem">
<td ng-if="$parent.$index == 0">0{{sub.SemesterID-3}}</td><td ng-if="$parent.$index == 1">0{{sub.SemesterID-4}}</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 ng-repeat="sub in studentObj.FeeDetails[3]">
<td>0{{sub.SemesterID-3}}</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>