From 1f1cf186199cd260a3a2f9fa88e3674120c88e31 Mon Sep 17 00:00:00 2001
From: Ravi Gulhane <ravi@stratawiz.com>
Date: Fri, 13 May 2022 15:30:37 +0530
Subject: [PATCH] Changes

---
 app/Http/Controllers/Controller.php               | 1 +
 app/Http/Controllers/FormsubmissionController.php | 7 ++++---
 resources/views/form/history.blade.php            | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index cc531ee5..7f45e805 100755
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -32,6 +32,7 @@ class Controller extends BaseController
     }
 
     protected function getlambda($type, $service, $module, $url, $data = []) {
+        return LambdaRequest::signedrequest($type, $service, $module.'/'.$url, $data);
         if($url == 'dropdown' && $this->_request->session()->has($service.'-'.$module.'-'.$url) ) {
             return $this->_request->session()->get($service.'-'.$module.'-'.$url);
         } elseif($url == 'dropdown'){
diff --git a/app/Http/Controllers/FormsubmissionController.php b/app/Http/Controllers/FormsubmissionController.php
index 9ac76139..67c45079 100644
--- a/app/Http/Controllers/FormsubmissionController.php
+++ b/app/Http/Controllers/FormsubmissionController.php
@@ -34,7 +34,7 @@ class FormsubmissionController extends Controller
         if(isset($post['startdate']))
             $startdate = $post['startdate'];
         else
-            $startdate = date("Y/m/d", strtotime("-1 month") );
+            $startdate = date("Y/m/d", strtotime("-1 day") );
 
         if(isset($post['enddate']))
             $enddate = $post['enddate'];
@@ -79,8 +79,9 @@ class FormsubmissionController extends Controller
 
     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);
-        $fields = ['Submitted By', 'Record Date', 'Submitted On'];
+        $fields = ['Submitted By', 'User identification', 'Record Date', 'Submitted On'];
         foreach($response->data->questions as $qid => $question){
             $fields[] = $question->label;
         }
@@ -93,7 +94,7 @@ class FormsubmissionController extends Controller
         $exceldata[] = $fields;
 
         foreach($response->data->submissions as $submission) {
-            $item = [$submission->user_info->name, date("d M Y", strtotime($submission->record_date)), date("d M Y", strtotime($submission->createdAt))];
+            $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){
                 $item[] = $submission->formdata->{$qid};
             }
diff --git a/resources/views/form/history.blade.php b/resources/views/form/history.blade.php
index 50db534c..cd243b82 100644
--- a/resources/views/form/history.blade.php
+++ b/resources/views/form/history.blade.php
@@ -51,7 +51,7 @@
                                             <tr>
                                                 <th>{{date("d M Y", strtotime($submission->updatedAt))}}</th>
                                                 @foreach($questions as $code => $question)
-                                                    @if(count((array)$question->options) > 0)
+                                                    @if(count((array)$question->options) > 0 && 1==2 )
                                                     <td>{{ $question->options->{ $submission->formdata->{$code} } }}</td>
                                                     @else
                                                     <td>{{ isset($submission->formdata->{$code}) ? $submission->formdata->{$code} : $code }}</td>