Sineedge/sparqapi
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BA OA MONTHS SAVE HTML REPORT TINY ISSUES

Browse Source
This commit is contained in:
Velz2020 2019-10-14 19:34:21 +05:30
parent d1c9130b5b
commit 9ce050f1bb
6 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
api/application/helpers/assetsform_helper.php
View File

@ -31,7 +31,8 @@ public static function getOthersAssetsDetails($values){
$storeValue['assets_mode'] = $fetchVal['assets_mode_master']; $storeValue['assets_mode'] = $fetchVal['assets_mode_master'];
$storeValue['name_of_the_owner'] = $assest_owners_name; $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')); $storeValue['emi'] = (!strcasecmp($fetchVal['emi'],'yes'));
// this is for investments type // this is for investments type
if($fetchVal['assets_mode']==7){ if($fetchVal['assets_mode']==7){
@ -154,7 +155,7 @@ public static function getOthersAssetsDetails($values){
$fourth_row = '<tr><td>Owned by</td>'; $fourth_row = '<tr><td>Owned by</td>';
$fifth_row = '<tr><td>Market Value</td>'; $fifth_row = '<tr><td>Market Value</td>';
$sixth_row = '<tr><td>Monthly Rent</td>'; $sixth_row = '<tr><td>Monthly Rent</td>';
$seventh_row = '<tr><td>Age of Asset(Yrs)</td>'; $seventh_row = '<tr><td>Age of Asset</td>';
$eighth_row = '<tr><td>Loan (Y/N)</td>'; $eighth_row = '<tr><td>Loan (Y/N)</td>';
$rupee_symbol = "<span style='font-family: DejaVu Sans; sans-serif;font-size:10px'>₹</span>"; $rupee_symbol = "<span style='font-family: DejaVu Sans; sans-serif;font-size:10px'>₹</span>";
$rental_flag = 0; $rental_flag = 0;
@ -207,7 +208,13 @@ public static function getOthersAssetsDetails($values){
$fourth_row .= '<td class="customtd">'.$owners_list.'</td>'; $fourth_row .= '<td class="customtd">'.$owners_list.'</td>';
$fifth_row .= '<td class="customtd">'.($fetchVal['business_approximate_market_value'] != "" && $fetchVal['business_approximate_market_value'] != null ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_approximate_market_value']) : 'NA').'</td>'; $fifth_row .= '<td class="customtd">'.($fetchVal['business_approximate_market_value'] != "" && $fetchVal['business_approximate_market_value'] != null ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_approximate_market_value']) : 'NA').'</td>';
$sixth_row .= '<td class="customtd">'.(($fetchVal['business_monthly_rented_amt'] != "") ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_monthly_rented_amt']) : 'NA').'</td>'; $sixth_row .= '<td class="customtd">'.(($fetchVal['business_monthly_rented_amt'] != "") ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_monthly_rented_amt']) : 'NA').'</td>';
$seventh_row .= '<td class="customtd">'.($fetchVal['business_vintage'] != "" ? $fetchVal['business_vintage'] : 'NA').'</td>'; $seventh_row .= '<td class="customtd">';
$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 .= '</td>';
$eighth_row .= '<td class="customtd">'.($fetchVal['business_emi'] != "" ? ucfirst($fetchVal['business_emi']) : 'NA').'</td>'; $eighth_row .= '<td class="customtd">'.($fetchVal['business_emi'] != "" ? ucfirst($fetchVal['business_emi']) : 'NA').'</td>';
} }
@ -222,7 +229,11 @@ public static function getOthersAssetsDetails($values){
$fourth_row .= '<td class="customtd">'.$owners_list.'</td>'; $fourth_row .= '<td class="customtd">'.$owners_list.'</td>';
$fifth_row .= '<td class="customtd">'.($fetchVal['business_approximate_market_value'] != "" && $fetchVal['business_approximate_market_value'] != null ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_approximate_market_value']) : 'NA').'</td>'; $fifth_row .= '<td class="customtd">'.($fetchVal['business_approximate_market_value'] != "" && $fetchVal['business_approximate_market_value'] != null ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_approximate_market_value']) : 'NA').'</td>';
$sixth_row .= '<td class="customtd">'.(($fetchVal['business_monthly_rented_amt'] != "") ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_monthly_rented_amt']) : 'NA').'</td>'; $sixth_row .= '<td class="customtd">'.(($fetchVal['business_monthly_rented_amt'] != "") ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_monthly_rented_amt']) : 'NA').'</td>';
$seventh_row .= '<td class="customtd">'.($fetchVal['business_vintage'] != "" ? $fetchVal['business_vintage'] : 'NA').'</td>'; $seventh_row .= '<td class="customtd">';
$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 .= '<td class="customtd">'.($fetchVal['business_emi'] != "" ? ucfirst($fetchVal['business_emi']) : 'NA').'</td>'; $eighth_row .= '<td class="customtd">'.($fetchVal['business_emi'] != "" ? ucfirst($fetchVal['business_emi']) : 'NA').'</td>';
} }
@ -237,7 +248,11 @@ public static function getOthersAssetsDetails($values){
$fourth_row .= '<td class="customtd">'.$owners_list.'</td>'; $fourth_row .= '<td class="customtd">'.$owners_list.'</td>';
$fifth_row .= '<td class="customtd">'.($fetchVal['business_approximate_market_value'] != "" && $fetchVal['business_approximate_market_value'] != null ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_approximate_market_value']) : 'NA').'</td>'; $fifth_row .= '<td class="customtd">'.($fetchVal['business_approximate_market_value'] != "" && $fetchVal['business_approximate_market_value'] != null ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_approximate_market_value']) : 'NA').'</td>';
$sixth_row .= '<td class="customtd">'.(($fetchVal['business_monthly_rented_amt'] != "") ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_monthly_rented_amt']) : 'NA').'</td>'; $sixth_row .= '<td class="customtd">'.(($fetchVal['business_monthly_rented_amt'] != "") ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_monthly_rented_amt']) : 'NA').'</td>';
$seventh_row .= '<td class="customtd">'.($fetchVal['business_vintage'] != "" ? $fetchVal['business_vintage'] : 'NA').'</td>'; $seventh_row .= '<td class="customtd">';
$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 .= '<td class="customtd">'.($fetchVal['business_emi'] != "" ? ucfirst($fetchVal['business_emi']) : 'NA').'</td>'; $eighth_row .= '<td class="customtd">'.($fetchVal['business_emi'] != "" ? ucfirst($fetchVal['business_emi']) : 'NA').'</td>';
} }
//this is for other //this is for other
@ -249,7 +264,11 @@ public static function getOthersAssetsDetails($values){
$fourth_row .= '<td class="customtd">'.$owners_list.'</td>'; $fourth_row .= '<td class="customtd">'.$owners_list.'</td>';
$fifth_row .= '<td class="customtd">'.($fetchVal['business_approximate_market_value'] != "" && $fetchVal['business_approximate_market_value'] != null ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_approximate_market_value']) : 'NA').'</td>'; $fifth_row .= '<td class="customtd">'.($fetchVal['business_approximate_market_value'] != "" && $fetchVal['business_approximate_market_value'] != null ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_approximate_market_value']) : 'NA').'</td>';
$sixth_row .= '<td class="customtd">'.(($fetchVal['business_monthly_rented_amt'] != "") ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_monthly_rented_amt']) : 'NA').'</td>'; $sixth_row .= '<td class="customtd">'.(($fetchVal['business_monthly_rented_amt'] != "") ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($fetchVal['business_monthly_rented_amt']) : 'NA').'</td>';
$seventh_row .= '<td class="customtd">'.($fetchVal['business_vintage'] != "" ? $fetchVal['business_vintage'] : 'NA').'</td>'; $seventh_row .= '<td class="customtd">';
$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 .= '<td class="customtd">'.($fetchVal['business_emi'] != "" ? ucfirst($fetchVal['business_emi']) : 'NA').'</td>'; $eighth_row .= '<td class="customtd">'.($fetchVal['business_emi'] != "" ? ucfirst($fetchVal['business_emi']) : 'NA').'</td>';
} }

4
api/application/views/report_templates/JSONTOREPORT_CLIX.php
View File

@ -2978,7 +2978,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
$stockRow = json_decode($stRow['processed_json'],true); $stockRow = json_decode($stRow['processed_json'],true);
//print_r($stockRow);die(); //print_r($stockRow);die();
$stock_form_remarks = $stockRow['stock_remarks']; $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 = $stockRow['is_sufficiant_finished_and_traded_goods'];
$is_stock_sufficient_enough_remarks = $stockRow['finished_and_traded_goods_remarks']; $is_stock_sufficient_enough_remarks = $stockRow['finished_and_traded_goods_remarks'];
$is_raw_materials_sufficient_enough = null; $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')) }else if(!strcasecmp($is_sufficiant_service_goods,'no'))
{ {
echo '<p style="text-align:justify;">Considering the size of operations, the stock maintained for service providing is not sufficient as per the PD Officer’s observations.</p>'; echo '<p style="text-align:justify;">Considering the size of operations, the stock maintained for service providing is not sufficient as per the PD Officer’s observations.</p>';
//echo '<p style="text-align:justify;">'. $is_raw_materials_sufficient_enough_remarks.'</p>'; echo '<p style="text-align:justify;">'. $service_goods_enough_remarks.'</p>';
} }
else if(!strcasecmp($is_sufficiant_service_goods,'not applicable')) else if(!strcasecmp($is_sufficiant_service_goods,'not applicable'))
{ {

8
api/application/views/report_templates/JSONTOREPORT_DI_AI.php
View File

@ -3025,7 +3025,7 @@ if($total_no_of_business > 0) {
$stockRow = json_decode($stRow['processed_json'],true); $stockRow = json_decode($stRow['processed_json'],true);
//print_r($stockRow);die(); //print_r($stockRow);die();
$stock_form_remarks = $stockRow['stock_remarks']; $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 = $stockRow['is_sufficiant_finished_and_traded_goods'];
$is_stock_sufficient_enough_remarks = $stockRow['finished_and_traded_goods_remarks']; $is_stock_sufficient_enough_remarks = $stockRow['finished_and_traded_goods_remarks'];
$is_raw_materials_sufficient_enough = null; $is_raw_materials_sufficient_enough = null;
@ -3200,7 +3200,7 @@ if($total_no_of_business > 0) {
}else if(!strcasecmp($is_sufficiant_service_goods,'no')) }else if(!strcasecmp($is_sufficiant_service_goods,'no'))
{ {
echo '<p style="text-align:justify;">Considering the size of operations, the stock maintained for service providing is not sufficient as per the PD Officer’s observations.</p>'; echo '<p style="text-align:justify;">Considering the size of operations, the stock maintained for service providing is not sufficient as per the PD Officer’s observations.</p>';
// echo '<p style="text-align:justify;">'. $is_raw_materials_sufficient_enough_remarks.'</p>'; echo '<p style="text-align:justify;">'. $service_goods_enough_remarks.'</p>';
} }
else if(!strcasecmp($is_sufficiant_service_goods,'not applicable')) else if(!strcasecmp($is_sufficiant_service_goods,'not applicable'))
{ {
@ -3725,7 +3725,7 @@ if($total_no_of_business > 0) {
<?php <?php
//print_r($otherAssetResult);die(); //print_r($otherAssetResult);die();
if($is_personal_info_available != null){ ?> if($is_personal_info_available != null){ ?>
<table class="scorecard_table_resonal_assest"> <table class="scorecard_table">
<thead> <thead>
<tr> <tr>
<th>Sr.No</th> <th>Sr.No</th>
@ -3733,7 +3733,7 @@ if($total_no_of_business > 0) {
<th>Asset Description</th> <th>Asset Description</th>
<th>Asset Owned By</th> <th>Asset Owned By</th>
<th>Approx Market Value(Rs)</th> <th>Approx Market Value(Rs)</th>
<th>Age of the Assest(Yrs)</th> <th>Age of the Assest</th>
<th>Loan Again Assest</th> <th>Loan Again Assest</th>
</tr> </tr>
</thead> </thead>

6
api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php
View File

@ -3008,7 +3008,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
$stockRow = json_decode($stRow['processed_json'],true); $stockRow = json_decode($stRow['processed_json'],true);
//print_r($stockRow);die(); //print_r($stockRow);die();
$stock_form_remarks = $stockRow['stock_remarks']; $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 = $stockRow['is_sufficiant_finished_and_traded_goods'];
$is_stock_sufficient_enough_remarks = $stockRow['finished_and_traded_goods_remarks']; $is_stock_sufficient_enough_remarks = $stockRow['finished_and_traded_goods_remarks'];
$is_raw_materials_sufficient_enough = null; $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')) }else if(!strcasecmp($is_sufficiant_service_goods,'no'))
{ {
echo '<p style="text-align:justify;">Considering the size of operations, the stock maintained for service providing is not sufficient as per the PD Officer’s observations.</p>'; echo '<p style="text-align:justify;">Considering the size of operations, the stock maintained for service providing is not sufficient as per the PD Officer’s observations.</p>';
// echo '<p style="text-align:justify;">'. $is_raw_materials_sufficient_enough_remarks.'</p>'; echo '<p style="text-align:justify;">'. $service_goods_enough_remarks.'</p>';
} }
else if(!strcasecmp($is_sufficiant_service_goods,'not applicable')) else if(!strcasecmp($is_sufficiant_service_goods,'not applicable'))
{ {
@ -3704,7 +3704,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
<th>Asset Description</th> <th>Asset Description</th>
<th>Asset Owned By</th> <th>Asset Owned By</th>
<th>Approx Market Value(Rs)</th> <th>Approx Market Value(Rs)</th>
<th>Age of the Assest(Yrs)</th> <th>Age of the Assest</th>
<th>Loan Again Assest</th> <th>Loan Again Assest</th>
</tr> </tr>
</thead> </thead>

2
api/application/views/report_templates/JSONTOREPORT_RI.php
View File

@ -1217,7 +1217,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
<th>Asset Description</th> <th>Asset Description</th>
<th>Asset Owned By</th> <th>Asset Owned By</th>
<th>Approx Market Value(Rs)</th> <th>Approx Market Value(Rs)</th>
<th>Age of the Assest(Yrs)</th> <th>Age of the Assest</th>
<th>Loan Again Assest</th> <th>Loan Again Assest</th>
</tr> </tr>
</thead> </thead>

6
api/index.php
View File

@ -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) 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 else
{ {
@ -95,10 +95,10 @@ switch (ENVIRONMENT)
case 'testing': case 'testing':
error_reporting(-1); error_reporting(-1);
ini_set('display_errors', 1); ini_set('display_errors', 0);
break; break;
case 'production': case 'production':
ini_set('display_errors', 1); ini_set('display_errors', 0);
if (version_compare(PHP_VERSION, '5.3', '>=')) if (version_compare(PHP_VERSION, '5.3', '>='))
{ {
error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED); error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);