From ddfd95ace797622ae9a5003aa164715881708537 Mon Sep 17 00:00:00 2001 From: velz Date: Thu, 23 May 2019 19:43:17 +0530 Subject: [PATCH] PD QC BASIC FUNCTIONALITY --- .gitignore | 1 + api/application/config/constants.php | 3 +- api/application/config/routes.php | 9 +- api/application/controllers/PD_Controller.php | 181 +++++++++++++++++- api/application/controllers/Welcome.php | 11 ++ api/application/docs/sample.pdf | Bin 744998 -> 745042 bytes .../helpers/authorization_helper.php | 5 + api/application/views/business_scorecard.php | 2 +- .../views/report_templates/JSONTOREPORT.php | 44 +++-- api/index.php | 4 +- 10 files changed, 231 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index 8e20071b..9d455059 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ api/application/logs/* api/application/syslogs/* api/application/request_logs/* api/application/pd_reports/* +api/application/views/pd_reports/* api/application/docs/* !api/application/logs/index.html !api/application/logs/.htaccess diff --git a/api/application/config/constants.php b/api/application/config/constants.php index 6f06b0a9..e30796b9 100644 --- a/api/application/config/constants.php +++ b/api/application/config/constants.php @@ -85,8 +85,9 @@ defined('EXIT__AUTO_MIN') OR define('EXIT__AUTO_MIN', 9); // lowest automat defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code // define login route name for token verification -//defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(listAllEntites/:any)'); // no errors +//defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', '(getPDReportHTML/:any)'); // no errors defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN', 'getPDOfficerCurrentLocation'); // no errors +defined('ROUTE_LOGIN_X') OR define('ROUTE_LOGIN_X', '(getPDReportHTML/:any)'); // no errors //defined('ROUTE_LOGIN') OR define('ROUTE_LOGIN','getFullPDDetails'); // no errors /*********************AWS resources Constants*************************************************/ diff --git a/api/application/config/routes.php b/api/application/config/routes.php index 26f0c9d4..adde5e77 100644 --- a/api/application/config/routes.php +++ b/api/application/config/routes.php @@ -87,6 +87,9 @@ $route['getCustomerSegment'] = 'Common_Masters_Controller/getCustomerSegment'; + + + //USER MANAGEMENT $route['getListOfUsers'] = 'User_Management_Controller/listAllUsers'; $route['saveNewUser'] = 'User_Management_Controller/saveNewUser'; @@ -197,7 +200,8 @@ $route['getPDAddress'] = 'PD_Controller/getPDAddress'; $route['updatePDAddress'] = 'PD_Controller/updatePDAddress'; $route['getPDCompleteDetails'] = 'PD_Controller/getPDCompleteDetails'; $route['getStateCityNamesAndPincode'] = 'PD_Controller/getStateCityNamesAndPincode'; - +$route['saveHTMLReport'] = 'PD_Controller/saveHTMLReport'; +$route['(getPDReportHTML/:any)'] = 'PD_Controller/getPDReportHTML'; // $route['savePDFormDetailsJSON'] = 'PD_Controller/savePDFormDetailsJSON'; // $route['getPDFormDetailsJSON'] = 'PD_Controller/getPDFormDetailsJSON'; @@ -221,5 +225,8 @@ $route['getDashBoardDetailsOfCity'] = 'Dash_Board_Controller/getDashBoardDetails $route['getDashBoardAlertDetails'] = 'Dash_Board_Controller/getDashBoardDetailsOfAlert'; $route['PD_MIS_report'] = 'Dash_Board_Controller/PD_MIS_report'; + +//$route['(getPDReportHTML/:any)'] = 'Welcome/getPDReportHTML'; + //miscellanous //$route['showBusinessScorecard'] = 'PD_Controller/'; diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index ae6da878..e423c5a7 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -703,7 +703,7 @@ class PD_Controller extends REST_Controller { $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; $charactersLength = strlen($characters); $randomString = ''; - for ($i = 0; $i < 8; $i++) + for ($i = 0; $i < 16; $i++) { $randomString .= $characters[rand(0, $charactersLength - 1)]; } @@ -3915,7 +3915,9 @@ class PD_Controller extends REST_Controller { /********************************************************************************************* *********************************************************************************************/ - public function generatePDReport_post() + + //Generate Report AS PDF, currenly not in use. + public function generatePDReportPDF_post() { $records = $this->post('records'); $pdid = $records['pd_id']; @@ -3981,8 +3983,7 @@ class PD_Controller extends REST_Controller { $temp = $this->load->view('report_templates/JSONTOREPORT',$data,true); //Save Report as HTML Version with timestamp - $file_name = APPPATH.'pd_reports/'.$pdid.'_'.date('Y-m-d-h-m-s').'.html'; - file_put_contents($file_name,$temp,LOCK_EX); + //PDF Gen using DOM PDF $pdf_doc = $this->pdfgenerator->generate($temp, $filename='version', $stream=false, $paper = 'A4', $orientation = "portrait"); @@ -4058,6 +4059,109 @@ class PD_Controller extends REST_Controller { } } } + + + //Generate Report as HTML File + public function generatePDReport_post() + { + $records = $this->post('records'); + $pdid = $records['pd_id']; + $fk_createdby = $records['fk_createdby']; + $original_template = "RAW"; + $is_regenerate = 0; + if(isset($records['regenerate'])) + { + $is_regenerate = 1; + } + + $data['pd_master_details'] = $this->PD_Model->getPDMasterDetails($pdid); + $data['applicants_details'] = $this->PD_Model->getApplicantsDetails($pdid); + $data['pd_additional_requirements'] = $this->PD_Model->getPDAdditionalRequirements($pdid); + $data['score_questions_display'] = $this->PD_Model->getScoreableQuestionToDispaly($pdid); + $data['pd_score'] = $this->calculateScore($pdid); + $data['dsc_cards'] = $this->getDetailedScoreCardChart( $data['pd_score'] ); + $data['assessed_income_details'] = $this->getAssessedIncomeForPDReport($pdid); + $score_for_chart = $data['pd_score']['score_summary']['overall_score']['final_score'] ? round($data['pd_score']['score_summary']['overall_score']['final_score'],1) : 0; + //echo $score_for_chart; + + //GET phantom script from DB + $phantom_script = $this->PD_Model->selectCustomRecords(array('*'),array('script_name' => PHANTOMJSSCRIPT_LOCATION),SCRIPTS); + + $exact_script = $phantom_script[0]['script_content']; + //print_r($exact_script); + $exact_script = str_replace('{{place_score_here}}',$score_for_chart,$exact_script); + //print_r($exact_script);die(); + + + //GENERATE CHART PART + file_put_contents(APPPATH.'/views/js/phantomchart.js',$exact_script,LOCK_EX); + + $str = 'phantomjs '.APPPATH.'/views/js/phantomchart.js'; + exec($str,$ou); + exec('phantom.exit();'); + + //print_r($ou); + + $chart_img_path = APPPATH.'/views/report_templates/chart.png'; + $type = pathinfo($chart_img_path, PATHINFO_EXTENSION); + $chart_img_content = file_get_contents($chart_img_path); + $base64_pdscore_chart_url = 'data:image/' . $type . ';base64,' . base64_encode($chart_img_content); + $data['base64_pdscore_chart_url'] = $base64_pdscore_chart_url; + // echo $data['base64_pdscore_chart_url']; + //die(); + //END OF GENERATE CHART PART + + + + + //GET ALL PROCESSED JSON + for($i = 1;$i<=25;$i++) + { + $fields = array('processed_json'); + $where_condition_array = array('isactive' => 1,'fk_pd_id'=>$pdid,'fk_form_id' => $i); + $data['pd_processed_forms'][$i] = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDFORMDETAILSJSON,array(),'','company_id','ASC'); + + $fields2 = array('*'); + $data['pd_images'][$i] = $this->PD_Model->getSignedPDDocsURL($pdid,$i); + } + + + $temp = $this->load->view('report_templates/JSONTOREPORT',$data,true); + //Save Report as HTML Version with timestamp + if (!is_dir(APPPATH.'views/pd_reports/'.$pdid)) { + $dust = mkdir(APPPATH.'views/pd_reports/'.$pdid, 0777, TRUE); + } + $pd_report_time = date('Y-m-d-h-m-s'); + $pd_report_store = APPPATH.'views/pd_reports/'.$pdid.'/'.$pd_report_time.'.html'; + $is_write_done = file_put_contents($pd_report_store,$t); + + if($is_write_done) + { + + $update = $this->PD_Model->updateRecords(array('pd_report_html_filename' => $pd_report_time),PDTRIGGER,array('pd_id' => $pdid)); + + $where_condition_array = array("pd_id" => $pdid); + $temp_array = array('is_original_report_created'=>1,'pd_report_html_filename' => $pd_report_time,'pd_report_generated_date' => date('Y-m-d h:m:s')); + + $id = $this->PD_Model->updateRecords($temp_array,PDTRIGGER,$where_condition_array); + + $response_data['dataStatus'] = true; + $response_data['status'] = REST_Controller::HTTP_OK; + $response_data['msg'] = 'Report Generated Sucessfully..!'; + $this->response($response_data,REST_Controller::HTTP_OK); + + } + else + { + $response_data['dataStatus'] = true; + $response_data['status'] = REST_Controller::HTTP_NOT_MODIFIED; + $response_data['msg'] = 'Something went wrong..!'; + $this->response($response_data,REST_Controller::HTTP_OK); + + } + + } + @@ -4863,9 +4967,12 @@ class PD_Controller extends REST_Controller { public function codeigniterViewTest_post() { + + //echo MYUTIL::customIndianNumberFormat(145263.45896);die(); $records = $this->post('records'); $pdid = $records['pd_id']; + $is_regenerate = 0; if(isset($records['regenerate'])) { @@ -4939,9 +5046,26 @@ class PD_Controller extends REST_Controller { //die(); //echo "*******************************************"; $t = $this->load->view('report_templates/JSONTOREPORT',$data,true); - $file_name = APPPATH.'pd_reports/'.$pdid.'_'.date('Y-m-d-h-m-s').'.html'; - //file_put_contents($file_name,$t,LOCK_EX); - //echo $t; die(); + + //echo $t; + + if (!is_dir(APPPATH.'views/pd_reports/'.$pdid)) { + $dust = mkdir(APPPATH.'views/pd_reports/'.$pdid, 0777, TRUE); + } + $pd_report_time = date('Y-m-d-h-m-s'); + $pd_report_store = APPPATH.'views/pd_reports/'.$pdid.'/'.$pd_report_time.'.html'; + file_put_contents($pd_report_store,$t); + + $update = $this->PD_Model->updateRecords(array('pd_report_html_filename' => $pd_report_time),PDTRIGGER,array('pd_id' => $pdid)); + + if(count($update)) + { + $dat['dataStatus'] = true; + $dat['status'] = REST_Controller::HTTP_OK; + $dat['msg'] = 'Report Generated Sucessfully..!'; + $this->response($dat,REST_Controller::HTTP_OK); + } + //PDF Gen using DOM PDF $pdf_doc = $this->pdfgenerator->generate($t, $filename='version', $stream=false, $paper = 'A4', $orientation = "portrait"); //End of PDF Gen using DOM PDF @@ -6483,5 +6607,48 @@ class PD_Controller extends REST_Controller { } + public function saveHTMLReport_post() + { + + $records = $this->post('records'); + $pdid = $records['pdid']; + $content = $records['content']; + $pd_report_time = date('Y-m-d-h-m-s'); + $pd_report_store = APPPATH.'views/pd_reports/'.$pdid.'/'.$pd_report_time.'.html'; + file_put_contents($pd_report_store,$content); + + $update = $this->PD_Model->updateRecords(array('pd_report_html_filename' => $pd_report_time),PDTRIGGER,array('pd_id' => $pdid)); + + if(count($update)) + { + $dat['dataStatus'] = true; + $dat['status'] = REST_Controller::HTTP_OK; + $dat['msg'] = 'Report Generated Sucessfully..!'; + $this->response($dat,REST_Controller::HTTP_OK); + } + } + + public function getPDReportHTML_get() + { + $pdid = $this->uri->segment(2); + if(($pdid != null || $pdid != "") && (strlen($pdid) == 16) &&(is_string($pdid))) + { + $pd_data = $this->PD_Model->selectCustomRecords(array('pd_id','pd_report_html_filename'),array('random_string' => $pdid),PDTRIGGER); + if(count($pd_data)) + { + $view_name = 'pd_reports/'.$pd_data[0]['pd_id'].'/'.$pd_data[0]['pd_report_html_filename'].'.html'; + $this->load->view($view_name); + } + else + { + echo "

Not Found

"; + } + } + else + { + echo "

Not Found

"; + } + } + } \ No newline at end of file diff --git a/api/application/controllers/Welcome.php b/api/application/controllers/Welcome.php index df8b7c0c..6190225c 100644 --- a/api/application/controllers/Welcome.php +++ b/api/application/controllers/Welcome.php @@ -28,4 +28,15 @@ class Welcome extends CI_Controller { //echo $PD_Controller->index(); } + + public function getPDReportHTML() + { + //$code = $_GET['']; + //echo $code; + //print_r($this->uri->segment(2)); + + + $this->load->view('pd_reports/602/2019-05-23-04-05-52.html'); + } + } diff --git a/api/application/docs/sample.pdf b/api/application/docs/sample.pdf index 4127dca040e6d6a3075df6cf98174f79a382bf9d..f7614112c056e0e45aede147ce2e72f089a3c8b6 100644 GIT binary patch delta 6837 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 HbkP3?U{(^j diff --git a/api/application/helpers/authorization_helper.php b/api/application/helpers/authorization_helper.php index 5e4481de..51cf57e8 100644 --- a/api/application/helpers/authorization_helper.php +++ b/api/application/helpers/authorization_helper.php @@ -63,6 +63,11 @@ class AUTHORIZATION //print_r($CI->uri->uri_string); //die(); + + if( $routingName == ROUTE_LOGIN_X) + { + return true; + } if (!array_key_exists("Authorization",$headersData) OR $headersData['Authorization']!=$CI->config->item('authorization_key')) { set_status_header(REST_CONTROLLER::HTTP_UNAUTHORIZED,"Unauthorized"); diff --git a/api/application/views/business_scorecard.php b/api/application/views/business_scorecard.php index 8fe66348..043dfde7 100644 --- a/api/application/views/business_scorecard.php +++ b/api/application/views/business_scorecard.php @@ -1,3 +1,3 @@ "Business Banking Vintage >>", "location_suited_for_busienss" => "Business Location suitability >>", "business_seasonality" => "Seasonality >>", "employees_total" => "Employee Strength >>", "cerificates" => "Business Certifications Sighted >>","owned_property" => "Business Premise Ownership >>", "owned_vechile" => "Vehicle Ownership >>", "business_activity_has_seen" => "Business Activity Observed >>", "minimum_supplier_info" => "Supplier Information Shared >>", "minimum_client_info" => "Client Information Shared >>","stock_raw_material_enough" => "Raw Materials Stock Sufficiency >>", "stock_finished_goods_enough" => "Finished/Traded Stock Sufficiency >>", "vintage_of_business_account" => "Main Business Banking Account Vintage >>");$descriptions = '';$score = '';if(isset($business) && count($business)){foreach($business as $key => $d){$descriptions .= '"'.$business_captions [$key].'",'; $score .= $d['attributed_score'] != 0 && $d['max_score'] != 0 ? (($d['attributed_score']/$d['max_score']) * 100).',' : '0'.',';}} +$business_captions = array("no_of_years_business_run" => "Business Vintage >>", "location_suited_for_busienss" => "Business Location suitability >>", "business_seasonality" => "Seasonality >>", "employees_total" => "Employee Strength >>", "cerificates" => "Business Certifications Sighted >>","owned_property" => "Business Premise Ownership >>", "owned_vechile" => "Vehicle Ownership >>", "business_activity_has_seen" => "Business Activity Observed >>", "minimum_supplier_info" => "Supplier Information Shared >>", "minimum_client_info" => "Client Information Shared >>","stock_raw_material_enough" => "Raw Materials Stock Sufficiency >>", "stock_finished_goods_enough" => "Finished/Traded Stock Sufficiency >>", "vintage_of_business_account" => "Main Business Banking Account Vintage >>");$descriptions = '';$score = '';if(isset($business) && count($business)){foreach($business as $key => $d){$descriptions .= '"'.$business_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 70e7f19d..2e5503ef 100644 --- a/api/application/views/report_templates/JSONTOREPORT.php +++ b/api/application/views/report_templates/JSONTOREPORT.php @@ -2,7 +2,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); ?> - + @@ -270,7 +270,17 @@ defined('BASEPATH') OR exit('No direct script access allowed'); - + @@ -637,7 +647,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');

PD Location Address : '.$pd_address['address'].' ,'.$pd_address['city_master'].' ,'.$pd_address['state_master'].' - '.$pincode; + echo 'PD Location Address : '.$pd_address['address'].', '.$pd_address['city_master'].', '.$pd_address['state_master'].' - '.$pincode; echo '

GPS Coordinates of location where PD Visit was done : '.$pd_master_details[0]['start_location']; echo '

'; ?> @@ -663,20 +673,20 @@ defined('BASEPATH') OR exit('No direct script access allowed'); if($business_assets_details['business_assets_for_address'][0]['business_month'] != ""){ $yrs_being_run.= ' and '.$business_assets_details['business_assets_for_address'][0]['business_month'].' Months';} echo '

'; - 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 "

The ".$address_type." is located in ".$locality." and the estimated area of the office is ".$estimated_area." ."; - echo "

The PD location was ". $pd_address['pd_location_master'].". " . "As Per PD Offcier, the ".$address_type ." is situated in ".$comment_locality_master ." Locality."; - echo "

The PD officer also made the following observations:" ; - echo "

    "; + 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 '

    The '.$address_type.' is located in '.$locality.' and the estimated area of the '.$address_type.' is '.$estimated_area.' .'; + echo '

    The PD location was '. $pd_address['pd_location_master'].'. ' . 'As Per PD Offcier, the '.$address_type .' is situated in '.$comment_locality_master .' Locality.'; + echo '

    The PD officer also made the following observations:' ; + echo '
      '; - echo "
    • The location of the ".$address_type." is ".$address_type_remarks_caption [ $final_remark_data['is_service_provided'] ]." to the nature of business.
      • "; + echo '
    • The location of the '.$address_type.' is '.$address_type_remarks_caption [ $final_remark_data['is_service_provided'] ].' to the nature of business.
      • '; if($business_assets_details['business_assets_for_address'][0]['business_is_pd_visited'] == 'yes') { - echo "
    • Business Activity was seen during visit.
      • "; + echo '
    • Business Activity was seen during visit.
      • '; } else{ - echo "
    • No business activity was seen during the PD visit
      • "; + echo '
    • No business activity was seen during the PD visit
      • '; } if(isset($business_assets_details['business_assets_form_remark']) && $business_assets_details['business_assets_form_remark'] != ""){ echo "
    • ".$business_assets_details['business_assets_form_remark'] ."
      • ";} @@ -1702,7 +1712,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $client_second_row .= ' '.$main_raw_material['manufacturing_client_name'].''; - $client_third_row .= ''.$main_raw_material['manufacturing_contact_person_mobile_number'] ? $main_raw_material['manufacturing_contact_person_mobile_number'] : 'Not Provided' .''; + $client_third_row .= ''.($main_raw_material['manufacturing_contact_person_mobile_number'] ? $main_raw_material['manufacturing_contact_person_mobile_number'].'' : 'Not Provided' .''); $client_fourth_row .= $main_raw_material['person_stdcode'] && $main_raw_material['person_landline'] ? ''. $main_raw_material['person_stdcode'].' '.$main_raw_material['person_landline'].'' : ''.'Not Provided'.''; @@ -1742,7 +1752,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $client_second_row .= ' '.$trading_product['trade_client_name'].''; - $client_third_row .= ''. $trading_product['trade_product_contact_person_mobile_number'] ? $trading_product['trade_product_contact_person_mobile_number'] : 'Not Provided'.''; + $client_third_row .= ''. ($trading_product['trade_product_contact_person_mobile_number'] ? $trading_product['trade_product_contact_person_mobile_number'].'' : 'Not Provided'.''); $client_fourth_row .= $trading_product['person_stdcode'] && $trading_product['person_landline'] ? ''. $trading_product['person_stdcode'].' '.$trading_product['person_landline'].'' : ''.'Not Provided'.''; @@ -1783,7 +1793,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $client_second_row .= ' '.$service_product['service_provider_client_name'].''; - $client_third_row .= ''. $service_product['service_provider_product_contact_person_mobile_number'] ? $service_product['service_provider_product_contact_person_mobile_number'] : 'Not Provided' .''; + $client_third_row .= ''. ($service_product['service_provider_product_contact_person_mobile_number'] ? $service_product['service_provider_product_contact_person_mobile_number'].'' : 'Not Provided' .''); $client_fourth_row .= $service_product['person_stdcode'] && $service_product['person_landline'] ? ''. $service_product['person_stdcode'].' '.$service_product['person_landline'].'' : ''.'Not Provided'.''; @@ -1808,7 +1818,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $client_fifth_row .= ''; $client_sixth_row .= ''; $client_seventh_row .= ''; - + //echo $client_third_row;die(); ?> Asset Description Asset Owned By Approx Market Value(Rs) - Purchase Year + Age of the Assest Loan Again Assest diff --git a/api/index.php b/api/index.php index c7fa828b..7f1cb7fb 100644 --- a/api/index.php +++ b/api/index.php @@ -54,7 +54,7 @@ * NOTE: If you change these, also change the error_reporting() code below */ //define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] : 'development'); - define('ENVIRONMENT','development'); + define('ENVIRONMENT','testing'); date_default_timezone_set('Asia/Kolkata'); @@ -77,7 +77,7 @@ switch (ENVIRONMENT) case 'testing': error_reporting(-1); - ini_set('display_errors', 0); + ini_set('display_errors', 1); break; case 'production': ini_set('display_errors', 0);