From 7febba704fbd3f55d4ced9585371ef1e70ffcc35 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Mon, 18 Dec 2017 12:51:34 +0530
Subject: [PATCH] course details changes done

---
 .../application/models/Fees_status_model.php  | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php
index 2363df2f..0977d6a7 100755
--- a/Apollo/api/application/models/Fees_status_model.php
+++ b/Apollo/api/application/models/Fees_status_model.php
@@ -16,7 +16,7 @@ class Fees_status_model extends CI_Model
      * */
     public function getStudentList($search=null)
     {
-        if($search['MobileNumber']!='' OR $search['Firstname']!=''){
+        if($search['MobileNumber']!='' OR $search['Firstname']!='' OR $search['UniversityID']!='' OR $search['CourseID']!=''){
             $this->db->select('ST.StudentID,ST.MobileNumber,ST.Firstname,ST.Fathername,ST.EmailID,STC.ID,US.UniversityID,US.UniversityName,CU.CourseID,CU.CourseName,BA.BatchCode,BA.BatchName');
             $this->db->from(STUDENTS.' as ST');
             $this->db->join(STUDENTCOURSE.' as STC', 'STC.StudentID = ST.StudentID');
@@ -25,7 +25,19 @@ class Fees_status_model extends CI_Model
             $this->db->join(UNIVERSITY.' as US', 'US.UniversityID = CU.UniversityID');
             $this->db->where('ST.IsActive','1');
             $this->db->where('STC.IsActive','1');
-            if($search['MobileNumber']!='' AND $search['Firstname']==''){
+            if($search['MobileNumber']!=''){
+                $this->db->where('ST.MobileNumber',$search['MobileNumber']);
+            }
+            if($search['Firstname']!=''){
+                $this->db->where('ST.Firstname',$search['Firstname']);
+            }
+            if($search['UniversityID']!=''){
+                $this->db->where('STC.UniversityID',$search['UniversityID']);
+            }
+            if($search['CourseID']!=''){
+                $this->db->where('STC.CourseID',$search['CourseID']);
+            }
+           /* if($search['MobileNumber']!='' AND $search['Firstname']==''){
                 $this->db->where('ST.MobileNumber',$search['MobileNumber']);
             }
             else if($search['MobileNumber']=='' AND $search['Firstname']!=''){
@@ -34,7 +46,7 @@ class Fees_status_model extends CI_Model
             else if($search['MobileNumber']!='' AND $search['Firstname']!=''){
                 $this->db->where('ST.MobileNumber',$search['MobileNumber']);
                 $this->db->where('ST.Firstname',$search['Firstname']);
-            }
+            }*/
             $searchDetails = $this->db->get();
 
             if($searchDetails->result()) {
@@ -235,22 +247,23 @@ class Fees_status_model extends CI_Model
 
         if($unviversityDetails->result()){
             $result_university = array();
+            $result_university['universityStatus'] = true;
             foreach ($unviversityDetails->result() as $row)
             {
-                $university_array['universityStatus'] = true;
+
                 $university_array['universityID'] = $row->UniversityID;
                 $university_array['universityName'] = $row->UniversityName;
                 $university_array['courseDetails']= $this->getCourseDetails($row->UniversityID);
-                $result_university[]=$university_array;
+                $result_array[]=$university_array;
             }
+            $result_university['univerSityDetails']= $result_array;
         }
         else {
-            $university_array['universityStatus'] = false;
-            $university_array['message'] = "No records found!";
-            $university_array['universityID'] = "";
-            $university_array['universityName'] = "";
-            $university_array['courseDetails']= "";
-            $result_university[]=$university_array;
+            $result_university['universityStatus'] = false;
+            $result_university['message'] = "No records found!";
+            $result_university['universityID'] = "";
+            $result_university['universityName'] = "";
+            $result_university['courseDetails']= "";
         }