From 49d8ea6d31039c810cb93585b083f5340589a74a Mon Sep 17 00:00:00 2001 From: sanjeev Date: Wed, 2 Mar 2022 18:48:31 +0530 Subject: [PATCH] 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){