diff --git a/Apollo/api/application/models/Hallticket_model.php b/Apollo/api/application/models/Hallticket_model.php index ed4d9859..9761e348 100755 --- a/Apollo/api/application/models/Hallticket_model.php +++ b/Apollo/api/application/models/Hallticket_model.php @@ -793,8 +793,9 @@ class Hallticket_model extends CI_Model //GET Year Based Semester if($ind['SemID'] == 1)//First Year { - for($i = 1;$i <= 2; $i++) - { + $i = 1; + // for($i = 1;$i <= 1; $i++) + // { $sql = "SELECT T_SemSubMap_Child.SubjectID,T_SubjectMaster.SubjectCode,T_SubjectMaster.SubjectName,T_SemSubMap_Master.SemesterID,T_Batch_Schedule_Child.ScheduleDate,T_Batch_Schedule_Child.FromTime,T_Batch_Schedule_Child.ToTime FROM T_SemSubMap_Child JOIN T_SubjectMaster on T_SemSubMap_Child.SubjectID = T_SubjectMaster.SubjectID JOIN T_SemSubMap_Master on T_SemSubMap_Child.MapID = T_SemSubMap_Master.MapID and T_SemSubMap_Master.UniversityID = ? and T_SemSubMap_Master.CourseID = ? and T_SemSubMap_Master.SemesterID = ? and T_SemSubMap_Master.BranchCode = ? and T_SemSubMap_Child.IsActive = 1 @@ -807,15 +808,16 @@ class Hallticket_model extends CI_Model //array_push($id['FeeDetails'][$key2],$ind); - } + // } array_splice($id['FeeDetails'][$key2],0,6,$in1); } else if($ind['SemID'] == 2)//Sec Year { - for($j = 3;$j <= 4; $j++) - { + $j = 3; + // for($j = 3;$j <= 3; $j++) + // { $sql = "SELECT T_SemSubMap_Child.SubjectID,T_SubjectMaster.SubjectCode,T_SubjectMaster.SubjectName,T_SemSubMap_Master.SemesterID,T_Batch_Schedule_Child.ScheduleDate,T_Batch_Schedule_Child.FromTime,T_Batch_Schedule_Child.ToTime FROM T_SemSubMap_Child JOIN T_SubjectMaster on T_SemSubMap_Child.SubjectID = T_SubjectMaster.SubjectID JOIN T_SemSubMap_Master on T_SemSubMap_Child.MapID = T_SemSubMap_Master.MapID and T_SemSubMap_Master.UniversityID = ? and T_SemSubMap_Master.CourseID = ? and T_SemSubMap_Master.SemesterID = ? and T_SemSubMap_Master.BranchCode = ? and T_SemSubMap_Child.IsActive = 1 @@ -828,15 +830,16 @@ class Hallticket_model extends CI_Model //array_push($id['FeeDetails'][$key2],$ind); - } + // } array_splice($id['FeeDetails'][$key2],0,6,$in2); } else if($ind['SemID'] == 3) { - for($k = 5;$k <= 6; $k++) - { + $k = 5; + // for($k = 5;$k <= 5; $k++) + // { $sql = "SELECT T_SemSubMap_Child.SubjectID,T_SubjectMaster.SubjectCode,T_SubjectMaster.SubjectName,T_SemSubMap_Master.SemesterID,T_Batch_Schedule_Child.ScheduleDate,T_Batch_Schedule_Child.FromTime,T_Batch_Schedule_Child.ToTime FROM T_SemSubMap_Child JOIN T_SubjectMaster on T_SemSubMap_Child.SubjectID = T_SubjectMaster.SubjectID JOIN T_SemSubMap_Master on T_SemSubMap_Child.MapID = T_SemSubMap_Master.MapID and T_SemSubMap_Master.UniversityID = ? and T_SemSubMap_Master.CourseID = ? and T_SemSubMap_Master.SemesterID = ? and T_SemSubMap_Master.BranchCode = ? and T_SemSubMap_Child.IsActive = 1 @@ -849,15 +852,16 @@ class Hallticket_model extends CI_Model //array_push($id['FeeDetails'][$key2],$ind); - } + // } array_splice($id['FeeDetails'][$key2],0,6,$in3); } else if($ind['SemID'] == 4) { - for($l = 7;$l <= 8; $l++) - { + $l = 7; + // for($l = 7;$l <= 7; $l++) + // { $sql = "SELECT T_SemSubMap_Child.SubjectID,T_SubjectMaster.SubjectCode,T_SubjectMaster.SubjectName,T_SemSubMap_Master.SemesterID,T_Batch_Schedule_Child.ScheduleDate,T_Batch_Schedule_Child.FromTime,T_Batch_Schedule_Child.ToTime FROM T_SemSubMap_Child JOIN T_SubjectMaster on T_SemSubMap_Child.SubjectID = T_SubjectMaster.SubjectID JOIN T_SemSubMap_Master on T_SemSubMap_Child.MapID = T_SemSubMap_Master.MapID and T_SemSubMap_Master.UniversityID = ? and T_SemSubMap_Master.CourseID = ? and T_SemSubMap_Master.SemesterID = ? and T_SemSubMap_Master.BranchCode = ? and T_SemSubMap_Child.IsActive = 1 @@ -870,7 +874,7 @@ class Hallticket_model extends CI_Model //array_push($id['FeeDetails'][$key2],$ind); - } + // } array_splice($id['FeeDetails'][$key2],0,6,$in4); } diff --git a/Apollo/assets/js/controllers/examAttendanceCtrl.js b/Apollo/assets/js/controllers/examAttendanceCtrl.js index 97ecdd1c..3b640ca0 100644 --- a/Apollo/assets/js/controllers/examAttendanceCtrl.js +++ b/Apollo/assets/js/controllers/examAttendanceCtrl.js @@ -308,15 +308,19 @@ $scope.isLoaderTxt = "Loading..."; if(AttendanceTableID_AM != "") { + console.log('AttendanceTableID_AM'); doc1.autoTable(AttendanceTableID_AM.columns, AttendanceTableID_AM.data, options1); - } doc1.save(fileNameAM); + } + if(AttendanceTableID_PM != "") { + console.log('AttendanceTableID_AM'); doc2.autoTable(AttendanceTableID_PM.columns, AttendanceTableID_PM.data, options2); - } doc2.save(fileNamePM); + } + diff --git a/Apollo/assets/views/hallticket/examAttendancePDF.html b/Apollo/assets/views/hallticket/examAttendancePDF.html index 2cc95452..d44f1926 100644 --- a/Apollo/assets/views/hallticket/examAttendancePDF.html +++ b/Apollo/assets/views/hallticket/examAttendancePDF.html @@ -31,7 +31,7 @@
- + @@ -43,7 +43,7 @@
SNO STUDENT NAME COURSE SEM/YEAR ENROLLMENT NO SUBJECT CODE SUBJECT NAMEBOOKLET NO STUDENT SUGNATURE
SNO STUDENT NAME COURSE SEM/YEAR ENROLLMENT NO SUBJECT CODE SUBJECT NAMEBOOKLET NO STUDENT SIGN
{{($index+1)}} {{student.Firstname}} {{student.Lastname}} {{student.CourseName}}{{student.Sem_Year}}{{student.EnrollmentID}}{{student.SubjectCode}}{{student.SubjectName}}
- +
SNO STUDENT NAME COURSE SEM/YEAR ENROLLMENT NO SUBJECT CODE SUBJECT NAMEBOOKLET NO STUDENT SUGNATURE
SNO STUDENT NAME COURSE SEM/YEAR ENROLLMENT NO SUBJECT CODE SUBJECT NAMEBOOKLET NO STUDENT SIGN
{{($index+1)}} {{student.Firstname}} {{student.Lastname}} {{student.CourseName}}{{student.Sem_Year}}{{student.EnrollmentID}}{{student.SubjectCode}}{{student.SubjectName}}