From 3b8b6495764d5e556afe354192aa28e0fd7bd3ba Mon Sep 17 00:00:00 2001
From: gayathri1990 <maran7mca@gmail.com>
Date: Wed, 12 Sep 2018 18:14:49 +0530
Subject: [PATCH] batchschdule changes

---
 Apollo/api/application/models/Hallticket_model.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Apollo/api/application/models/Hallticket_model.php b/Apollo/api/application/models/Hallticket_model.php
index 582da2af..17d2e960 100644
--- a/Apollo/api/application/models/Hallticket_model.php
+++ b/Apollo/api/application/models/Hallticket_model.php
@@ -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 bsc.SchId='".$mapid."' 
+WHERE semchild.isActive = '1' and bsm.SchId='".$mapid."' 
 group by semchild.SubjectID,semchild.MapID";
   $b=$this->db->query($sql);
      //print_r($b);	
@@ -136,8 +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('SCM.CourseID',$CourseID);
-       // $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);