From 144dbcc5d90edaea17a6151f3667e8c1504c9a15 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Mon, 31 Oct 2022 22:37:02 +0530 Subject: [PATCH] Test Feedback 2 ; ps --- api/application/controllers/PD_Controller.php | 7 +++++-- api/application/helpers/getprocessedjson_helper.php | 2 +- .../views/report_templates/JSONTOREPORT_FI_OV_DI.php | 4 ++-- .../views/report_templates/JSONTOREPORT_FI_OV_SAL.php | 1 + .../views/report_templates/JSONTOREPORT_FI_RV.php | 11 ++++++----- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index eb781206..b072c3d9 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -2633,7 +2633,7 @@ class PD_Controller extends REST_Controller $where_condition_array['rental_count_id'] = $rental_count_id; } - // $id = $this->PD_Model->updateRecords($fields, PDFORMDETAILSJSON, $where_condition_array); + $id = $this->PD_Model->updateRecords($fields, PDFORMDETAILSJSON, $where_condition_array); $custom_log_info = '###OLD Entries Deactivated PDID - (' . $pdid . ' - ' . $formid . ') - ' . date('Y-m-d H:i:s A'); log_message('ERROR', $custom_log_info); @@ -4760,10 +4760,11 @@ class PD_Controller extends REST_Controller // { // $t = $this->load->view('report_templates/JSONTOREPORT_DI_AI_ADDON',$data,true); // } - +echo "i"; $pd_report_time = date('Y-m-d-H-i-s'); $pd_report_store = $this->external_path . '/pd_reports/' . $pdid . '/' . $pd_report_time . '.html'; $is_write_done = file_put_contents($pd_report_store, $t); + echo "is_write_done".$is_write_done;die; if ($is_write_done) { @@ -7839,6 +7840,7 @@ class PD_Controller extends REST_Controller function getLatestPDReportHTMLFile($pdid, $random_string, $return_type = false) { + // echo $pdid;echo $random_string;die; // echo "now i am in child function "; // exit(); if (($pdid != null || $pdid != "")) //&& (strlen($pdid) == 16) &&(is_string($pdid))) @@ -7906,6 +7908,7 @@ class PD_Controller extends REST_Controller $report_data = substr_replace($report_data, '', strpos($report_data, ''), (strlen(''))); } } else { + $report_data = $this->getLatestPDReportHTMLFile($pdid, $random_string, true); //replace tooltip and span tags diff --git a/api/application/helpers/getprocessedjson_helper.php b/api/application/helpers/getprocessedjson_helper.php index 0119236f..e8658f12 100644 --- a/api/application/helpers/getprocessedjson_helper.php +++ b/api/application/helpers/getprocessedjson_helper.php @@ -2902,7 +2902,7 @@ class GETPROCESSEDJSON } } } - if(isset($raw_json['is_pd_done_on_initiated_address']) && ($raw_json['is_pd_done_on_initiated_address'] == "no") ) + if(isset($raw_json['is_pd_done_on_initiated_address']) && (strtoupper($raw_json['is_pd_done_on_initiated_address']) == "NO") ) { // if(array_key_exists('State_list',$address)) if(isset($address['State_list'])) diff --git a/api/application/views/report_templates/JSONTOREPORT_FI_OV_DI.php b/api/application/views/report_templates/JSONTOREPORT_FI_OV_DI.php index 35edb148..b0f46e94 100644 --- a/api/application/views/report_templates/JSONTOREPORT_FI_OV_DI.php +++ b/api/application/views/report_templates/JSONTOREPORT_FI_OV_DI.php @@ -253,6 +253,7 @@ defined('BASEPATH') or exit('No direct script access allowed'); ₹"; + $company_name = ""; ?>
"; @@ -381,7 +382,7 @@ defined('BASEPATH') or exit('No direct script access allowed'); $neighbour_details = json_decode($pd_processed_forms[32][0]['processed_json'], true); $neighbour_value = $neighbour_details['json']; // print_r($neighbour_value); - $neighbourhood_form_common_remarks = $neighbour_value['neighbourhood_remarks']; + // if(strcasecmp($neighbour_value['neighbourhood_status'],'Could Not Verify')){ $pd_offiecer_status_about_neighbor = $neighbour_value['neighbourhood_status']; // } @@ -630,7 +631,6 @@ defined('BASEPATH') or exit('No direct script access allowed'); ?> $com_value) { if ($com_value['pd_document_title'] == 'satellite') { diff --git a/api/application/views/report_templates/JSONTOREPORT_FI_OV_SAL.php b/api/application/views/report_templates/JSONTOREPORT_FI_OV_SAL.php index 8fc5ba9f..fa09135c 100644 --- a/api/application/views/report_templates/JSONTOREPORT_FI_OV_SAL.php +++ b/api/application/views/report_templates/JSONTOREPORT_FI_OV_SAL.php @@ -253,6 +253,7 @@ defined('BASEPATH') or exit('No direct script access allowed'); ₹"; + $company_name = ""; ?>
"; diff --git a/api/application/views/report_templates/JSONTOREPORT_FI_RV.php b/api/application/views/report_templates/JSONTOREPORT_FI_RV.php index f2c73c1e..1ede5552 100644 --- a/api/application/views/report_templates/JSONTOREPORT_FI_RV.php +++ b/api/application/views/report_templates/JSONTOREPORT_FI_RV.php @@ -253,6 +253,7 @@ defined('BASEPATH') or exit('No direct script access allowed'); ₹"; + $company_name = ""; ?>
"; @@ -328,8 +329,8 @@ defined('BASEPATH') or exit('No direct script access allowed'); if (strtoupper($address_value['is_pd_done_on_initiated_address']) == 'NO') { echo '

' . ' Address Where Visit is Initiated: ' . $address_value['initiated_address'] . ' , ' . $address_value['city_master'] . ' , ' . $address_value['state_master'] . ' , ' . $address_value['pincode_master'] . '. - Address Where Visit was actually done: ' . $address_value['actual_pd_address'] . ' , ' . $address_value['city2_master'] . ' , ' . $address_value['state2_master'] . ' , ' . $address_value['pincode2_master'] . '. - Reason for change in Visit address: ' . $address_value['end_use'] . '.

'; +
Address Where Visit was actually done: ' . $address_value['actual_pd_address'] . ' , ' . $address_value['city2_master'] . ' , ' . $address_value['state2_master'] . ' , ' . $address_value['pincode2_master'] . '. +
Reason for change in Visit address: ' . $address_value['end_use'] . '.

'; } echo '

' . 'The Field Visit was done at ' . $address_value['address_type_master'] . ' of the loan applicants. The ' . $address_value['address_type_master'] . ' is located in a ' . $address_value['locality_master'] . ' and the estimated area of the ' . $address_value['address_type_master'] . ' is ' . $address_value['uom_master'] . '. The location was ' . $address_value['Approach_to_PD_location'] . '. As Per Officer, the ' . $address_value['address_type_master'] . ' is situated in a ' . $address_value['comment_locality_master'] . ' Locality. ' . '

'; } @@ -358,10 +359,10 @@ defined('BASEPATH') or exit('No direct script access allowed'); echo '