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

SALES & SAL

Browse Source
This commit is contained in:
Velz2020 2020-01-08 19:46:18 +05:30
parent 6eb06a15df
commit 6969740c0b
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/application/controllers/Sales_PD_Controller.php
View File

@ -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); $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)) if(count($selfie))
{ {
// $photo_questions['questions'][$key]['answer_value'] = $selfie[0]['img']; $photo_questions['questions'][$key]['answer_value'] = $selfie[0]['img'];
$photo_questions['questions'][$key]['answer_value'] = "CHNAGED"; //$photo_questions['questions'][$key]['answer_value'] = "CHNAGED";
} }
} }
else else
@ -757,8 +757,8 @@ class Sales_PD_Controller extends REST_Controller {
{ {
if($individual_value['questions'][0]['question_key'] == $img_value['img_name']) 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'] = $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'] = "CHANGED";
unset($all_sales_pd_images[$img_key]); unset($all_sales_pd_images[$img_key]);
break; break;
} }

29
api/application/views/report_templates/JSONTOREPORT_SAL.php
View File

@ -649,9 +649,10 @@ defined('BASEPATH') OR exit('No direct script access allowed');
echo '<div id="page_break"></div>'; echo '<div id="page_break"></div>';
echo '<p><strong>Person(s) Met:</strong> </p>';
if(count($person_met_data)) if(count($person_met_data))
{ {
echo '<p><strong>Person(s) Met:</strong> </p>';
//echo '<div style="border: 1px solid #0191ed;">'; //echo '<div style="border: 1px solid #0191ed;">';
foreach($person_met_data as $pk => $person) foreach($person_met_data as $pk => $person)
@ -858,22 +859,22 @@ defined('BASEPATH') OR exit('No direct script access allowed');
// echo '<br><br>'; // echo '<br><br>';
?> ?>
<?php <?php
// $satellite_url = ''; $satellite_url = '';
// if(isset($pd_images['common_images']) && count($pd_images['common_images'])) if(isset($pd_images['common_images']) && count($pd_images['common_images']))
// { {
// foreach($pd_images['common_images'] as $com_key => $com_value) foreach($pd_images['common_images'] as $com_key => $com_value)
// { {
// if($com_value['pd_document_title'] == 'satellite') if($com_value['pd_document_title'] == 'satellite')
// { {
// $satellite_url = $com_value['doc_url'];break; $satellite_url = $com_value['doc_url'];break;
// } }
// } }
// } }
?> ?>
<!-- <img border="3" src = "<?php echo $satellite_url;?>" alt=" Satellite Image of location of Where PD was Done" style="width:100%;height:300px;border-color:#0191ed" /><br><br><br> --> <img border="3" src = "<?php echo $satellite_url;?>" alt=" Satellite Image of location of Where PD was Done" style="width:100%;height:300px;border-color:#0191ed" /><br><br><br>
<!-- <?php if($pd_location_approach_img_url != "" ) {?> <!-- <?php if($pd_location_approach_img_url != "" ) {?>
<table> <table>
@ -1960,7 +1961,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
for($i = $from ; $i <= $to; $i++) for($i = $from ; $i <= $to; $i++)
{ {
if(isset($pd_images['common_images'][$i]))// && ($pd_images['common_images'][$i]['img_type'] != 1 && $pd_images['common_images'][$i]['img_type'] != 2 && $pd_images['common_images'][$i]['pd_document_title'] != 'satellite')) if(isset($pd_images['common_images'][$i]) && ($pd_images['common_images'][$i]['pd_document_title'] != 'satellite'))
{ {
echo '<td style="text-align:center;border:1px solid;"> <img src="'.$pd_images['common_images'][$i]['doc_url'].'" height = "200" width="200" alt="'.$pd_images['common_images'][$i]['pd_document_title'].'"/><br>'. $pd_images['common_images'][$i]['pd_document_title'] .'</td>'; echo '<td style="text-align:center;border:1px solid;"> <img src="'.$pd_images['common_images'][$i]['doc_url'].'" height = "200" width="200" alt="'.$pd_images['common_images'][$i]['pd_document_title'].'"/><br>'. $pd_images['common_images'][$i]['pd_document_title'] .'</td>';
} }