diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 8bf2cc6f..f4d8829c 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -6220,7 +6220,7 @@ public function getPDFormDetailsJSON_post() { $data['pd_images']['common_images'] = $this->PD_Model->getSignedPDDocsURL($pdid,null,null,null,null,'report'); } - //print_r(json_decode($data['pd_processed_forms'][24][0]['processed_json']));die(); + //print_r(json_decode($data['pd_processed_forms'][24][0]['processed_json']));//die(); // $it = array_filter($data['pd_images'][11],function($d){ if($d['company_id'] == 2){ echo $d['company_id'].'TRUE';return 1;}else {echo $d['company_id'].'FALSE'; return 0;} }); // print_r($it); diff --git a/api/application/views/report_templates/JSONTOREPORT_CLIX.php b/api/application/views/report_templates/JSONTOREPORT_CLIX.php index 386b1a24..86254fd0 100644 --- a/api/application/views/report_templates/JSONTOREPORT_CLIX.php +++ b/api/application/views/report_templates/JSONTOREPORT_CLIX.php @@ -4286,14 +4286,20 @@ defined('BASEPATH') OR exit('No direct script access allowed'); if(isset($credit_officier_specific_queries['covid_section']) && isset($credit_officier_specific_queries['covid_section']['question_info']) && count($credit_officier_specific_queries['covid_section']['question_info'])) { echo '
'; - echo '

COVID-19 Section:

'; + echo '

Queries related to Covid-19:

'; foreach ($credit_officier_specific_queries['covid_section']['question_info'] as $covid_key => $covid_value) { if(isset($covid_value['is_subfield']) && !$covid_value['is_subfield']) { echo 'Question : ' . $covid_value['question'].'
'; - echo 'Answer : ' . $credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ].'
'; + $temp_answer = $credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ]; + + if(($covid_value['type'] == 1 || $covid_value['type'] == 9) && ($covid_value['field_type'] == 'str&numtoword' || $covid_value['field_type'] == 'num' || $covid_value['field_type'] == 'numtoword') && is_numeric($temp_answer)) + { + $temp_answer = MYUTIL::customIndianNumberFormat($temp_answer) .' ('. MYUTIL::numtowords($temp_answer) .')'; + } + echo 'Answer : ' . $temp_answer .'
'; $sub_field_key = $covid_value['question_key'] . '_'.$credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ]; if(isset( $credit_officier_specific_queries['covid_section'][$sub_field_key] ) ) { diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php index 6f125b4e..96508bcf 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php @@ -4341,14 +4341,20 @@ if($total_no_of_business > 0) { if(isset($credit_officier_specific_queries['covid_section']) && isset($credit_officier_specific_queries['covid_section']['question_info']) && count($credit_officier_specific_queries['covid_section']['question_info'])) { echo '
'; - echo '

COVID-19 Section:

'; + echo '

Queries related to Covid-19:

'; foreach ($credit_officier_specific_queries['covid_section']['question_info'] as $covid_key => $covid_value) { if(isset($covid_value['is_subfield']) && !$covid_value['is_subfield']) { echo 'Question : ' . $covid_value['question'].'
'; - echo 'Answer : ' . $credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ].'
'; + $temp_answer = $credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ]; + + if(($covid_value['type'] == 1 || $covid_value['type'] == 9) && ($covid_value['field_type'] == 'str&numtoword' || $covid_value['field_type'] == 'num' || $covid_value['field_type'] == 'numtoword') && is_numeric($temp_answer)) + { + $temp_answer = MYUTIL::customIndianNumberFormat($temp_answer) .' ('. MYUTIL::numtowords($temp_answer) .')'; + } + echo 'Answer : ' . $temp_answer .'
'; $sub_field_key = $covid_value['question_key'] . '_'.$credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ]; if(isset( $credit_officier_specific_queries['covid_section'][$sub_field_key] ) ) { diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php index e0d03fc3..57cd6f6a 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php @@ -4452,14 +4452,20 @@ defined('BASEPATH') OR exit('No direct script access allowed'); if(isset($credit_officier_specific_queries['covid_section']) && isset($credit_officier_specific_queries['covid_section']['question_info']) && count($credit_officier_specific_queries['covid_section']['question_info'])) { echo '
'; - echo '

COVID-19 Section:

'; + echo '

Queries related to Covid-19:

'; foreach ($credit_officier_specific_queries['covid_section']['question_info'] as $covid_key => $covid_value) { if(isset($covid_value['is_subfield']) && !$covid_value['is_subfield']) { echo 'Question : ' . $covid_value['question'].'
'; - echo 'Answer : ' . $credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ].'
'; + $temp_answer = $credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ]; + + if(($covid_value['type'] == 1 || $covid_value['type'] == 9) && ($covid_value['field_type'] == 'str&numtoword' || $covid_value['field_type'] == 'num' || $covid_value['field_type'] == 'numtoword') && is_numeric($temp_answer)) + { + $temp_answer = MYUTIL::customIndianNumberFormat($temp_answer) .' ('. MYUTIL::numtowords($temp_answer) .')'; + } + echo 'Answer : ' . $temp_answer .'
'; $sub_field_key = $covid_value['question_key'] . '_'.$credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ]; if(isset( $credit_officier_specific_queries['covid_section'][$sub_field_key] ) ) { diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI_TELE_PD.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI_TELE_PD.php index f04b8b89..ea77d7f7 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI_TELE_PD.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI_TELE_PD.php @@ -4277,14 +4277,18 @@ if($total_no_of_business > 0) { if(isset($credit_officier_specific_queries['covid_section']) && isset($credit_officier_specific_queries['covid_section']['question_info']) && count($credit_officier_specific_queries['covid_section']['question_info'])) { echo '
'; - echo '

COVID-19 Section:

'; + echo '

Queries related to Covid-19:

'; foreach ($credit_officier_specific_queries['covid_section']['question_info'] as $covid_key => $covid_value) { if(isset($covid_value['is_subfield']) && !$covid_value['is_subfield']) { echo 'Question : ' . $covid_value['question'].'
'; - echo 'Answer : ' . $credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ].'
'; + if(($covid_value['type'] == 1 || $covid_value['type'] == 9) && ($covid_value['field_type'] == 'str&numtoword' || $covid_value['field_type'] == 'num' || $covid_value['field_type'] == 'numtoword') && is_numeric($temp_answer)) + { + $temp_answer = MYUTIL::customIndianNumberFormat($temp_answer) .' ('. MYUTIL::numtowords($temp_answer) .')'; + } + echo 'Answer : ' . $temp_answer .'
'; $sub_field_key = $covid_value['question_key'] . '_'.$credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ]; if(isset( $credit_officier_specific_queries['covid_section'][$sub_field_key] ) ) { diff --git a/api/application/views/report_templates/JSONTOREPORT_RI.php b/api/application/views/report_templates/JSONTOREPORT_RI.php index def239f3..624f4818 100644 --- a/api/application/views/report_templates/JSONTOREPORT_RI.php +++ b/api/application/views/report_templates/JSONTOREPORT_RI.php @@ -1679,14 +1679,18 @@ defined('BASEPATH') OR exit('No direct script access allowed'); if(isset($credit_officier_specific_queries['covid_section']) && isset($credit_officier_specific_queries['covid_section']['question_info']) && count($credit_officier_specific_queries['covid_section']['question_info'])) { echo '
'; - echo '

COVID-19 Section:

'; + echo '

Queries related to Covid-19:

'; foreach ($credit_officier_specific_queries['covid_section']['question_info'] as $covid_key => $covid_value) { ifisset($covid_value['is_subfield']) && !$covid_value['is_subfield']) { echo 'Question : ' . $covid_value['question'].'
'; - echo 'Answer : ' . $credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ].'
'; + if(($covid_value['type'] == 1 || $covid_value['type'] == 9) && ($covid_value['field_type'] == 'str&numtoword' || $covid_value['field_type'] == 'num' || $covid_value['field_type'] == 'numtoword') && is_numeric($temp_answer)) + { + $temp_answer = MYUTIL::customIndianNumberFormat($temp_answer) .' ('. MYUTIL::numtowords($temp_answer) .')'; + } + echo 'Answer : ' . $temp_answer .'
'; $sub_field_key = $covid_value['question_key'] . '_'.$credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ]; if(isset( $credit_officier_specific_queries['covid_section'][$sub_field_key] ) ) { diff --git a/api/application/views/report_templates/JSONTOREPORT_SAL.php b/api/application/views/report_templates/JSONTOREPORT_SAL.php index 305fcc63..05fe3d27 100644 --- a/api/application/views/report_templates/JSONTOREPORT_SAL.php +++ b/api/application/views/report_templates/JSONTOREPORT_SAL.php @@ -1755,7 +1755,35 @@ defined('BASEPATH') OR exit('No direct script access allowed'); else { echo 'There are no specific documents to be collect.'; - } + } + + if(isset($credit_officier_specific_queries['covid_section']) && isset($credit_officier_specific_queries['covid_section']['question_info']) && count($credit_officier_specific_queries['covid_section']['question_info'])) + { + echo '
'; + echo '

Queries related to Covid-19:

'; + + foreach ($credit_officier_specific_queries['covid_section']['question_info'] as $covid_key => $covid_value) + { + if(isset($covid_value['is_subfield']) && !$covid_value['is_subfield']) + { + echo 'Question : ' . $covid_value['question'].'
'; + $temp_answer = $credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ]; + + if(($covid_value['type'] == 1 || $covid_value['type'] == 9) && ($covid_value['field_type'] == 'str&numtoword' || $covid_value['field_type'] == 'num' || $covid_value['field_type'] == 'numtoword') && is_numeric($temp_answer)) + { + $temp_answer = MYUTIL::customIndianNumberFormat($temp_answer) .' ('. MYUTIL::numtowords($temp_answer) .')'; + } + echo 'Answer : ' . $temp_answer .'
'; + $sub_field_key = $covid_value['question_key'] . '_'.$credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ]; + if(isset( $credit_officier_specific_queries['covid_section'][$sub_field_key] ) ) + { + echo 'Reason/Description : ' . $credit_officier_specific_queries['covid_section'][$sub_field_key].'
'; + } + + echo '
'; + } + } + } //}