From e00147c0b16ee7f02e8334b21efbc3b7465e545d Mon Sep 17 00:00:00 2001 From: Ravi Gulhane Date: Wed, 27 Apr 2022 20:25:40 +0530 Subject: [PATCH] Changes --- .../Controllers/MetricreportController.php | 23 ++++++++++++ resources/views/metricreport/report.blade.php | 37 ++++++++++++++++++- 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/MetricreportController.php b/app/Http/Controllers/MetricreportController.php index eb79f437..abfce35e 100644 --- a/app/Http/Controllers/MetricreportController.php +++ b/app/Http/Controllers/MetricreportController.php @@ -50,6 +50,7 @@ class MetricreportController extends Controller $post = $request->except('_token'); //echo '
';print_r($post); exit;
         $response = LambdaRequest::signedrequest('post', $this->_service, $this->_module.'/view', $post);
+        //echo '
'; print_r($response); exit;
         if($post['type'] == 'trend' && $post['chart'] == 'tabularperuser') {
             
 
@@ -117,6 +118,28 @@ class MetricreportController extends Controller
                     }
                 }
                 break;
+            case 'details':
+                if($response->data->graph->chart == 'tabular') {
+                    $headers = ['User', 'Designation', 'Zone', 'Region', "Area", "Territory"];
+                    foreach($response->data->graph->values->metrics as $metric) {
+                        $headers[] = $metric->metric;
+                    }
+                    $exceldata[] = $headers;
+                    foreach($response->data->graph->values->users as $user) {
+                        $row = [];
+                        $row[] = $user->name;
+                        $row[] = $user->designation;
+                        $row[] = isset($user->positions->Zone) ? $user->positions->Zone : '-';
+                        $row[] = isset($user->positions->Region) ? $user->positions->Region : '-';
+                        $row[] = isset($user->positions->Area) ? $user->positions->Area : '-';
+                        $row[] = isset($user->positions->Territory) ? $user->positions->Territory : '-';
+                        foreach($response->data->graph->values->metrics as $metric) {
+                            $row[] = isset($metric->stats->{$user->id}) ? $metric->stats->{$user->id} : '-';
+                        }
+                        $exceldata[] = $row;
+                    }
+                }
+                break;
         }
         //echo '
'; print_r($exceldata); exit;
         if(isset($post['email']) && $post['email'] == 1) {
diff --git a/resources/views/metricreport/report.blade.php b/resources/views/metricreport/report.blade.php
index 6713c39d..5a0f4c81 100644
--- a/resources/views/metricreport/report.blade.php
+++ b/resources/views/metricreport/report.blade.php
@@ -37,7 +37,7 @@
                             

{{$graph->valid_from}} to {{$graph->valid_till}}

- @if(in_array($post['type'], ['trend','leaderboard']) || ($post['type'] == 'graphical' && $graph->type == 'grouped') ) + @if(in_array($post['type'], ['trend','leaderboard']) || ($post['type'] == 'graphical' && $graph->type == 'grouped') || ($post['type'] == 'details' && $graph->chart == 'tabular') ) @endif @@ -165,6 +165,41 @@
@break + @case($post['type'] == 'details' && $graph->chart == 'tabular') +
+
+ + + + + + + + + @foreach($graph->values->metrics as $metric) + + @endforeach + + + + @foreach($graph->values->users as $user) + + + + + + + + @foreach($graph->values->metrics as $metric) + + @endforeach + +
UserZoneRegionAreaTerritory{{$metric->metric}}
{{$user->name}}
{{$user->designation}}
{{ isset($user->positions->Zone) ? $user->positions->Zone : '-' }}{{ isset($user->positions->Region) ? $user->positions->Region : '-' }}{{ isset($user->positions->Area) ? $user->positions->Area : '-' }}{{ isset($user->positions->Territory) ? $user->positions->Territory : '-' }}{{ isset($metric->stats->{$user->id}) ? $metric->stats->{$user->id} : '-' }} + @endforeach +
+
+
+ @break @default
@if($post['type'] == 'value' || ($post['type'] == 'graphical' && $graph->chart = 'percentile' && $graph->type == 'simple' ))