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

Test Feedback 2 ; ps

Browse Source
This commit is contained in:
VE10-Sanjeev 2022-10-31 22:37:02 +05:30
parent fc1f134491
commit 144dbcc5d9
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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, '<span class="tooltip">'), (strlen('<span class="tooltip">')));
}
} else {
$report_data = $this->getLatestPDReportHTMLFile($pdid, $random_string, true);
//replace tooltip and span tags

2
api/application/helpers/getprocessedjson_helper.php
View File

@ -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']))

4
api/application/views/report_templates/JSONTOREPORT_FI_OV_DI.php
View File

@ -253,6 +253,7 @@ defined('BASEPATH') or exit('No direct script access allowed');
<?php
$main_applicant_name = $pd_master_details[0]['title_name'] . ' ' . $pd_master_details[0]['main_applicant'];
$rupee_symbol = "<span style='font-family: DejaVu Sans; sans-serif;font-size:10px'>₹</span>";
$company_name = "";
?>
<?php
echo "<br><br>";
@ -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');
?>
<?php
$satellite_url = '';
if (isset($pd_images['common_images']) && count($pd_images['common_images'])) {
foreach ($pd_images['common_images'] as $com_key => $com_value) {
if ($com_value['pd_document_title'] == 'satellite') {

1
api/application/views/report_templates/JSONTOREPORT_FI_OV_SAL.php
View File

@ -253,6 +253,7 @@ defined('BASEPATH') or exit('No direct script access allowed');
<?php
$main_applicant_name = $pd_master_details[0]['title_name'] . ' ' . $pd_master_details[0]['main_applicant'];
$rupee_symbol = "<span style='font-family: DejaVu Sans; sans-serif;font-size:10px'>₹</span>";
$company_name = "";
?>
<?php
echo "<br><br>";

11
api/application/views/report_templates/JSONTOREPORT_FI_RV.php
View File

@ -253,6 +253,7 @@ defined('BASEPATH') or exit('No direct script access allowed');
<?php
$main_applicant_name = $pd_master_details[0]['title_name'] . ' ' . $pd_master_details[0]['main_applicant'];
$rupee_symbol = "<span style='font-family: DejaVu Sans; sans-serif;font-size:10px'>₹</span>";
$company_name = "";
?>
<?php
echo "<br><br>";
@ -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 '<p>' . '
<b>Address Where Visit is Initiated:</b> ' . $address_value['initiated_address'] . ' , ' . $address_value['city_master'] . ' , ' . $address_value['state_master'] . ' , ' . $address_value['pincode_master'] . '.
<b>Address Where Visit was actually done:</b> ' . $address_value['actual_pd_address'] . ' , ' . $address_value['city2_master'] . ' , ' . $address_value['state2_master'] . ' , ' . $address_value['pincode2_master'] . '.
<b>Reason for change in Visit address:</b> ' . $address_value['end_use'] . '.</p>';
<br><b>Address Where Visit was actually done:</b> ' . $address_value['actual_pd_address'] . ' , ' . $address_value['city2_master'] . ' , ' . $address_value['state2_master'] . ' , ' . $address_value['pincode2_master'] . '.
<br><b>Reason for change in Visit address:</b> ' . $address_value['end_use'] . '.</p>';
}
echo '<p>' . 'The Field Visit was done at <b>' . $address_value['address_type_master'] . '</b> of the loan applicants. The <b>' . $address_value['address_type_master'] . '</b> is located in a <b>' . $address_value['locality_master'] . '</b> and the estimated area of the <b>' . $address_value['address_type_master'] . '</b> is <b>' . $address_value['uom_master'] . '</b>. The location was <b>' . $address_value['Approach_to_PD_location'] . '</b>. As Per Officer, the <b>' . $address_value['address_type_master'] . '</b> is situated in a <b>' . $address_value['comment_locality_master'] . '</b> Locality. ' . '</p>';
}
@ -358,10 +359,10 @@ defined('BASEPATH') or exit('No direct script access allowed');
echo '<ul><li style="margin: 15px 0;">The Applicant is residing at the visited address for ' . $year . $month . '.</li>
<li style="margin: 15px 0;">The Residence is <b>' . ucwords($rv_value['Visited_address_is_rented']) . '</b> by the applicant.</li>';
if (strtoupper($ov_value['address_proof_shared']) == 'YES') {
if (strtoupper($rv_value['address_proof_shared']) == 'YES') {
echo '<li style="margin: 15px 0;"> Address Proof: <b>' . $type_of_proof . '</b> was shared during visit.</li>';
}
if (strtoupper($ov_value['address_proof_shared']) == 'NO') {
if (strtoupper($rv_value['address_proof_shared']) == 'NO') {
echo '<li style="margin: 15px 0;"> Address Proof <b> was not shared </b> during visit.</li>';
}
// if($ov_value['Visited_address_is_rented'] != 'not disclosed '){
@ -379,7 +380,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'];
// }