diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 16fafd9d..e83ae913 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -1492,52 +1492,63 @@ class PD_Controller extends REST_Controller { $result_array = $this->PD_Model->getPDFormDetails($pd_id,$pd_form_id); $final_data = array(); - // if($pd_form_id == 1) - // { + //print_r($result_array); - $group = array(); - $pre_iter = 1; + $overall = array(); + $pre_group = ""; + $pre_iter = ""; $t1 = array(); $t2 = array(); + $group = array(); foreach($result_array as $rkey => $result) { + if($result['iteration'] != "" || $result['iteration'] != null) { - if($result['iteration'] == $pre_iter) + + if($result['iter_column_name'] != $pre_group && $result['iter_column_name'] != $pre_iter) { - - $t1 = array_merge($t1,array($result['column_name']=>$result['column_value'])); - $group[$result['iter_column_name']][$result['iteration']] = $t1; - $pre_iter = $result['iteration']; + $t1 = array(); + $t2 = array(); + $group = array(); + // echo "New-".$result['iter_column_name']; + // print_r(array($result['column_name']=>$result['column_value'])); + $t1 = array_merge($t1,array($result['column_name']=>$result['column_value'])); + $group[$result['iter_column_name']][$result['iteration']] = $t1; + $pre_group = $result['iter_column_name']; + $pre_iter = $result['iteration']; } else { - - $t2 = array_merge($t2,array($result['column_name']=>$result['column_value'])); - $group[$result['iter_column_name']][$result['iteration']] = $t2; - $pre_iter = $result['iteration']; - } + + // echo "old-".$result['iter_column_name']; + // print_r(array($result['column_name']=>$result['column_value'])); + $t1 = array_merge($t1,array($result['column_name']=>$result['column_value'])); + $group[$result['iter_column_name']][$result['iteration']] = $t1; + $pre_group = $result['iter_column_name']; + $pre_iter = $result['iteration']; + } } else { + $t = array($result['column_name']=>$result['column_value']); - //$final_data[] = $t; $final_data = array_merge($final_data,$t); } + + $final_data = array_merge($final_data,$group); } - //$final_data[] = $group; - - + //$final_data = array_merge($final_data,$group); $result_array = $final_data; - //} + if($result_array) { @@ -1615,6 +1626,11 @@ class PD_Controller extends REST_Controller { } + $data['dataStatus'] = true; + $data['status'] = REST_Controller::HTTP_OK; + //$data['records'] = $result_array; + $this->response($data,REST_Controller::HTTP_OK); + } diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php index 10d8b75a..089a5243 100644 --- a/api/application/models/PD_Model.php +++ b/api/application/models/PD_Model.php @@ -735,15 +735,17 @@ class PD_Model extends SPARQ_Model { public function getPDFormDetails($pd_id,$pd_form_id) { + //echo $pd_id.'-'.$pd_form_id; $this->db->SELECT('PDFORMDETAILS.iter_column_name,PDFORMDETAILS.iteration, PDFORMDETAILS.column_name, PDFORMDETAILS.column_id, PDFORMDETAILS.column_value, PDFORMDETAILS.createdon, PDFORMDETAILS.fk_createdby,USERPROFILE.first_name,USERPROFILE.last_name'); $this->db->FROM(PDFORMDETAILS.' as PDFORMDETAILS'); - $this->db->JOIN(USERPROFILE.' as USERPROFILE','PDFORMDETAILS.fk_createdby = USERPROFILE.userid'); + $this->db->JOIN(USERPROFILE.' as USERPROFILE','PDFORMDETAILS.fk_createdby = USERPROFILE.userid','LEFT'); $this->db->WHERE('PDFORMDETAILS.fk_pd_id',$pd_id); $this->db->WHERE('PDFORMDETAILS.fk_form_id',$pd_form_id); $this->db->WHERE('PDFORMDETAILS.isactive',1); //$this->db->ORDER_BY('PDFORMDETAILS.iteration'); $form_details = $this->db->GET()->result_array(); - + //print_r($this->db->last_query()); + //print_r($form_details);die(); return $form_details;