From 9ce050f1bb376ee1320f31e800d572ab618d91cd Mon Sep 17 00:00:00 2001 From: Velz2020 Date: Mon, 14 Oct 2019 19:34:21 +0530 Subject: [PATCH] BA OA MONTHS SAVE HTML REPORT TINY ISSUES --- api/application/helpers/assetsform_helper.php | 31 +++++++++++++++---- .../report_templates/JSONTOREPORT_CLIX.php | 4 +-- .../report_templates/JSONTOREPORT_DI_AI.php | 8 ++--- .../JSONTOREPORT_DI_AI_ADDON.php | 6 ++-- .../report_templates/JSONTOREPORT_RI.php | 2 +- api/index.php | 6 ++-- 6 files changed, 38 insertions(+), 19 deletions(-) diff --git a/api/application/helpers/assetsform_helper.php b/api/application/helpers/assetsform_helper.php index 68c2a92b..88221299 100644 --- a/api/application/helpers/assetsform_helper.php +++ b/api/application/helpers/assetsform_helper.php @@ -31,7 +31,8 @@ public static function getOthersAssetsDetails($values){ $storeValue['assets_mode'] = $fetchVal['assets_mode_master']; $storeValue['name_of_the_owner'] = $assest_owners_name; - $storeValue['purchase_year'] = $fetchVal['vintage_personal']; + $storeValue['purchase_year'] = $fetchVal['vintage_personal'] . ' Yrs'; + $storeValue['purchase_year'] .= isset($fetchVal['asset_months']) ? (' & '.$fetchVal['asset_months'] . ' Mns'): ''; $storeValue['emi'] = (!strcasecmp($fetchVal['emi'],'yes')); // this is for investments type if($fetchVal['assets_mode']==7){ @@ -154,7 +155,7 @@ public static function getOthersAssetsDetails($values){ $fourth_row = 'Owned by'; $fifth_row = 'Market Value'; $sixth_row = 'Monthly Rent'; - $seventh_row = 'Age of Asset(Yrs)'; + $seventh_row = 'Age of Asset'; $eighth_row = 'Loan (Y/N)'; $rupee_symbol = "₹"; $rental_flag = 0; @@ -207,7 +208,13 @@ public static function getOthersAssetsDetails($values){ $fourth_row .= ''.$owners_list.''; $fifth_row .= ''.($fetchVal['business_approximate_market_value'] != "" && $fetchVal['business_approximate_market_value'] != null ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_approximate_market_value']) : 'NA').''; $sixth_row .= ''.(($fetchVal['business_monthly_rented_amt'] != "") ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_monthly_rented_amt']) : 'NA').''; - $seventh_row .= ''.($fetchVal['business_vintage'] != "" ? $fetchVal['business_vintage'] : 'NA').''; + $seventh_row .= ''; + + $seventh_row .= ($fetchVal['business_vintage'] != "" ? $fetchVal['business_vintage'].' Yrs ' : '' ); + + $seventh_row .= isset($fetchVal['asset_months']) && $fetchVal['asset_months'] != '' ? $fetchVal['asset_months'].' Mns' : ($fetchVal['business_vintage'] == "" ? 'NA' : ''); + + $seventh_row .= ''; $eighth_row .= ''.($fetchVal['business_emi'] != "" ? ucfirst($fetchVal['business_emi']) : 'NA').''; } @@ -222,7 +229,11 @@ public static function getOthersAssetsDetails($values){ $fourth_row .= ''.$owners_list.''; $fifth_row .= ''.($fetchVal['business_approximate_market_value'] != "" && $fetchVal['business_approximate_market_value'] != null ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_approximate_market_value']) : 'NA').''; $sixth_row .= ''.(($fetchVal['business_monthly_rented_amt'] != "") ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_monthly_rented_amt']) : 'NA').''; - $seventh_row .= ''.($fetchVal['business_vintage'] != "" ? $fetchVal['business_vintage'] : 'NA').''; + $seventh_row .= ''; + + $seventh_row .= ($fetchVal['business_vintage'] != "" ? $fetchVal['business_vintage'].' Yrs ' : '' ); + + $seventh_row .= isset($fetchVal['asset_months']) && $fetchVal['asset_months'] != '' ? $fetchVal['asset_months'].' Mns' : ($fetchVal['business_vintage'] == "" ? 'NA' : ''); $eighth_row .= ''.($fetchVal['business_emi'] != "" ? ucfirst($fetchVal['business_emi']) : 'NA').''; } @@ -237,7 +248,11 @@ public static function getOthersAssetsDetails($values){ $fourth_row .= ''.$owners_list.''; $fifth_row .= ''.($fetchVal['business_approximate_market_value'] != "" && $fetchVal['business_approximate_market_value'] != null ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_approximate_market_value']) : 'NA').''; $sixth_row .= ''.(($fetchVal['business_monthly_rented_amt'] != "") ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_monthly_rented_amt']) : 'NA').''; - $seventh_row .= ''.($fetchVal['business_vintage'] != "" ? $fetchVal['business_vintage'] : 'NA').''; + $seventh_row .= ''; + + $seventh_row .= ($fetchVal['business_vintage'] != "" ? $fetchVal['business_vintage'].' Yrs ' : '' ); + + $seventh_row .= isset($fetchVal['asset_months']) && $fetchVal['asset_months'] != '' ? $fetchVal['asset_months'].' Mns' : ($fetchVal['business_vintage'] == "" ? 'NA' : ''); $eighth_row .= ''.($fetchVal['business_emi'] != "" ? ucfirst($fetchVal['business_emi']) : 'NA').''; } //this is for other @@ -249,7 +264,11 @@ public static function getOthersAssetsDetails($values){ $fourth_row .= ''.$owners_list.''; $fifth_row .= ''.($fetchVal['business_approximate_market_value'] != "" && $fetchVal['business_approximate_market_value'] != null ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_approximate_market_value']) : 'NA').''; $sixth_row .= ''.(($fetchVal['business_monthly_rented_amt'] != "") ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_monthly_rented_amt']) : 'NA').''; - $seventh_row .= ''.($fetchVal['business_vintage'] != "" ? $fetchVal['business_vintage'] : 'NA').''; + $seventh_row .= ''; + + $seventh_row .= ($fetchVal['business_vintage'] != "" ? $fetchVal['business_vintage'].' Yrs ' : '' ); + + $seventh_row .= isset($fetchVal['asset_months']) && $fetchVal['asset_months'] != '' ? $fetchVal['asset_months'].' Mns' : ($fetchVal['business_vintage'] == "" ? 'NA' : ''); $eighth_row .= ''.($fetchVal['business_emi'] != "" ? ucfirst($fetchVal['business_emi']) : 'NA').''; } diff --git a/api/application/views/report_templates/JSONTOREPORT_CLIX.php b/api/application/views/report_templates/JSONTOREPORT_CLIX.php index 4e8c8ad6..39c0c4f1 100644 --- a/api/application/views/report_templates/JSONTOREPORT_CLIX.php +++ b/api/application/views/report_templates/JSONTOREPORT_CLIX.php @@ -2978,7 +2978,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $stockRow = json_decode($stRow['processed_json'],true); //print_r($stockRow);die(); $stock_form_remarks = $stockRow['stock_remarks']; - $stock_remarks = $stockRow['stock_remarks']; + $service_goods_enough_remarks = $stockRow['service_goods_enough_remarks']; $is_stock_sufficient_enough = $stockRow['is_sufficiant_finished_and_traded_goods']; $is_stock_sufficient_enough_remarks = $stockRow['finished_and_traded_goods_remarks']; $is_raw_materials_sufficient_enough = null; @@ -3155,7 +3155,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); }else if(!strcasecmp($is_sufficiant_service_goods,'no')) { echo '

Considering the size of operations, the stock maintained for service providing is not sufficient as per the PD Officer’s observations.

'; - //echo '

'. $is_raw_materials_sufficient_enough_remarks.'

'; + echo '

'. $service_goods_enough_remarks.'

'; } else if(!strcasecmp($is_sufficiant_service_goods,'not applicable')) { diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php index e8309257..3b915919 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php @@ -3025,7 +3025,7 @@ if($total_no_of_business > 0) { $stockRow = json_decode($stRow['processed_json'],true); //print_r($stockRow);die(); $stock_form_remarks = $stockRow['stock_remarks']; - $stock_remarks = $stockRow['stock_remarks']; + $service_goods_enough_remarks = $stockRow['service_goods_remarks']; $is_stock_sufficient_enough = $stockRow['is_sufficiant_finished_and_traded_goods']; $is_stock_sufficient_enough_remarks = $stockRow['finished_and_traded_goods_remarks']; $is_raw_materials_sufficient_enough = null; @@ -3200,7 +3200,7 @@ if($total_no_of_business > 0) { }else if(!strcasecmp($is_sufficiant_service_goods,'no')) { echo '

Considering the size of operations, the stock maintained for service providing is not sufficient as per the PD Officer’s observations.

'; - // echo '

'. $is_raw_materials_sufficient_enough_remarks.'

'; + echo '

'. $service_goods_enough_remarks.'

'; } else if(!strcasecmp($is_sufficiant_service_goods,'not applicable')) { @@ -3725,7 +3725,7 @@ if($total_no_of_business > 0) { - +
@@ -3733,7 +3733,7 @@ if($total_no_of_business > 0) { - + 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 c1c45829..6ce3e05b 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php @@ -3008,7 +3008,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $stockRow = json_decode($stRow['processed_json'],true); //print_r($stockRow);die(); $stock_form_remarks = $stockRow['stock_remarks']; - $stock_remarks = $stockRow['stock_remarks']; + $service_goods_enough_remarks = $stockRow['service_goods_remarks']; $is_stock_sufficient_enough = $stockRow['is_sufficiant_finished_and_traded_goods']; $is_stock_sufficient_enough_remarks = $stockRow['finished_and_traded_goods_remarks']; $is_raw_materials_sufficient_enough = null; @@ -3183,7 +3183,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); }else if(!strcasecmp($is_sufficiant_service_goods,'no')) { echo '

Considering the size of operations, the stock maintained for service providing is not sufficient as per the PD Officer’s observations.

'; - // echo '

'. $is_raw_materials_sufficient_enough_remarks.'

'; + echo '

'. $service_goods_enough_remarks.'

'; } else if(!strcasecmp($is_sufficiant_service_goods,'not applicable')) { @@ -3704,7 +3704,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); - + diff --git a/api/application/views/report_templates/JSONTOREPORT_RI.php b/api/application/views/report_templates/JSONTOREPORT_RI.php index 82c4bc89..03ded8a0 100644 --- a/api/application/views/report_templates/JSONTOREPORT_RI.php +++ b/api/application/views/report_templates/JSONTOREPORT_RI.php @@ -1217,7 +1217,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); - + diff --git a/api/index.php b/api/index.php index ee155f4f..25ec6399 100644 --- a/api/index.php +++ b/api/index.php @@ -69,7 +69,7 @@ } else if(isset($_SERVER['HTTP_HOST']) && !strcasecmp($_SERVER['HTTP_HOST'],'localhost') && isset($_SERVER['REQUEST_URI']) && substr_count($_SERVER['REQUEST_URI'], 'sparqapi') == 1) { - define('ENVIRONMENT','production'); + define('ENVIRONMENT','testing'); } else { @@ -95,10 +95,10 @@ switch (ENVIRONMENT) case 'testing': error_reporting(-1); - ini_set('display_errors', 1); + ini_set('display_errors', 0); break; case 'production': - ini_set('display_errors', 1); + ini_set('display_errors', 0); if (version_compare(PHP_VERSION, '5.3', '>=')) { error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
Sr.NoAsset Description Asset Owned By Approx Market Value(Rs)Age of the Assest(Yrs)Age of the Assest Loan Again Assest
Asset Description Asset Owned By Approx Market Value(Rs)Age of the Assest(Yrs)Age of the Assest Loan Again Assest
Asset Description Asset Owned By Approx Market Value(Rs)Age of the Assest(Yrs)Age of the Assest Loan Again Assest