From aba35da1b8c7e890a1e2dd9a0997cdba9fa88d7a Mon Sep 17 00:00:00 2001 From: velz Date: Thu, 22 Nov 2018 16:28:15 +0530 Subject: [PATCH] PD REPORT QUESTION AND ANSWERS2 --- api/application/controllers/PD_Controller.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index 53013629..9ca1795a 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -1875,7 +1875,8 @@ class PD_Controller extends REST_Controller { $final_data_to_response = array(); - $final_data_to_response['pd_master_details'] = $this->PD_Model->getPDMasterDetails($pd_id); + $pd_master_details = $this->PD_Model->getPDMasterDetails($pd_id); + $final_data_to_response = $pd_master_details[0]; $final_data_to_response['pd_applicant_details'] = $this->PD_Model->getApplicantsDetails($pd_id); //Get Template id @@ -1914,13 +1915,15 @@ class PD_Controller extends REST_Controller { $transformed_data = $this->transformKeyPairToQuestionAnswers($pd_form_raw_data,$template_form_detail['form_id']); - $final_data_to_response['question_answers'][$template_form_detail['pd_form_name']] = $transformed_data; + $final_data_to_response['question_answers']['form_details'][$template_form_detail['pd_form_name']] = $transformed_data; } } + } + $final_data_to_response['question_answers']['general_questions'] = array(); if(count($final_data_to_response)) { $data['dataStatus'] = true;