diff --git a/Apollo/api/application/models/Login_model.php b/Apollo/api/application/models/Login_model.php index a73efa0d..aad586dd 100755 --- a/Apollo/api/application/models/Login_model.php +++ b/Apollo/api/application/models/Login_model.php @@ -198,20 +198,21 @@ class Login_model extends CI_Model } - + else if($loginDetails->ListCode ==SUPER_ADMIN) { - // echo 'SUPER_ADMIN';die(); - + if ($password == $loginDetails->Password) { + /// echo 'SUPER_ADMIN';die(); + $superadminpwd= md5($password); $this->db->select('t1.MobileNumber, t1.ListCode, t1.ID, t2.BranchCode, t2.FinanceModuleAccess'); $this->db->from('' . LOGIN . ' as t1'); $this->db->join('' . STAFF . ' as t2', 't1.StaffID = t2.StaffID', 'LEFT'); $this->db->where('t1.MobileNumber', $mobile); $this->db->where('t2.IsActive', 1); - $responseDetails = $this->db->get()->first_row(); + $responseDetails = $this->db->get()->first_row();// print_r($this->db->last_query());die(); if($responseDetails) { if ($responseDetails->ListCode == SUPER_ADMIN) @@ -251,7 +252,17 @@ class Login_model extends CI_Model - } + } + + else + { + $result['loginStatus'] = false; + $result['message'] = "Please Enter Valid Password !!"; + } + + } + + } } diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php index 6ecc2fcf..68e2641f 100755 --- a/Apollo/api/application/models/Student_model.php +++ b/Apollo/api/application/models/Student_model.php @@ -1561,18 +1561,27 @@ if(count($qry)>0) $Enrollment = $reqArr['EnrollmentID']; + $universityid = $reqArr['UniversityID']; + + //echo $Enrollment ; + + //print_r($reqArr);die(); + if($Enrollment !='') { - + // echo 'in if'; $this->db->select('*'); $this->db->from('T_Student_CourseDetails'); $this->db->where('EnrollmentID',$Enrollment); - $this->db->where_not_in('StudentID', $reqArr['StudentID']); - $this->db->where_not_in('CourseID', $reqArr['CourseID']); + $this->db->where('UniversityID',$universityid); + // $this->db->where_not_in('StudentID', $reqArr['StudentID']); + // $this->db->where_not_in('CourseID', $reqArr['CourseID']); $qry=$this->db->get(); $qry=$qry->result(); + // print_r($this->db->last_query());die(); + //echo count($qry);die(); if(count($qry)>0)