diff --git a/resources/views/metricreport/appreport.blade.php b/resources/views/metricreport/appreport.blade.php index a942a969..7b2805fc 100644 --- a/resources/views/metricreport/appreport.blade.php +++ b/resources/views/metricreport/appreport.blade.php @@ -77,12 +77,20 @@ @endif + @php + $leader_id = ''; + @endphp @foreach($graph->values as $i => $val) -
-
-
{{$val->user->name}}
{{$val->user->designation}}
-
{{$graph->values[0]->rank != 0 ? ($graph->values[0]->rank == 1 ? ($graph->values[0]->score ? ceil(($val->score/$graph->values[0]->score)*100) : 0) : ($graph->values[1]->score ? ceil(($val->score/$graph->values[1]->score)*100) : 0 ) ) : 0 }}%
{{round($val->score, 2)}}
-
+ @if($leader_id != $val->user->id) +
+
+
{{$val->user->name}}
{{$val->user->designation}}
+
{{$graph->values[0]->rank != 0 ? ($graph->values[0]->rank == 1 ? ($graph->values[0]->score ? ceil(($val->score/$graph->values[0]->score)*100) : 0) : ($graph->values[1]->score ? ceil(($val->score/$graph->values[1]->score)*100) : 0 ) ) : 0 }}%
{{round($val->score, 2)}}
+
+ @endif + @php + $leader_id = $val->user->id; + @endphp @endforeach @break diff --git a/resources/views/metricreport/report.blade.php b/resources/views/metricreport/report.blade.php index 5a0f4c81..cf6c490e 100644 --- a/resources/views/metricreport/report.blade.php +++ b/resources/views/metricreport/report.blade.php @@ -63,12 +63,9 @@ - - -
@foreach($charts as $chart) @if($chart->type == $post['type'] && sizeof($chart->charts) > 1) @@ -102,15 +99,23 @@ + @php + $leader_id = ''; + @endphp @foreach($graph->values as $i => $val) - - - - {{$val->user->name}} - {{$val->user->designation}} - {{round($val->score, 2)}} - {{$graph->values[0]->rank != 0 ? ($graph->values[0]->rank == 1 ? ($graph->values[0]->score ? ceil(($val->score/$graph->values[0]->score)*100) : 0) : ($graph->values[1]->score ? ceil(($val->score/$graph->values[1]->score)*100) : 0 ) ) : 0 }}% - + @if($leader_id != $val->user->id) + + + + {{$val->user->name}} + {{$val->user->designation}} + {{round($val->score, 2)}} + {{$graph->values[0]->rank != 0 ? ($graph->values[0]->rank == 1 ? ($graph->values[0]->score ? ceil(($val->score/$graph->values[0]->score)*100) : 0) : ($graph->values[1]->score ? ceil(($val->score/$graph->values[1]->score)*100) : 0 ) ) : 0 }}% + + @endif + @php + $leader_id = $val->user->id; + @endphp @endforeach