diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index b75cb560..805761d9 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -5983,7 +5983,7 @@ public function getPDFormDetailsJSON_post() //$t = $this->load->view('temp_html.html',null,true); echo $t; - //die(); + die(); $total_replaces = substr_count($t,''); for($i = 0 ;$i < $total_replaces;$i++) diff --git a/api/application/helpers/assetsform_helper.php b/api/application/helpers/assetsform_helper.php index 88221299..f1a861dd 100644 --- a/api/application/helpers/assetsform_helper.php +++ b/api/application/helpers/assetsform_helper.php @@ -114,7 +114,12 @@ public static function getOthersAssetsDetails($values){ $storeValue['approximate_market_value'] = $fetchVal['approximate_market_value']; $storeValue['assets_mode'] .= '
('.$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'].'.'; diff --git a/api/application/views/report_templates/JSONTOREPORT_CLIX.php b/api/application/views/report_templates/JSONTOREPORT_CLIX.php index 39c0c4f1..79f61f9d 100644 --- a/api/application/views/report_templates/JSONTOREPORT_CLIX.php +++ b/api/application/views/report_templates/JSONTOREPORT_CLIX.php @@ -477,7 +477,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); echo "

"; echo "
"; - echo "

PERSONAL DISCUSSION REPORT CLIX

"; + echo "

PERSONAL DISCUSSION REPORT

"; echo "
for the case of
"; echo "

".$general_form['companies'][0]['company_name']."

"; @@ -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) { @@ -1153,7 +1155,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); { echo ''.$address_form['address_form_remark'].'Address Form - Address Form Remarks ';} echo "

"; - echo "
"; + // echo "
"; //die(); // ?> @@ -1312,7 +1314,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); // if($temp_show == null) // { ?> -
+ @@ -3076,8 +3078,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); - + + + @@ -3096,8 +3099,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); - + + + @@ -3113,8 +3117,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); - + + + @@ -3638,7 +3643,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); Sr.No Asset Type - + Asset Description Asset Owned By Approx Market Value(Rs) @@ -3651,7 +3656,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); - + '. $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($paRow['approximate_market_value']) : $rupee_symbol.' '.MYUTIL::customIndianNumberFormat($paRow['approximate_market_value']); ?> @@ -3818,8 +3823,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $residence_text ='This is a '. $fmValue['residence_ownership'].' Family Information - Ownership of Residence residence, where the applicant has been staying for '. $fmValue['residence_No_of_years'].'Family Information - No of Yrs in current residence .'; $residence_text .= (!strcasecmp($fmValue['residence_ownership'],'rented')) ? ' The rent paid '.$rupee_symbol.' '.$fmValue['rent'].' per month.' : ''; - $clix_dependency_text = 'There are totally '.$fmValue['no_family_members_clix'].' family member(s)'; - $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 = 'There are '.$fmValue['no_family_members_clix'].' family member(s) family '; + $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 "

";echo $residence_text;echo "

";echo $clix_dependency_text;