diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index e380dfd0..8d5baf5c 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -4758,7 +4758,7 @@ class PD_Controller extends REST_Controller { function getDetailedScoreCardChart($score) { - $business_score['business'] = array_reverse($score['business']); + $business_score['business'] = ($score['business']); $general_score['general'] = array_reverse($score['general']); $logger = MYLOG::logFunction(); //print_r($business_score['business']);die(); @@ -4770,7 +4770,10 @@ class PD_Controller extends REST_Controller { } } $business_score['business'] = array_reverse($business_score['business']); - // print_r($general_score['general']);die(); + // print_r($general_score['general']); + // print_r($business_score['business']); + + // die(); $data = array(); $img_name = ''; @@ -4779,9 +4782,9 @@ class PD_Controller extends REST_Controller { { // Incase running from local windows (Velz sys) - //$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' => 'phantom_dsc_local'),SCRIPTS); - $dsc_script_from_db = $this->PD_Model->selectCustomRecords(array('*'),array('script_name' => DETAILED_SCORE_CARD_IMAGE_LOCATION),SCRIPTS); + //$dsc_script_from_db = $this->PD_Model->selectCustomRecords(array('*'),array('script_name' => DETAILED_SCORE_CARD_IMAGE_LOCATION),SCRIPTS); if(count($dsc_script_from_db)) { @@ -4878,11 +4881,11 @@ class PD_Controller extends REST_Controller { // print_r($data['assessed_income_details']); // echo "**************************"; - // $data['dsc_cards'] = $this->getDetailedScoreCardChart( $data['pd_score'] ); + $data['dsc_cards'] = $this->getDetailedScoreCardChart( $data['pd_score'] ); $score_for_chart = $data['pd_score']['score_summary']['overall_score']['final_score'] ? round($data['pd_score']['score_summary']['overall_score']['final_score'],1) : 0; - //echo $score_for_chart; - $chart = null; + //echo $score_for_chart;die(); + $chart = 1; if($chart) { //GET phantom script from DB diff --git a/api/application/docs/sample.pdf b/api/application/docs/sample.pdf index 2193c779..1e7b1831 100644 Binary files a/api/application/docs/sample.pdf and b/api/application/docs/sample.pdf differ diff --git a/api/application/helpers/assessedincome_helper.php b/api/application/helpers/assessedincome_helper.php index e58c8ecd..92fca961 100644 --- a/api/application/helpers/assessedincome_helper.php +++ b/api/application/helpers/assessedincome_helper.php @@ -31,22 +31,22 @@ class AssessedIncome $ai_table_header_row .= 'Declared by Customer'; - $sale_revenue_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_declared_by_customer']['sales_revenue']).''; + $sale_revenue_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_declared_by_customer']['sales_revenue']).''; if($ai_core_details['gross_profit_calculation_type'][0]['mode'] == 1) { - $purchase_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_declared_by_customer']['purchases']).''; + $purchase_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_declared_by_customer']['purchases']).''; }else if($ai_core_details['gross_profit_calculation_type'][0]['mode'] == 2) { - $purchase_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_declared_by_customer']['cost_of_goods_sold']).''; + $purchase_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_declared_by_customer']['cost_of_goods_sold']).''; } - $gross_profit_loss_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_declared_by_customer']['grossprofit']).''; - $business_expense_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_declared_by_customer']['business_expenses']).''; - $net_profit_loss_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_declared_by_customer']['netprofit']).''; - $house_hold_expense_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_declared_by_customer']['house_hold_expenses']).''; - $disposable_income_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_declared_by_customer']['disposable_income']).''; - $net_margin_row .= ''.($ai_summary_details['sales_declared_by_customer']['netmargin']).'%'; + $gross_profit_loss_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_declared_by_customer']['grossprofit']).''; + $business_expense_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_declared_by_customer']['business_expenses']).''; + $net_profit_loss_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_declared_by_customer']['netprofit']).''; + $house_hold_expense_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_declared_by_customer']['house_hold_expenses']).''; + $disposable_income_row .= ''.$rupee_symbol.'' .MYUTIL::customIndianNumberFormat($ai_summary_details['sales_declared_by_customer']['disposable_income']).''; + $net_margin_row .= ''.($ai_summary_details['sales_declared_by_customer']['netmargin']).'%'; } @@ -57,20 +57,20 @@ class AssessedIncome $ai_table_header_row .= 'As Derived from Item Wise Sales'; - $sale_revenue_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_itemwise']['sales_revenue']).''; + $sale_revenue_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_itemwise']['sales_revenue']).''; if($ai_core_details['gross_profit_calculation_type'][0]['mode'] == 1) { - $purchase_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_itemwise']['purchases']).''; + $purchase_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_itemwise']['purchases']).''; }else if($ai_core_details['gross_profit_calculation_type'][0]['mode'] == 2) { - $purchase_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_itemwise']['cost_of_goods_sold']).''; + $purchase_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_itemwise']['cost_of_goods_sold']).''; } - $gross_profit_loss_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_itemwise']['grossprofit']).''; - $business_expense_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_itemwise']['business_expenses']).''; - $net_profit_loss_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_itemwise']['netprofit']).''; - $house_hold_expense_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_itemwise']['house_hold_expenses']).''; - $disposable_income_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_itemwise']['disposable_income']).''; - $net_margin_row .= ''.($ai_summary_details['sales_calculated_by_itemwise']['netmargin']).'%'; + $gross_profit_loss_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_itemwise']['grossprofit']).''; + $business_expense_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_itemwise']['business_expenses']).''; + $net_profit_loss_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_itemwise']['netprofit']).''; + $house_hold_expense_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_itemwise']['house_hold_expenses']).''; + $disposable_income_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_itemwise']['disposable_income']).''; + $net_margin_row .= ''.($ai_summary_details['sales_calculated_by_itemwise']['netmargin']).'%'; } if(isset($ai_summary_details['sales_calculated_by_monthwise']) && count($ai_summary_details['sales_calculated_by_monthwise'])) @@ -80,28 +80,28 @@ class AssessedIncome $ai_table_header_row .= 'As Derived from Kuchha Sales Book/Bills'; - $sale_revenue_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_monthwise']['sales_revenue']).''; + $sale_revenue_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_monthwise']['sales_revenue']).''; if($ai_core_details['gross_profit_calculation_type'][0]['mode'] == 1) { - $purchase_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_monthwise']['purchases']).''; + $purchase_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_monthwise']['purchases']).''; } else if($ai_core_details['gross_profit_calculation_type'][0]['mode'] == 2) { - $purchase_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_monthwise']['cost_of_goods_sold']).''; + $purchase_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_monthwise']['cost_of_goods_sold']).''; } - $gross_profit_loss_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_monthwise']['grossprofit']).''; - $business_expense_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_monthwise']['business_expenses']).''; - $net_profit_loss_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_monthwise']['netprofit']).''; - $house_hold_expense_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_monthwise']['house_hold_expenses']).''; - $disposable_income_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_monthwise']['disposable_income']).''; - $net_margin_row .= ''.($ai_summary_details['sales_calculated_by_monthwise']['netmargin']).'%'; + $gross_profit_loss_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_monthwise']['grossprofit']).''; + $business_expense_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_monthwise']['business_expenses']).''; + $net_profit_loss_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_monthwise']['netprofit']).''; + $house_hold_expense_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_monthwise']['house_hold_expenses']).''; + $disposable_income_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['sales_calculated_by_monthwise']['disposable_income']).''; + $net_margin_row .= ''.($ai_summary_details['sales_calculated_by_monthwise']['netmargin']).'%'; } if(isset($ai_summary_details['consolidated_report']) && count($ai_summary_details['consolidated_report'])) { - $considered_sales_revenue_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['consolidated_report']['consolidated_sales_revenue']).''; - $considered_net_profit_row .= ''.$rupee_symbol.MYUTIL::customIndianNumberFormat($ai_summary_details['consolidated_report']['consolidated_nerprofit']).''; - $considered_net_margint_row .= ''.$ai_summary_details['consolidated_report']['consolidated_nermagin'].'%'; + $considered_sales_revenue_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['consolidated_report']['consolidated_sales_revenue']).''; + $considered_net_profit_row .= ''.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($ai_summary_details['consolidated_report']['consolidated_nerprofit']).''; + $considered_net_margint_row .= ''.$ai_summary_details['consolidated_report']['consolidated_nermagin'].'%'; } $ai_table_header_row .= ''; diff --git a/api/application/helpers/myutil_helper.php b/api/application/helpers/myutil_helper.php index 643e8675..fd717c19 100644 --- a/api/application/helpers/myutil_helper.php +++ b/api/application/helpers/myutil_helper.php @@ -52,7 +52,7 @@ class MYUTIL { $res.=$points . ""; } - return $result.' rupees Only'; + return $result; } diff --git a/api/application/helpers/otherfamilyform_helper.php b/api/application/helpers/otherfamilyform_helper.php index fcc82e96..422c0e28 100644 --- a/api/application/helpers/otherfamilyform_helper.php +++ b/api/application/helpers/otherfamilyform_helper.php @@ -9,7 +9,7 @@ public static function getFamilyDetails($values){ //print_r($fetchVal);die(); $storeValue=array(); $storeValue['selected_person']= isset($fetchVal['selected_person_master']) ? $fetchVal['selected_person_master'] : $fetchVal['selected_person']; - $storeValue['residency_address']=$fetchVal['residence_place'].' in '.$fetchVal['residence_city_master'].','.$fetchVal['residence_state_master'].'-'; + $storeValue['residency_address']=$fetchVal['residence_place'].' in, '.$fetchVal['residence_city_master'].', '.$fetchVal['residence_state_master'].'-'; $storeValue['residency_address'] .=($fetchVal['residence_pin'] == 1) ? $fetchVal['residence_other_pincode'] : (($fetchVal['residence_pin'] > 1) ? $fetchVal['residence_pincode_master'] : ""); //$storeValue['residency_address'] .='.'; $storeValue['residence_No_of_years']=($fetchVal['residence_No_of_years'] == 1) ? $fetchVal['residence_No_of_years'].' year' :(($fetchVal['residence_No_of_years'] > 1) ? $fetchVal['residence_No_of_years'].' years' : ""); @@ -20,8 +20,8 @@ public static function getFamilyDetails($values){ $getFamilyEarning=''; if($tag['family_member_earning_status']==1){ $getFamilyEarning= 'Earning '; - $getFamilyOccupation = $tag['earning_segment']==1 ? $tag['earning_if_others_segment'].' Income of '.$tag['earning_gross_income_per_month'].' per month. ':' Income of '.'₹'.MYUTIL::customIndianNumberFormat($tag['earning_gross_income_per_month']).' per month.'; - $getFamilyOccupation .= $tag['earning_name_of_the_employer_or_business'] ? ' received from '.$tag['earning_name_of_the_employer_or_business'].'.' : ''; + $getFamilyOccupation = $tag['earning_segment']==1 ? $tag['earning_if_others_segment'].' Income of '.$tag['earning_gross_income_per_month'].' per month. ':' Income of '.'₹'.' '.MYUTIL::customIndianNumberFormat($tag['earning_gross_income_per_month']).' per month '; + $getFamilyOccupation .= $tag['earning_name_of_the_employer_or_business'] ? ' received from '.$tag['earning_name_of_the_employer_or_business'].'. ' : ''; $getFamilyOccupation .= 'He has been working for '.$tag['earning_number_of_years_in_employment_or_business'].' years.'; diff --git a/api/application/helpers/pdscore_helper.php b/api/application/helpers/pdscore_helper.php index d58b3915..a8ad0f65 100644 --- a/api/application/helpers/pdscore_helper.php +++ b/api/application/helpers/pdscore_helper.php @@ -68,7 +68,7 @@ class PDSCORE /*-------- BUSNIESS --------------*/ $no_of_years_business_run = array('100> to >=10' => 10,'5<= to <10' => 8,'3<= to <5' => 6,'1<= to <3' => 4,' 1> to >0' => 2); $business_seasonality = array('yes' => 5, 'no major changes in sales' => 10); - $employees_total = array('1000> to >=50' => 10,'21<= to <50' => 8, '11<= to <=20' => 6, '6<= to <10' =>4,'5>= to >0' => 2) ; + $employees_total = array('1000> to >50' => 10,'21<= to <=50' => 8, '11<= to <=20' => 6, '6<= to <10' =>4,'5>= to >0' => 2) ; $cerificates = array('yes' => 10,'no' => 0, 'not applicable' => 0); $owned_property = array('yes' => 10, 'no' => 0); $owned_vechile = array('yes' => 10, 'no' => 0); diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index fb2b84d5..55400a21 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -231,17 +231,17 @@ class PD_Model extends SPARQ_Model { { //Get PD Documenttitle and name from DB $where_condition_array = array('fk_pd_id' => $pdid); - if($form_id != null) - { - $where_condition_array['fk_form_id'] = $form_id; - } + - if($company_id != null) - { - $where_condition_array['company_id'] = $company_id; - } + $where_condition_array['fk_form_id'] = $form_id != null ? $form_id : null; + + + $where_condition_array['company_id'] = $company_id != null ? $company_id : null; + + //print_r($where_condition_array);die(); $document_lists = $this->selectRecords(PDDOCUMENTS,$where_condition_array); + //print_r($document_lists);die(); if(count($document_lists)) { diff --git a/api/application/views/business_scorecard.php b/api/application/views/business_scorecard.php index 1d1f07d7..8fe66348 100644 --- a/api/application/views/business_scorecard.php +++ b/api/application/views/business_scorecard.php @@ -1,3 +1,3 @@ "Business Vintage >>", "location_suited_for_busienss" => "Business Location suitability >>", "business_seasonality" => "Seasonality >>", "employees_total" => "Employee Strength >>", "cerificates" => "Business Certifications Sighted >>","owned_property" => "Business Premise Ownership >>", "owned_vechile" => "Vehicle Ownership >>", "business_activity_has_seen" => "Business Activity Observed >>", "minimum_supplier_info" => "Supplier Information Shared >>", "minimum_client_info" => "Client Information Shared >>","stock_raw_material_enough" => "Sufficiency of Raw Materials Stock Observed >>", "stock_finished_goods_enough" => "Sufficiency of Finished/Traded Stock Observed >>", "vintage_of_business_account" => "Main Business Banking Account Vintage >>");$descriptions = '';$score = '';if(isset($business) && count($business)){foreach($business as $key => $d){$descriptions .= '"'.$business_captions [$key].'",'; $score .= $d['attributed_score'] != 0 && $d['max_score'] != 0 ? (($d['attributed_score']/$d['max_score']) * 100).',' : '0'.',';}} -?>
Powered by ZingChart
\ No newline at end of file +$business_captions = array("no_of_years_business_run" => "Business Banking Vintage >>", "location_suited_for_busienss" => "Business Location suitability >>", "business_seasonality" => "Seasonality >>", "employees_total" => "Employee Strength >>", "cerificates" => "Business Certifications Sighted >>","owned_property" => "Business Premise Ownership >>", "owned_vechile" => "Vehicle Ownership >>", "business_activity_has_seen" => "Business Activity Observed >>", "minimum_supplier_info" => "Supplier Information Shared >>", "minimum_client_info" => "Client Information Shared >>","stock_raw_material_enough" => "Raw Materials Stock Sufficiency >>", "stock_finished_goods_enough" => "Finished/Traded Stock Sufficiency >>", "vintage_of_business_account" => "Main Business Banking Account Vintage >>");$descriptions = '';$score = '';if(isset($business) && count($business)){foreach($business as $key => $d){$descriptions .= '"'.$business_captions [$key].'",'; $score .= $d['attributed_score'] != 0 && $d['max_score'] != 0 ? (($d['attributed_score']/$d['max_score']) * 100).',' : '0'.',';}} +?>
Powered by ZingChart
\ No newline at end of file diff --git a/api/application/views/general_scorecard.php b/api/application/views/general_scorecard.php index 70b1f529..6fb7ee69 100644 --- a/api/application/views/general_scorecard.php +++ b/api/application/views/general_scorecard.php @@ -1,3 +1,3 @@ "OTP authentication done >>","person_met_is_applicant" => "Is person Met, one of the loan applicants? >>","qualification" => "Qualification of Loan Applicants >>","comment_locality" => "Comment on Locality >>","pd_location_approach" => "Approach to PD location >>","customer_behaviour" => "Customer Behaviour >>","neibourhood_check_as_per_pd_officer" => "Neighbourhood check >>","was_the_company_name_board_sighted" => "Name Board of the Business Seen >>","value_of_other_assets" => "Value of Assets as a % of Loan Amount >>");$descriptions = '';$score = '';if(isset($general) && count($general)){foreach($general as $key => $d){$descriptions .= '"'.$general_captions [$key].'",'; $score .= $d['attributed_score'] != 0 && $d['max_score'] != 0 ? (($d['attributed_score']/$d['max_score']) * 100).',' : '0'.',';}} -?>
Powered by ZingChart
\ No newline at end of file +$general_captions = array("otp_done" => "OTP authentication done >>","person_met_is_applicant" => "Is person Met, a loan applicant >>","qualification" => "Qualification of Loan Applicants >>","comment_locality" => "Comment on Locality >>","pd_location_approach" => "Approach to PD location >>","customer_behaviour" => "Customer Behaviour >>","neibourhood_check_as_per_pd_officer" => "Neighbourhood check >>","was_the_company_name_board_sighted" => "Business Board Sighted >>","value_of_other_assets" => "Asset Value by Loan Amount% >>");$descriptions = '';$score = '';if(isset($general) && count($general)){foreach($general as $key => $d){$descriptions .= '"'.$general_captions [$key].'",'; $score .= $d['attributed_score'] != 0 && $d['max_score'] != 0 ? (($d['attributed_score']/$d['max_score']) * 100).',' : '0'.',';}} +?>
Powered by ZingChart
\ No newline at end of file diff --git a/api/application/views/js/phantomchart.js b/api/application/views/js/phantomchart.js index c75ecbb5..531959a1 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 = 82.3;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 +var page = require('webpage').create();page.viewportSize = { width: 600, height: 350 };page.clipRect = { top: 0, left: 0, width: 600, height: 350 };var score = 91.1;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 1030abd0..17e36e0f 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 = '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 +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 182cfb01..f77fb9af 100644 --- a/api/application/views/report_templates/JSONTOREPORT.php +++ b/api/application/views/report_templates/JSONTOREPORT.php @@ -11,7 +11,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); .page_break { page-break-before: always; } - .page { width: 100%; height: 95%; } + #page_break { page-break-before: always; } + /*.page { width: 100%; height: 95%; }*/ @page { margin: 100px 50px; /*font-family:Helvetica,Arial;*/ @@ -193,6 +194,17 @@ defined('BASEPATH') OR exit('No direct script access allowed'); border-color:red; color:red; } + #tick_div_other { + position: relative; + width: 40px; + height: 25px; + margin-left: 93%; + margin-top: -29px; + border: 2px outset #000; + text-align: center; + border-color:red; + color:red; + } /* #########Person met card css######### */ @@ -310,8 +322,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); Loan Amount Applied For :

"; echo ' - -
As Per PD Initiation ₹' . MYUTIL::customIndianNumberFormat($pd_master_details[0]['loan_amount']). '
('. MYUTIL::numtowords($pd_master_details[0]['loan_amount']) .')
As Per Loan Applicants during PD ₹' . MYUTIL::customIndianNumberFormat($loan_form['loan_amount']). '
('. MYUTIL::numtowords($loan_form['loan_amount']) .')
'; + As Per PD Initiation ₹' .' '. MYUTIL::customIndianNumberFormat($pd_master_details[0]['loan_amount']). '
('. MYUTIL::numtowords($pd_master_details[0]['loan_amount']) .') + As Per Loan Applicants during PD ₹' .' '. MYUTIL::customIndianNumberFormat($loan_form['loan_amount']). '
('. MYUTIL::numtowords($loan_form['loan_amount']) .') '; //echo "
"; echo "

"; ?> @@ -463,7 +475,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -->
-
+

Loan Applicants:

@@ -534,7 +546,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); ?>
-
+
"; + echo "

PD Score Summary

"; ?> @@ -604,7 +616,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); { echo "Score Chart Not Generated"; } - echo "
"; + echo "
"; //######################### CHART ########################### } ?> @@ -628,7 +640,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); echo '

'; ?> - alt="Satellite Image of location of Where PD was Done" style="width:500px;height:200px;" />


+ alt="Satellite Image of location of Where PD was Done" style="width:500px;height:200px;border-color:#0191ed" />