From 9a7e5d7993b21e57fd3741f1897cc1fda1fb37ea Mon Sep 17 00:00:00 2001 From: arbaz <54329740+arbazbagwan@users.noreply.github.com> Date: Fri, 20 Jan 2023 16:25:25 +0530 Subject: [PATCH] create radiometrix with subquestions and radio element show value --- app/Http/Controllers/FormController.php | 3 +- .../SurveysubmissionController.php | 68 ++-- resources/views/srvey/common.blade.php | 325 +++++++++++------- 3 files changed, 243 insertions(+), 153 deletions(-) diff --git a/app/Http/Controllers/FormController.php b/app/Http/Controllers/FormController.php index 71bc1347..f127e110 100644 --- a/app/Http/Controllers/FormController.php +++ b/app/Http/Controllers/FormController.php @@ -846,7 +846,7 @@ class FormController extends Controller public function surveyhandle($finfo, Request $request) { $request->session()->put('finfo', $finfo); $finfo = LambdaRequest::postrequest('form', 'survey/getforminfo', ['finfo' => $finfo]); - //echo '
'; print_r($finfo); exit;
+ // echo ''; print_r($finfo); exit;
$request->session()->put('formdata', $finfo->data->formdata);
if($finfo->status == 'success' && $finfo->data->formdata->link_type == 'form') {
//return $this->deliverform($finfo->data->formdata, $finfo->data->questions);
@@ -858,6 +858,7 @@ class FormController extends Controller
} elseif (\View::exists('form.'.$formdata->form_id)) {
return view('srvey.'.$formdata->form_id)->with($data);
} else {
+ // return $data;
return view('srvey.common')->with($data);
}
diff --git a/app/Http/Controllers/SurveysubmissionController.php b/app/Http/Controllers/SurveysubmissionController.php
index 4a4c282c..787cad1a 100644
--- a/app/Http/Controllers/SurveysubmissionController.php
+++ b/app/Http/Controllers/SurveysubmissionController.php
@@ -1,6 +1,7 @@
_base_url = '/surveysubmission';
}
- protected function get_list_buttons() {
- return [ ['title' => 'Date Filter', 'link' => '#.' ], ['title' => 'Export Excel', 'link' => $this->_base_url.'/export'] ];
+ protected function get_list_buttons()
+ {
+ return [['title' => 'Date Filter', 'link' => '#.'], ['title' => 'Export Excel', 'link' => $this->_base_url . '/export']];
}
- public function list(Request $request) {
+ public function list(Request $request)
+ {
$user = Auth::user();
$form_id = $request->session()->get('entity_id');
$post = $request->input();
- if(isset($post['startdate']))
+ if (isset($post['startdate']))
$startdate = $post['startdate'];
else
- $startdate = date("Y/m/d", strtotime("-1 day") );
+ $startdate = date("Y/m/d", strtotime("-1 day"));
- if(isset($post['enddate']))
+ if (isset($post['enddate']))
$enddate = $post['enddate'];
else
- $enddate = date("Y/m/d", strtotime("now") + 86400 );
+ $enddate = date("Y/m/d", strtotime("now") + 86400);
- $reqdata = ["partition" => 'rapport-'.$user->domain, "form_id" => $form_id, "alldata" => true, "date_range" => $startdate.'_'.$enddate ];
+ $reqdata = ["partition" => 'rapport-' . $user->domain, "form_id" => $form_id, "alldata" => true, "date_range" => $startdate . '_' . $enddate];
$request->session()->put('formdata_request', $reqdata);
//echo ''; print_r($reqdata); exit;
- $response = LambdaRequest::signedrequest('post', $this->_service, $this->_module.'/getformhistory', $reqdata);
- if($response->statusCode == 401) {
+ $response = LambdaRequest::signedrequest('post', $this->_service, $this->_module . '/getformhistory', $reqdata);
+ if ($response->statusCode == 401) {
return redirect('/unauthorised');
}
//echo ''; print_r($response); exit;
@@ -54,18 +57,34 @@ class SurveysubmissionController extends Controller
'date' => ['title' => 'Record Date', 'type' => 'text'],
'sdate' => ['title' => 'Submitted On', 'type' => 'text'],
];
- foreach($response->data->questions as $qid => $question){
- $fields['field_'.$qid] = ['title' => $question->label, 'type' => 'text'];
+ foreach ($response->data->questions as $qid => $question) {
+ $fields['field_' . $qid] = ['title' => $question->label, 'type' => 'text'];
}
+ // echo ''; print_r($fields);
+ // exit;
$items = [];
- foreach($response->data->submissions as $submission) {
+ // print_r($response->data->questions);
+ // print_r($response->data->submissions);
+ // exit;
+ foreach ($response->data->submissions as $submission) {
$item = ['user' => $submission->user_info->name, 'date' => date("d M Y", strtotime($submission->record_date)), 'sdate' => date("d M Y", strtotime($submission->createdAt))];
- foreach($response->data->questions as $qid => $question){
- $item['field_'.$qid] = count((array)$question->options) > 0 && isset($question->options->{ $submission->formdata->{$qid} }) ? $question->options->{ $submission->formdata->{$qid} } : $submission->formdata->{$qid};
+ foreach ($response->data->questions as $qid => $question) {
+ if ($question->type == 'radiometrix') {
+ $rm = [];
+ foreach ($submission->formdata->$qid as $key => $val) {
+ $rm[] = $key . ':' . $val;
+ }
+ $item['field_' . $qid] = implode(', ', $rm);
+ } else {
+ $item['field_' . $qid] = count((array)$question->options) > 0 && isset($question->options->{$submission->formdata->{$qid}}) ? $question->options->{$submission->formdata->{$qid}} : $submission->formdata->{$qid};
+ }
}
$items[] = (object)$item;
}
- //echo ''; print_r($items); exit;
+ // echo '';
+ // print_r($items);
+ // exit;
+
return $this->view('list')->with([
'title' => $response->data->formname . $this->_title,
'fields' => $fields,
@@ -77,25 +96,26 @@ class SurveysubmissionController extends Controller
]);
}
- public function export(Request $request) {
+ public function export(Request $request)
+ {
$reqdata = $request->session()->get('formdata_request');
//$reqdata = ["partition" => 'rapport-vitalis1', "form_id" => '1650365457-c86bd7f2-a33c-49a5-9671-3c2511b57f3b', "alldata" => true, "date_range" => '2022/_'.$enddate ];
- $response = LambdaRequest::signedrequest('post', $this->_service, $this->_module.'/getformhistory', $reqdata);
+ $response = LambdaRequest::signedrequest('post', $this->_service, $this->_module . '/getformhistory', $reqdata);
$fields = ['Submitted By', 'User identification', 'Record Date', 'Submitted On'];
- foreach($response->data->questions as $qid => $question){
+ foreach ($response->data->questions as $qid => $question) {
$fields[] = $question->label;
}
list($startdate, $enddate) = explode('_', $reqdata['date_range']);
$exceldata = [];
- $exceldata[] = [ucwords($response->data->formname . $this->_title).' Report'];
- $exceldata[] = ['Start Date: '.date("d M Y", strtotime($startdate))];
- $exceldata[] = ['End Date: '.date("d M Y", strtotime($enddate))];
+ $exceldata[] = [ucwords($response->data->formname . $this->_title) . ' Report'];
+ $exceldata[] = ['Start Date: ' . date("d M Y", strtotime($startdate))];
+ $exceldata[] = ['End Date: ' . date("d M Y", strtotime($enddate))];
$exceldata[] = [''];
$exceldata[] = $fields;
- foreach($response->data->submissions as $submission) {
+ foreach ($response->data->submissions as $submission) {
$item = [$submission->user_info->name, $submission->user_info->id, date("d M Y", strtotime($submission->record_date)), date("d M Y", strtotime($submission->createdAt))];
- foreach($response->data->questions as $qid => $question){
+ foreach ($response->data->questions as $qid => $question) {
$item[] = $submission->formdata->{$qid};
}
$exceldata[] = $item;
diff --git a/resources/views/srvey/common.blade.php b/resources/views/srvey/common.blade.php
index 31db5641..1b988959 100644
--- a/resources/views/srvey/common.blade.php
+++ b/resources/views/srvey/common.blade.php
@@ -1,13 +1,15 @@
+
- @include('layouts.shared/title-meta', ['title' => "Form"])
- @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? ''])
-
+ @include('layouts.shared/title-meta', ['title' => 'Form'])
+ @include('layouts.shared/head-css', ['mode' => $mode ?? '', 'demo' => $demo ?? ''])
+
-
+
+
@@ -16,96 +18,163 @@
- @if(Session::has('error')){{Session::get('error')}}
-
@endif
- @if(session('success')){{ session('success') }}
-
-
@endif
-
- {{$form->title}}
-
-
-