Sineedge/sparqapi
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Template Form Status fixes : ps

Browse Source
This commit is contained in:
VE10-Sanjeev 2022-04-07 13:30:05 +05:30
parent b479e7f99a
commit 8198485db6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/application/controllers/Template_Management_Controller.php
View File

@ -1067,13 +1067,14 @@ class Template_Management_Controller extends REST_Controller {
$template = $form_template[$i]['form_template']; $template = $form_template[$i]['form_template'];
if($template != null || $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"); $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); $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"; $msg = "Sucessfully Inserted";
$flag++; $flag++;
$STScode = REST_Controller::HTTP_CREATED; $STScode = REST_Controller::HTTP_OK;
} }
if($flag>0) if($flag>0)

9
api/application/models/Template_Management_Model.php
View File

@ -327,22 +327,21 @@ class Template_Management_Model extends SPARQ_Model {
// $this->db->ORDER_BY('PDFORMS.pd_form_order'); // $this->db->ORDER_BY('PDFORMS.pd_form_order');
// $result = $this->db->GET()->result_array(); // $result = $this->db->GET()->result_array();
// return $result; // 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`.`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` `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` 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` LEFT JOIN `m_pd_forms` as `PDFORMS` ON `TEMPLATE_JSON_V2`.`form_id` = `PDFORMS`.`pd_form_id`
WHERE `TEMPLATE_JSON_V2`.`isactive` = 1 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 `PDFORMS`.`is_business_form` = 0
AND AND (
`TEMPLATE_JSON_V2`.`is_form_status` = 'COMPLETED' `TEMPLATE_JSON_V2`.`is_form_status` = 'COMPLETED'
or or
`TEMPLATE_JSON_V2`.`is_form_status` = 'APPROVED' `TEMPLATE_JSON_V2`.`is_form_status` = 'APPROVED'
or or
`TEMPLATE_JSON_V2`.`is_form_status` = 'DRAFT' `TEMPLATE_JSON_V2`.`is_form_status` = 'DRAFT' )
ORDER BY `PDFORMS`.`pd_form_order`"; ORDER BY `PDFORMS`.`pd_form_order`";
// print_r($sql_query);die();
return $this->db->query($sql_query)->result_array(); return $this->db->query($sql_query)->result_array();
} }