Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

activity changes done

Browse Source
This commit is contained in:
gandhimathi 2018-04-23 12:40:39 +05:30
parent e7f3a0f451
commit 28324c21a7
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Apollo/api/application/models/University_model.php
View File

@ -94,15 +94,13 @@ class University_model extends CI_Model
public function addActivity($arrayDetails=null,$jsonData=null) public function addActivity($arrayDetails=null,$jsonData=null)
{ {
$this->db->select('ActivityID,ActivityName'); $this->db->select('ActivityID,ActivityName');
$this->db->where('ActivityName', $arrayDetails['ActivityName']); $this->db->where('ActivityName', $arrayDetails['ActivityName']);
$this->db->where('BranchCode', $arrayDetails['BranchCode']);
if($this->db->get(ACTIVITY)->first_row()){ if($this->db->get(ACTIVITY)->first_row()){
$result['activityStatus'] = false; $result['activityStatus'] = false;
$result['message'] = "Activity name is already exist!"; $result['message'] = "Activity name is already exist!";
} }
else{ else{
$this->db->insert(ACTIVITY, $arrayDetails); $this->db->insert(ACTIVITY, $arrayDetails);
if($this->db->affected_rows() == '1'){ if($this->db->affected_rows() == '1'){
$last = $this->db->order_by('ActivityID',"desc")->limit(1)->get(ACTIVITY)->row(); $last = $this->db->order_by('ActivityID',"desc")->limit(1)->get(ACTIVITY)->row();
@ -141,11 +139,12 @@ class University_model extends CI_Model
* created by Surendiran * created by Surendiran
* */ * */
public function getActivity() public function getActivity($requestedBy=null,$requestedBranch=null)
{ {
$this->db->distinct(); $this->db->distinct();
$this->db->select('ActivityID,ActivityName,Description,IsActive'); $this->db->where('BranchCode',$requestedBranch);
$this->db->order_by('ActivityID','DESC'); $this->db->order_by('ActivityID','DESC');
$this->db->select('ActivityID,ActivityName,Description,IsActive');
$activityDetails=$this->db->get(ACTIVITY); $activityDetails=$this->db->get(ACTIVITY);
if($activityDetails->result()){ if($activityDetails->result()){
@ -172,7 +171,7 @@ class University_model extends CI_Model
$activity_result['activityStatus'] = false; $activity_result['activityStatus'] = false;
$activity_result['details'] = "No records found!"; $activity_result['details'] = "No records found!";
} }
$activity_result['masterStatusList']=$this->getAllStatusList('1'); $activity_result['masterStatusList']=$this->getAllStatusList('1',$requestedBranch);
return $activity_result; return $activity_result;
} }
@ -202,6 +201,7 @@ class University_model extends CI_Model
$this->db->select('ActivityName'); $this->db->select('ActivityName');
$this->db->where('ActivityName',$arrayDetails['ActivityName']); $this->db->where('ActivityName',$arrayDetails['ActivityName']);
$this->db->where('ActivityID !=',$arrayDetails['ActivityID']); $this->db->where('ActivityID !=',$arrayDetails['ActivityID']);
$this->db->where('BranchCode',$arrayDetails['BranchCode']);
if($this->db->get(ACTIVITY)->first_row()){ if($this->db->get(ACTIVITY)->first_row()){
$result['activityStatus'] = false; $result['activityStatus'] = false;
$result['message'] = "Activity name is already exist!"; $result['message'] = "Activity name is already exist!";