diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index a42d1e11..1c064c90 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -520,6 +520,8 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se } public function app_pending($bat=null,$br=null,$u=null){ + + $sql = "SELECT APFS.ID as id, @@ -603,6 +605,8 @@ where STU.IsActive = '1' and APFS.ID in (select max(ID) from T_ApplicationFormS $sql.=" and COUR.UniversityID = '".$u."'"; } + + $sql.="and STU.BranchCode='".$br."'"; $sql.=" group by regid,Student_id "; $sql.=" ORDER BY StatusUpdationOn DESC "; @@ -615,6 +619,9 @@ where STU.IsActive = '1' and APFS.ID in (select max(ID) from T_ApplicationFormS $results['app_pendingList'] = false; $results['message'] = 'No record found'; } + + + // print_r($this->db->last_query());die(); return $results; @@ -706,11 +713,11 @@ $sql.=" group by Student_id,cid,ctype"; order by CourseID) as cm on cm.cid=cfd.ccid left join - (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,concat(FirstName,' ',Lastname) as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid + (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,concat(FirstName,' ',Lastname) as name,Fathername as father,PermanentAddress as address,AlternateNumber,BranchCode FROM T_StudentDetails) as std on std.sid=sms.sid left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid - where std.active = 1 and sfs.batch = '".$bat."' and cm.uid = '".$u."' + where std.active = 1 and sfs.batch = '".$bat."' and cm.uid = '".$u."' and std.BranchCode= '".$br."' group by Student_id,Course_id,certname "; - + } //if ($u!= '' and $bat = '') else{ @@ -740,9 +747,9 @@ $sql.=" group by Student_id,cid,ctype"; order by CourseID) as cm on cm.cid=cfd.ccid left join - (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,concat(FirstName,' ',Lastname) as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid + (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,concat(FirstName,' ',Lastname) as name,Fathername as father,PermanentAddress as address,AlternateNumber,BranchCode FROM T_StudentDetails) as std on std.sid=sms.sid left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid - where std.active = 1 and cm.uid = '".$u."' + where std.active = 1 and cm.uid = '".$u."' and std.BranchCode= '".$br."' group by Student_id,Course_id,certname "; }