diff --git a/Apollo/api/application/controllers/HallTickets_Controller.php b/Apollo/api/application/controllers/HallTickets_Controller.php index 8a0b6b91..5dd3aacd 100644 --- a/Apollo/api/application/controllers/HallTickets_Controller.php +++ b/Apollo/api/application/controllers/HallTickets_Controller.php @@ -337,9 +337,6 @@ class HallTickets_Controller extends REST_Controller { { $maparray[]=$object->SubjectCode; } - // $a1=$fileArray; - // $b1=$maparray; - // print_r($maparray); $result=array_diff($fileArray,$maparray); $unmatched= sizeof($result); diff --git a/Apollo/api/application/models/Hallticket_model.php b/Apollo/api/application/models/Hallticket_model.php index 4c17cf0e..582da2af 100644 --- a/Apollo/api/application/models/Hallticket_model.php +++ b/Apollo/api/application/models/Hallticket_model.php @@ -114,7 +114,7 @@ class Hallticket_model extends CI_Model //////////// public function get_unShedules($mapid,$subid,$branchcode,$CourseID,$universityID) { - //echo $mapid; + $sql="SELECT semchild.SubjectID,semchild.MapID,bsc.ScheduleDate,bsc.FromTime,bsc.ToTime,sm.SubjectName FROM T_SemSubMap_Child semchild LEFT JOIN T_SemSubMap_Master semmaster ON semmaster.MapID = semchild.MapID @@ -122,7 +122,7 @@ class Hallticket_model extends CI_Model and bsm.CourseID=semmaster.CourseID LEFT JOIN T_Batch_Schedule_Child bsc ON bsc.SchId = bsm.SchId and bsc.SubjectID=semchild.SubjectID LEFT JOIN T_SubjectMaster sm ON sm.SubjectID=semchild.SubjectID -WHERE semchild.isActive = '1' and bsm.SchId='".$mapid."' +WHERE semchild.isActive = '1' and bsc.SchId='".$mapid."' group by semchild.SubjectID,semchild.MapID"; $b=$this->db->query($sql); //print_r($b); @@ -136,7 +136,8 @@ group by semchild.SubjectID,semchild.MapID"; $this->db->from('T_Batch_Schedule_Master SCM'); $this->db->join('T_Batch_Schedule_Child','T_Batch_Schedule_Child.SchId = SCM.SchId'); $this->db->where('SCM.BranchCode',$branchcode); - $this->db->where('T_Batch_Schedule_Child.SchId',$mapid); + $this->db->where('SCM.CourseID',$CourseID); + // $this->db->where('T_Batch_Schedule_Child.SchId',$mapid); $this->db->where('T_Batch_Schedule_Child.SubjectID',$row->SubjectID); $existsheduledetails = $this->db->get(); //print_r($existsheduledetails);