More optimisations for users dashboard
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 36s
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m34s
Create Docker Image / Final Docker Image Manifest (push) Successful in 10s

This commit is contained in:
2024-04-20 22:03:47 +10:00
parent 20d3776490
commit 3f5668292f
4 changed files with 47 additions and 56 deletions

View File

@@ -186,7 +186,7 @@
@foreach($dl as $do)
{
name: '{{ $do->name }}',
y: {{ $do->daily_area_stats()->sum('y') }},
y: {{ $do->echoarea_total_daily()->sum('count') }},
drilldown: 'n-{{ $do->name }}',
},
@endforeach
@@ -200,7 +200,7 @@
@foreach($dl as $do)
{
name: '{{ $do->name }}',
y: {{ $do->daily_area_stats(FALSE,$user->systems)->sum('y') }},
y: {{ $do->echoarea_total_daily($user->systems)->sum('count') }},
drilldown: 'ny-{{ $do->name }}',
color: Highcharts.color(Highcharts.getOptions().colors[{{$loop->index}}]).brighten(-0.2).get()
},
@@ -220,7 +220,10 @@
{
name: '{{ $do->name }}',
id: 'n-{{ $do->name }}',
data: {!! $do->daily_area_stats(TRUE)->sortBy('name')->map(function($item) { return ['name'=>$item['name'],'y'=>$item['data']->sum('y'),'drilldown'=>'e-'.$item['name']]; })->values() !!}
data: {!! $do->echoarea_total_daily()
->groupBy('name')
->map(function($item,$key) { return ['name'=>$key,'y'=>$item->sum('count'),'drilldown'=>'e-'.$key]; })
->values() !!}
},
@endforeach
@@ -228,7 +231,10 @@
{
name: '{{ $do->name }}',
id: 'ny-{{ $do->name }}',
data: {!! $do->daily_area_stats(TRUE,$user->systems)->sortBy('name')->map(function($item) { return ['name'=>$item['name'],'y'=>$item['data']->sum('y'),'drilldown'=>'ey-'.$item['name']]; })->values() !!}
data: {!! $do->echoarea_total_daily($user->systems)
->groupBy('name')
->map(function($item,$key) { return ['name'=>$key,'y'=>$item->sum('count'),'drilldown'=>'e-'.$key]; })
->values() !!}
},
@endforeach
]