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

FI report fixes and Api : ps

Browse Source
This commit is contained in:
VE10-Sanjeev 2022-12-16 15:45:28 +05:30
parent a48600a599
commit b008d91eb2
6 changed files with 95 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/application/config/routes.php
View File

@ -410,9 +410,12 @@ $route['archivePDSMCImages'] = 'SMC_Credit_PD_Controller/archivePDImages';
$route['smcPhotoPDFDownload'] = 'SMC_Credit_PD_Controller/imgPDFDownload';
$route['myFunction']='Flyhi_Controller/myFunction';
$route['previewDigiLockerDocs']='Flyhi_Controller/previewDigiLockerDocs';
$route['applicantWiseDigiLockerDocs']='Flyhi_Controller/DigiLockerDocs';
$route['purge_pddata']='Data_Dump_Controller/renamingExistingPDinfo';
$route['checkjsonPD']='Data_Dump_Controller/checkjsonPD';
$route['deleteS3Image']='Data_Dump_Controller/deleteS3Images';
$route['saveShortsVideo'] = 'PD_Controller/saveShortsVideo';
$route['saveShortsVideo'] = 'PD_Controller/saveShortsVideo';
$route['merge']='Data_Dump_Controller/pdfmerge';

37
api/application/controllers/Flyhi_Controller.php
View File

@ -2549,6 +2549,43 @@ $this->load->view("digital_locker",$view_data);
$reponse_data['msg'] = 'No File Uploaded';
$this->response($reponse_data,REST_Controller::HTTP_OK);
}
}
public function DigiLockerDocs_post(){
$this->load->helper('digital_locker');
$form_data = $this->post();
$pd_id = $form_data['pd_id'];
// print_r($pd_id);
$details = $this->Flyhi_Model->getDocsDetails($pd_id);
// print_r($details);
if(!empty($details)){
$fields = array('pd_id','fk_lender_id');
$where_condition_array = array('pd_id' => $pd_id);
$dtls = $this->Flyhi_Model->selectCustomRecords($fields,$where_condition_array,PDTRIGGER);
$pd_id = (count($dtls)>0) ? $dtls[0]['pd_id'] : null;
$fk_lender_id = (count($dtls)>0) ? $dtls[0]['fk_lender_id'] : null;
$bucketname = LENDER_BUCKET_NAME_PREFIX.$fk_lender_id;
for($i=0;$i<count($details);$i++){
$key = 'pd' . $pd_id . '/' . $details[$i]['pd_document_name'];
$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucketname, $key, '+30 minutes');
$details[$i]['url'] = $singed_uri;
}
// print_r($details);
$reponse_data['dataStatus'] = true;
$reponse_data['status'] = REST_Controller::HTTP_OK;
$reponse_data['msg'] = $details;
}else{
$reponse_data['dataStatus'] = false;
$reponse_data['status'] = REST_Controller::HTTP_NO_CONTENT;
$reponse_data['msg'] = 'No Documents Founded';
}
$this->response($reponse_data,REST_Controller::HTTP_OK);
}
public function readfile($file){
chmod($file, 0777);

9
api/application/models/Flyhi_Model.php
View File

@ -93,4 +93,13 @@ class Flyhi_Model extends SPARQ_Model {
// $modified = $this->db->query($sql);
}
public function getDocsDetails($pd_id){
// c.fk_pd_id, c.applicant_name, c.digi_locker_token, d.pd_document_id, d.fk_pd_id, d.img_type, d.image_key, d.pd_document_title, d.pd_document_name, d.pd_image_alias_name, d.createdon, d.fk_createdby, d.isactive, d.content_type
$sql = "SELECT d.fk_pd_id,c.pd_co_applicant_id, c.applicant_name, d.pd_document_id, d.image_key, d.pd_document_title, d.pd_document_name, d.pd_image_alias_name
FROM t_pd_documents as d
left join t_pd_co_applicants_details as c on c.fk_pd_id = d.fk_pd_id and d.co_applicant_id = c.pd_co_applicant_id
where d.fk_pd_id = ".$pd_id." and d.content_type = 3 and d.isactive = 1";
return $this->db->query($sql)->result_array();
}
}

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

@ -308,7 +308,8 @@ defined('BASEPATH') or exit('No direct script access allowed');
if (strtoupper($value['is_person_met']) == 'YES') {
echo '<p>' . 'Applicant <b>(' . isset($value['Name_of_the_Person_met_master']) ? $value['Name_of_the_Person_met_master'] : $value['Name_of_the_Person_met'] . ')</b> was met at the visited address.' . '</p>';
} else if (strtoupper($value['is_person_met']) == 'NO') {
echo '<p>' . '(' . $value['Name_of_the_Person'] . ') (' . $value['designation_person_met_master'] . ') was met at the visited address during visit.' . '</p>';
$designation = str_replace(' of', '', $value['designation_person_met_master']);
echo '<p>' . '(' . $value['Name_of_the_Person'] . ') (' . $designation . ') was met at the visited address during visit.' . '</p>';
}
if (isset($general_form['general_remark']) && $general_form['general_remark'] != "") {
echo '<p>' . $general_form['general_remark'] . '</p>';
@ -465,7 +466,7 @@ defined('BASEPATH') or exit('No direct script access allowed');
</ul>
<?php } ?>
<li style="margin: 15px 0;"> Neighbourhood Check Status is <span style="font-size:16px;font-weight:bold;"><?php echo $pd_offiecer_status_about_neighbor; ?>.</span></li>
<li style="margin: 15px 0;"> Neighbourhood Check Status is <span style="font-weight:bold;"><?php echo $pd_offiecer_status_about_neighbor; ?>.</span></li>
</li>
@ -557,7 +558,7 @@ defined('BASEPATH') or exit('No direct script access allowed');
<?php
$final_remark = json_decode($pd_processed_forms[33][0]['processed_json'], true);
$final_remark_data = $final_remark['json'];
//print_r($final_remark_data);
print_r($final_remark_data);
$positive = null;
@ -584,12 +585,11 @@ defined('BASEPATH') or exit('No direct script access allowed');
?>
<div>
<ul>
<?php $tick_mark = '<span style="font-family: DejaVu Sans; sans-serif;font-size:12px">✔</span>';
?>
<br>
<li>Final Status of Field Visit: </li>
Final Status of Field Visit:
<br><br>
<table>
@ -616,10 +616,17 @@ defined('BASEPATH') or exit('No direct script access allowed');
</table>
<br>
</ul>
<br>
<li>Remarks:</li>
<br>
Remarks:
<ul>
<?php if (isset($final_remark_data['officer_remarks']) && count($final_remark_data['officer_remarks'])) {
foreach ($final_remark_data['officer_remarks'] as $remark_key => $remark_value) {
echo '<li><p style="text-align:justify;">' . $remark_value['common_remarks'] . '</p></li>';
}}
?>
</ul>
<br>
Remarks:
<?php echo '<p style="text-align:justify;">' . $pd_officer_final_remark . '</p>' ?>
</div>
<!-- ################# final remarks ends #################-->

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

@ -308,7 +308,8 @@ defined('BASEPATH') or exit('No direct script access allowed');
if (strtoupper($value['is_person_met']) == 'YES') {
echo '<p>' . 'Applicant <b>(' . isset($value['Name_of_the_Person_met_master']) ? $value['Name_of_the_Person_met_master'] : $value['Name_of_the_Person_met'] . ')</b> was met at the visited address.' . '</p>';
} else if (strtoupper($value['is_person_met']) == 'NO') {
echo '<p>' . 'During PD (' . $value['Name_of_the_Person'] . ') (' . $value['designation_person_met_master'] . ') was met at the visited address during visit.' . '</p>';
$designation = str_replace(' of', '', $value['designation_person_met_master']);
echo '<p>' . 'During PD (' . $value['Name_of_the_Person'] . ') (' . $designation . ') was met at the visited address during visit.' . '</p>';
}
if (isset($general_form['general_remark']) && $general_form['general_remark'] != "") {
echo '<p>' . $general_form['general_remark'] . '</p>';
@ -506,7 +507,7 @@ defined('BASEPATH') or exit('No direct script access allowed');
<?php
$final_remark = json_decode($pd_processed_forms[33][0]['processed_json'], true);
$final_remark_data = $final_remark['json'];
//print_r($final_remark_data);
// print_r($final_remark_data);
$positive = null;
@ -533,7 +534,7 @@ defined('BASEPATH') or exit('No direct script access allowed');
?>
<div>
<ul>
<?php $tick_mark = '<span style="font-family: DejaVu Sans; sans-serif;font-size:12px">✔</span>';
?>
@ -565,8 +566,16 @@ defined('BASEPATH') or exit('No direct script access allowed');
</table>
<br>
</ul>
<br>
Remarks:
<ul>
<?php if (isset($final_remark_data['officer_remarks']) && count($final_remark_data['officer_remarks'])) {
foreach ($final_remark_data['officer_remarks'] as $remark_key => $remark_value) {
echo '<li><p style="text-align:justify;">' . $remark_value['common_remarks'] . '</p></li>';
}}
?>
</ul>
<br>
<li>Remarks:</li>
<?php echo '<p style="text-align:justify;">' . $pd_officer_final_remark . '</p>' ?>

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

@ -259,7 +259,7 @@ defined('BASEPATH') or exit('No direct script access allowed');
echo "<br><br>";
echo "<div>";
echo "<h1><center>VISIT REPORT</center></h1> ";
echo "<center style='font-size:15px;font-style:italic;font-weight:bold'>for the case of</center>";
echo "<center style='font-style:italic;font-weight:bold'>for the case of</center>";
echo "<h2><center>" . $main_applicant_name . "</center></h2>";
echo "</div>";
echo "<br><br><br><br>";
@ -308,7 +308,8 @@ defined('BASEPATH') or exit('No direct script access allowed');
if (strtoupper($value['is_person_met']) == 'YES') {
echo '<p>' . 'Applicant <b>(' . isset($value['Name_of_the_Person_met_master']) ? $value['Name_of_the_Person_met_master'] : $value['Name_of_the_Person_met'] . ')</b> was met at the visited address.' . '</p>';
} else if (strtoupper($value['is_person_met']) == 'NO') {
echo '<p>' . '(' . $value['Name_of_the_Person'] . ') (' . $value['designation_person_met_master'] . ') was met at the visited address during visit.' . '</p>';
$designation = str_replace(' of', '', $value['designation_person_met_master']);
echo '<p>' . '(' . $value['Name_of_the_Person'] . ') (' . $designation . ') was met at the visited address during visit.' . '</p>';
}
if (isset($general_form['general_remark']) && $general_form['general_remark'] != "") {
echo '<p>' . $general_form['general_remark'] . '</p>';
@ -462,7 +463,7 @@ defined('BASEPATH') or exit('No direct script access allowed');
</ul>
<?php } ?>
<li style="margin: 15px 0;"> Neighbourhood Check Status is <span style="font-size:16px;font-weight:bold;"><?php echo $pd_offiecer_status_about_neighbor; ?>.</span></li>
<li style="margin: 15px 0;"> Neighbourhood Check Status is <span style="font-weight:bold;"><?php echo $pd_offiecer_status_about_neighbor; ?>.</span></li>
</li>
@ -559,7 +560,7 @@ defined('BASEPATH') or exit('No direct script access allowed');
<?php
$final_remark = json_decode($pd_processed_forms[33][0]['processed_json'], true);
$final_remark_data = $final_remark['json'];
//print_r($final_remark_data);
print_r($final_remark_data);
$positive = null;
@ -586,7 +587,6 @@ defined('BASEPATH') or exit('No direct script access allowed');
?>
<div>
<ul>
<?php $tick_mark = '<span style="font-family: DejaVu Sans; sans-serif;font-size:12px">✔</span>';
?>
@ -618,8 +618,16 @@ defined('BASEPATH') or exit('No direct script access allowed');
</table>
<br>
</ul>
<br>
Remarks:
<ul>
<?php if (isset($final_remark_data['officer_remarks']) && count($final_remark_data['officer_remarks'])) {
foreach ($final_remark_data['officer_remarks'] as $remark_key => $remark_value) {
echo '<li><p style="text-align:justify;">' . $remark_value['common_remarks'] . '</p></li>';
}}
?>
</ul>
<br>
<li>Remarks:</li>
<?php echo '<p style="text-align:justify;">' . $pd_officer_final_remark . '</p>' ?>