activity changes done
This commit is contained in:
parent
e7f3a0f451
commit
28324c21a7
@ -94,40 +94,38 @@ 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()){
|
||||||
|
$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['activityStatus'] = false;
|
||||||
$result['message'] = "Activity name is already exist!";
|
$result['message'] = "Something went wrong.please try again";
|
||||||
}
|
|
||||||
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";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -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!";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user