diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 4ab7665b..a7d24f66 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -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,''); for($i = 0 ;$i < $total_replaces;$i++) diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 1212a0e7..3af895ae 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -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; } diff --git a/api/application/views/welcome_message.php b/api/application/views/welcome_message.php index 283f8054..54b16b36 100644 --- a/api/application/views/welcome_message.php +++ b/api/application/views/welcome_message.php @@ -8,7 +8,7 @@ $score = substr($_SERVER['REQUEST_URI'],(strripos($_SERVER['REQUEST_URI'],"?")+1 PDSCORE CHART - +