From 047e239f447262efcb0227e12be93f04078e2d9c Mon Sep 17 00:00:00 2001 From: Sanjeev Date: Thu, 29 Apr 2021 17:46:20 +0530 Subject: [PATCH] pd visit date fixes 2 : ps --- api/application/controllers/PD_Controller.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index ce34d178..e5a8afb9 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -910,6 +910,7 @@ class PD_Controller extends REST_Controller { $logger = MYLOG::logFunction(null,$pd_details['pd_id']); EXTERNAL_DIR_CHECK::checkExternalDirectory($pd_details['pd_id']); $exist_pd_details = $this->PD_Model->getPDMasterDetails($pd_details['pd_id']); + // print_r($pd_details); // print_r($exist_pd_details); 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; unset($pd_details['link']); } + 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]['fk_pd_type'] != 2 && (!isset($pd_details['is_revert_status']))) - { - $pd_details['pd_visit_date'] = date('Y-m-d H:i:s'); - } - } + 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']))) + { + $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']); //get satellite image blob and store it in DB //$pd_details['satellite_image_base64_blob'] = $this->getSatelliteImage($pd_details['pd_id']);