diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index e01920d3..9dd2c709 100644 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -300,6 +300,7 @@ class DashboardController extends ExtendedController $statistics = array(); $totals = (object)[]; $totals->totalOverall = 0; + $totals->totalAddresses = 0; $totals->totalLastHour = 0; $totals->totalToday = 0; $totals->totalToday = 0; @@ -312,6 +313,9 @@ class DashboardController extends ExtendedController $obj->subscriptions = SubscribeChild::where('city', $city->city)->count(); $totals->totalOverall += $obj->subscriptions; + $obj->addresses = SubscribeChild::where('city', $city->city)->groupBy('lastnameParent')->get()->count(); + $totals->totalAddresses += $obj->addresses; + $obj->lastHour = SubscribeChild::where('city', $city->city) ->where('created_at', '>', Carbon::now()->subHours(1)->toDateTimeString()) ->count(); diff --git a/resources/views/inc/admin/subscriptions.blade.php b/resources/views/inc/admin/subscriptions.blade.php index 9483aaff..f5567635 100644 --- a/resources/views/inc/admin/subscriptions.blade.php +++ b/resources/views/inc/admin/subscriptions.blade.php @@ -10,6 +10,7 @@ Ort Gesamt + Haushalte Letzte Stunde Heute Letzte 7 Tage @@ -21,6 +22,7 @@ {{ $s->city }} {{ $s->subscriptions }} + {{ $s->addresses }} {{ $s->lastHour }} {{ $s->today }} {{ $s->sevenDays }} @@ -36,6 +38,7 @@ Gesamt {{ $totals->totalOverall }} + {{ $totals->totalAddresses }} {{ $totals->totalLastHour }} {{ $totals->totalToday }} {{ $totals->totalSevenDays }}