diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php
index c3f33342..9829fcec 100644
--- a/api/application/controllers/PD_Controller.php
+++ b/api/application/controllers/PD_Controller.php
@@ -4754,11 +4754,10 @@ class PD_Controller extends REST_Controller {
function getDetailedScoreCardChart($score)
{
-
$business_score['business'] = $score['business'];
- //$general_score['general'] = array_merge($score['general'],$score['final_remarks']);
+
$general_score['general'] = $score['general'];
-
+ $logger = MYLOG::logFunction();
// print_r($general_score['general']);die();
$data = array();
@@ -4772,36 +4771,49 @@ class PD_Controller extends REST_Controller {
$dsc_script_from_db = $this->PD_Model->selectCustomRecords(array('*'),array('script_name' => DETAILED_SCORE_CARD_IMAGE_LOCATION),SCRIPTS);
- $dsc_script_from_db = $dsc_script_from_db[0]['script_content'];
- //print_r($dsc_script_from_db);
+ if(count($dsc_script_from_db))
+ {
+
+
+ $dsc_script_from_db = $dsc_script_from_db[0]['script_content'];
+ //print_r($dsc_script_from_db);
+
+ $html_content = "";
+ if($i == 1){ $html_content = $this->load->view('business_scorecard',$business_score,true); }
+
+ else if($i == 2) { $html_content = $this->load->view('general_scorecard',$general_score,true);}
+ //print_r($html_content);
+ $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->info('Score Card Graphical Representation called',array('card_type' => $i,'script' => $dsc_script_from_db));
+ //echo $dsc_script_from_db;
+ //echo "*************";
+ file_put_contents(APPPATH.'/views/js/phantomdsc.js',$dsc_script_from_db);
+
+ //call& execute phantom script
+ $str = 'phantomjs '.APPPATH.'/views/js/phantomdsc.js';
+ exec($str,$ou);
+ exec('phantom.exit();');
+
+
+ // //convert as base 64 image.
+ $dsc_image_png_path = $i == 1 ? APPPATH.'/views/report_templates/dsc_business.png' : APPPATH.'/views/report_templates/dsc_general.png';
+ $type = pathinfo($dsc_image_png_path, PATHINFO_EXTENSION);
+ $dsc_img_content = file_get_contents($dsc_image_png_path);
+ $base64_dsc_url = 'data:image/' . $type . ';base64,' . base64_encode($dsc_img_content);
+ if($i == 1){ $data['base64_dsc_business'] = $base64_dsc_url; }
+ else if($i == 2){ $data['base64_dsc_general'] = $base64_dsc_url; }
- $html_content = "";
- if($i == 1){ $html_content = $this->load->view('business_scorecard',$business_score,true); }
-
- else if($i == 2) { $html_content = $this->load->view('general_scorecard',$general_score,true);}
- //print_r($html_content);
- $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);
- //echo $dsc_script_from_db;
- //echo "*************";
- file_put_contents(APPPATH.'/views/js/phantomdsc.js',$dsc_script_from_db);
-
- //call& execute phantom script
- $str = 'phantomjs '.APPPATH.'/views/js/phantomdsc.js';
- exec($str,$ou);
- exec('phantom.exit();');
-
-
- // //convert as base 64 image.
- $dsc_image_png_path = $i == 1 ? APPPATH.'/views/report_templates/dsc_business.png' : APPPATH.'/views/report_templates/dsc_general.png';
- $type = pathinfo($dsc_image_png_path, PATHINFO_EXTENSION);
- $dsc_img_content = file_get_contents($dsc_image_png_path);
- $base64_dsc_url = 'data:image/' . $type . ';base64,' . base64_encode($dsc_img_content);
- if($i == 1){ $data['base64_dsc_business'] = $base64_dsc_url; }
- else if($i == 2){ $data['base64_dsc_general'] = $base64_dsc_url; }
-
+ }
}
-
+ else
+ {
+ $logger->error('SCORE CARD SCRIPT NOT FOUND');
+ }
+ // print_r($data);
+ // die();
return $data;
@@ -4853,9 +4865,9 @@ class PD_Controller extends REST_Controller {
// echo "**************************";
$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'],2) : 0;
+ $score_for_chart = $data['pd_score']['score_summary']['overall_score']['final_score'] ? round($data['pd_score']['score_summary']['overall_score']['final_score'],2) : 0;
//echo $score_for_chart;
- $chart = null;
+ $chart = 1;
if($chart)
{
//GET phantom script from DB
@@ -4880,10 +4892,11 @@ class PD_Controller extends REST_Controller {
$chart_img_content = file_get_contents($chart_img_path);
$base64_pdscore_chart_url = 'data:image/' . $type . ';base64,' . base64_encode($chart_img_content);
$data['base64_pdscore_chart_url'] = $base64_pdscore_chart_url;
- // echo $data['base64_pdscore_chart_url'];
+ //echo $data['base64_pdscore_chart_url'];
//GENERATE CHART PART
}
+ //die();
//GET ALL PROCESSED JSON
for($i = 1;$i<=25;$i++)
{
@@ -5815,7 +5828,7 @@ class PD_Controller extends REST_Controller {
{
$records = $this->post('records');
- $company_id = $records['company_id'] ? $records['company_id'] : null;
+ $company_id = isset($records['company_id']) && $records['company_id']? $records['company_id'] : null;
$res = $this->saveBase64Images($records['pd_id'],$records['formid'],$company_id,$records['images']);
if(count($res))
diff --git a/api/application/docs/sample.pdf b/api/application/docs/sample.pdf
index 57de9d00..00761ba1 100644
Binary files a/api/application/docs/sample.pdf and b/api/application/docs/sample.pdf differ
diff --git a/api/application/views/business_scorecard.php b/api/application/views/business_scorecard.php
index e99747d4..aae91c18 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 RM 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'] * 100).',';}}
-?>