diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index f479acd5..ae6da878 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -4879,8 +4879,8 @@ class PD_Controller extends REST_Controller { $data['pd_additional_requirements'] = $this->PD_Model->getPDAdditionalRequirements($pdid); $data['score_questions_display'] = $this->PD_Model->getScoreableQuestionToDispaly(); $data['pd_score'] = $this->calculateScore($pdid); - // print_r($data['pd_score']); - // die(); + //print_r($data['pd_score']); + //die(); $data['assessed_income_details'] = $this->getAssessedIncomeForPDReport($pdid); // print_r($data['assessed_income_details']); @@ -4935,7 +4935,7 @@ class PD_Controller extends REST_Controller { // print_r($this->db->last_query()); } //die(); - //print_r(json_decode($data['pd_processed_forms'][14][0]['processed_json'],true)); + //print_r($data['pd_images']);die(); //print_r(json_decode($data['pd_processed_forms'][14][0]['processed_json'],true)); //die(); //echo "*******************************************"; $t = $this->load->view('report_templates/JSONTOREPORT',$data,true); diff --git a/api/application/docs/sample.pdf b/api/application/docs/sample.pdf index ae08045b..b7210bae 100644 Binary files a/api/application/docs/sample.pdf and b/api/application/docs/sample.pdf differ diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 55400a21..88fa4ce3 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -235,13 +235,13 @@ class PD_Model extends SPARQ_Model { $where_condition_array['fk_form_id'] = $form_id != null ? $form_id : null; - - - $where_condition_array['company_id'] = $company_id != null ? $company_id : null; + if($company_id != null){ + $where_condition_array['company_id'] = $company_id ; + } //print_r($where_condition_array);die(); $document_lists = $this->selectRecords(PDDOCUMENTS,$where_condition_array); - //print_r($document_lists);die(); + // print_r($this->db->last_query());die(); if(count($document_lists)) { diff --git a/api/application/views/general_scorecard.php b/api/application/views/general_scorecard.php index 6fb7ee69..2fc7c572 100644 --- a/api/application/views/general_scorecard.php +++ b/api/application/views/general_scorecard.php @@ -1,3 +1,3 @@ "OTP authentication done >>","person_met_is_applicant" => "Is person Met, a loan applicant >>","qualification" => "Qualification of Loan Applicants >>","comment_locality" => "Comment on Locality >>","pd_location_approach" => "Approach to PD location >>","customer_behaviour" => "Customer Behaviour >>","neibourhood_check_as_per_pd_officer" => "Neighbourhood check >>","was_the_company_name_board_sighted" => "Business Board Sighted >>","value_of_other_assets" => "Asset Value by Loan Amount% >>");$descriptions = '';$score = '';if(isset($general) && count($general)){foreach($general as $key => $d){$descriptions .= '"'.$general_captions [$key].'",'; $score .= $d['attributed_score'] != 0 && $d['max_score'] != 0 ? (($d['attributed_score']/$d['max_score']) * 100).',' : '0'.',';}} +$general_captions = array("otp_done" => "OTP authentication done >>","person_met_is_applicant" => "Is person Met, a loan applicant >>","qualification" => "Qualification of Loan Applicants >>","comment_locality" => "Comment on Locality >>","pd_location_approach" => "Approach to PD location >>","customer_behaviour" => "Customer Behaviour >>","neibourhood_check_as_per_pd_officer" => "Neighbourhood check >>","was_the_company_name_board_sighted" => "Business Board Sighted >>","value_of_other_assets" => "Asset Value by Loan Amount % >>");$descriptions = '';$score = '';if(isset($general) && count($general)){foreach($general as $key => $d){$descriptions .= '"'.$general_captions [$key].'",'; $score .= $d['attributed_score'] != 0 && $d['max_score'] != 0 ? (($d['attributed_score']/$d['max_score']) * 100).',' : '0'.',';}} ?>
\ 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 90efdef2..67a263fa 100644 --- a/api/application/views/report_templates/JSONTOREPORT.php +++ b/api/application/views/report_templates/JSONTOREPORT.php @@ -655,9 +655,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $estimated_area = $pd_address['estimated_area'].' '; $estimated_area .= $pd_address['uom_others'] != "" || $pd_address['uom_others'] != null ? $pd_address['uom_others'] : $pd_address['uom_master']; $locality = $pd_address['locality_master']; - $locality_master_article = !strcasecmp($pd_address['locality_master'],'excellent') ? 'an' : 'a'; - $locality = preg_match("/^[aeiouAEIOU]/U", $locality) ? 'an '.$locality : 'a '.$locality; + $comment_locality_master = preg_match("/^[aeiouAEIOU]/U", $pd_address['comment_locality_master']) ? 'an '.$pd_address['comment_locality_master'] : 'a '.$pd_address['comment_locality_master']; $property_owner_type = $business_assets_details['business_assets_for_address'][0]['business_ownership_type']; if($property_owner_type == 'rented') { $property_owner_type ='Rented (Rent Rs'.$business_assets_details['business_assets_for_address'][0]['business_monthly_rented_amt'].' Per Month)'; }else{$property_owner_type = 'Owned'; } $yrs_being_run = $business_assets_details['business_assets_for_address'][0]['business_years'].' Years'; @@ -667,7 +666,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); echo "The PD visit was done at ". $address_type. " of the loan applicants. "; echo "The ".$address_type." is ".$property_owner_type." and the business has been in operation from here for the last $yrs_being_run."; echo "Considering the size of operations, the stock of raw materials maintained is not sufficient as per the PD Officer’s observations.
'; } $stock_photo_count = $pd_images[11]; - //echo count($stock_photo_count); + // echo count($pd_images[11]); + // die(); $stock_img_row_count = ceil(count($stock_photo_count) / 5); //echo $stock_img_row_count; @@ -2315,27 +2315,38 @@ defined('BASEPATH') OR exit('No direct script access allowed'); echo 'Annual Purchase value:'. $rupee_symbol.' '.MYUTIL::customIndianNumberFormat(($sale_month_wise['total_months_value'] )).''; } echo '';
echo '
| ';
+ }
}
+ echo '||||||||
Business Expenses Details :
'; @@ -2824,14 +2839,14 @@ defined('BASEPATH') OR exit('No direct script access allowed');|
- Polite
+ Polite
|
- Rude
+ Rude
|
- Others mentioned as below
+ Others mentioned as below
|
PD officer recommendation is '.$fo_diplay.'';?>. The following key points were considered while arriving at the aforementioned status.
+ echo ''.$fo_diplay.'';?>. The following key points were considered while arriving at the aforementioned status. "; foreach($final_remark_data['recommendation_positive'] as $pos){ echo "