diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 8d263691..be985f18 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -21,6 +21,7 @@ class PD_Controller extends REST_Controller { { // Construct the parent class parent::__construct(); + $this->load->model('PD_Model'); $this->load->library('AWS_S3'); $this->load->library('AWS_SNS'); @@ -44,7 +45,7 @@ class PD_Controller extends REST_Controller { for ($i = 0; $i < 5; $i++) { $randomString .= $characters[rand(0, $charactersLength - 1)]; } - $temp_file_name = $randomString.date('Y-m-d-H:m:s'); + $temp_file_name = $randomString.date('Y-m-d-h:i:s'); $ifp = fopen( $output_file, 'wb' ); @@ -531,7 +532,7 @@ class PD_Controller extends REST_Controller { // for ($i = 0; $i < 5; $i++) { // $randomString .= $characters[rand(0, $charactersLength - 1)]; // } - // $temp_file_name = $randomString.date('Y-m-d-H:m:s').'.png'; + // $temp_file_name = $randomString.date('Y-m-d-h:i:s').'.png'; // $ifp = fopen( $output_file, 'wb' ); @@ -730,7 +731,7 @@ class PD_Controller extends REST_Controller { { $pd_details['start_location'] = $pd_details['link']; - $pd_details['pd_visit_date'] = date('Y-m-d h:m:s'); + $pd_details['pd_visit_date'] = date('Y-m-d h:i:s'); unset($pd_details['link']); $string2 = str_shuffle('1234567890'); $OTP = substr($string2,0,6); @@ -1108,7 +1109,7 @@ class PD_Controller extends REST_Controller { $updatePd['pd_status'] = INPROGRESS; $updatePd['is_otp_done'] = 1; $updatePd['fk_updatedby'] = $pdotp['fk_updatedby']; - $updatePd['updatedon'] = date('Y-m-d h:m:00'); + //$updatePd['updatedon'] = date('Y-m-d h:i:00'); if($pdotpStatus != 0 || $pdotpStatus != '' && count($pdotpStatus) != 0) { @@ -1136,7 +1137,7 @@ class PD_Controller extends REST_Controller { $updatePd['is_otp_done'] = 0; $updatePd['otp_reject_reason'] = $pdotp['reason']; $updatePd['otp_reject_other_reason'] = $pdotp['other_reason']; - $updatePd['updatedon'] = date('Y-m-d h:m:00'); + //$updatePd['updatedon'] = date('Y-m-d h:m:00'); $updatePd['fk_updatedby'] = $pdotp['fk_updatedby']; $where_condition_array = array('pd_id' => $pdotp['pd_id']); @@ -1374,7 +1375,7 @@ class PD_Controller extends REST_Controller { //$id = $this->PD_Model->saveRecords($records,PDSCHEDULE); $where_condition_array = array('pd_id' => $records['fk_pd_id']); - $temp_array = array('pd_status' => SCHEDULED,'fk_updatedby'=>$records['fk_scheduled_by'],'updatedon'=>date('Y-m-d H:m:i'),'scheduled_on'=>$records['schedule_time']); + $temp_array = array('pd_status' => SCHEDULED,'fk_updatedby'=>$records['fk_scheduled_by'],'scheduled_on'=>$records['schedule_time']); $pd_id_modified = $this->PD_Model->updateRecords($temp_array,PDTRIGGER,$where_condition_array); /******* Code Snippt for Save Template Category Weightage info to PD category Info*/ @@ -2011,7 +2012,7 @@ class PD_Controller extends REST_Controller { for ($i = 0; $i < 5; $i++) { $randomString .= $characters[rand(0, $charactersLength - 1)]; } - $temp_file_name = $randomString.date('Y-m-d-H:m:s').'.png'; + $temp_file_name = $randomString.date('Y-m-d-H:i:s').'.png'; $ifp = fopen( $output_file, 'wb' ); @@ -2110,7 +2111,7 @@ class PD_Controller extends REST_Controller { for ($i = 0; $i < 5; $i++) { $randomString .= $characters[rand(0, $charactersLength - 1)]; } - $temp_file_name = $randomString.date('Y-m-d-H:m:s').'.png'; + $temp_file_name = $randomString.date('Y-m-d-H:i:s').'.png'; $ifp = fopen( $output_file, 'wb' ); @@ -3414,7 +3415,7 @@ class PD_Controller extends REST_Controller { } // Get all assigned pd forms associated with this pd from template_forms table - if($template_id != null) + if($template_id == null) { $columns = array('TEMPLATEFORMS.form_id','PDFORMS.pd_form_name'); $table = TEMPLATEFORMS.' as TEMPLATEFORMS'; @@ -3935,7 +3936,7 @@ class PD_Controller extends REST_Controller { $is_qc_edited = 1; } - if($is_qc_edited) + if($is_qc_edited == 1 || $is_qc_edited == 2) { //Get Latest PD Report Html file and convert it into PDF $latest_pd_report_html_file_name = $pd_master_details[0]['pd_report_html_filename']; @@ -4018,7 +4019,7 @@ class PD_Controller extends REST_Controller { //Generate Report as HTML File public function generatePDReport_post() - { + { $records = $this->post('records'); $pdid = $records['pd_id']; $fk_createdby = $records['fk_createdby']; @@ -4080,7 +4081,7 @@ class PD_Controller extends REST_Controller { if (!is_dir(APPPATH.'views/pd_reports/'.$pdid)) { $dust = mkdir(APPPATH.'views/pd_reports/'.$pdid, 0777, TRUE); } - $pd_report_time = date('Y-m-d-h-m-s'); + $pd_report_time = date('Y-m-d-h-i-s'); $pd_report_store = APPPATH.'views/pd_reports/'.$pdid.'/'.$pd_report_time.'.html'; $is_write_done = file_put_contents($pd_report_store,$temp); @@ -4090,7 +4091,7 @@ class PD_Controller extends REST_Controller { //$update = $this->PD_Model->updateRecords(array('pd_report_html_filename' => $pd_report_time),PDTRIGGER,array('pd_id' => $pdid)); $where_condition_array = array("pd_id" => $pdid); - $temp_array = array('is_original_report_created'=>1,'pd_report_html_filename' => $pd_report_time,'pd_report_generated_date' => date('Y-m-d h:m:s')); + $temp_array = array('is_original_report_created'=>1,'pd_report_html_filename' => $pd_report_time,'pd_report_generated_date' => date('Y-m-d h:i:s'),'is_qc_edited' => 2); $id = $this->PD_Model->updateRecords($temp_array,PDTRIGGER,$where_condition_array); @@ -4847,7 +4848,7 @@ class PD_Controller extends REST_Controller { for($i = 1;$i < 3;$i++) { - // Incase running from local windows (Velz sys) + // Incase running from local windows //$dsc_script_from_db = $this->PD_Model->selectCustomRecords(array('*'),array('script_name' => 'phantom_dsc_local'),SCRIPTS); $dsc_script_from_db = $this->PD_Model->selectCustomRecords(array('*'),array('script_name' => DETAILED_SCORE_CARD_IMAGE_LOCATION),SCRIPTS); @@ -4867,7 +4868,7 @@ class PD_Controller extends REST_Controller { $dsc_script_from_db = str_replace('{{html_content}}',$html_content,$dsc_script_from_db); $dsc_script_from_db = $i == 1 ? str_replace('{{img_name}}','dsc_business',$dsc_script_from_db) : str_replace('{{img_name}}','dsc_general',$dsc_script_from_db); - + $logger = MYLOG::logFunction(); $logger->info('Score Card Graphical Representation called',array('card_type' => $i,'script' => $dsc_script_from_db)); //echo $dsc_script_from_db; //echo "*************"; @@ -4925,9 +4926,7 @@ class PD_Controller extends REST_Controller { public function codeigniterViewTest_post() { - - - + //echo MYUTIL::customIndianNumberFormat(145263.45896);die(); $records = $this->post('records'); $pdid = $records['pd_id']; @@ -4945,7 +4944,7 @@ class PD_Controller extends REST_Controller { $data['pd_additional_requirements'] = $this->PD_Model->getPDAdditionalRequirements($pdid); $data['score_questions_display'] = $this->PD_Model->getScoreableQuestionToDispaly(); $data['pd_score'] = $this->calculateScore($pdid); - //print_r($data['pd_score']); + //print_r($data['pd_score']); //die(); $data['assessed_income_details'] = $this->getAssessedIncomeForPDReport($pdid); @@ -5011,7 +5010,7 @@ class PD_Controller extends REST_Controller { if (!is_dir(APPPATH.'views/pd_reports/'.$pdid)) { $dust = mkdir(APPPATH.'views/pd_reports/'.$pdid, 0777, TRUE); } - $pd_report_time = date('Y-m-d-h-m-s'); + $pd_report_time = date('Y-m-d-h-i-s'); $pd_report_store = APPPATH.'views/pd_reports/'.$pdid.'/'.$pd_report_time.'.html'; file_put_contents($pd_report_store,$t); @@ -6001,7 +6000,7 @@ class PD_Controller extends REST_Controller { for ($i = 0; $i < 5; $i++) { $randomString .= $characters[rand(0, $charactersLength - 1)]; } - $temp_file_name = $randomString.date('Y-m-d-H:m:s').'.png'; + $temp_file_name = $randomString.date('Y-m-d-H:i:s').'.png'; $ifp = fopen( $output_file, 'wb' ); @@ -6396,11 +6395,11 @@ class PD_Controller extends REST_Controller { $over_all_asset_value = 0; if(array_key_exists('assets_details',$other_asset_form)) { - //print_r($other_asset_form); + //print_r($other_asset_form['assets_details']);die(); foreach($other_asset_form['assets_details'] as $asset) { //echo 'Value - '.$asset['approximate_market_value']; - $over_all_asset_value += $asset['approximate_market_value'] ; + $over_all_asset_value += is_numeric($asset['approximate_market_value']) ? $asset['approximate_market_value'] : 0 ; if($asset['assets_mode'] == 6)//LIC { $over_all_asset_value += $asset['details'][0]['sum_assured']; @@ -6573,7 +6572,7 @@ class PD_Controller extends REST_Controller { $pdid = $records['pdid']; $content = $records['content']; $fk_createdby = $records['fk_createdby']; - $pd_report_time = date('Y-m-d-h-m-s'); + $pd_report_time = date('Y-m-d-h-i-s'); $pd_report_store = APPPATH.'views/pd_reports/'.$pdid.'/'.$pd_report_time.'.html'; file_put_contents($pd_report_store,$content); @@ -6602,6 +6601,8 @@ class PD_Controller extends REST_Controller { public function getPDReportHTML_get() { $pdid = $this->uri->segment(2); + //date_default_timezone_set("Asia/Kolkata"); + //echo date('Y-m-d h:i:s');die(); if(($pdid != null || $pdid != "") && (strlen($pdid) == 16) &&(is_string($pdid))) { $pd_data = $this->PD_Model->selectCustomRecords(array('pd_id','pd_report_html_filename'),array('random_string' => $pdid),PDTRIGGER); @@ -6612,7 +6613,7 @@ class PD_Controller extends REST_Controller { } else { - echo "

Not Found

"; + echo "

DNot Found

"; } } else diff --git a/api/application/helpers/bankingform_helper.php b/api/application/helpers/bankingform_helper.php index 91a08dd7..43c6297d 100644 --- a/api/application/helpers/bankingform_helper.php +++ b/api/application/helpers/bankingform_helper.php @@ -10,7 +10,7 @@ public static function getBusinessBankingDetails($values){ $count_vintage = $tag['vintage_year'] >0 ? $tag['vintage_year'] :""; $count_vintage .= ($tag['vintage_year'] == 1) ? " Year" : (($tag['vintage_year'] > 1) ? " Years" : ""); $count_vintage.=' '; - $count_vintage .=$tag['vintage_month'] >0 ? ' and ' . $tag['vintage_month'] : ""; + $count_vintage .=$tag['vintage_month'] >0 ? ($tag['vintage_year'] >0 ? ' and ' . $tag['vintage_month'] : $tag['vintage_month']) : ""; $count_vintage .=($tag['vintage_month'] == 1) ? " Month" : (($tag['vintage_month'] > 1) ? " Months" : ""); return array( 'account_name' => $tag['applicant_name']['id']==0 ? $tag['other_applicant'] : $tag['applicant_name']['name'], diff --git a/api/application/helpers/businessform_helper.php b/api/application/helpers/businessform_helper.php index b676de07..8bfff812 100644 --- a/api/application/helpers/businessform_helper.php +++ b/api/application/helpers/businessform_helper.php @@ -391,7 +391,7 @@ public static function getActivityDetails($values,$type){ // get business peak period details public static function getBusinessPeakDetails($details){ - $getRow='The Business has major changes,'; + $getRow='The Business has maximum sales/services during,'; $getRow.= count($details) >1 ?' the periods of ' :' the period of '; foreach($details as $key=>$value){ $getRow=$getRow; @@ -435,7 +435,7 @@ public static function getBusinessPeakDetails($details){ break; } } - $getRow .=' maximum sales/services done.'; + $getRow .='.'; return $getRow; } } diff --git a/api/application/helpers/pdscore_helper.php b/api/application/helpers/pdscore_helper.php index d0c79724..5b0b668f 100644 --- a/api/application/helpers/pdscore_helper.php +++ b/api/application/helpers/pdscore_helper.php @@ -62,7 +62,7 @@ class PDSCORE $supplir_client_answer_scores = array('Provided' => 10, 'Not Provided' => 0,'Not Applicable' => 0); $otp_done = array('Yes' => 10, 'No' => 0); - $qualification = array( 'name_score' => array('Completed Professinal Course' => 10,'Completed Post Graduation' => 8, 'Completed Graduation' => 6,'Completed Schooling' => 4,'Not Completed Schooling' => 2,'No Formal Education' => 0), + $qualification = array( 'name_score' => array('Completed Professional Course' => 10,'Completed Post Graduation' => 8, 'Completed Graduation' => 6,'Completed Schooling' => 4,'Not Completed Schooling' => 2,'No Formal Education' => 0), 'id_score' => array('1' => 10,'2' => 8,'3' => 6,'4' => 4,'5' => 2,'6' => 0)); /*-------- BUSNIESS --------------*/ @@ -207,6 +207,8 @@ class PDSCORE //echo 'loan_amount - '.$loan_amount; $avg_expected_value_of_assets = $personal_asset_grid['master_grid'][0]['avg_expected_value_assets']; + //print_r($personal_asset_grid); + //echo $avg_expected_value_of_assets; $asset_calculation_details['avg_expected_value_of_assets'] = round($avg_expected_value_of_assets,2); //echo "avg_expected_value_of_assets - ".$avg_expected_value_of_assets; //$expected_value_of_assets = ($avg_expected_value_of_assets / 100 ) * $personal_asset_grid['master_grid'][0]['loan_amount_to']; @@ -223,7 +225,10 @@ class PDSCORE //echo 'actual_value_of_assets_percentage--'.$actual_value_of_assets_percentage; $variance = (($actual_value_of_assets_percentage - $avg_expected_value_of_assets)/$avg_expected_value_of_assets )* 100 ; + + //echo 'varience--'.$variance; + //die(); $asset_calculation_details['variance'] = round($variance,2); $final_asset_attributed_score = 0; diff --git a/api/application/views/js/phantomchart.js b/api/application/views/js/phantomchart.js index 6ee2e068..cc616224 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 = 53.4;var url = 'http://localhost/sparqtest/api?'+score;var image_url = '/opt/lampp/htdocs/sparqtest/api/application/views/report_templates/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.viewportSize = { width: 600, height: 350 };page.clipRect = { top: 0, left: 0, width: 600, height: 350 };var score = 89;var url = 'http://localhost:9999/AWSEC2/sparqapi/api?'+score;var image_url = 'C:/5.6/xampp/htdocs/AWSEC2/sparqapi/api/application/views/report_templates/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/js/phantomdsc.js b/api/application/views/js/phantomdsc.js index 7c25f3da..bf7a0ee0 100644 --- a/api/application/views/js/phantomdsc.js +++ b/api/application/views/js/phantomdsc.js @@ -1 +1 @@ -var wpage = require('webpage').create();var Content = '
Powered by ZingChart
';var pageurl = '/opt/lampp/htdocs/sparqapi/api/application/views/report_templates/dsc.html'; wpage.viewportSize = { width: 810, height: 250 };wpage.setContent(Content, pageurl); wpage.onLoadFinished = function(status){wpage.render('/opt/lampp/htdocs/sparqtest/api/application/views/report_templates/dsc_general.png'); phantom.exit();}; \ No newline at end of file +var wpage = require('webpage').create();var Content = '
Powered by ZingChart
';var pageurl = 'C:/5.6/xampp/htdocs/AWSEC2/sparqapi/api/application/views/report_templates/dsc.html'; wpage.viewportSize = { width: 810, height: 250 };wpage.setContent(Content, pageurl); wpage.onLoadFinished = function(status){wpage.render('C:/5.6/xampp/htdocs/AWSEC2/sparqapi/api/application/views/report_templates/dsc_general.png'); phantom.exit();}; \ No newline at end of file diff --git a/api/application/views/report_templates/JSONTOREPORT.php b/api/application/views/report_templates/JSONTOREPORT.php index c3a23f37..a484ace7 100644 --- a/api/application/views/report_templates/JSONTOREPORT.php +++ b/api/application/views/report_templates/JSONTOREPORT.php @@ -318,7 +318,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); "; + echo ""; echo ""; echo ""; echo ""; @@ -393,7 +393,11 @@ defined('BASEPATH') OR exit('No direct script access allowed'); { if($individual['pd_co_applicant_id'] == $persons_with_relationship['pd_co_applicant_id'] && isset($persons_with_relationship['relationship'])) { - $RSNA = isset($persons_with_relationship['relation_to_master']) ? $persons_with_relationship['relation_to_master'] : " Could Not Find"; + + if(isset($persons_with_relationship['relation_to_master'])) + { + //? $persons_with_relationship['relation_to_master'] : " Could Not Find"; + $RSNA = $persons_with_relationship['relation_to_master']; if(isset($persons_with_relationship['relationship_master'])) { $personal_relationship_data .= $persons_with_relationship['relationship_master'] .' Of '. $RSNA; @@ -401,6 +405,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $personal_relationship_data.=', '; } + } } } @@ -488,7 +493,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
PD Initiated Date ".$pd_master_details[0]['pd_date_of_initiation']."
PD Initiated Date ".$pd_master_details[0]['createdon']."
PD Vist Date ".$pd_master_details[0]['pd_visit_date']."
PD Report Date ".$pd_master_details[0]['pd_report_generated_date']."
PD Initiated by ".$pd_master_details[0]['branch_name']." Branch
-->
-

Loan Applicants:

+

Loan Applicants:

@@ -540,13 +545,17 @@ defined('BASEPATH') OR exit('No direct script access allowed'); if(($individual['pd_co_applicant_id'] == $persons_with_relationship['pd_co_applicant_id'] || !strcasecmp($applicant_name,$persons_with_relationship['applicant_name']))&& isset($persons_with_relationship['relationship'])) { - $RSNA = isset($persons_with_relationship['relation_to_master']) ? $persons_with_relationship['relation_to_master'] : " Could Not Find"; - if(isset($persons_with_relationship['relationship_master'])) + + if( isset($persons_with_relationship['relation_to_master'])) { - $personal_relationship_data .= $persons_with_relationship['relationship_master'] .' of '. $RSNA; + $RSNA = $persons_with_relationship['relation_to_master']; + if(isset($persons_with_relationship['relationship_master'])) + { + $personal_relationship_data .= $persons_with_relationship['relationship_master'] .' of '. $RSNA; - $personal_relationship_data.='
and

'; - } + $personal_relationship_data.='
and

'; + } + } } } $company_relationship_data .= $personal_relationship_data; @@ -576,7 +585,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); if($is_show_scorecard) { - echo "

PD Score Summary

"; + echo '

PD Score Summary

'; ?>
Name Age
(Yrs)		 Qualification Relationships
@@ -677,10 +686,10 @@ defined('BASEPATH') OR exit('No direct script access allowed'); echo 'The '.$address_type.' is '.$property_owner_type.' and the business has been in operation from here for the last'.$yrs_being_run.'.'; echo '

The '.$address_type.' is located in '.$locality.' and the estimated area of the '.$address_type.' is '.$estimated_area.' .'; echo '

The PD location was '. $pd_address['pd_location_master'].'. ' . 'As Per PD Offcier, the '.$address_type .' is situated in '.$comment_locality_master .' Locality.'; - echo '

The PD officer also made the following observations:' ; + echo '

The PD officer also made the following observations:' ; echo '
@@ -1477,7 +1486,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); ?>
-

Financial Information

+

Financial Information

0){ ?>
-

Business Banking:

+

Business Banking:

@@ -1858,6 +1867,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); 0 ) { + + echo '
'; echo "

Client Details

"; ?> @@ -1920,7 +1931,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $supplier_second_row = ''; - $supplier_second_row .= isset($raw['person_title_name_master']) ? ''; - $supplier_second_row .= isset($tradeRow['person_title_name_master']) ? '
2Contact Person ' . $raw['person_title_name_master']: '' . ''; + $supplier_second_row .= isset($raw['person_title_name_master']) ? '' . $raw['person_title_name_master'].' ': '' . ''; $supplier_second_row .= $raw['manufacturing_contact_person_name'] ; $supplier_second_row .= isset($raw['person_designation']) && $raw['person_designation']== 1 ? ' '.$raw['other_person_designation'] : ' ';// @@ -1970,7 +1981,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $supplier_second_row = '
2Contact Person ' . $tradeRow['person_title_name_master']: '' . ''; + $supplier_second_row .= isset($tradeRow['person_title_name_master']) ? '' . $tradeRow['person_title_name_master'].' ': '' . ''; $supplier_second_row .= $tradeRow['trade_product_contact_person_name'] ; $supplier_second_row .= isset($tradeRow['person_designation']) && $tradeRow['person_designation']== 1 ? ' '.$tradeRow['other_person_designation'] : ' ';// @@ -2010,11 +2021,12 @@ defined('BASEPATH') OR exit('No direct script access allowed'); if(count($supplierResult)) { ?> -

Supplier Details

+

Supplier Details

$fetchRow){ echo '
Supplier '.($k+1).':'; ?> +
@@ -2098,7 +2110,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); if(count($stockResult)){ $stock_sr_no = 0; ?> -

Stock Details

+
+

Stock Details

@@ -2350,7 +2363,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); //die(); if(isset($ai_core_details) && count($ai_core_details['sales_calculated_by_itemwise'])) { - echo '

Sales Itemwise :

'; + echo '

Sales Itemwise :

'; echo '
'; echo ''; echo $ai_core_details_processed['sales_calculated_by_itemwise_header']; @@ -2374,7 +2387,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); if(isset($ai_core_details) && count($ai_core_details['sales_items_by_monthwise'])) { echo "
"; - echo "

Kuchha Sales Book/Bills :

"; + echo '

Kuchha Sales Book/Bills :

'; foreach($ai_core_details_processed['sales_month_wise_to_display'] as $sale_month_wise) { // if($sale_month_wise['sales_type'] == 1) @@ -2450,7 +2463,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); //die(); if(isset($ai_core_details) && count($ai_core_details['business_expenses'])) { - echo '

Business Expenses Details :

'; + echo '

Business Expenses Details :

'; echo '
'; echo ''; echo ''; @@ -2466,7 +2479,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); if(isset($ai_core_details) && count($ai_core_details['house_hold_expenses'])) { - echo '

Household Expenses Details :

'; + echo '

Household Expenses Details :

'; echo '
Business Expense Amount Frequency Annual Expenses
'; echo ''; echo ''; @@ -2483,7 +2496,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); if(isset($ai_core_details) && count($ai_summary_details_processed)) { - echo '

The Summary of Income :

'; + echo '

The Summary of Income :

'; echo '
Expense Particulars Amount (Rs) Frequency Annual Expenses(Rs)
'; echo ''; echo $ai_summary_details_processed['ai_table_header_row']; @@ -2540,7 +2553,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); } } ?> -

Personal Assets

+
+

Personal Assets

0){ ?> @@ -2593,7 +2607,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); ?> -

Personal Banking:

+

Personal Banking:

0){ //print_r($bankingResult); ?> @@ -2650,7 +2664,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); 0){ //print_r($otherIncomeResult); ?> -

Other Sources of Income of Individual Loan Applicants:

+

Other Sources of Income of Individual Loan Applicants:

@@ -2697,14 +2711,14 @@ defined('BASEPATH') OR exit('No direct script access allowed'); //print_r($familyResult);die(); ?>
-

Family Information:

+

Family Information:

$fmValue) { ?> who is an applicant in the case, resides at '.$fmValue['residency_address'].'.'; - $residence_text = "This is a ". $fmValue['residence_ownership']." residence, where the applicant has been staying for ". $fmValue['residence_No_of_years'].'.'; - $residence_text .= (!strcasecmp($fmValue['residence_ownership'],'rented')) ? 'The rent paid Rs.'.$fmValue['rent'].'per month.' : ''; + $residence_text ='This is a '. $fmValue['residence_ownership'].' residence, where the applicant has been staying for '. $fmValue['residence_No_of_years'].'.'; + $residence_text .= (!strcasecmp($fmValue['residence_ownership'],'rented')) ? 'The rent paid Rs.'.$fmValue['rent'].'per month.' : ''; echo $intro_text;echo "
";echo $residence_text; @@ -2764,7 +2778,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); //print_r($existLoanResult);die(); ?> -

Existing Loan Obligation

+
+

Existing Loan Obligation

The table below lists the details of Existing Loan Obligations of the Loan Applicants.

@@ -2861,7 +2876,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
-

PD OFFICERS REMARKS ON CUSTOMER BEHAVOUR, BUSINESS LOCATION & OVERALL PD STATUS

+

PD OFFICERS REMARKS ON CUSTOMER BEHAVOUR, BUSINESS LOCATION & OVERALL PD STATUS

@@ -2919,20 +2934,22 @@ defined('BASEPATH') OR exit('No direct script access allowed');
- + +
Rude
Others*
- +
-
+

  • Suitability of Business Location:
    • +
    + @@ -2983,24 +3003,26 @@ defined('BASEPATH') OR exit('No direct script access allowed'); - + -
    Positive
    Negative
    		 -
    Others
    +     		+
    Others*
    +
    + - -

    PD officer recommendation is PD officer recommendation is '.$fo_diplay.'';?>. The following key points were considered while arriving at the aforementioned status.

    + echo ''.$fo_diplay.'.

    ';?>

    The following key points were considered while arriving at the aforementioned status.

    "; foreach($final_remark_data['recommendation_positive'] as $pos){ echo "
  • ".$pos['reason_for_positive']."
    • ";} @@ -3011,7 +3033,11 @@ defined('BASEPATH') OR exit('No direct script access allowed'); } echo ""; ?> - ".$other_command_remark."

    ";} ?> + ".$other_command_remark."

    ";} + + echo '

    '.$pd_officer_final_remark.'

    ' + ?> +
    diff --git a/api/application/views/report_templates/chart.png b/api/application/views/report_templates/chart.png index bc6e8027..5e48a70f 100644 Binary files a/api/application/views/report_templates/chart.png and b/api/application/views/report_templates/chart.png differ diff --git a/api/application/views/report_templates/dsc_business.png b/api/application/views/report_templates/dsc_business.png index f5ce876b..ef2182af 100644 Binary files a/api/application/views/report_templates/dsc_business.png and b/api/application/views/report_templates/dsc_business.png differ diff --git a/api/application/views/report_templates/dsc_general.png b/api/application/views/report_templates/dsc_general.png index e4a72fcd..8fc59f5b 100644 Binary files a/api/application/views/report_templates/dsc_general.png and b/api/application/views/report_templates/dsc_general.png differ