From 5208bf6cfbe88a4cfdd076c1156a7cea155ac0c5 Mon Sep 17 00:00:00 2001 From: sanjeev Date: Tue, 11 Jan 2022 22:37:52 +0530 Subject: [PATCH] question filter api completed : ps --- .../Template_Management_Controller.php | 44 ++++++++++++++++--- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/api/application/controllers/Template_Management_Controller.php b/api/application/controllers/Template_Management_Controller.php index ce96f091..be86dbf1 100644 --- a/api/application/controllers/Template_Management_Controller.php +++ b/api/application/controllers/Template_Management_Controller.php @@ -1322,9 +1322,10 @@ class Template_Management_Controller extends REST_Controller { if(count($json_table)>0){ $json = json_decode($json_table[0]['json'],true); if(isset($json['questions'][0]['question_key']) ){ - $quest = $json['questions']; + $quest = isset($json['questions'])?$json['questions']:$json['question']; }else{ - $quest = $json['questions'][0]['question']; + $quest = isset($json['questions'][0]['question'])?$json['questions'][0]['question']:$json['question'][0]['question']; + // s$quest = $json['questions'][0]['question']; } // re-check (1,2) // done (5,19,14,24,20,22) //ok-but-doubt (13,11) // print_r($quest);die(); @@ -1340,7 +1341,7 @@ class Template_Management_Controller extends REST_Controller { $data['dataStatus'] = true; $data['status'] = REST_Controller::HTTP_OK; $data['available_question'] = $filter_arr; - $data['json'] = $quest; + // $data['json'] = $quest; $this->response($data,REST_Controller::HTTP_OK); }else{ $data['dataStatus'] = false; @@ -1363,14 +1364,38 @@ class Template_Management_Controller extends REST_Controller { public function call_arr1($quest){ $return_arr = array(); $i = 0 ; + // print_r($quest); if((!empty($quest)) && (is_array($quest) || is_object($quest)) ) { foreach ($quest as $key => $value) { // $return_arr[$i] = array('question'=> $value['question'],'question_key'=>$value['question_key']); // $return_arr[$i]['question'] = $value['question']; // $return_arr[$i]['question_key'] = $value['question_key']; - $return_arr[$i] = $value['question']; - $i++; + + if(isset($value['question'][0]['question_key'])){ + $question = isset($value['question']) ? $value['question'] : array(); + for($j = 0 ;$jcall_arr1($latest_quest); + $arr2 = $this->call_arr2($latest_quest); + $return_arr[$i] = $this->merged_arr($temp[$i],$arr2); + $i++; + } + }else if(isset($value['questions'][0]['question_key'])){ + $question = isset($value['questions']) ? $value['questions'] : array(); + for($j = 0 ;$jcall_arr1($latest_quest); + $arr2 = $this->call_arr2($latest_quest); + $return_arr[$i] = $this->merged_arr($temp[$i],$arr2); + $i++; + } + } + + else{ + $return_arr[$i] = $value['question']; + $i++; + } } } return $return_arr; @@ -1383,7 +1408,8 @@ class Template_Management_Controller extends REST_Controller { if(!empty($quest) && is_array($quest) || is_object($quest)){ foreach ($quest as $key => $value) { if((isset($value['onchange_properties'])) && (!empty($value['onchange_properties'])) && ($value['onchange_properties'] != null)){ - $onchange_properties = isset($value['onchange_properties'][0]['form_controls']) ? $value['onchange_properties'][0]['form_controls'] : array(); + for($h=0;$h0 && !empty($onchange_properties)){ foreach ($onchange_properties as $key1 => $value1) { @@ -1391,10 +1417,15 @@ class Template_Management_Controller extends REST_Controller { // echo "I have step 1"; // echo($value['question_key']); // echo $value1['question_key'];} + // if($value['question_key'] == 'Assets_Type'){ + // } if($value1['insert_index'] == $value['question_key']){ if(count($value1['questions']) > 0){ // echo " 8-i".$i; for($j = 0 ;$j