From 28324c21a7252651f28a8035c1ac53383e17c70b Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Mon, 23 Apr 2018 12:40:39 +0530
Subject: [PATCH] activity changes done

---
 .../application/models/University_model.php   | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/Apollo/api/application/models/University_model.php b/Apollo/api/application/models/University_model.php
index 7fdef201..69966e78 100755
--- a/Apollo/api/application/models/University_model.php
+++ b/Apollo/api/application/models/University_model.php
@@ -94,40 +94,38 @@ class University_model extends CI_Model
     public function addActivity($arrayDetails=null,$jsonData=null)
     {
         $this->db->select('ActivityID,ActivityName');
-
         $this->db->where('ActivityName', $arrayDetails['ActivityName']);
+        $this->db->where('BranchCode', $arrayDetails['BranchCode']);
+        if($this->db->get(ACTIVITY)->first_row()){
+            $result['activityStatus'] = false;
+            $result['message'] = "Activity name is already exist!";
+        }
+        else{
+            $this->db->insert(ACTIVITY, $arrayDetails);
+            if($this->db->affected_rows() == '1'){
+                $last = $this->db->order_by('ActivityID',"desc")->limit(1)->get(ACTIVITY)->row();
+               $lastActivityID=$last->ActivityID;
 
-            if($this->db->get(ACTIVITY)->first_row()){
+                if($jsonData){
+
+                   foreach ($jsonData as $srow){
+                       $status_array["StatusName"]=$srow['id'];
+                       $status_array["ActivityID"]=$lastActivityID;
+                       $status_array["IsActive"]=$arrayDetails['IsActive'];
+                       $status_array["CreatedBy"]=$arrayDetails['CreatedBy'];
+                       $status_array["CreatedOn"]=$arrayDetails['CreatedOn'];
+                       $this->db->insert(ACTIVITY_STATUS, $status_array);
+                   }
+                }
+                $result['activityStatus'] = true;
+                $result['message'] = "Successfully activity details added";
+
+            }
+            else {
                 $result['activityStatus'] = false;
-                $result['message'] = "Activity name is already exist!";
-            }
-            else{
-
-                $this->db->insert(ACTIVITY, $arrayDetails);
-                if($this->db->affected_rows() == '1'){
-                    $last = $this->db->order_by('ActivityID',"desc")->limit(1)->get(ACTIVITY)->row();
-                   $lastActivityID=$last->ActivityID;
-
-                    if($jsonData){
-
-                       foreach ($jsonData as $srow){
-                           $status_array["StatusName"]=$srow['id'];
-                           $status_array["ActivityID"]=$lastActivityID;
-                           $status_array["IsActive"]=$arrayDetails['IsActive'];
-                           $status_array["CreatedBy"]=$arrayDetails['CreatedBy'];
-                           $status_array["CreatedOn"]=$arrayDetails['CreatedOn'];
-                           $this->db->insert(ACTIVITY_STATUS, $status_array);
-                       }
-                    }
-                    $result['activityStatus'] = true;
-                    $result['message'] = "Successfully activity details added";
-
-                }
-                else {
-                    $result['activityStatus'] = false;
-                    $result['message'] = "Something went wrong.please try again";
-                }
+                $result['message'] = "Something went wrong.please try again";
             }
+        }
 
 
 
@@ -141,11 +139,12 @@ class University_model extends CI_Model
      * created by Surendiran
      * */
 
-    public function getActivity()
+    public function getActivity($requestedBy=null,$requestedBranch=null)
     {
         $this->db->distinct();
-        $this->db->select('ActivityID,ActivityName,Description,IsActive');
+        $this->db->where('BranchCode',$requestedBranch);
         $this->db->order_by('ActivityID','DESC');
+        $this->db->select('ActivityID,ActivityName,Description,IsActive');
         $activityDetails=$this->db->get(ACTIVITY);
         if($activityDetails->result()){
 
@@ -172,7 +171,7 @@ class University_model extends CI_Model
             $activity_result['activityStatus'] = false;
             $activity_result['details'] = "No records found!";
         }
-        $activity_result['masterStatusList']=$this->getAllStatusList('1');
+        $activity_result['masterStatusList']=$this->getAllStatusList('1',$requestedBranch);
         return $activity_result;
 
     }
@@ -202,6 +201,7 @@ class University_model extends CI_Model
                  $this->db->select('ActivityName');
                  $this->db->where('ActivityName',$arrayDetails['ActivityName']);
                  $this->db->where('ActivityID !=',$arrayDetails['ActivityID']);
+                $this->db->where('BranchCode',$arrayDetails['BranchCode']);
                 if($this->db->get(ACTIVITY)->first_row()){
                     $result['activityStatus'] = false;
                     $result['message'] = "Activity name is already exist!";