Sineedge/sparqapi
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pd visit date fixes 2 : ps

Browse Source
This commit is contained in:
Sanjeev 2021-04-29 17:46:20 +05:30
parent 21a7cd8d1a
commit 047e239f44
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
api/application/controllers/PD_Controller.php
View File

@ -910,6 +910,7 @@ class PD_Controller extends REST_Controller {
$logger = MYLOG::logFunction(null,$pd_details['pd_id']); $logger = MYLOG::logFunction(null,$pd_details['pd_id']);
EXTERNAL_DIR_CHECK::checkExternalDirectory($pd_details['pd_id']); EXTERNAL_DIR_CHECK::checkExternalDirectory($pd_details['pd_id']);
$exist_pd_details = $this->PD_Model->getPDMasterDetails($pd_details['pd_id']); $exist_pd_details = $this->PD_Model->getPDMasterDetails($pd_details['pd_id']);
// print_r($pd_details);
// print_r($exist_pd_details); // print_r($exist_pd_details);
if(!file_exists($this->external_path.'/pd_reports/'.$pd_details['pd_id'])) if(!file_exists($this->external_path.'/pd_reports/'.$pd_details['pd_id']))
@ -975,14 +976,19 @@ class PD_Controller extends REST_Controller {
$pd_details['complete_location'] = isset($pd_details['link']) ? $pd_details['link'] : null; $pd_details['complete_location'] = isset($pd_details['link']) ? $pd_details['link'] : null;
unset($pd_details['link']); unset($pd_details['link']);
} }
if($pd_details['pd_status'] == COMPLETED){ if($pd_details['pd_status'] == COMPLETED){
if(($exist_pd_details[0]['pd_status'] != COMPLETED) || ($exist_pd_details[0]['pd_status'] != QC_COMPLETED)){ if(($exist_pd_details[0]['pd_status'] != COMPLETED) && ($exist_pd_details[0]['pd_status'] != QC_COMPLETED)){
if($exist_pd_details[0]['fk_pd_type'] != 2 && (!isset($pd_details['is_revert_status']))) if($exist_pd_details[0]['fk_pd_type'] != 2 && (!isset($pd_details['is_revert_status'])))
{ {
$pd_details['pd_visit_date'] = date('Y-m-d H:i:s'); $pd_details['pd_visit_date'] = date('Y-m-d H:i:s');
} }
} }
} }
// else{
// $pd_details['pd_visit_date'] = $exist_pd_details[0]['pd_visit_date'];
// }
unset($pd_details['is_revert_status']); unset($pd_details['is_revert_status']);
//get satellite image blob and store it in DB //get satellite image blob and store it in DB
//$pd_details['satellite_image_base64_blob'] = $this->getSatelliteImage($pd_details['pd_id']); //$pd_details['satellite_image_base64_blob'] = $this->getSatelliteImage($pd_details['pd_id']);