diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index cb225940..d6dc7dda 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -659,7 +659,7 @@ class PD_Controller extends REST_Controller { $ch = curl_init(); $timeout = 5; - $url = 'https:/ssa.sineedge.com/officertracking/'.$randomString; + $url = 'https://ssa.sineedge.com/officertracking/'.$randomString; //echo "$url"; curl_setopt($ch,CURLOPT_URL,'http://tinyurl.com/api-create.php?url='.$url); curl_setopt($ch,CURLOPT_RETURNTRANSFER,1); @@ -682,8 +682,8 @@ class PD_Controller extends REST_Controller { unset($pd_details['mobile_no']); $pd_details['OTP'] = $OTP; - $client = new \GuzzleHttp\Client(); - $response = $client->post( $url); + // $client = new \GuzzleHttp\Client(); + // $response = $client->post($url); SMS_GUPSHUP::sendSMS($msg,$no); } @@ -3344,14 +3344,14 @@ class PD_Controller extends REST_Controller { $temp_netmargin = ($temp_netprofit/$total_sales_itemwise) * 100; } - $overall_summary_report['sales_calculated_by_itemwise']['sales_revenue'] = $total_sales_itemwise; - $purchases_flag ? $overall_summary_report['sales_calculated_by_itemwise']['purchases'] = $temp_purchases : $overall_summary_report['sales_calculated_by_itemwise']['cost_of_goods_sold'] = $temp_purchases; - $overall_summary_report['sales_calculated_by_itemwise']['grossprofit'] = $temp_grossprofit; - $overall_summary_report['sales_calculated_by_itemwise']['business_expenses'] = $overall_business_expenses_total; - $overall_summary_report['sales_calculated_by_itemwise']['netprofit'] = $temp_netprofit; - $overall_summary_report['sales_calculated_by_itemwise']['house_hold_expenses'] = $overall_household_total; - $overall_summary_report['sales_calculated_by_itemwise']['disposable_income'] = $temp_netprofit - $overall_household_total; - $overall_summary_report['sales_calculated_by_itemwise']['netmargin'] = $temp_netmargin; + $overall_summary_report['sales_calculated_by_itemwise']['sales_revenue'] = round($total_sales_itemwise); + $purchases_flag ? $overall_summary_report['sales_calculated_by_itemwise']['purchases'] = round($temp_purchases) : $overall_summary_report['sales_calculated_by_itemwise']['cost_of_goods_sold'] = round($temp_purchases); + $overall_summary_report['sales_calculated_by_itemwise']['grossprofit'] = round($temp_grossprofit); + $overall_summary_report['sales_calculated_by_itemwise']['business_expenses'] = round($overall_business_expenses_total); + $overall_summary_report['sales_calculated_by_itemwise']['netprofit'] = round($temp_netprofit); + $overall_summary_report['sales_calculated_by_itemwise']['house_hold_expenses'] = round($overall_household_total); + $overall_summary_report['sales_calculated_by_itemwise']['disposable_income'] = round($temp_netprofit - $overall_household_total); + $overall_summary_report['sales_calculated_by_itemwise']['netmargin'] = round($temp_netmargin,2); } if($sales_by_item_monthwise_flag == 1) @@ -3403,14 +3403,14 @@ class PD_Controller extends REST_Controller { $temp_netmargin = ($temp_netprofit/$total_sales_monthwise) * 100; } - $overall_summary_report['sales_calculated_by_monthwise']['sales_revenue'] = $total_sales_monthwise; - $purchases_flag ? $overall_summary_report['sales_calculated_by_monthwise']['purchases'] = $temp_purchases : $overall_summary_report['sales_calculated_by_monthwise']['cost_of_goods_sold'] = $temp_purchases; - $overall_summary_report['sales_calculated_by_monthwise']['grossprofit'] = $temp_grossprofit; - $overall_summary_report['sales_calculated_by_monthwise']['business_expenses'] = $overall_business_expenses_total; - $overall_summary_report['sales_calculated_by_monthwise']['netprofit'] = $temp_netprofit; - $overall_summary_report['sales_calculated_by_monthwise']['house_hold_expenses'] = $overall_household_total; - $overall_summary_report['sales_calculated_by_monthwise']['disposable_income'] = $temp_netprofit - $overall_household_total; - $overall_summary_report['sales_calculated_by_monthwise']['netmargin'] = $temp_netmargin; + $overall_summary_report['sales_calculated_by_monthwise']['sales_revenue'] = round($total_sales_monthwise); + $purchases_flag ? $overall_summary_report['sales_calculated_by_monthwise']['purchases'] = round($temp_purchases) : $overall_summary_report['sales_calculated_by_monthwise']['cost_of_goods_sold'] = round($temp_purchases); + $overall_summary_report['sales_calculated_by_monthwise']['grossprofit'] = round($temp_grossprofit); + $overall_summary_report['sales_calculated_by_monthwise']['business_expenses'] = round($overall_business_expenses_total); + $overall_summary_report['sales_calculated_by_monthwise']['netprofit'] = round($temp_netprofit); + $overall_summary_report['sales_calculated_by_monthwise']['house_hold_expenses'] = round($overall_household_total); + $overall_summary_report['sales_calculated_by_monthwise']['disposable_income'] = round($temp_netprofit - $overall_household_total); + $overall_summary_report['sales_calculated_by_monthwise']['netmargin'] = round($temp_netmargin,2); @@ -3441,14 +3441,14 @@ class PD_Controller extends REST_Controller { } - $overall_summary_report['sales_declared_by_customer']['sales_revenue'] = $total_sales_declared_by_customer; - $purchases_flag ? $overall_summary_report['sales_declared_by_customer']['purchases'] = $temp_purchases : $overall_summary_report['sales_declared_by_customer']['cost_of_goods_sold'] = $temp_purchases; - $overall_summary_report['sales_declared_by_customer']['grossprofit'] = $temp_grossprofit; - $overall_summary_report['sales_declared_by_customer']['business_expenses'] = $overall_business_expenses_total; - $overall_summary_report['sales_declared_by_customer']['netprofit'] = $temp_netprofit; - $overall_summary_report['sales_declared_by_customer']['house_hold_expenses'] = $overall_household_total; - $overall_summary_report['sales_declared_by_customer']['disposable_income'] = $temp_netprofit - $overall_household_total; - $overall_summary_report['sales_declared_by_customer']['netmargin'] = $temp_netmargin; + $overall_summary_report['sales_declared_by_customer']['sales_revenue'] = round($total_sales_declared_by_customer); + $purchases_flag ? $overall_summary_report['sales_declared_by_customer']['purchases'] = round($temp_purchases) : $overall_summary_report['sales_declared_by_customer']['cost_of_goods_sold'] = round($temp_purchases); + $overall_summary_report['sales_declared_by_customer']['grossprofit'] = round($temp_grossprofit); + $overall_summary_report['sales_declared_by_customer']['business_expenses'] = round($overall_business_expenses_total); + $overall_summary_report['sales_declared_by_customer']['netprofit'] = round($temp_netprofit); + $overall_summary_report['sales_declared_by_customer']['house_hold_expenses'] = round($overall_household_total); + $overall_summary_report['sales_declared_by_customer']['disposable_income'] = round($temp_netprofit - $overall_household_total); + $overall_summary_report['sales_declared_by_customer']['netmargin'] = round($temp_netmargin,2); } @@ -3465,9 +3465,9 @@ class PD_Controller extends REST_Controller { if(isset($overall_summary_report['sales_calculated_by_monthwise']['netmargin'])){ $temp_netmargin_array = array_merge($temp_netmargin_array,array($overall_summary_report['sales_calculated_by_monthwise']['netmargin'])); } if(isset($overall_summary_report['sales_calculated_by_itemwise']['netmargin'])){ $temp_netmargin_array = array_merge($temp_netmargin_array,array($overall_summary_report['sales_calculated_by_itemwise']['netmargin'])); } - $overall_summary_report['consolidated_report']['consolidated_sales_revenue'] = round(array_sum($temp_sales_array) / count($temp_sales_array),2); + $overall_summary_report['consolidated_report']['consolidated_sales_revenue'] = round(array_sum($temp_sales_array) / count($temp_sales_array)); $overall_summary_report['consolidated_report']['consolidated_nermagin'] = round(array_sum($temp_netmargin_array) / count($temp_netmargin_array),2); - $overall_summary_report['consolidated_report']['consolidated_nerprofit'] = round($overall_summary_report['consolidated_report']['consolidated_sales_revenue'] * ($overall_summary_report['consolidated_report']['consolidated_nermagin'] / 100 ),2); + $overall_summary_report['consolidated_report']['consolidated_nerprofit'] = round($overall_summary_report['consolidated_report']['consolidated_sales_revenue'] * ($overall_summary_report['consolidated_report']['consolidated_nermagin'] / 100 )); return ($overall_summary_report); @@ -3489,7 +3489,9 @@ class PD_Controller extends REST_Controller { public function getLatestPDReportBlob_post() { $records = $this->post('records'); - $pdid = $records['pd_id']; + //print_r($records);die(); + $records = $records['pd_id']; + $pdid = $records['startId']; $version_id = $records['version_id']; $version_no = ""; @@ -3593,12 +3595,12 @@ class PD_Controller extends REST_Controller { { //$result_array[0]['content'] $where_condition_array = array("pd_id" => $pdid); - $temp_array = array('is_original_report_created'=>1,'pd_report_latest_version_blob'=>null,'pd_report_latest_version' => 0); + $temp_array = array('is_original_report_created'=>1,'pd_report_latest_version_blob'=>$temp,'pd_report_latest_version' => 0); if($is_regenerate != 0) { //$result_array[0]['content'] - $temp_array = array('is_original_report_created'=>1,'pd_report_latest_version_blob'=>null,'pd_report_latest_version'=>$data['pd_master_details'][0]['pd_report_latest_version'] + 1); + $temp_array = array('is_original_report_created'=>1,'pd_report_latest_version_blob'=>$temp,'pd_report_latest_version'=>$data['pd_master_details'][0]['pd_report_latest_version'] + 1); } @@ -3651,7 +3653,7 @@ class PD_Controller extends REST_Controller { $pdid = $records['pd_id']; $blob = $records['content']; $fk_updatedby = $records['fk_updatedby']; - $fk_createdby = $records['fk_createdby']; + //$fk_createdby = $records['fk_createdby']; //Get PD Master Details $pd_master_details = $this->PD_Model->getPDMasterDetails($pdid); $main_applicant_name = $pd_master_details[0]['main_applicant']; @@ -3696,7 +3698,7 @@ class PD_Controller extends REST_Controller { if(is_object($s3result) && $s3result['ObjectURL'] != '' && $s3result['@metadata']['statusCode'] == 200) { - $urls = $this->getALLPDReportsSingedURLs($bucketname,$key); + $urls = $this->getALLPDReportsSingedURLs($bucketname,$key,$pdid); if($id != null || $id != "" ) { $data['dataStatus'] = true; @@ -4283,6 +4285,8 @@ class PD_Controller extends REST_Controller { public function codeigniterViewTest_post() { + $records = $this->post('records'); + $pdid = $records['pd_id']; $is_regenerate = 0; if(isset($records['regenerate'])) { @@ -4293,6 +4297,28 @@ class PD_Controller extends REST_Controller { $data['applicants_details'] = $this->PD_Model->getApplicantsDetails($pdid); $data['pd_additional_requirements'] = $this->PD_Model->getPDAdditionalRequirements($pdid); $data['pd_score'] = $this->calculateScore($pdid); + $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; + //GENERATE CHART PART + + $jsdata = file_get_contents(APPPATH.'/views/js/phantomchart.js'); + $jsdata = substr_replace($jsdata,$score_for_chart,(strpos($jsdata,"score")+8),5); + //echo $jsdata; + file_put_contents(APPPATH.'/views/js/phantomchart.js',$jsdata,LOCK_EX); + $str = 'phantomjs '.APPPATH.'/views/js/phantomchart.js'; + exec($str,$ou); + //print_r($ou); + + $chart_img_path = APPPATH.'/views/report_templates/chart.png'; + $type = pathinfo($chart_img_path, PATHINFO_EXTENSION); + $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']; + //die(); + + + //GENERATE CHART PART //print_r($data['pd_score']);die(); //GET ALL PROCESSED JSON for($i = 1;$i<=25;$i++) @@ -4317,7 +4343,7 @@ class PD_Controller extends REST_Controller { //End of PDF Gen using DOM PDF $output_file2 = APPPATH."/docs/sample.pdf"; $ti = file_put_contents($output_file2, $pdf_doc); - //echo $ti; + echo $ti; die(); $dat['dataStatus'] = true; $dat['status'] = REST_Controller::HTTP_OK; $dat['records'] = $ti; diff --git a/api/application/docs/sample.pdf b/api/application/docs/sample.pdf index a8da6c86..cc4d879b 100644 Binary files a/api/application/docs/sample.pdf and b/api/application/docs/sample.pdf differ diff --git a/api/application/helpers/getprocessedjson_helper.php b/api/application/helpers/getprocessedjson_helper.php index 67fc00ff..05ff131e 100644 --- a/api/application/helpers/getprocessedjson_helper.php +++ b/api/application/helpers/getprocessedjson_helper.php @@ -1872,7 +1872,7 @@ class GETPROCESSEDJSON $master_tables_field_names = $CI->config->item('master_tables_field_names'); $master_tables_pkid = $CI->config->item('master_tables_pkid'); - print_r($raw_json); + //print_r($raw_json); foreach($raw_json['addresses'] as $raw_json_key => $address) { // GET KEYS FROM MASTER TABLE FOR SUPPLIER FORM diff --git a/api/application/libraries/Pdfgenerator.php b/api/application/libraries/Pdfgenerator.php index 549c9767..f5b5473f 100644 --- a/api/application/libraries/Pdfgenerator.php +++ b/api/application/libraries/Pdfgenerator.php @@ -21,10 +21,17 @@ class Pdfgenerator public function generate($html, $filename='', $stream=TRUE, $paper = 'A4', $orientation = "portrait") { // echo 'stream'.$html.'tttt'; - $dompdf = new Dompdf(array('enable_remote' => true)); + $dompdf = new Dompdf(array('enable_remote' => true,'DOMPDF_ENABLE_PHP'=>true)); $dompdf->load_html($html); + $dompdf->set_paper($paper, $orientation); $dompdf->render(); + + $canvas = $dompdf->get_canvas(); + //$font = Font_Metrics::get_font("helvetica", "bold"); + $font = null; + $canvas->page_text(515,750, "Page {PAGE_NUM} of {PAGE_COUNT}", $font,8, array(0,0,0)); + if ($stream) { $dompdf->stream($filename.".pdf", array("Attachment" => 0)); } else { diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 24bcf4d9..cae362cd 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -1067,7 +1067,7 @@ class PD_Model extends SPARQ_Model { if($result->OTP == $pddata['OTP']) { $fields = ('is_otp_done'); - $where_condition_array = array('pd_id' => $pdotp['pd_id']); + $where_condition_array = array('pd_id' => $pddata['pd_id']); $this->PD_Model->updateRecords($fields,PDTRIGGER,$where_condition_array); $result = true; @@ -1255,7 +1255,7 @@ class PD_Model extends SPARQ_Model { $assessed_income = array(); //get sales_declared_by_customer details - $fields = array('sdc_id','sales_declared_by_customer','margin_per','margin_value'); + $fields = array('sdc_id','sales_declared_by_customer','margin_per','margin_value','comments'); $where_condition_array = array('fk_pd_id'=>$pdid,'isactive'=>1); $sales_declared_by_customer = $this->selectCustomRecords($fields,$where_condition_array,SALESDECLAREDBYCUSTOMER); //get Gross Profit calculatio Mode details @@ -1264,7 +1264,7 @@ class PD_Model extends SPARQ_Model { $gross_profit_calculation_type = $this->selectCustomRecords($fields,$where_condition_array,PDASSESSEDINCOMEESTIMATIONOFGROSSPROFITTYPE); //get sales_calculated_by_itemwise details - $fields = array('sci_id','sales_item','sales_qty','UOM.name as uom_name','fk_uom_id','FREQUENCY.name as frequency_name','rate_per_unit','fk_frequency_id','annual_sale_value','margin_final_value','margin_per','margin_per_uom'); + $fields = array('sci_id','sales_item','sales_qty','UOM.name as uom_name','fk_uom_id','FREQUENCY.name as frequency_name','rate_per_unit','fk_frequency_id','annual_sale_value','margin_final_value','margin_per','margin_per_uom','uom_other','comments'); $table = SALESCALCULATEDBYITEMWISE.' as SALESCALCULATEDBYITEMWISE'; $where_condition_array = array('fk_pd_id'=>$pdid,'SALESCALCULATEDBYITEMWISE.isactive'=>1); $joins = array( @@ -1277,7 +1277,7 @@ class PD_Model extends SPARQ_Model { $sales_items_by_months = array(); - $this->db->SELECT('sim_id,sales_item,margin_value,margin_per'); + $this->db->SELECT('sim_id,sales_item,margin_value,margin_per,comments'); $this->db->FROM(SALESITEMMONTHWISE.' as SALESITEMMONTHWISE'); $this->db->WHERE('SALESITEMMONTHWISE.fk_pd_id',$pdid); $this->db->WHERE('SALESITEMMONTHWISE.isactive',1); @@ -1329,7 +1329,7 @@ class PD_Model extends SPARQ_Model { //Get purchase_details - $fields = array('purchase_id','purchase_item','purchase_qty','UOM.name as uom_name','fk_uom_id','FREQUENCY.name as frequency_name','rate_per_unit','fk_frequency_id','annual_purchase_value'); + $fields = array('purchase_id','purchase_item','purchase_qty','UOM.name as uom_name','fk_uom_id','FREQUENCY.name as frequency_name','rate_per_unit','fk_frequency_id','annual_purchase_value','uom_other','comments'); $table = PDPURCHASEDETAILS.' as PDPURCHASEDETAILS'; $where_condition_array = array('fk_pd_id'=>$pdid,'PDPURCHASEDETAILS.isactive'=>1); $joins = array( @@ -1339,7 +1339,7 @@ class PD_Model extends SPARQ_Model { //Get business_expenses - $fields = array('pd_expense_id','PDBUSINESSEXPENSES.expense_item_id','BUSINESSEXPENSES.expense_item','FREQUENCY.name as frequency_name','fk_frequency_id','expense_value','annual_expenses_value'); + $fields = array('pd_expense_id','PDBUSINESSEXPENSES.expense_item_id','BUSINESSEXPENSES.expense_item','FREQUENCY.name as frequency_name','fk_frequency_id','expense_value','annual_expenses_value','comments'); $table = PDBUSINESSEXPENSES.' as PDBUSINESSEXPENSES'; $where_condition_array = array('fk_pd_id'=>$pdid,'PDBUSINESSEXPENSES.isactive'=>1); $joins = array( @@ -1350,7 +1350,7 @@ class PD_Model extends SPARQ_Model { //Get house_hold_expenses - $fields = array('household_expense_id','expense_item','FREQUENCY.name as frequency_name','fk_frequency_id','expense_value','annual_expense_value'); + $fields = array('household_expense_id','expense_item','FREQUENCY.name as frequency_name','fk_frequency_id','expense_value','annual_expense_value','comments'); $table = PDHOUSEHOLDEXPENSES.' as PDHOUSEHOLDEXPENSES'; $where_condition_array = array('fk_pd_id'=>$pdid,'PDHOUSEHOLDEXPENSES.isactive'=>1); $joins = array( @@ -1359,7 +1359,7 @@ class PD_Model extends SPARQ_Model { //get Other Business Income details - $fields = array('PDBUSINESSINCOME.pd_business_income_id', 'PDBUSINESSINCOME.fk_pd_id', 'PDBUSINESSINCOME.business_income_id', 'PDBUSINESSINCOME.income_value', 'PDBUSINESSINCOME.fk_frequency_id', 'PDBUSINESSINCOME.annual_income_value','PDBUSINESSINCOME.fk_createdby','PDBUSINESSINCOME.other_income_item','PDBUSINESSINCOME.other_frequncy_item','FREQUENCY.name as frequency_name','BUSINESSINCOME.business_income_item'); + $fields = array('PDBUSINESSINCOME.pd_business_income_id', 'PDBUSINESSINCOME.fk_pd_id', 'PDBUSINESSINCOME.business_income_id', 'PDBUSINESSINCOME.income_value', 'PDBUSINESSINCOME.fk_frequency_id', 'PDBUSINESSINCOME.annual_income_value','PDBUSINESSINCOME.fk_createdby','PDBUSINESSINCOME.other_income_item','PDBUSINESSINCOME.other_frequncy_item','FREQUENCY.name as frequency_name','BUSINESSINCOME.business_income_item','comments'); $table = PDBUSINESSINCOME.' as PDBUSINESSINCOME'; $where_condition_array = array('fk_pd_id'=>$pdid,'PDBUSINESSINCOME.isactive'=>1); $joins = array( diff --git a/api/application/views/js/phantomchart.js b/api/application/views/js/phantomchart.js new file mode 100644 index 00000000..bbd1b84a --- /dev/null +++ b/api/application/views/js/phantomchart.js @@ -0,0 +1,12 @@ +var page = require('webpage').create(); +page.viewportSize = { width: 600, height: 350 }; +page.clipRect = { top: 0, left: 0, width: 600, height: 350 }; +var score = 69.08 ; +console.log('score card chart'); +var url = 'http://localhost:9999/AWSEC2/sparqapi/api?'+score; +page.open(url, function() { + setTimeout(function() { + page.render('C:/5.6/xampp/htdocs/AWSEC2/sparqapi/api/application/views/report_templates/chart.png'); + phantom.exit(); + }, 500); +}); \ 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 440aa300..6c90b7c3 100644 --- a/api/application/views/report_templates/JSONTOREPORT.php +++ b/api/application/views/report_templates/JSONTOREPORT.php @@ -12,14 +12,14 @@ defined('BASEPATH') OR exit('No direct script access allowed'); .page_break { page-break-before: always; } @page { margin: 100px 50px; - font-family:Helvetica, Arial, sans-serif; + font-family:Helvetica,Arial; } - footer { + header { position: fixed; - bottom: 5px; + top: -70px; left: 0px; right: 0px; - height: 30px; + height: 20px; /** Extra personal styles **/ /*background-color: #03a9f4; @@ -27,6 +27,21 @@ defined('BASEPATH') OR exit('No direct script access allowed'); text-align: right; /*line-height: 35px;*/ } + footer { + position: fixed; + bottom: 5px; + left: 0px; + right: 0px; + height: 30px; + font-size: 10px; + + /** Extra personal styles **/ + /*background-color: #03a9f4; + color: white;*/ + text-align: left; + /*line-height: 35px;*/ + } + .table2 { border: 1px solid black; @@ -48,28 +63,45 @@ defined('BASEPATH') OR exit('No direct script access allowed'); tfoot{ color:#e00201; } + /* metert gauge css */ + + + +.sc-gauge { width:200px; height:200px; margin:200px auto; } +.sc-background { position:relative; height:100px; margin-bottom:10px; background-color:#fff; border-radius:150px 150px 0 0; overflow:hidden; text-align:center; } +.sc-mask { position:absolute; top:20px; right:20px; left:20px; height:80px; background-color:#555888; border-radius:150px 150px 0 0 } +.sc-percentage { position:absolute; top:100px; left:-200%; width:400%; height:400%; margin-left:100px; background-color:#00aeef; } +.sc-percentage { transform:rotate(158deg); transform-origin:top center; } +.sc-min { float:left; } +.sc-max { float:right; } +.sc-value { position:absolute; top:50%; left:0; width:100%; font-size:48px; font-weight:700 } + + /* metert gauge css */ - - + + +
+ +
+
+
+







"; + echo "








"; setlocale(LC_MONETARY, 'en_IN'); echo "
"; echo "

PERSONAL DISCUSSION REPORT

"; @@ -91,7 +123,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); ?> - + Loan Amount Applied For

"; @@ -104,15 +136,27 @@ defined('BASEPATH') OR exit('No direct script access allowed');

"; + echo "
"; echo "

"; - echo "

Score Summary

"; - echo "General Section Score :".number_format($pd_score['score_summary']['general']['actual_score'],2,'.','.')."
"; - echo "Business Section Score :".number_format($pd_score['score_summary']['business']['actual_score'],2,'.','.')."
"; - echo "Final Remarks Score :".number_format($pd_score['score_summary']['final_remarks']['actual_score'],2,'.','.')."
"; - echo "Final PD Score :".number_format($pd_score['score_summary']['overall_score']['final_score'],2,'.','.')."
"; + echo "

Executive Summary

"; + // echo "General Section Score :".number_format($pd_score['score_summary']['general']['actual_score'],2,'.','.')."
"; + // echo "Business Section Score :".number_format($pd_score['score_summary']['business']['actual_score'],2,'.','.')."
"; + // echo "Final Remarks Score :".number_format($pd_score['score_summary']['final_remarks']['actual_score'],2,'.','.')."
"; + // echo "Final PD Score :".number_format($pd_score['score_summary']['overall_score']['final_score'],2,'.','.')."
"; + ?> + + + + + +
General Section Score
Business Section Score
Final Remarks Score
Final PD Score
+
"; + //####################### CHART ############################# + echo '

'; + //######################### CHART ########################### + echo "
"; - - //####################General Section Statred######################## $general_form = json_decode($pd_processed_forms[18][0]['processed_json'],true); diff --git a/api/application/views/report_templates/chart.png b/api/application/views/report_templates/chart.png new file mode 100644 index 00000000..fdd8cb8c Binary files /dev/null and b/api/application/views/report_templates/chart.png differ diff --git a/api/application/views/report_templates/pdscorechart.html b/api/application/views/report_templates/pdscorechart.html new file mode 100644 index 00000000..5b382fb8 --- /dev/null +++ b/api/application/views/report_templates/pdscorechart.html @@ -0,0 +1,137 @@ + + + + + + + + + + +
Charts by ZingChart
+ + + + \ No newline at end of file diff --git a/api/application/views/report_templates/switched-column-chart.png b/api/application/views/report_templates/switched-column-chart.png deleted file mode 100644 index e26f9e64..00000000 Binary files a/api/application/views/report_templates/switched-column-chart.png and /dev/null differ diff --git a/api/application/views/welcome_message.php b/api/application/views/welcome_message.php index dee9bef1..6b06a9b8 100644 --- a/api/application/views/welcome_message.php +++ b/api/application/views/welcome_message.php @@ -1,95 +1,141 @@ - + +PDSCORE CHART - - Welcome to CodeIgniter - - - + + + + +
Charts by ZingChart
+ + \ No newline at end of file