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:41:19 +05:30
parent e10d31313f
commit 521cae5d4c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Apollo/api/application/controllers/University_Controller.php
View File

@ -169,6 +169,7 @@ class University_Controller extends REST_Controller {
$details['CreatedBy'] = $this->post('createdBy'); $details['CreatedBy'] = $this->post('createdBy');
$details['CreatedOn'] = $now->format('Y-m-d H:i:s'); $details['CreatedOn'] = $now->format('Y-m-d H:i:s');
$details['IsActive'] = $this->post('status'); $details['IsActive'] = $this->post('status');
$details['BranchCode'] = $this->post('branchCode');
$jsonData=$this->post('activityStatus'); $jsonData=$this->post('activityStatus');
$activityDetails = $this->university_model->addActivity($details,$jsonData);// Check if the users data store contains users (in case the database result returns NULL) $activityDetails = $this->university_model->addActivity($details,$jsonData);// Check if the users data store contains users (in case the database result returns NULL)
if ($activityDetails) { if ($activityDetails) {
@ -189,7 +190,8 @@ class University_Controller extends REST_Controller {
public function getActivityDetails_post() public function getActivityDetails_post()
{ {
$requestedBy = $this->post('requestedBy'); $requestedBy = $this->post('requestedBy');
$getActivity = $this->university_model->getActivity($requestedBy); $requestedBranch = $this->post('branchCode');
$getActivity = $this->university_model->getActivity($requestedBy,$requestedBranch);
if ($getActivity) if ($getActivity)
{ {
$getActivity['status'] = REST_Controller::HTTP_OK; $getActivity['status'] = REST_Controller::HTTP_OK;
@ -220,6 +222,7 @@ class University_Controller extends REST_Controller {
$details['IsActive'] = $this->post('status'); $details['IsActive'] = $this->post('status');
$details['UpdatedBy'] = $this->post('updatedBy'); $details['UpdatedBy'] = $this->post('updatedBy');
$details['UpdatedOn'] = $now->format('Y-m-d H:i:s'); $details['UpdatedOn'] = $now->format('Y-m-d H:i:s');
$details['BranchCode'] = $this->post('branchCode');
$jsonData=$this->post('activityStatus'); $jsonData=$this->post('activityStatus');
$activityDetails = $this->university_model->updateActivity($details,$jsonData);// Check if the users data store contains users (in case the database result returns NULL) $activityDetails = $this->university_model->updateActivity($details,$jsonData);// Check if the users data store contains users (in case the database result returns NULL)