From 14cc8527adce2b38ad1552d94751014915e78630 Mon Sep 17 00:00:00 2001 From: sanjeev Date: Tue, 1 Mar 2022 18:50:20 +0530 Subject: [PATCH 1/9] Buiness FOrm Templated Id fixes : ps --- api/application/config/routes.php | 7 +- api/application/controllers/PD_Controller.php | 237 ++++++++++++++++++ .../Template_Management_Controller.php | 19 +- api/application/models/PD_Model.php | 7 +- 4 files changed, 256 insertions(+), 14 deletions(-) diff --git a/api/application/config/routes.php b/api/application/config/routes.php index 75678b13..d710a314 100755 --- a/api/application/config/routes.php +++ b/api/application/config/routes.php @@ -331,7 +331,7 @@ $route['downloadDataDump'] = 'Request_DataDump_Controller/downloadDataDump2'; $route['getSMCVendorList'] = 'SMC_Credit_PD_Controller/getStateWiseAgency'; $route['getSMCVendorPDOfficersList'] = 'SMC_Credit_PD_Controller/getSMCVendorPDOfficersList'; -//Template V2 (Dynamical) +## Template V2 (Dynamical) $route['getTemplateMappingDetailsV2'] = 'Template_Management_Controller/getTemplateV2'; $route['getTemplateFormsV2'] = 'Template_Management_Controller/getTemplateFormsV2'; $route['saveTemplateMappingDetailsV2'] = 'Template_Management_Controller/saveTemplateV2'; @@ -342,8 +342,9 @@ $route['loadFullTemplateV2'] = 'Template_Management_Controller/loadFullTemplateV $route['formWiseJSONTemplateV2'] = 'Template_Management_Controller/formWiseJSONTemplateV2'; $route['disableformV2'] = 'Template_Management_Controller/disableformV2'; $route['questionsV2'] = 'Template_Management_Controller/JSONquestionFilterV2'; -$route['getBuinessGroupForms'] = 'Template_Management_Controller/getBuinessGroupForms'; - +$route['getBuinessGroupForms'] = 'Template_Management_Controller/getBuinessGroupFormsV2'; +$route['getCompaniesListsForBusinessV2'] = 'PD_Controller/getCompaniesListsFromGeneralFormRawJSONV2'; +## PDjson developers Testing Purposer $route['PDjson'] = 'PD_Controller/PDjson'; $route['regenerateSatelliteImg'] = 'Sales_PD_Controller/regenerateSatelliteImg'; diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 9c57d74e..bf6db135 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -2977,6 +2977,7 @@ public function assignPDTempalate($data) $temp_array = array('fk_form_id'=>$formid,'company_id' => $company_id,'fk_pd_id'=>$pdid,'fk_createdby'=>$createdby,'json'=>$records,'processed_json' => $processed_json,'rental_count_id' => $rental_count_id,'template_id'=>$templateid); + // $temp_array = array('fk_form_id'=>$formid,'company_id' => $company_id,'fk_pd_id'=>$pdid,'fk_createdby'=>$createdby,'json'=>$records,'processed_json' => $processed_json,'rental_count_id' => $rental_count_id); $id = $this->PD_Model->saveRecords($temp_array,PDFORMDETAILSJSON); @@ -6721,11 +6722,247 @@ public function getPDFormDetailsJSON_post() } } +##v1 public function getCompaniesListsFromGeneralFormRawJSON_post() { $records = $this->post('records'); $pd_id = $records['pd_id']; + $ai_flag = 0; + //GET TEMPALE ID FROM MASTER + $pd_master_details = $this->PD_Model->getPDMasterDetails($pd_id); + $lender_short_name = $pd_master_details[0]['lender_short_name']; + $product_abbr = $pd_master_details[0]['product_abbr']; + //print_r($lender_short_name); + $str = substr($pd_master_details[0]['customer_segment_abbr'],-2); + //echo $str; + if(!strcmp($str,'AI')) { $ai_flag = 1; } + //echo $ai_flag; + + $company_list = array(); + $fields = array('json'); + $where_condition_array = array('isactive' => 1,'fk_form_id'=>18,'fk_pd_id'=>$pd_id); + $rec = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDFORMDETAILSJSON); + if(count($rec)) + { + $temp_data = json_decode($rec[0]['json'],true); + // print_r($temp_data);die(); + foreach($temp_data['companies'] as $company) + { + + if($company['associate_pd_id'] == $pd_id) + { + $temp_array = array('company_order_id' => $company['company_order_id'],'company_name' => $company['company_name'],'is_active' => $company['is_active'],'is_company_applicant'=>$company['is_company_applicant'],'business_entity_type'=>$company['business_entity_type'],'business_years'=>$company['business_years'],'business_month'=>$company['business_month'],'business_month'=>$company['business_month'],'business_date_object'=>$company['business_date_object']); + if(isset($company['business_entity_type_other'])) + { + $temp_array['business_entity_type_other'] = $company['business_entity_type_other']; + } + $company_list[] = $temp_array; + } + } + // $company_list = array( array('company_order_id' => 1)); + //print_r($company_list);die(); + $form_array = array(); + + if($ai_flag == 0) // DI case + { + + $form_array[] = array('form_id' => 13,'form_name' => 'About Business'); + + + $form_array[] = array('form_id' => 22,'form_name' => 'Business Assets'); + if(!strcasecmp($lender_short_name, 'CLIX')){ + $form_array[] = array('form_id' => 21,'form_name' => 'Business Banking'); + } + $form_array[] = array('form_id' => 14,'form_name' => 'Financial Information'); + $form_array[] = array('form_id' => 1,'form_name' => 'Supplier Details'); + $form_array[] = array('form_id' => 2,'form_name' => 'Client Details'); + $form_array[] = array('form_id' => 11,'form_name' => 'Stock Details'); + if(!strcasecmp($lender_short_name, 'CLIX') || (!strcasecmp($lender_short_name, 'MWISE'))) + { + $form_array[] = array('form_id' => 23,'form_name' => 'Future Plans & Business Environments'); + } + + } + else // AI Case + { + + $form_array[] = array('form_id' => 13,'form_name' => 'About Business'); + $form_array[] = array('form_id' => 22,'form_name' => 'Business Assets'); + if(!strcasecmp($lender_short_name, 'CLIX')){ + $form_array[] = array('form_id' => 21,'form_name' => 'Business Banking'); + } + $form_array[] = array('form_id' => 14,'form_name' => 'Financial Information'); + $form_array[] = array('form_id' => 1,'form_name' => 'Supplier Details'); + $form_array[] = array('form_id' => 2,'form_name' => 'Client Details'); + $form_array[] = array('form_id' => 11,'form_name' => 'Stock Details'); + $form_array[] = array('form_id' => 16,'form_name' => 'Assessed Income'); + if(!strcasecmp($lender_short_name, 'CLIX') || (!strcasecmp($lender_short_name, 'MWISE')) )// && !strcasecmp($product_abbr,'LFMP')) + { + $form_array[] = array('form_id' => 23,'form_name' => 'Future Plans & Business Environments'); + } + + } + + + //print_r($form_array);//die(); + foreach($company_list as $list_key => $company) + { + + $temp = array(); + $business_form_status = 0; + $supplier_form_status = 0; + $client_form_status = 0; + foreach($form_array as $form) + { + + $template_forms_count = 0; + if($form['form_id'] != 16) + { + $this->db->SELECT('count(*) as count'); + $this->db->FROM(PDFORMDETAILSJSON.' as PDFORMDETAILSJSON'); + $this->db->WHERE('PDFORMDETAILSJSON.fk_pd_id',$pd_id); + $this->db->WHERE('PDFORMDETAILSJSON.fk_form_id',$form['form_id']); + $this->db->WHERE('PDFORMDETAILSJSON.company_id',$company['company_order_id']); + $this->db->WHERE('PDFORMDETAILSJSON.isactive',1); + $template_forms_count = $this->db->GET()->result_array(); + //print_r($this->db->last_query());die(); + + } + else + { + + $fields = array('count(*) as count'); + $where_condition_array = array('fk_pd_id'=>$pd_id,'company_id' => $company['company_order_id'],'is_completed' => 1); + $template_forms_count = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDASSESSEDINCOMEESTIMATIONOFGROSSPROFITTYPE); + } + // print_r($this->db->last_query()); + // print_r($template_forms_count);echo $form['form_id']; + if($template_forms_count[0]['count'] != 0) { + + + if($form['form_id'] == 13 || $form['form_id'] == 22 || $form['form_id'] == 23) + { + + $temp[] = array('form_id' => $form['form_id'],'form_name'=> $form['form_name'],'isAnswered' => true,'isAnswerable'=>true); + if($form['form_id'] == 22) + { + $business_form_status = 1; + } + } + + else + { + if($business_form_status == 1){ + + + + if($form['form_id'] == 1)//if supplier form answered set supplier_form_status = 1 + { + $supplier_form_status = 1; + } + + if($form['form_id'] == 2)//if client form answered set client_form_status = 1 + { + $client_form_status = 1; + } + + if($form['form_id'] == 11 || $form['form_id'] == 22 || $form['form_id'] == 23) + { + //echo "COUNT YES STOCK" + if($client_form_status == 1 && $supplier_form_status == 1) + { + $temp[] = array('form_id' => $form['form_id'],'form_name'=> $form['form_name'],'isAnswered' => true,'isAnswerable'=>true); + } + } + else + { + $temp[] = array('form_id' => $form['form_id'],'form_name'=> $form['form_name'],'isAnswered' => true,'isAnswerable'=>true); + } + + } + else //busienss false + { + //echo "business false".$form['form_id']; + $temp[] = array('form_id' => $form['form_id'],'form_name'=> $form['form_name'],'isAnswered' => true,'isAnswerable'=>false); + } + } + } + else //Not previously answered + { + //echo "else-- " .$form['form_id']; + if($form['form_id'] == 13 || $form['form_id'] == 22 || $form['form_id'] == 23) + { + + $temp[] = array('form_id' => $form['form_id'],'form_name'=> $form['form_name'],'isAnswered' => false,'isAnswerable'=>true); + + } + else{ + if($business_form_status == 1){ + + if($form['form_id'] == 11 || $form['form_id'] == 22 || $form['form_id'] == 23) + { + //echo "BUSISTOCk"; + if($client_form_status == 1 && $supplier_form_status == 1) + { + $temp[] = array('form_id' => $form['form_id'],'form_name'=> $form['form_name'],'isAnswered' => false,'isAnswerable'=>true); + } + else + { + $temp[] = array('form_id' => $form['form_id'],'form_name'=> $form['form_name'],'isAnswered' => false,'isAnswerable'=>false); + } + } + else + { + $temp[] = array('form_id' => $form['form_id'],'form_name'=> $form['form_name'],'isAnswered' => false,'isAnswerable'=>true); + } + + } + else + { + + $temp[] = array('form_id' => $form['form_id'],'form_name'=> $form['form_name'],'isAnswered' => false,'isAnswerable'=>false); + + } + } + } + + } + + $company_list[$list_key]['form_status'] = $temp; + + + } + } + + // print_r($company_list);die(); + if(count($company_list)) + { + if($pd_master_details[0]['fk_pd_type'] == 2) + { + $vendor_form_status = $this->PD_Model->getVendorFormStatus($pd_id); + $company_list[0]['vendor_form_status'] = $vendor_form_status; + } + $data['dataStatus'] = true; + $data['status'] = REST_Controller::HTTP_OK; + $data['records'] = $company_list; + $this->response($data,REST_Controller::HTTP_OK); + } + else + { $data['dataStatus'] = false; + $data['status'] = REST_Controller::HTTP_NO_CONTENT; + $data['msg'] = 'No Comapany Details Found!'; + $this->response($data,REST_Controller::HTTP_OK); + + } + + } + +### V2 +public function getCompaniesListsFromGeneralFormRawJSONV2_post() +{ + $records = $this->post('records'); + $pd_id = $records['pd_id']; $ai_flag = 0; //GET TEMPALE ID FROM MASTER $pd_master_details = $this->PD_Model->getPDMasterDetails($pd_id); diff --git a/api/application/controllers/Template_Management_Controller.php b/api/application/controllers/Template_Management_Controller.php index 449a78e9..d0fb6f03 100644 --- a/api/application/controllers/Template_Management_Controller.php +++ b/api/application/controllers/Template_Management_Controller.php @@ -953,9 +953,9 @@ class Template_Management_Controller extends REST_Controller { }else{ $result_array[$inx]["forms"] = array(); } - array_push($result_array[$inx]["forms"],array("form_id"=> "13","form_name"=> "Business Information","json"=> "","is_form_disabled"=> "0","is_business_form"=> "1","is_group_form"=> "1","pd_form_order"=>"5","is_form_status"=>null)); - array_push($result_array[$inx]["forms"],array("form_id"=> "18","form_name"=> "General Information","json"=> "","is_form_disabled"=> "0","is_business_form"=> "0","is_group_form"=> "0","pd_form_order"=>"2","is_form_status"=>null)); - array_push($result_array[$inx]["forms"],array("form_id"=> "26","form_name"=> "Photograph","json"=> "","is_form_disabled"=> "0","is_business_form"=> "0","is_group_form"=> "0","pd_form_order"=>"24","is_form_status"=>null)); + array_push($result_array[$inx]["forms"],array("form_id"=> "13","form_name"=> "Business Information","json"=> "","is_form_disabled"=> "0","is_business_form"=> "1","is_group_form"=> "1","pd_form_order"=>"5","is_form_status"=>null,"template_id"=>null)); + array_push($result_array[$inx]["forms"],array("form_id"=> "18","form_name"=> "General Information","json"=> "","is_form_disabled"=> "0","is_business_form"=> "0","is_group_form"=> "0","pd_form_order"=>"2","is_form_status"=>null,"template_id"=>null)); + array_push($result_array[$inx]["forms"],array("form_id"=> "26","form_name"=> "Photograph","json"=> "","is_form_disabled"=> "0","is_business_form"=> "0","is_group_form"=> "0","pd_form_order"=>"24","is_form_status"=>null,"template_id"=>null)); // $buiness_arr = array("form_id"=> "13","form_name"=> "Business Information","json"=> "","is_form_disabled"=> "0","is_business_form"=> "1","is_group_form"=> "1"); // array_push($result_array[$inx]["forms"],$buiness_arr); } @@ -1221,7 +1221,6 @@ class Template_Management_Controller extends REST_Controller { } //API 7 public function formWiseJSONTemplateV2_get(){ - if( (!isset($_GET['map_id'])) && (!isset($_GET['form_id'])) ) { $data['dataStatus'] = false; @@ -1232,13 +1231,17 @@ class Template_Management_Controller extends REST_Controller { $map_id = $_GET['map_id']; $form_id = $_GET['form_id']; - $fields = array('json'); - $where_condition_array = array('map_id'=>$map_id,"form_id"=>$form_id,"isactive"=>1,"is_form_status"=>"COMPLETED"); + $form_id = $_GET['form_id']; + $template_id = isset($_GET['template_id'])?$_GET['template_id']:null; + $fields = array('id','json'); + if($template_id){$where_condition_array = array('map_id'=>$map_id,"form_id"=>$form_id,"is_form_status"=>"COMPLETED","id"=>$template_id);} + else{$where_condition_array = array('map_id'=>$map_id,"form_id"=>$form_id,"is_form_status"=>"COMPLETED","isactive"=>1);$data['note'] = "Existing JSON..";} $json_table = $this->Template_Management_Model->selectCustomRecords($fields,$where_condition_array,TEMPLATE_JSON_V2); if(count($json_table)>0){ $data['dataStatus'] = true; $data['status'] = REST_Controller::HTTP_OK; $data['json'] = $json_table[0]['json']; + $data['template_id'] = $json_table[0]['id']; $this->response($data,REST_Controller::HTTP_OK); } else @@ -1298,8 +1301,8 @@ class Template_Management_Controller extends REST_Controller { } } } - - public function getBuinessGroupForms_get(){ + // analysing + public function getBuinessGroupFormsV2_get(){ // if((!isset($_GET['map_id']))) // { // $data['dataStatus'] = false; diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 96f3e157..066e71cb 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -2364,17 +2364,18 @@ class PD_Model extends SPARQ_Model { $map_id = ""; } } - $this->db->SELECT('TEMPLATE_JSON_V2.map_id,TEMPLATE_JSON_V2.form_id,PDFORMS.pd_form_order,PDFORMS.pd_form_level_order,PDFORMS.pd_form_name as form_name,TEMPLATE_JSON_V2.is_form_disabled,PDFORMS.is_business_form,TEMPLATE_JSON_V2.is_group_form'); + $this->db->SELECT('TEMPLATE_JSON_V2.id as template_id,TEMPLATE_JSON_V2.map_id,TEMPLATE_JSON_V2.form_id,PDFORMS.pd_form_order,PDFORMS.pd_form_level_order,PDFORMS.pd_form_name as form_name,TEMPLATE_JSON_V2.is_form_disabled,PDFORMS.is_business_form,TEMPLATE_JSON_V2.is_group_form'); $this->db->FROM(TEMPLATE_JSON_V2.' as TEMPLATE_JSON_V2'); $this->db->JOIN(PDFORMS.' as PDFORMS','TEMPLATE_JSON_V2.form_id = PDFORMS.pd_form_id','LEFT'); $this->db->WHERE('TEMPLATE_JSON_V2.isactive',1); $this->db->WHERE('TEMPLATE_JSON_V2.map_id',$map_id); + $this->db->WHERE("(TEMPLATE_JSON_V2.is_form_status = 'COMPLETED' or TEMPLATE_JSON_V2.is_form_status = 'APPROVED' or TEMPLATE_JSON_V2.is_form_status = 'DRAFT')"); $this->db->ORDER_BY('PDFORMS.pd_form_order'); $template_forms = $this->db->GET()->result_array(); //here Hard-coded if(count($template_forms) > 0){ - array_push($template_forms,Array('map_id'=>$map_id,'form_id' => '18','pd_form_order' => '2','pd_form_level_order' => '1','form_name' => 'General Information','is_form_disabled'=>0)); - array_push($template_forms,Array('map_id'=>$map_id,'form_id' => '26','pd_form_order' => '24','pd_form_level_order' => '1','form_name' => 'Photograph','is_form_disabled'=>0)); + array_push($template_forms,Array('map_id'=>$map_id,'form_id' => '18','pd_form_order' => '2','pd_form_level_order' => '1','form_name' => 'General Information','is_form_disabled'=>0,"template_id"=>null)); + array_push($template_forms,Array('map_id'=>$map_id,'form_id' => '26','pd_form_order' => '24','pd_form_level_order' => '1','form_name' => 'Photograph','is_form_disabled'=>0,"template_id"=>null)); } $buiness_related_form = array(22,14,1,2,11,16); if(!strcasecmp($pd_master_detials[0]['lender_short_name'], 'CLIX')){ From 49d8ea6d31039c810cb93585b083f5340589a74a Mon Sep 17 00:00:00 2001 From: sanjeev Date: Wed, 2 Mar 2022 18:48:31 +0530 Subject: [PATCH 2/9] template fixes 2 : ps --- .../Template_Management_Controller.php | 10 +--- .../models/Template_Management_Model.php | 47 ++++++++++++------- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/api/application/controllers/Template_Management_Controller.php b/api/application/controllers/Template_Management_Controller.php index d0fb6f03..8f99c30a 100644 --- a/api/application/controllers/Template_Management_Controller.php +++ b/api/application/controllers/Template_Management_Controller.php @@ -924,6 +924,7 @@ class Template_Management_Controller extends REST_Controller { // API 2 Get Template with Form Details V2.0 : ps 20/12/2021 public function getTemplateFormsV2_get(){ + // echo "i am @927";die(); if(isset($_GET['map_id'])) { $records['map_id'] = $this->get("map_id");} @@ -942,14 +943,7 @@ class Template_Management_Controller extends REST_Controller { foreach($result_array as $inx => $arr) { if($arr['map_id'] != null || $arr['map_id'] != ""){ - $completed_details = $this->Template_Management_Model->getTemplateFormsV2($arr['map_id'],1); ### 1 means completed - $draft_or_approve_details = $this->Template_Management_Model->getTemplateFormsV2($arr['map_id'],2); ### 2 means draft or approved - $details = ((count($completed_details)>0) - ?$completed_details - :((count($draft_or_approve_details)>0) - ?$draft_or_approve_details - :array())); - $result_array[$inx]["forms"] = $details; + $result_array[$inx]["forms"] = $this->Template_Management_Model->getTemplateFormsV2($arr['map_id']); }else{ $result_array[$inx]["forms"] = array(); } diff --git a/api/application/models/Template_Management_Model.php b/api/application/models/Template_Management_Model.php index 7a8bdfd3..a33d24fc 100644 --- a/api/application/models/Template_Management_Model.php +++ b/api/application/models/Template_Management_Model.php @@ -313,24 +313,35 @@ class Template_Management_Model extends SPARQ_Model { return $result; } - public function getTemplateFormsV2($value,$flag){ - $this->db->SELECT('TEMPLATE_JSON_V2.id as template_id,TEMPLATE_JSON_V2.form_id,PDFORMS.pd_form_name as form_name,TEMPLATE_JSON_V2.json,TEMPLATE_JSON_V2.is_form_disabled,PDFORMS.is_business_form,TEMPLATE_JSON_V2.is_group_form,PDFORMS.pd_form_order,TEMPLATE_JSON_V2.is_form_status'); - $this->db->FROM(TEMPLATE_JSON_V2.' as TEMPLATE_JSON_V2'); - $this->db->JOIN(PDFORMS.' as PDFORMS','TEMPLATE_JSON_V2.form_id = PDFORMS.pd_form_id','LEFT'); - $this->db->WHERE('TEMPLATE_JSON_V2.isactive',1); - $this->db->WHERE('TEMPLATE_JSON_V2.map_id',$value); - if($flag == 1){ - $this->db->WHERE('TEMPLATE_JSON_V2.is_form_status',"COMPLETED"); - }else if($flag == 2){ - // $this->db->WHERE("(TEMPLATE_JSON_V2.is_form_status = 'APPROVED' or TEMPLATE_JSON_V2.is_form_status = 'DRAFT')"); - $this->db->WHERE('TEMPLATE_JSON_V2.is_form_status', "APPROVED"); - $this->db->OR_WHERE("TEMPLATE_JSON_V2.is_form_status", "DRAFT"); - } - - $this->db->WHERE('PDFORMS.is_business_form',0); - $this->db->ORDER_BY('PDFORMS.pd_form_order'); - $result = $this->db->GET()->result_array(); - return $result; + public function getTemplateFormsV2($value){ + // $this->db->SELECT('TEMPLATE_JSON_V2.id as template_id,TEMPLATE_JSON_V2.form_id,PDFORMS.pd_form_name as form_name,TEMPLATE_JSON_V2.json,TEMPLATE_JSON_V2.is_form_disabled,PDFORMS.is_business_form,TEMPLATE_JSON_V2.is_group_form,PDFORMS.pd_form_order,TEMPLATE_JSON_V2.is_form_status'); + // $this->db->FROM(TEMPLATE_JSON_V2.' as TEMPLATE_JSON_V2'); + // $this->db->JOIN(PDFORMS.' as PDFORMS','TEMPLATE_JSON_V2.form_id = PDFORMS.pd_form_id','LEFT'); + // $this->db->WHERE('TEMPLATE_JSON_V2.isactive',1); + // $this->db->WHERE('TEMPLATE_JSON_V2.map_id',$value); + // $this->db->WHERE("(TEMPLATE_JSON_V2.is_form_status = 'COMPLETED')"); + // $this->db->OR_WHERE("(TEMPLATE_JSON_V2.is_form_status = 'APPROVED')"); + // $this->db->OR_WHERE("(TEMPLATE_JSON_V2.is_form_status = 'DRAFT')"); + // $this->db->WHERE('PDFORMS.is_business_form',0); + // $this->db->ORDER_BY('PDFORMS.pd_form_order'); + // $result = $this->db->GET()->result_array(); + // return $result; + $sql_query = "SELECT `TEMPLATE_JSON_V2`.`id` as `template_id`, `TEMPLATE_JSON_V2`.`form_id`, `PDFORMS`.`pd_form_name` as `form_name`, + `TEMPLATE_JSON_V2`.`json`, `TEMPLATE_JSON_V2`.`is_form_disabled`, `PDFORMS`.`is_business_form`, + `TEMPLATE_JSON_V2`.`is_group_form`, `PDFORMS`.`pd_form_order`, `TEMPLATE_JSON_V2`.`is_form_status` + FROM `m_template_json_v2` as `TEMPLATE_JSON_V2` + LEFT JOIN `m_pd_forms` as `PDFORMS` ON `TEMPLATE_JSON_V2`.`form_id` = `PDFORMS`.`pd_form_id` + WHERE `TEMPLATE_JSON_V2`.`isactive` = 1 + AND `TEMPLATE_JSON_V2`.`map_id` = ".$value." + AND + (`TEMPLATE_JSON_V2`.`is_form_status` = 'COMPLETED' + or + `TEMPLATE_JSON_V2`.`is_form_status` = 'APPROVED' + or + `TEMPLATE_JSON_V2`.`is_form_status` = 'DRAFT' ) + AND `PDFORMS`.`is_business_form` =0 + ORDER BY `PDFORMS`.`pd_form_order`"; + return $this->db->query($sql_query)->result_array(); } public function saveTemplateMapping($records,$table){ From 0a17993fe6037ee023b62ff21d6f65f8163be034 Mon Sep 17 00:00:00 2001 From: sanjeev Date: Thu, 3 Mar 2022 16:07:09 +0530 Subject: [PATCH 3/9] updated : ps --- .../controllers/Template_Management_Controller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/application/controllers/Template_Management_Controller.php b/api/application/controllers/Template_Management_Controller.php index 8f99c30a..ca7724e3 100644 --- a/api/application/controllers/Template_Management_Controller.php +++ b/api/application/controllers/Template_Management_Controller.php @@ -1121,10 +1121,10 @@ class Template_Management_Controller extends REST_Controller { }else if($status == "APPROVED" || $status == "COMPLETED"){ //approve and completed status means just update the status only. $json_pk_id = $json_table[0]['id']; + $data = array('json' => json_encode($records['json'],true),'is_form_status' => $status); $this->db->where('isactive',1); $this->db->where('id',$json_pk_id); - $this->db->set('is_form_status',$status); - $this->db->update(TEMPLATE_JSON_V2); + $this->db->update(TEMPLATE_JSON_V2,$data); $msg = "Sucessfully Updated"; } From 73a71e5a091f465f53a4316a5c3990bad63eb4fa Mon Sep 17 00:00:00 2001 From: sanjeev Date: Tue, 8 Mar 2022 13:02:58 +0530 Subject: [PATCH 4/9] code committed : ps --- .../Template_Management_Controller.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/api/application/controllers/Template_Management_Controller.php b/api/application/controllers/Template_Management_Controller.php index ca7724e3..47ffd91c 100644 --- a/api/application/controllers/Template_Management_Controller.php +++ b/api/application/controllers/Template_Management_Controller.php @@ -1108,16 +1108,25 @@ class Template_Management_Controller extends REST_Controller { // $json_pk_id = $this->Template_Management_Model->saveTemplateMapping($fields,TEMPLATE_JSON_V2); if($status == "DRAFT"){ - if(count($json_table)>0 && $status == "COMPLETED"){ + if(count($json_table)>0){ + if($status == "COMPLETED"){ $this->db->where_in('id',$json_table[0]['id']); $this->db->set('isactive',0); + $this->db->where('is_form_status',"COMPLETED"); $this->db->update(TEMPLATE_JSON_V2); - } - //draft means insert. + }else{ + $json_pk_id = $json_table[0]['id']; + $data = array('json' => json_encode($records['json'],true),'is_form_status' => $status); + $this->db->where('isactive',1); + $this->db->where('id',$json_pk_id); + $this->db->update(TEMPLATE_JSON_V2,$data); + $msg = "Sucessfully Updated"; + } + }else{ $json = json_encode($records['json'],true); $fields = array('form_id' => $form_id,'json' => $json,'map_id'=>$map_id,'is_form_status'=>$status); $json_pk_id = $this->Template_Management_Model->saveTemplateMapping($fields,TEMPLATE_JSON_V2); - $msg = "Sucessfully Inserted"; + $msg = "Sucessfully Inserted";} }else if($status == "APPROVED" || $status == "COMPLETED"){ //approve and completed status means just update the status only. $json_pk_id = $json_table[0]['id']; From d5512279ea5ef7556683345b2a6e453aae5a31c0 Mon Sep 17 00:00:00 2001 From: sanjeev Date: Fri, 11 Mar 2022 14:48:09 +0530 Subject: [PATCH 5/9] name static setted : ps --- .../controllers/Template_Management_Controller.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/api/application/controllers/Template_Management_Controller.php b/api/application/controllers/Template_Management_Controller.php index 47ffd91c..33a8cba4 100644 --- a/api/application/controllers/Template_Management_Controller.php +++ b/api/application/controllers/Template_Management_Controller.php @@ -943,7 +943,11 @@ class Template_Management_Controller extends REST_Controller { foreach($result_array as $inx => $arr) { if($arr['map_id'] != null || $arr['map_id'] != ""){ - $result_array[$inx]["forms"] = $this->Template_Management_Model->getTemplateFormsV2($arr['map_id']); + $forms =$this->Template_Management_Model->getTemplateFormsV2($arr['map_id']); + for($i=0; $i Date: Fri, 11 Mar 2022 18:14:43 +0530 Subject: [PATCH 6/9] Fixes : ps --- .../Template_Management_Controller.php | 1 + .../models/Template_Management_Model.php | 52 ++++++++++++++----- .../views/smc_creditpd_reports/MWISE.php | 6 ++- .../views/smc_creditpd_reports/NBFC.php | 2 +- 4 files changed, 44 insertions(+), 17 deletions(-) diff --git a/api/application/controllers/Template_Management_Controller.php b/api/application/controllers/Template_Management_Controller.php index 33a8cba4..2cdfbacc 100644 --- a/api/application/controllers/Template_Management_Controller.php +++ b/api/application/controllers/Template_Management_Controller.php @@ -1336,6 +1336,7 @@ class Template_Management_Controller extends REST_Controller { { if($arr['map_id'] != null || $arr['map_id'] != ""){ $result_array[$inx]["forms"] = $this->Template_Management_Model->getBuinessGroupForms($arr['map_id']); + array_push($result_array[$inx]["forms"],array("form_id"=> "14","form_name"=> "Financial Information","pd_form_level_order"=> "2","json"=> "","is_form_disabled"=> "0","is_business_form"=> "1","is_group_form"=> "0","pd_form_order"=>"8","is_form_status"=>null,"template_id"=>null,"map_id"=>$arr['map_id'])); }else{ $result_array[$inx]["forms"] = array(); } diff --git a/api/application/models/Template_Management_Model.php b/api/application/models/Template_Management_Model.php index a33d24fc..571e5cd6 100644 --- a/api/application/models/Template_Management_Model.php +++ b/api/application/models/Template_Management_Model.php @@ -333,13 +333,13 @@ class Template_Management_Model extends SPARQ_Model { LEFT JOIN `m_pd_forms` as `PDFORMS` ON `TEMPLATE_JSON_V2`.`form_id` = `PDFORMS`.`pd_form_id` WHERE `TEMPLATE_JSON_V2`.`isactive` = 1 AND `TEMPLATE_JSON_V2`.`map_id` = ".$value." + AND `PDFORMS`.`is_business_form` = 0 AND - (`TEMPLATE_JSON_V2`.`is_form_status` = 'COMPLETED' + `TEMPLATE_JSON_V2`.`is_form_status` = 'COMPLETED' or `TEMPLATE_JSON_V2`.`is_form_status` = 'APPROVED' or - `TEMPLATE_JSON_V2`.`is_form_status` = 'DRAFT' ) - AND `PDFORMS`.`is_business_form` =0 + `TEMPLATE_JSON_V2`.`is_form_status` = 'DRAFT' ORDER BY `PDFORMS`.`pd_form_order`"; return $this->db->query($sql_query)->result_array(); } @@ -364,22 +364,46 @@ class Template_Management_Model extends SPARQ_Model { return count($afftectedRows)>0 ? true: false; } - public function getBuinessGroupForms($map_id){ - $this->db->SELECT('TEMPLATE_JSON_V2.id as template_id,TEMPLATE_JSON_V2.form_id,PDFORMS.pd_form_order,PDFORMS.pd_form_level_order,PDFORMS.pd_form_name as form_name,TEMPLATE_JSON_V2.is_form_disabled,PDFORMS.is_business_form,TEMPLATE_JSON_V2.is_group_form'); + public function getBuinessGroupForms_existing($map_id){ + $this->db->SELECT('TEMPLATE_JSON_V2.id as template_id,TEMPLATE_JSON_V2.form_id,PDFORMS.pd_form_order,PDFORMS.pd_form_level_order,PDFORMS.pd_form_name as form_name,TEMPLATE_JSON_V2.is_form_disabled,PDFORMS.is_business_form,TEMPLATE_JSON_V2.is_group_form'); + if(!empty($map_id)){ + $this->db->SELECT('TEMPLATE_JSON_V2.map_id,TEMPLATE_JSON_V2.json'); + $this->db->FROM(TEMPLATE_JSON_V2.' as TEMPLATE_JSON_V2'); + $this->db->JOIN(PDFORMS.' as PDFORMS','TEMPLATE_JSON_V2.form_id = PDFORMS.pd_form_id','LEFT'); + $this->db->WHERE('TEMPLATE_JSON_V2.map_id',$map_id); + }else{ + $this->db->SELECT('TEMPLATE_JSON_V2.map_id,PDFORMS.form_template as json'); + $this->db->FROM(PDFORMS.' as PDFORMS'); + $this->db->JOIN(TEMPLATE_JSON_V2.' as TEMPLATE_JSON_V2','TEMPLATE_JSON_V2.form_id = PDFORMS.pd_form_id','LEFT'); + } + $this->db->WHERE('TEMPLATE_JSON_V2.isactive',1); + $this->db->WHERE('PDFORMS.is_business_form',1); + $result = $this->db->GET()->result_array(); + return $result; + } + + public function getBuinessGroupForms($map_id){ if(!empty($map_id)){ - $this->db->SELECT('TEMPLATE_JSON_V2.map_id,TEMPLATE_JSON_V2.json'); - $this->db->FROM(TEMPLATE_JSON_V2.' as TEMPLATE_JSON_V2'); - $this->db->JOIN(PDFORMS.' as PDFORMS','TEMPLATE_JSON_V2.form_id = PDFORMS.pd_form_id','LEFT'); - $this->db->WHERE('TEMPLATE_JSON_V2.map_id',$map_id); - }else{ + $sql_query = "SELECT `TEMPLATE_JSON_V2`.`id` as `template_id`, `TEMPLATE_JSON_V2`.`form_id`, `PDFORMS`.`pd_form_order`, `PDFORMS`.`pd_form_level_order`, `PDFORMS`.`pd_form_name` as `form_name`, `TEMPLATE_JSON_V2`.`is_form_disabled`, `PDFORMS`.`is_business_form`, `TEMPLATE_JSON_V2`.`is_group_form`, `TEMPLATE_JSON_V2`.`is_form_status`, `TEMPLATE_JSON_V2`.`map_id`, `TEMPLATE_JSON_V2`.`json` + FROM `m_template_json_v2` as `TEMPLATE_JSON_V2` + LEFT JOIN `m_pd_forms` as `PDFORMS` ON `TEMPLATE_JSON_V2`.`form_id` = `PDFORMS`.`pd_form_id` + WHERE `TEMPLATE_JSON_V2`.`map_id` = ".$map_id." + AND `PDFORMS`.`is_business_form` = 1 + AND `TEMPLATE_JSON_V2`.`isactive` = 1 + AND `TEMPLATE_JSON_V2`.`is_form_status` = 'COMPLETED' + OR `TEMPLATE_JSON_V2`.`is_form_status` = 'APPROVED' + OR `TEMPLATE_JSON_V2`.`is_form_status` = 'DRAFT'"; + $result = $this->db->query($sql_query)->result_array(); + }else{ + $this->db->SELECT('TEMPLATE_JSON_V2.id as template_id,TEMPLATE_JSON_V2.form_id,PDFORMS.pd_form_order,PDFORMS.pd_form_level_order,PDFORMS.pd_form_name as form_name,TEMPLATE_JSON_V2.is_form_disabled,PDFORMS.is_business_form,TEMPLATE_JSON_V2.is_group_form,TEMPLATE_JSON_V2.is_form_status'); $this->db->SELECT('TEMPLATE_JSON_V2.map_id,PDFORMS.form_template as json'); $this->db->FROM(PDFORMS.' as PDFORMS'); $this->db->JOIN(TEMPLATE_JSON_V2.' as TEMPLATE_JSON_V2','TEMPLATE_JSON_V2.form_id = PDFORMS.pd_form_id','LEFT'); + $this->db->WHERE('TEMPLATE_JSON_V2.isactive',1); + $this->db->WHERE('PDFORMS.is_business_form',1); + $result = $this->db->GET()->result_array(); } - $this->db->WHERE('TEMPLATE_JSON_V2.isactive',1); - $this->db->WHERE('PDFORMS.is_business_form',1); - $result = $this->db->GET()->result_array(); - return $result; + return $result; } diff --git a/api/application/views/smc_creditpd_reports/MWISE.php b/api/application/views/smc_creditpd_reports/MWISE.php index 46a070a6..77327ae7 100644 --- a/api/application/views/smc_creditpd_reports/MWISE.php +++ b/api/application/views/smc_creditpd_reports/MWISE.php @@ -6,6 +6,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $dash = ' '; // $product_name = $master[0]['abbr']; $rupee_symbol = "₹"; + // echo $pd_master_details[0]['main_applicant']; + // echo $applicant_details[0]['company_name'];die(); // $pd_type = ""; // if($master[0]['sales_pd_type'] == 1){$pd_type = "Physical "; }else if($master[0]['sales_pd_type'] == 2){$pd_type = "Telephonic ";} // $company = array(); @@ -223,7 +225,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); Name of the Company/Firm - + @@ -859,7 +861,7 @@ $business_pd_visited_remark = (isset($pd_section_data[8]['business_pd_visited_re Name of the Company / Firm whose financials are noted - + diff --git a/api/application/views/smc_creditpd_reports/NBFC.php b/api/application/views/smc_creditpd_reports/NBFC.php index 99cacdbb..881f8eb0 100644 --- a/api/application/views/smc_creditpd_reports/NBFC.php +++ b/api/application/views/smc_creditpd_reports/NBFC.php @@ -211,7 +211,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); - + From 5ac886a73cc2bea358c3ae132d537b032c7d60c3 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 16 Mar 2022 10:04:42 +0000 Subject: [PATCH 7/9] PD_Controller.php edited online with Bitbucket --- api/application/controllers/PD_Controller.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index bf6db135..8d936c95 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -11005,10 +11005,9 @@ public function getCompaniesListsFromGeneralFormRawJSONV2_post() // is_smc_vendor(true/false) - here this api called both smart pd(vendor) and SMC(vendor) also but we using this key only for SMC(vendor module). if($smc_lender_id == $current_lender_id && isset($agency_id) && $agency_id != null && $records['is_smc_vendor'] == true){ if(isset($records['vendor_status']) && ($records['vendor_status'] == QC_COMPLETED)){ - $records['pd_status'] = $records['vendor_status']; //Here vendor_status is (QC_COMPLETED) means i have to update the Normal Status also. - unset($records['vendor_status']);//Here vendor status unsetted when qc_completed means. + $fields_to_update['pd_status'] = COMPLETED; //Here vendor_status is (QC_COMPLETED) means i have to update the Normal Status as COMPLETED. } - // else{ $records['vendor_status'] = $records['pd_status']; } + else{ $fields_to_update['vendor_status'] = $records['pd_status']; } } if(!isset($records['complete_override_data']) && isset($records['is_smc_vendor']) && $records['is_smc_vendor'] == false) { From a732024933dc0bd320c490e500950079c40bb36c Mon Sep 17 00:00:00 2001 From: VENBA-emp-10 sanjeev Date: Thu, 17 Mar 2022 23:10:42 +0530 Subject: [PATCH 8/9] unwanted print_r : ps --- api/application/views/report_templates/JSONTOREPORT_SAL.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/application/views/report_templates/JSONTOREPORT_SAL.php b/api/application/views/report_templates/JSONTOREPORT_SAL.php index 51d9bcdb..243511ae 100644 --- a/api/application/views/report_templates/JSONTOREPORT_SAL.php +++ b/api/application/views/report_templates/JSONTOREPORT_SAL.php @@ -1847,7 +1847,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); //echo $pd_offiecer_status_about_neighbor; if(count($existNeighRefCheck)>0){ - print_r($existNeighRefCheck);die(); + // print_r($existNeighRefCheck);die(); ?> $nfValue) { From c2cf35c2ddd7389c2bcc3e4f43af30c5eb463742 Mon Sep 17 00:00:00 2001 From: VENBA-emp-10 sanjeev Date: Thu, 17 Mar 2022 23:15:49 +0530 Subject: [PATCH 9/9] merge : ps
Name of the Company/Firm