diff --git a/api/application/controllers/Sales_PD_Controller.php b/api/application/controllers/Sales_PD_Controller.php index 95c707d6..2206600d 100644 --- a/api/application/controllers/Sales_PD_Controller.php +++ b/api/application/controllers/Sales_PD_Controller.php @@ -740,8 +740,8 @@ class Sales_PD_Controller extends REST_Controller { $selfie = $this->Sales_PD_Model->selectCustomRecords(array('*'),array('fk_sales_pd_id' => $records['sales_pd_id'],'img_name' => 'selfie_with_person_met','isactive' => 1),SALEPD_DOCS); if(count($selfie)) { - // $photo_questions['questions'][$key]['answer_value'] = $selfie[0]['img']; - $photo_questions['questions'][$key]['answer_value'] = "CHNAGED"; + $photo_questions['questions'][$key]['answer_value'] = $selfie[0]['img']; + //$photo_questions['questions'][$key]['answer_value'] = "CHNAGED"; } } else @@ -757,8 +757,8 @@ class Sales_PD_Controller extends REST_Controller { { if($individual_value['questions'][0]['question_key'] == $img_value['img_name']) { - //$photo_questions['questions'][$key]['questions_group'][$v_key]['questions'][0]['answer_value'] = $img_value['img']; - $photo_questions['questions'][$key]['questions_group'][$v_key]['questions'][0]['answer_value'] = "CHANGED"; + $photo_questions['questions'][$key]['questions_group'][$v_key]['questions'][0]['answer_value'] = $img_value['img']; + //$photo_questions['questions'][$key]['questions_group'][$v_key]['questions'][0]['answer_value'] = "CHANGED"; unset($all_sales_pd_images[$img_key]); break; } diff --git a/api/application/views/report_templates/JSONTOREPORT_SAL.php b/api/application/views/report_templates/JSONTOREPORT_SAL.php index edf6670e..6ab8acee 100644 --- a/api/application/views/report_templates/JSONTOREPORT_SAL.php +++ b/api/application/views/report_templates/JSONTOREPORT_SAL.php @@ -649,9 +649,10 @@ defined('BASEPATH') OR exit('No direct script access allowed'); echo '
'; - echo '

Person(s) Met:

'; + if(count($person_met_data)) { + echo '

Person(s) Met:

'; //echo '
'; foreach($person_met_data as $pk => $person) @@ -858,22 +859,22 @@ defined('BASEPATH') OR exit('No direct script access allowed'); // echo '

'; ?> $com_value) - // { - // if($com_value['pd_document_title'] == 'satellite') - // { - // $satellite_url = $com_value['doc_url'];break; - // } - // } - // } + $satellite_url = ''; + if(isset($pd_images['common_images']) && count($pd_images['common_images'])) + { + foreach($pd_images['common_images'] as $com_key => $com_value) + { + if($com_value['pd_document_title'] == 'satellite') + { + $satellite_url = $com_value['doc_url'];break; + } + } + } ?> - +  Satellite Image of location of Where PD was Done