diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 37218c45..e310288e 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -2261,7 +2261,7 @@ class PD_Controller extends REST_Controller { 'condition' =>'TEMPLATEFORMS.form_id = PDFORMS.pd_form_id AND TEMPLATEFORMS.isactive = 1', 'jointype' => 'INNER')); $where_condition_array = array('fk_template_id' => $template_id); - $template_form_details = $this->PD_Model->getJoinRecords($columns,$table,$joins,$where_condition_array); + $template_form_details = $this->PD_Model->getJoinRecords($columns,$table,$joins,$where_condition_array,'PDFORMS.pd_form_order'); //print_r($template_form_details); if(count($template_form_details)) { diff --git a/api/application/libraries/SPARQ_Model.php b/api/application/libraries/SPARQ_Model.php index ce896237..d75804dc 100644 --- a/api/application/libraries/SPARQ_Model.php +++ b/api/application/libraries/SPARQ_Model.php @@ -93,7 +93,7 @@ class SPARQ_Model extends CI_Model { } - public function getJoinRecords($columns,$table,$joins,$where_condition_array = array(),$print_query = '') + public function getJoinRecords($columns,$table,$joins,$where_condition_array = array(),$order_by = '',$print_query = '') { @@ -113,6 +113,10 @@ class SPARQ_Model extends CI_Model { } } + if($order_by != '') + { + $this->db->ORDER_BY($order_by); + } $data = $this->db->get()->result_array();