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

CLIX CHANGES

Browse Source
This commit is contained in:
Velz2020 2019-10-15 19:32:33 +05:30
parent 72b64fe89a
commit e6b3cf6e9c
3 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/application/controllers/PD_Controller.php
View File

@ -5983,7 +5983,7 @@ public function getPDFormDetailsJSON_post()
//$t = $this->load->view('temp_html.html',null,true); //$t = $this->load->view('temp_html.html',null,true);
echo $t; echo $t;
//die(); die();
$total_replaces = substr_count($t,'<span class="tooltip">'); $total_replaces = substr_count($t,'<span class="tooltip">');
for($i = 0 ;$i < $total_replaces;$i++) for($i = 0 ;$i < $total_replaces;$i++)

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

@ -114,7 +114,12 @@ public static function getOthersAssetsDetails($values){
$storeValue['approximate_market_value'] = $fetchVal['approximate_market_value']; $storeValue['approximate_market_value'] = $fetchVal['approximate_market_value'];
$storeValue['assets_mode'] .= '<br>('.$fetchVal['details'][0]['property_type_master'].')'; $storeValue['assets_mode'] .= '<br>('.$fetchVal['details'][0]['property_type_master'].')';
$storeValue['about_assets'] = $fetchVal['details'][0]['property_type_master'] . ' property ( '. $fetchVal['details'][0]['describe_of_the_property_asset'] .' ) at '.$fetchVal['details'][0]['address_of_the_property'].' having area of '. $fetchVal['details'][0]['area_covered_by_this_property']; $storeValue['about_assets'] = $fetchVal['details'][0]['property_type_master'] . ' property' ;
$storeValue['about_assets'] .= isset($fetchVal['details'][0]['describe_of_the_property_asset']) && $fetchVal['details'][0]['describe_of_the_property_asset'] != "" ? ' ( '. $fetchVal['details'][0]['describe_of_the_property_asset'] .' )': '';
$storeValue['about_assets'] .= ' at '.$fetchVal['details'][0]['address_of_the_property'];
$storeValue['about_assets'] .= isset($fetchVal['details'][0]['area_covered_by_this_property']) && $fetchVal['details'][0]['area_covered_by_this_property'] != "" ? ' having area of '. $fetchVal['details'][0]['area_covered_by_this_property'] : '';
$storeValue['about_assets'] .= $fetchVal['details'][0]['uom_of_the_property'] == 1 ? ' '.$fetchVal['details'][0]['uom_of_the_property'].'.' : ' '.$fetchVal['details'][0]['uom_master'].'.'; $storeValue['about_assets'] .= $fetchVal['details'][0]['uom_of_the_property'] == 1 ? ' '.$fetchVal['details'][0]['uom_of_the_property'].'.' : ' '.$fetchVal['details'][0]['uom_master'].'.';

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

@ -477,7 +477,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
echo "<br><br>"; echo "<br><br>";
echo "<div>"; echo "<div>";
echo "<h1><center>PERSONAL DISCUSSION REPORT CLIX</center></h1> "; echo "<h1><center>PERSONAL DISCUSSION REPORT </center></h1> ";
echo "<center style='font-size:15px;font-style:italic;font-weight:bold'>for the case of</center>"; echo "<center style='font-size:15px;font-style:italic;font-weight:bold'>for the case of</center>";
echo "<h2><center>".$general_form['companies'][0]['company_name']."</center></h2>"; echo "<h2><center>".$general_form['companies'][0]['company_name']."</center></h2>";
@ -695,6 +695,8 @@ defined('BASEPATH') OR exit('No direct script access allowed');
} }
} }
//print_r($general_form['individuals']) ;die();
foreach($general_form['individuals'] as $ind_key => $individual) foreach($general_form['individuals'] as $ind_key => $individual)
{ {
@ -1153,7 +1155,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
{ {
echo '<span class="tooltip">'.$address_form['address_form_remark'].'<span class="tooltiptext">Address Form - Address Form Remarks </span></span>';} echo '<span class="tooltip">'.$address_form['address_form_remark'].'<span class="tooltiptext">Address Form - Address Form Remarks </span></span>';}
echo "</p>"; echo "</p>";
echo "<div id='page_break'></div>"; // echo "<div id='page_break'></div>";
//die(); //die();
// //
?> ?>
@ -1312,7 +1314,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
// if($temp_show == null) // if($temp_show == null)
// { // {
?> ?>
<div id='page_break'></div> <!-- <div id='page_break'></div> -->
<?php <?php
$businessResult=array(); $businessResult=array();
if(isset($pd_processed_forms[13][$business_count])) if(isset($pd_processed_forms[13][$business_count]))
@ -2888,9 +2890,9 @@ defined('BASEPATH') OR exit('No direct script access allowed');
echo $supplier_second_row; echo $supplier_second_row;
echo $supplier_third_row; echo $supplier_third_row;
echo $supplier_fourth_row; echo $supplier_fourth_row;
echo $supplier_fifth_row; // echo $supplier_fifth_row;
echo $supplier_sixth_row; // echo $supplier_sixth_row;
echo $supplier_seventh_row; // echo $supplier_seventh_row;
?> ?>
</tbody> </tbody>
@ -3076,8 +3078,9 @@ defined('BASEPATH') OR exit('No direct script access allowed');
<td class="customtd"><?php echo (++$stock_sr_no) ?></td> <td class="customtd"><?php echo (++$stock_sr_no) ?></td>
<td class="customtd"><?php echo $reRow['type'] ?></td> <td class="customtd"><?php echo $reRow['type'] ?></td>
<td class="customtd"><?php echo $reRow['name'] ?></td> <td class="customtd"><?php echo $reRow['name'] ?></td>
<!-- <td class="customtd"><?php echo $reRow['value'] && $reRow['value'] != " " ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($reRow['value']) : 'Not Observed' ?></td> <td class="customtd"><?php echo $reRow['value'] && $reRow['value'] != " " ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($reRow['value']) : 'Not Observed' ?></td>
<td class="customtd"><?php echo $reRow['quantity'] && $reRow['quantity'] != "" ? $reRow['quantity'].' '.$reRow['uom'] : 'Not Observed' ?></td> -->
<!-- <td class="customtd"><?php echo $reRow['quantity'] && $reRow['quantity'] != "" ? $reRow['quantity'].' '.$reRow['uom'] : 'Not Observed' ?></td> -->
</tr> </tr>
<?php } <?php }
} ?> } ?>
@ -3096,8 +3099,9 @@ defined('BASEPATH') OR exit('No direct script access allowed');
<td class="customtd"><?php echo (++$stock_sr_no) ?></td> <td class="customtd"><?php echo (++$stock_sr_no) ?></td>
<td class="customtd"><?php echo $wsRow['type'] ?></td> <td class="customtd"><?php echo $wsRow['type'] ?></td>
<td class="customtd"><?php echo $wsRow['name'] ?></td> <td class="customtd"><?php echo $wsRow['name'] ?></td>
<!-- <td class="customtd"><?php echo $wsRow['value'] && $wsRow['value'] != "" ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($wsRow['value']) : 'Not Observed' ?></td> <td class="customtd"><?php echo $wsRow['value'] && $wsRow['value'] != "" ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($wsRow['value']) : 'Not Observed' ?></td>
<td class="customtd"><?php echo $wsRow['quantity'] && $wsRow['quantity'] != " " ? $wsRow['quantity'].' '.$wsRow['uom'] : 'Not Observed' ?></td> -->
<!-- <td class="customtd"><?php echo $wsRow['quantity'] && $wsRow['quantity'] != " " ? $wsRow['quantity'].' '.$wsRow['uom'] : 'Not Observed' ?></td> -->
</tr> </tr>
<?php }} ?> <?php }} ?>
<?php } ?> <?php } ?>
@ -3113,8 +3117,9 @@ defined('BASEPATH') OR exit('No direct script access allowed');
<td class="customtd"><?php echo (++$stock_sr_no) ?></td> <td class="customtd"><?php echo (++$stock_sr_no) ?></td>
<td class="customtd"><?php echo $serviceRow['type'] ?></td> <td class="customtd"><?php echo $serviceRow['type'] ?></td>
<td class="customtd"><?php echo $serviceRow['name'] ?></td> <td class="customtd"><?php echo $serviceRow['name'] ?></td>
<!-- <td class="customtd"><?php echo $serviceRow['value'] && $serviceRow['value'] != '' ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($serviceRow['value']) : 'Not Observed'?></td> <td class="customtd"><?php echo $serviceRow['value'] && $serviceRow['value'] != '' ? $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($serviceRow['value']) : 'Not Observed'?></td>
<td class="customtd"><?php echo $serviceRow['quantity'] && $serviceRow['quantity'] != ""? $serviceRow['quantity'].' '.$serviceRow['uom'] : 'Not Observed' ?></td> -->
<!-- <td class="customtd"><?php echo $serviceRow['quantity'] && $serviceRow['quantity'] != ""? $serviceRow['quantity'].' '.$serviceRow['uom'] : 'Not Observed' ?></td> -->
</tr> </tr>
<?php }} ?> <?php }} ?>
<?php } ?> <?php } ?>
@ -3638,7 +3643,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
<tr> <tr>
<th>Sr.No</th> <th>Sr.No</th>
<th>Asset Type</th> <th>Asset Type</th>
<!-- <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(Yrs)</th> -->
@ -3651,7 +3656,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
<tr> <tr>
<td class="customtd"><?php echo (++$oakey); ?></td> <td class="customtd"><?php echo (++$oakey); ?></td>
<td class="customtd"><?php echo $paRow['assets_mode']; ?></td> <td class="customtd"><?php echo $paRow['assets_mode']; ?></td>
<!-- <td class="customtd"><?php echo $paRow['about_assets']; ?></td> --> <td class="customtd"><?php echo $paRow['about_assets']; ?></td>
<td class="customtd"><?php echo $paRow['name_of_the_owner']; ?></td> <td class="customtd"><?php echo $paRow['name_of_the_owner']; ?></td>
<td class="customtd"><?php echo isset($paRow['is_sum_assured']) ? 'Sum Assured -<br> '. $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($paRow['approximate_market_value']) : $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($paRow['approximate_market_value']); ?></td> <td class="customtd"><?php echo isset($paRow['is_sum_assured']) ? 'Sum Assured -<br> '. $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($paRow['approximate_market_value']) : $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($paRow['approximate_market_value']); ?></td>
<!-- <td class="customtd"><?php echo $paRow['purchase_year'] ? $paRow['purchase_year'] : 'NA'; ?></td> --> <!-- <td class="customtd"><?php echo $paRow['purchase_year'] ? $paRow['purchase_year'] : 'NA'; ?></td> -->
@ -3818,8 +3823,8 @@ defined('BASEPATH') OR exit('No direct script access allowed');
$residence_text ='<span contenteditable="true">This is a </span><span class="tooltip">'. $fmValue['residence_ownership'].' <span class="tooltiptext">Family Information - Ownership of Residence </span></span><span contenteditable="true"> residence, where the applicant has been staying for </span><span class="tooltip">'. $fmValue['residence_No_of_years'].'<span class="tooltiptext">Family Information - No of Yrs in current residence </span></span><span contenteditable="true">.</span>'; $residence_text ='<span contenteditable="true">This is a </span><span class="tooltip">'. $fmValue['residence_ownership'].' <span class="tooltiptext">Family Information - Ownership of Residence </span></span><span contenteditable="true"> residence, where the applicant has been staying for </span><span class="tooltip">'. $fmValue['residence_No_of_years'].'<span class="tooltiptext">Family Information - No of Yrs in current residence </span></span><span contenteditable="true">.</span>';
$residence_text .= (!strcasecmp($fmValue['residence_ownership'],'rented')) ? '<span contenteditable="true"> The rent paid '.$rupee_symbol.' </span>'.$fmValue['rent'].'<span contenteditable="true"> per month.</span>' : ''; $residence_text .= (!strcasecmp($fmValue['residence_ownership'],'rented')) ? '<span contenteditable="true"> The rent paid '.$rupee_symbol.' </span>'.$fmValue['rent'].'<span contenteditable="true"> per month.</span>' : '';
$clix_dependency_text = 'There are totally '.$fmValue['no_family_members_clix'].' family member(s)'; $clix_dependency_text = 'There are '.$fmValue['no_family_members_clix'].' family member(s) family ';
$clix_dependency_text .= isset($fmValue['no_dependents_clix']) && $fmValue['no_dependents_clix'] != 0 ? ' and ' . $fmValue['no_dependents_clix']. ' of them have dependents on applicant.' : ' and no dependents on applicant.'; $clix_dependency_text .= isset($fmValue['no_dependents_clix']) && $fmValue['no_dependents_clix'] != 0 ? ' in which ' . ($fmValue['no_dependents_clix'] == 1 ? 'One' : $fmValue['no_dependents_clix']). ' of them have dependent on applicant.' : ' and no dependents on applicant.';
echo $intro_text;echo "<br><br>";echo $residence_text;echo "<br><br>";echo $clix_dependency_text; echo $intro_text;echo "<br><br>";echo $residence_text;echo "<br><br>";echo $clix_dependency_text;