diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 0d48ee57..ed8c0552 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -6300,7 +6300,7 @@ public function getPDFormDetailsJSON_post() $t = substr_replace($t,'',strpos($t,''),(strlen(''))); } - echo $t;die(); + //echo $t;die(); //$t = file_get_contents($this->external_path ."/pd_reports/" . $pdid . "/sample.html"); // $start_pos = strpos($t,''); @@ -6315,6 +6315,7 @@ public function getPDFormDetailsJSON_post() //End of PDF Gen using DOM PDF $output_file2 = $this->external_path ."/pd_reports/" . $pdid . "/sample.pdf"; $ti = file_put_contents($output_file2, $pdf_doc); + echo $output_file2; echo $ti;die(); $dat['dataStatus'] = true; $dat['status'] = REST_Controller::HTTP_OK; @@ -9648,7 +9649,7 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() $applicants_ids_array = array(); $docs_to_be_uploads_ids_array = array(); $add_req_ids_array = array(); - $form_ids_to_replace_new_co_applicants_id = array(18,4,6,7,8,9,10,13,19,21,22); + $form_ids_to_replace_new_co_applicants_id = array(18,4,6,7,8,9,10,13,17,19,21,22); $logger = MYLOG::logFunction(null,$pdid); $logger->info("duplicatePD_post called: ".$pdid,array('ENV'=>ENVIRONMENT,'DATA' => $lender_applicant_id)); diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index ed4e3ef3..ec3574f9 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -1104,10 +1104,10 @@ class PD_Model extends SPARQ_Model { $this->db->JOIN(PDFORMS.' as PDFORMS','TEMPLATEFORMS.form_id = PDFORMS.pd_form_id'); $this->db->WHERE('TEMPLATEFORMS.fk_template_id',$template_id); $this->db->WHERE('TEMPLATEFORMS.isactive',1); - if( !(count($docs_to_be_collected) || count($pd_additional_requirements)) ) - { - $this->db->WHERE('TEMPLATEFORMS.form_id != ',24); //credit managers specific queries form - } + // if( !(count($docs_to_be_collected) || count($pd_additional_requirements)) ) + // { + // $this->db->WHERE('TEMPLATEFORMS.form_id != ',24); //credit managers specific queries form + // } if($pd_master_detials[0]['fk_pd_type'] == 3) { $this->db->WHERE('TEMPLATEFORMS.form_id != ',19); diff --git a/api/application/views/js/phantomchart.js b/api/application/views/js/phantomchart.js index 75e25e94..adf11212 100644 --- a/api/application/views/js/phantomchart.js +++ b/api/application/views/js/phantomchart.js @@ -1 +1 @@ -var page = require('webpage').create();page.viewportSize = { width: 600, height: 350 };page.clipRect = { top: 0, left: 0, width: 600, height: 350 };var score = 44.5;var url = 'http://localhost/AWSEC2/sparqapi/api?'+score;var image_url = 'C:/xampp/htdocs/ssa_external_data/production/pd_reports/1/chart.png' ;page.open(url,function() {setTimeout(function() {page.render(image_url);phantom.exit();}, 500);}); \ No newline at end of file +var page = require('webpage').create();page.onInitialized = function(){page.evaluate(function(){Math.log10 = Math.log10 || function(x) {return Math.log(x) / Math.LN10;};});};page.viewportSize = { width: 600, height: 350 };page.clipRect = { top: 0, left: 0, width: 600, height: 350 };var score = 69.2;var url = 'http://localhost/AWSEC2/sparqapi/api?'+score;var image_url = 'C:/xampp/htdocs/ssa_external_data/testing/pd_reports/1792/chart.png' ;page.open(url,function() {setTimeout(function() {page.render(image_url);phantom.exit();}, 500);}); \ No newline at end of file diff --git a/api/application/views/report_templates/JSONTOREPORT_CLIX.php b/api/application/views/report_templates/JSONTOREPORT_CLIX.php index 12d8c287..74c1453d 100644 --- a/api/application/views/report_templates/JSONTOREPORT_CLIX.php +++ b/api/application/views/report_templates/JSONTOREPORT_CLIX.php @@ -492,11 +492,11 @@ defined('BASEPATH') OR exit('No direct script access allowed');
- Powered by PDGenie + Powered by PDGenie™
-
+
@@ -4281,7 +4281,29 @@ 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 '

COVID-19 Section:

'; + + foreach ($credit_officier_specific_queries['covid_section']['question_info'] as $covid_key => $covid_value) + { + if(strcasecmp($covid_value['question'],'choose any')) + { + echo 'Question : ' . $covid_value['question'].'
'; + echo 'Answer : ' . $credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ].'
'; + $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 '
'; + } + } + } //} diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php index ca44b5a0..c7c114f0 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php @@ -512,11 +512,11 @@ if ( isset($pdf) ) {
- Powered by PD Genie + Powered by PD Genie™
-
+
@@ -4338,6 +4338,30 @@ if($total_no_of_business > 0) { 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 '

COVID-19 Section:

'; + + foreach ($credit_officier_specific_queries['covid_section']['question_info'] as $covid_key => $covid_value) + { + if(strcasecmp($covid_value['question'],'choose any')) + { + echo 'Question : ' . $covid_value['question'].'
'; + echo 'Answer : ' . $credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ].'
'; + $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 '
'; + } + } + } + + + //} ?> 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 bf968aeb..9d84ff95 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php @@ -491,11 +491,11 @@ defined('BASEPATH') OR exit('No direct script access allowed');
- Powered by PDGenie + Powered by PDGenie™
-
+
@@ -4449,6 +4449,28 @@ defined('BASEPATH') OR exit('No direct script access allowed'); 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 '

COVID-19 Section:

'; + + foreach ($credit_officier_specific_queries['covid_section']['question_info'] as $covid_key => $covid_value) + { + if(strcasecmp($covid_value['question'],'choose any')) + { + echo 'Question : ' . $covid_value['question'].'
'; + echo 'Answer : ' . $credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ].'
'; + $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 '
'; + } + } + } + //} ?> 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 bb223b3b..dc461d00 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 @@ -512,11 +512,11 @@ if ( isset($pdf) ) {
- Powered by PD Genie + Powered by PD Genie™
-
+
@@ -4274,6 +4274,28 @@ if($total_no_of_business > 0) { 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 '

COVID-19 Section:

'; + + foreach ($credit_officier_specific_queries['covid_section']['question_info'] as $covid_key => $covid_value) + { + if(strcasecmp($covid_value['question'],'choose any')) + { + echo 'Question : ' . $covid_value['question'].'
'; + echo 'Answer : ' . $credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ].'
'; + $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 '
'; + } + } + } + //} ?> diff --git a/api/application/views/report_templates/JSONTOREPORT_RI.php b/api/application/views/report_templates/JSONTOREPORT_RI.php index d27cb8e1..5157254c 100644 --- a/api/application/views/report_templates/JSONTOREPORT_RI.php +++ b/api/application/views/report_templates/JSONTOREPORT_RI.php @@ -490,11 +490,11 @@ defined('BASEPATH') OR exit('No direct script access allowed');
- Powered by PDGenie + Powered by PDGenie™
-
+
@@ -1676,6 +1676,28 @@ defined('BASEPATH') OR exit('No direct script access allowed'); 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 '

COVID-19 Section:

'; + + foreach ($credit_officier_specific_queries['covid_section']['question_info'] as $covid_key => $covid_value) + { + if(strcasecmp($covid_value['question'],'choose any')) + { + echo 'Question : ' . $covid_value['question'].'
'; + echo 'Answer : ' . $credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ].'
'; + $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 '
'; + } + } + } + //} ?> diff --git a/api/application/views/report_templates/JSONTOREPORT_SAL.php b/api/application/views/report_templates/JSONTOREPORT_SAL.php index 55bc2f87..305fcc63 100644 --- a/api/application/views/report_templates/JSONTOREPORT_SAL.php +++ b/api/application/views/report_templates/JSONTOREPORT_SAL.php @@ -489,11 +489,11 @@ defined('BASEPATH') OR exit('No direct script access allowed');
- Powered by PDGenie + Powered by PDGenie™
-
+