From 7e144c8a14a92d1e0a9f65cc9aba0b418279b433 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 20 Apr 2018 14:27:34 +0530 Subject: [PATCH] subject master changes done --- Apollo/api/application/models/Subject_model.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Apollo/api/application/models/Subject_model.php b/Apollo/api/application/models/Subject_model.php index d4e185a9..cdc61da0 100755 --- a/Apollo/api/application/models/Subject_model.php +++ b/Apollo/api/application/models/Subject_model.php @@ -15,6 +15,7 @@ class Subject_model extends CI_Model $this->db->select('SubjectCode'); $this->db->where('SubjectCode',$arrayDetails['SubjectCode']); + $this->db->where('BranchCode',$arrayDetails['BranchCode']); if($this->db->get(SUBJECTMASTER)->first_row()){ $result['SubjectStatus']=false; $result['message']="This subject code already exists"; @@ -44,12 +45,14 @@ public function updateSubject($arrayDetails=null,$SubjectID=null) { $this->db->select('SubjectCode'); $this->db->where('SubjectCode',$arrayDetails['SubjectCode']); - $this->db->where('SubjectCode !=', $arrayDetails['SubjectCode']); + $this->db->where('SubjectID !=', $SubjectID); + $this->db->where('BranchCode', $arrayDetails['BranchCode']); if($this->db->get(SUBJECTMASTER)->first_row()){ $result['SubjectStatus']=false; $result['message']="This subject code is already exists"; }else{ $this->db->where('SubjectID',$SubjectID); + $this->db->where('BranchCode', $arrayDetails['BranchCode']); $upateStatus=$this->db->update(SUBJECTMASTER, $arrayDetails); @@ -78,10 +81,11 @@ public function updateSubject($arrayDetails=null,$SubjectID=null) - public function getSubject() + public function getSubject($requestedBy=null,$branchCode=null) { - $this->db->select('*'); - $this->db->order_by('CreatedOn','DESC'); + $this->db->select('*'); + $this->db->where('BranchCode',$branchCode); + $this->db->order_by('SubjectID','DESC'); $subjectDetails = $this->db->get(SUBJECTMASTER);