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

SCORECHART AND TINY ISSUES

Browse Source
This commit is contained in:
Velz2020 2020-01-28 20:11:56 +05:30
parent 7f8e9022f3
commit 2c79ea07f6
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1171,9 +1171,13 @@ public function assignPDTempalate($data)
public function updatePDAddress_post()
{
$records = $this->post('records');
$count = 0;
foreach($records as $key => $value)
{
unset($value['stateSearch']);
unset($value['citySearch']);
unset($value['pinSearch']);
if(count($records) == 1)
{
$value['is_primary'] = 1;
@ -4924,7 +4928,7 @@ public function getPDFormDetailsJSON_post()
$key = 'pd'.$pdid.'/'.$main_applicant_name.'_'.$pdid.'_'.'pd_images.pdf';
//$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucketname,$key,'+30 minutes');
if($pd_master_details[0]['is_img_pdf_created'])
if(!$pd_master_details[0]['is_img_pdf_created'])
{
$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucketname,$key,'+30 minutes');
@ -4938,7 +4942,7 @@ public function getPDFormDetailsJSON_post()
$all_pd_images = $this->PD_Model->getSignedPDDocsURL($pdid,null,null,null,null,'report');
//print_r($all_pd_images);die();
//print_r(count($all_pd_images));die();
// $all_form_names = $this->PD_Model->selectCustomRecords(array('pd_form_id','pd_form_name'),array(),PDFORMS);
// $form_name = array();
// foreach($all_form_names as $form)
@ -4952,6 +4956,7 @@ public function getPDFormDetailsJSON_post()
//End of PDF Gen using DOM PDF
$output_file2 = $this->external_path ."/pd_reports/" . $pdid . "/pd_images_pdf.pdf";
$ti = file_put_contents($output_file2, $pdf_doc);
echo $ti;die();
$bucket_data = array('bucket_name'=>$bucketname,'key'=>$key,'sourcefile'=>($output_file2));
@ -6116,9 +6121,9 @@ public function getPDFormDetailsJSON_post()
$t = $this->load->view('report_templates/JSONTOREPORT_DI_AI_ADDON',$data,true);
}
//$t = $this->load->view('temp_html.html',null,true);
echo $t;
//echo $t;
die();
//die();
$total_replaces = substr_count($t,'<span class="tooltip">');
for($i = 0 ;$i < $total_replaces;$i++)

5
api/application/models/PD_Model.php
View File

@ -200,7 +200,7 @@ class PD_Model extends SPARQ_Model {
$this->db->WHERE('PDTRIGGER.pd_status !=',TRUNCATED);
if($include_archive == 1)
{
$this->db->WHERE('PDTRIGGER.pd_status',ARCHIVED);
$this->db->OR_WHERE('PDTRIGGER.pd_status',ARCHIVED);
}
if(!empty($pd_type))
@ -248,9 +248,10 @@ class PD_Model extends SPARQ_Model {
}
$this->db->ORDER_BY('PDTRIGGER.pd_id','DESC');
$this->db->LIMIT(1000,0);
$result_array = $this->db->GET()->result_array();
// print_r($this->db->last_query());
//print_r($this->db->last_query());die();
return $result_array;
}

2
api/application/views/welcome_message.php
View File

@ -8,7 +8,7 @@ $score = substr($_SERVER['REQUEST_URI'],(strripos($_SERVER['REQUEST_URI'],"?")+1
<html>
<title>PDSCORE CHART</title>
<head>
<script src="https://cdn.zingchart.com/zingchart.min.js"></script>
<script src="https://cdn.zingchart.com/2.8.4/zingchart.min.js"></script>
<script>
zingchart.MODULESDIR = "https://cdn.zingchart.com/modules/";
ZC.LICENSE = ["569d52cefae586f634c54f86dc99e6a9", "ee6b7db5b51705a13dc2339db3edaf6d"];