From c46448f7641ae936cc1d48bb15fc68bb403c7288 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 20 Apr 2018 14:50:04 +0530 Subject: [PATCH] center master changes done --- Apollo/api/application/models/Center_model.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Apollo/api/application/models/Center_model.php b/Apollo/api/application/models/Center_model.php index 02d085de..22a196a2 100755 --- a/Apollo/api/application/models/Center_model.php +++ b/Apollo/api/application/models/Center_model.php @@ -20,6 +20,7 @@ class Center_model extends CI_Model { $this->db->select('CenterCode'); $this->db->where('CenterCode', $arrayDetails['CenterCode']); + $this->db->where('BranchCode', $arrayDetails['BranchCode']); if($this->db->get(CENTER)->first_row()){ $result['centerStatus'] = false; $result['message'] = "This center Code is already exist!"; @@ -46,10 +47,11 @@ class Center_model extends CI_Model { - public function getCenter() + public function getCenter($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('CenterID','DESC'); $centerDetails = $this->db->get(CENTER); // print_r($centerDetails); // die; @@ -77,14 +79,15 @@ class Center_model extends CI_Model { $this->db->select('CenterCode'); $this->db->where('CenterCode',$arrayDetails['CenterCode']); - //$this->db->where('SubjectCode !=', $arrayDetails['SubjectCode']); - $this->db->where('CenterCode !=',$arrayDetails['CenterCode']); + $this->db->where('BranchCode',$arrayDetails['BranchCode']); + $this->db->where('CenterID !=',$CenterID); if($this->db->get(CENTER)->first_row()){ $result['centerStatus']=false; $result['message']= " This Center code already exist"; } else{ $this->db->where('CenterID',$CenterID); + $this->db->where('BranchCode',$arrayDetails['BranchCode']); $updateStatus=$this->db->update(CENTER, $arrayDetails); if($updateStatus){