diff --git a/api/application/controllers/Template_Management_Controller.php b/api/application/controllers/Template_Management_Controller.php index 3422b7ff..c6939e76 100644 --- a/api/application/controllers/Template_Management_Controller.php +++ b/api/application/controllers/Template_Management_Controller.php @@ -1067,13 +1067,14 @@ class Template_Management_Controller extends REST_Controller { $template = $form_template[$i]['form_template']; if($template != null || $template != ""){ $fields = array('form_id' => $form_template[$i]['form_id'],'json' => $template,'map_id'=>$map_pk_id,'is_form_status'=>"DRAFT"); + if($form_template[$i]['form_id'] != 13 || $form_template[$i]['form_id'] != 18 ||$form_template[$i]['form_id'] != 26){ $json_pk_id = $this->Template_Management_Model->saveTemplateMapping($fields,TEMPLATE_JSON_V2); - $c = $c." ".$json_pk_id; + $c = $c." ".$json_pk_id;} } } $msg = "Sucessfully Inserted"; $flag++; - $STScode = REST_Controller::HTTP_CREATED; + $STScode = REST_Controller::HTTP_OK; } if($flag>0) diff --git a/api/application/models/Template_Management_Model.php b/api/application/models/Template_Management_Model.php index d9f40e61..b40e7ec8 100644 --- a/api/application/models/Template_Management_Model.php +++ b/api/application/models/Template_Management_Model.php @@ -327,22 +327,21 @@ class Template_Management_Model extends SPARQ_Model { // $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`, + $sql_query = "SELECT `TEMPLATE_JSON_V2`.`map_id`,`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`.`id` = ".$value." + AND `TEMPLATE_JSON_V2`.`map_id` = ".$value." AND `PDFORMS`.`is_business_form` = 0 - AND + AND ( `TEMPLATE_JSON_V2`.`is_form_status` = 'COMPLETED' or `TEMPLATE_JSON_V2`.`is_form_status` = 'APPROVED' or - `TEMPLATE_JSON_V2`.`is_form_status` = 'DRAFT' + `TEMPLATE_JSON_V2`.`is_form_status` = 'DRAFT' ) ORDER BY `PDFORMS`.`pd_form_order`"; - // print_r($sql_query);die(); return $this->db->query($sql_query)->result_array(); }