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

SALESPD LIVE ISSUES

Browse Source
This commit is contained in:
Velz2020 2019-12-11 18:36:20 +05:30
parent 1b92c49363
commit 225175d993
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1870,6 +1870,7 @@ public function assignPDTempalate($data)
public function listLessPDDetails_get() public function listLessPDDetails_get()
{ {
//print_r($_GET);die();
//check empty query params //check empty query params
$this->checkEmptyQueryParams($_GET); $this->checkEmptyQueryParams($_GET);
$page = 0;$limit = 1000;$sort = 'DESC';$pdofficerid = "";$datetype = "";$fdate ="";$tdate =""; $page = 0;$limit = 1000;$sort = 'DESC';$pdofficerid = "";$datetype = "";$fdate ="";$tdate ="";
@ -2220,7 +2221,7 @@ public function assignPDTempalate($data)
for ($i = 0; $i < 5; $i++) { for ($i = 0; $i < 5; $i++) {
$randomString .= $characters[rand(0, $charactersLength - 1)]; $randomString .= $characters[rand(0, $charactersLength - 1)];
} }
$temp_file_name = $randomString.date('Y-m-d-H:i:s').'.jpeg'; $temp_file_name = $randomString.date('Y-m-d-H-i-s').'.jpeg';
$ifp = fopen( $output_file, 'wb' ); $ifp = fopen( $output_file, 'wb' );
@ -2319,7 +2320,7 @@ public function assignPDTempalate($data)
for ($i = 0; $i < 5; $i++) { for ($i = 0; $i < 5; $i++) {
$randomString .= $characters[rand(0, $charactersLength - 1)]; $randomString .= $characters[rand(0, $charactersLength - 1)];
} }
$temp_file_name = $randomString.date('Y-m-d-H:i:s').'.jpeg'; $temp_file_name = $randomString.date('Y-m-d-H-i-s').'.jpeg';
$ifp = fopen( $output_file, 'wb' ); $ifp = fopen( $output_file, 'wb' );
@ -4785,8 +4786,9 @@ public function getPDFormDetailsJSON_post()
foreach($all_pd_images as $image) foreach($all_pd_images as $image)
{ {
$temp_dir_name = isset($form_name[ $image['fk_form_id'] ]) ? $form_name[ $image['fk_form_id'] ] : 'Common'; $temp_dir_name = isset($form_name[ $image['fk_form_id'] ]) ? $form_name[ $image['fk_form_id'] ] : 'Common';
//replace colon with hyphen in doc name
$this->zip->add_data('pdimages/'.$image['pd_document_name'],file_get_contents($image['doc_url'])); $doc_name = str_replace(':', '-', $image['pd_document_name']);
$this->zip->add_data('pdimages/'.$doc_name,file_get_contents($image['doc_url']));
} }
$temp_path = $main_applicant_name.'_'.$pdid.'_'.'pd_images.zip'; $temp_path = $main_applicant_name.'_'.$pdid.'_'.'pd_images.zip';
@ -6986,7 +6988,7 @@ public function getCompaniesListsFromGeneralFormRawJSON_post()
for ($i = 0; $i < 5; $i++) { for ($i = 0; $i < 5; $i++) {
$randomString .= $characters[rand(0, $charactersLength - 1)]; $randomString .= $characters[rand(0, $charactersLength - 1)];
} }
$temp_file_name = $randomString.date('Y-m-d-H:i:s').'.jpeg'; $temp_file_name = $randomString.date('Y-m-d-H-i-s').'.jpeg';
$ifp = fopen( $output_file, 'wb' ); $ifp = fopen( $output_file, 'wb' );
@ -7092,7 +7094,7 @@ public function getCompaniesListsFromGeneralFormRawJSON_post()
for ($i = 0; $i < 5; $i++) { for ($i = 0; $i < 5; $i++) {
$randomString .= $characters[rand(0, $charactersLength - 1)]; $randomString .= $characters[rand(0, $charactersLength - 1)];
} }
$temp_file_name = $randomString.date('Y-m-d-H:i:s').'.jpeg'; $temp_file_name = $randomString.date('Y-m-d-H-i-s').'.jpeg';
$ifp = fopen( $output_file, 'wb' ); $ifp = fopen( $output_file, 'wb' );

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

@ -191,6 +191,7 @@ class Sales_PD_Controller extends REST_Controller {
$view_data['section9'] = $this->Sales_PD_Model->selectCustomRecords(array('*'),array('fk_sales_pd_id' => $sales_pd_id,'img_name !=' => 'satellite'),SALEPD_DOCS); $view_data['section9'] = $this->Sales_PD_Model->selectCustomRecords(array('*'),array('fk_sales_pd_id' => $sales_pd_id,'img_name !=' => 'satellite'),SALEPD_DOCS);
$view_data['satellite_image'] = $this->Sales_PD_Model->selectCustomRecords(array('*'),array('fk_sales_pd_id' => $sales_pd_id,'img_name' => 'satellite'),SALEPD_DOCS); $view_data['satellite_image'] = $this->Sales_PD_Model->selectCustomRecords(array('*'),array('fk_sales_pd_id' => $sales_pd_id,'img_name' => 'satellite'),SALEPD_DOCS);
$view_data['product_id'] = $sales_pd_data[0]['product_id']; $view_data['product_id'] = $sales_pd_data[0]['product_id'];
$view_data['geo_location'] = $sales_pd_data[0]['geo_location'];
//print_r($this->db->last_query());die(); //print_r($this->db->last_query());die();
//$view_name = $sales_pd_data[0]['short_name'].'_'.$sales_pd_data[0]['abbr']; //$view_name = $sales_pd_data[0]['short_name'].'_'.$sales_pd_data[0]['abbr'];
$view_name = $sales_pd_data[0]['short_name']; $view_name = $sales_pd_data[0]['short_name'];

4
api/application/views/sale_pd_templates/MWISE.php
View File

@ -98,7 +98,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
<footer> <footer>
<hr> <hr>
<img style="width:50px;height:50px;opacity: 0.5;" src='https://pdgenie.com/logo/sineedge_red.png'/> <img style="width:50px;height:50px;opacity: 0.5;padding-top: 5px;" src='https://pdgenie.com/logo/sineedge_red.png'/> Powered By PDGenie
</footer> </footer>
<header> <header>
@ -462,6 +462,7 @@ if(isset($section6))
?> ?>
<br><table class="scorecard_table"><tr><th class="thlargefont" colspan="10">Satellite Image of PD Location</th></tr></table><br> <br><table class="scorecard_table"><tr><th class="thlargefont" colspan="10">Satellite Image of PD Location</th></tr></table><br>
<p><b>GPS Coordinates of location where PD Visit was done : <?php echo $geo_location ?></b></p>
<img style="border:3px solid #0191ed;" src = "<?php echo 'data:image/gif;base64,'.$satellite_image[0]['img']; ?>" alt = "PD Visted Location Satellite Image " height="300px" width="630px"> <img style="border:3px solid #0191ed;" src = "<?php echo 'data:image/gif;base64,'.$satellite_image[0]['img']; ?>" alt = "PD Visted Location Satellite Image " height="300px" width="630px">
<?php <?php
$iter = 0; $iter = 0;
@ -494,6 +495,7 @@ if(isset($section6))
} }
?> ?>
<br> <br>
<br><br>
<table class="scorecard_table"> <table class="scorecard_table">
<tbody> <tbody>
<tr> <tr>