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

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Browse Source
This commit is contained in:
resicovenba 2017-12-01 11:31:40 +05:30
commit a07d3ebcbc
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Apollo/api/application/controllers/Batch_Controller.php
View File

@ -31,12 +31,15 @@ class Batch_Controller extends REST_Controller {
public function addBatchDetails_post() public function addBatchDetails_post()
{ {
$now = new DateTime();
$now->setTimezone(new DateTimezone('Asia/Kolkata'));
$details['BatchCode'] = $this->post('batchcode'); $details['BatchCode'] = $this->post('batchcode');
$details['BatchName'] = $this->post('batcheName'); $details['BatchName'] = $this->post('batcheName');
$details['UniversityID'] = $this->post('universityName'); $details['UniversityID'] = $this->post('universityName');
$details['CreatedBy'] = $this->post('createdBy'); $details['CreatedBy'] = $this->post('createdBy');
$details['IsActive'] = $this->post('status'); $details['IsActive'] = $this->post('status');
$details['CreatedOn'] = $now->format('Y-m-d H:i:s');
$batchDetails = $this->batch_model->addBatch($details);// Check if the users data store contains users (in case the database result returns NULL) $batchDetails = $this->batch_model->addBatch($details);// Check if the users data store contains users (in case the database result returns NULL)
if ($batchDetails) if ($batchDetails)
{ {
@ -86,11 +89,16 @@ class Batch_Controller extends REST_Controller {
* */ * */
public function updateBatchDetails_post() public function updateBatchDetails_post()
{ {
$now = new DateTime();
$now->setTimezone(new DateTimezone('Asia/Kolkata'));
$details['BatchCode'] = $this->post('batchCode'); $details['BatchCode'] = $this->post('batchCode');
$details['BatchName'] = $this->post('batchName'); $details['BatchName'] = $this->post('batchName');
$details['IsActive'] = $this->post('status'); $details['IsActive'] = $this->post('status');
$details['UpdatedBy'] = $this->post('updatedBy'); $details['UpdatedBy'] = $this->post('updatedBy');
$details['UpdatedOn'] = date("Y-m-d", time()); $details['UpdatedOn'] = $now->format("Y-m-d H:i:s");
// print_r( $details['UpdatedOn'])
//exit();
$updateDetails = $this->batch_model->updateBatch($details);// Check if the users data store contains users (in case the database result returns NULL) $updateDetails = $this->batch_model->updateBatch($details);// Check if the users data store contains users (in case the database result returns NULL)
if ($updateDetails) if ($updateDetails)
@ -112,4 +120,4 @@ class Batch_Controller extends REST_Controller {
} }
} }

8
Apollo/api/application/models/Calltracking_model.php
View File

@ -409,7 +409,7 @@ class Calltracking_model extends CI_Model {
$todayFollowupDate=$now->format('d-m-Y'); $todayFollowupDate=$now->format('d-m-Y');
$todayDateTime=$now->format('Y-m-d'); $todayDateTime=$now->format('Y-m-d');
/* $follouwpDetails=$this->todayFollowupDetails($todayFollowupDate,CLOSE,'1'); $follouwpDetails=$this->todayFollowupDetails($todayFollowupDate,CLOSE,'1');
if($follouwpDetails){ if($follouwpDetails){
$result_array['todayStatus']=true; $result_array['todayStatus']=true;
$result_array['todayFolloupDetails']=$follouwpDetails; $result_array['todayFolloupDetails']=$follouwpDetails;
@ -418,7 +418,7 @@ class Calltracking_model extends CI_Model {
$result_array['todayStatus']=false; $result_array['todayStatus']=false;
$result_array['todayFolloupDetails']=""; $result_array['todayFolloupDetails']="";
}*/ }
$follouwpPendingDetails=$this->todayFollowupDetails($todayFollowupDate,CLOSE,'2'); $follouwpPendingDetails=$this->todayFollowupDetails($todayFollowupDate,CLOSE,'2');
if($follouwpPendingDetails){ if($follouwpPendingDetails){
@ -430,7 +430,7 @@ class Calltracking_model extends CI_Model {
$result_array['PendingFolloupDetails']=""; $result_array['PendingFolloupDetails']="";
} }
/* $todayLeadDetails=$this->todayFollowupDetails($todayDateTime,OPEN,'3'); $todayLeadDetails=$this->todayFollowupDetails($todayDateTime,OPEN,'3');
if($todayLeadDetails){ if($todayLeadDetails){
$result_array['todayLeadStatus']=true; $result_array['todayLeadStatus']=true;
$result_array['todayLeadDetails']=$todayLeadDetails; $result_array['todayLeadDetails']=$todayLeadDetails;
@ -439,7 +439,7 @@ class Calltracking_model extends CI_Model {
$result_array['todayLeadStatus']=false; $result_array['todayLeadStatus']=false;
$result_array['todayLeadDetails']=""; $result_array['todayLeadDetails']="";
}*/ }
return $result_array; return $result_array;