From cf773196cf468441c21aea0c06a3e50220b8904d Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Thu, 30 Aug 2018 17:58:45 +0530 Subject: [PATCH] hallticket date changes --- .../api/application/models/Hallticket_model.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Apollo/api/application/models/Hallticket_model.php b/Apollo/api/application/models/Hallticket_model.php index 152cf58f..aa2a5a78 100755 --- a/Apollo/api/application/models/Hallticket_model.php +++ b/Apollo/api/application/models/Hallticket_model.php @@ -866,7 +866,7 @@ class Hallticket_model extends CI_Model 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 JOIN T_Batch_Schedule_Master on T_Batch_Schedule_Master.UniversityID = ? and T_Batch_Schedule_Master.CourseID = ? and T_Batch_Schedule_Master.BranchCode = ? JOIN T_Batch_Schedule_Child on T_Batch_Schedule_Master.SchId = T_Batch_Schedule_Child.SchId and T_SemSubMap_Child.SubjectID = T_Batch_Schedule_Child.SubjectID and T_Batch_Schedule_Child.IsActive = 1 - order by T_SemSubMap_Master.SemesterID"; + order by T_Batch_Schedule_Child.ScheduleDate"; $res = $this->db->query($sql,array($UID['universityID'],$courseID,$i,$branchId,$UID['universityID'],$courseID,$branchId)); //$id['FeeDetails'][$key2] = $res->result(); $in1[] = $res->result(); @@ -888,7 +888,7 @@ class Hallticket_model extends CI_Model 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 JOIN T_Batch_Schedule_Master on T_Batch_Schedule_Master.UniversityID = ? and T_Batch_Schedule_Master.CourseID = ? and T_Batch_Schedule_Master.BranchCode = ? JOIN T_Batch_Schedule_Child on T_Batch_Schedule_Master.SchId = T_Batch_Schedule_Child.SchId and T_SemSubMap_Child.SubjectID = T_Batch_Schedule_Child.SubjectID and T_Batch_Schedule_Child.IsActive = 1 - order by T_SemSubMap_Master.SemesterID"; + order by T_Batch_Schedule_Child.ScheduleDate"; $res = $this->db->query($sql,array($UID['universityID'],$courseID,$j,$branchId,$UID['universityID'],$courseID,$branchId)); //$id['FeeDetails'][$key2] = $res->result(); $in2[] = $res->result(); @@ -910,7 +910,7 @@ class Hallticket_model extends CI_Model 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 JOIN T_Batch_Schedule_Master on T_Batch_Schedule_Master.UniversityID = ? and T_Batch_Schedule_Master.CourseID = ? and T_Batch_Schedule_Master.BranchCode = ? JOIN T_Batch_Schedule_Child on T_Batch_Schedule_Master.SchId = T_Batch_Schedule_Child.SchId and T_SemSubMap_Child.SubjectID = T_Batch_Schedule_Child.SubjectID and T_Batch_Schedule_Child.IsActive = 1 - order by T_SemSubMap_Master.SemesterID"; + order by T_Batch_Schedule_Child.ScheduleDate"; $res = $this->db->query($sql,array($UID['universityID'],$courseID,$k,$branchId,$UID['universityID'],$courseID,$branchId)); //$id['FeeDetails'][$key2] = $res->result(); $in3[] = $res->result(); @@ -932,7 +932,7 @@ class Hallticket_model extends CI_Model 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 JOIN T_Batch_Schedule_Master on T_Batch_Schedule_Master.UniversityID = ? and T_Batch_Schedule_Master.CourseID = ? and T_Batch_Schedule_Master.BranchCode = ? JOIN T_Batch_Schedule_Child on T_Batch_Schedule_Master.SchId = T_Batch_Schedule_Child.SchId and T_SemSubMap_Child.SubjectID = T_Batch_Schedule_Child.SubjectID and T_Batch_Schedule_Child.IsActive = 1 - order by T_SemSubMap_Master.SemesterID"; + order by T_Batch_Schedule_Child.ScheduleDate"; $res = $this->db->query($sql,array($UID['universityID'],$courseID,$l,$branchId,$UID['universityID'],$courseID,$branchId)); //$id['FeeDetails'][$key2] = $res->result(); $in4[] = $res->result(); @@ -955,7 +955,7 @@ class Hallticket_model extends CI_Model 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 JOIN T_Batch_Schedule_Master on T_Batch_Schedule_Master.UniversityID = ? and T_Batch_Schedule_Master.CourseID = ? and T_Batch_Schedule_Master.BranchCode = ? JOIN T_Batch_Schedule_Child on T_Batch_Schedule_Master.SchId = T_Batch_Schedule_Child.SchId and T_SemSubMap_Child.SubjectID = T_Batch_Schedule_Child.SubjectID and T_Batch_Schedule_Child.IsActive = 1 - order by T_SemSubMap_Master.SemesterID"; + order by T_Batch_Schedule_Child.ScheduleDate"; $res = $this->db->query($sql,array($UID['universityID'],$courseID,$m,$branchId,$UID['universityID'],$courseID,$branchId)); //$id['FeeDetails'][$key2] = $res->result(); $in[] = $res->result(); @@ -974,9 +974,9 @@ class Hallticket_model extends CI_Model $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 - JOIN T_Batch_Schedule_Master on T_Batch_Schedule_Master.UniversityID = ? and T_Batch_Schedule_Master.CourseID = ? and T_Batch_Schedule_Master.BranchCode = ? - JOIN T_Batch_Schedule_Child on T_Batch_Schedule_Master.SchId = T_Batch_Schedule_Child.SchId and T_SemSubMap_Child.SubjectID = T_Batch_Schedule_Child.SubjectID and T_Batch_Schedule_Child.IsActive = 1 - order by T_SemSubMap_Master.SemesterID"; + JOIN T_Batch_Schedule_Master on T_Batch_Schedule_Master.UniversityID = ? and T_Batch_Schedule_Master.CourseID = ? and T_Batch_Schedule_Master.BranchCode = ? + JOIN T_Batch_Schedule_Child on T_Batch_Schedule_Master.SchId = T_Batch_Schedule_Child.SchId and T_SemSubMap_Child.SubjectID = T_Batch_Schedule_Child.SubjectID and T_Batch_Schedule_Child.IsActive = 1 + order by T_Batch_Schedule_Child.ScheduleDate"; $res = $this->db->query($sql,array($UID['universityID'],$courseID,$i,$branchId,$UID['universityID'],$courseID,$branchId)); //$id['FeeDetails'][$key2] = $res->result(); $in[] = $res->result();