diff --git a/Laravel/app/Http/Controllers/PagesController.php b/Laravel/app/Http/Controllers/PagesController.php index 235fa6f..c183dca 100644 --- a/Laravel/app/Http/Controllers/PagesController.php +++ b/Laravel/app/Http/Controllers/PagesController.php @@ -11,26 +11,30 @@ use App\Http\Requests; class PagesController extends Controller { // -public function dashboard() { - $pagetitle = 'Dashboard'; - $activeNav = 'dashboard'; +public function details() { + $pagetitle = 'Details'; + $activeNav = 'details'; $temperature = Stats::select('temperature') + ->where('node_id', 1) ->limit('144') ->orderBy('created_at', 'desc') ->pluck('temperature'); $humidity = Stats::select('humidity') + ->where('node_id', 1) ->limit('144') ->orderBy('created_at', 'desc') ->pluck('humidity'); $gm3 = Stats::select('gm3') + ->where('node_id', 1) ->limit('144') ->orderBy('created_at', 'desc') ->pluck('gm3'); $created_at = Stats::select('created_at') + ->where('node_id', 1) ->limit('144') ->orderBy('created_at', 'desc') ->pluck('created_at'); @@ -56,10 +60,7 @@ public function dashboard() { $latestHumidity = '' . $latestHumidity[0]; $latestGM3 = '' . $latestGM3[0]; - - $latestShit = 'Temp: ' . $latestTemp . ' Hum: ' . $latestHumidity . ' g/m³: ' . $latestGM3; - - $chart = Charts::multi('line', 'material') + $chart[0] = Charts::multi('line', 'material') ->title("Temperatur, Luftfeuchtigkeit, g/m³") ->dimensions(0, 400) // Width x Height // This defines a preset of colors already done:) @@ -72,22 +73,37 @@ public function dashboard() { ->dataset('g/m³', $gm3) // Setup what the values mean ->labels($created_at); + + $chart[1] = Charts::multi('line', 'material') + ->title("Temperatur") + ->dimensions(0, 400) // Width x Height + // This defines a preset of colors already done:) + ->template("material") + // You could always set them manually + // ->colors(['#2196F3', '#F44336', '#FFC107']) + // Setup the diferent datasets (this is a multi chart) + ->dataset('°C', $temperature) + //->dataset('%', $humidity) + //->dataset('g/m³', $gm3) + // Setup what the values mean + ->labels($created_at); - return view('dashboard')->with([ + return view('details')->with([ 'pagetitle' => $pagetitle, 'activeNav' => $activeNav, 'chart' => $chart, 'latestTemp' => $latestTemp, 'latestHumidity' => $latestHumidity, 'latestGM3' => $latestGM3, - 'latestShit' => $latestShit, ]); } - public function welcome() { - $pagetitle = 'Willkommen'; - $activeNav = 'welcome'; + public function dashboard() { + $pagetitle = 'Dashboard'; + $activeNav = 'dashboard'; + + //Db queries $latestTemp = Stats::select('temperature') ->orderBy('created_at', 'desc') ->limit('1') @@ -103,12 +119,29 @@ public function dashboard() { ->limit('1') ->pluck('gm3'); - return view('welcome')->with([ + //Pick values from array + $latestTemp = $latestTemp[0]; + $latestHumidity = $latestHumidity[0]; + $latestGM3 = $latestGM3[0]; + + //prepare suggestion + $compareIDs = '1-2'; + $ids = explode('-', $compareIDs); + $latestTest = 11.0; //Outside + $lowerHumidityMode = true; //true --> suggestion lowers inside humidity; false --> suggestion heighten inside humidity + if ($lowerHumidityMode) { + ($latestGM3 > $latestTest) ? $air = true : $air = false; + } else { + ($latestGM3 < $latestTest) ? $air = true : $air = false; + } + + return view('dashboard')->with([ 'pagetitle' => $pagetitle, 'activeNav' => $activeNav, 'latestTemp' => $latestTemp, 'latestHumidity' => $latestHumidity, 'latestGM3' => $latestGM3, + 'air' => $air, ]); } diff --git a/Laravel/resources/views/dashboard.blade.php b/Laravel/resources/views/dashboard.blade.php index ea0b592..9ed21f4 100644 --- a/Laravel/resources/views/dashboard.blade.php +++ b/Laravel/resources/views/dashboard.blade.php @@ -3,9 +3,7 @@ @section('title', $pagetitle) @section('content') - {!! Charts::styles() !!}

Dashboard Infos auf einen Blick

-
@@ -44,13 +42,38 @@
- -
- {!! $chart->html() !!} + @if($latestHumidity > 80) +
+ @else +
+ @endif +
+

Schimmelbildung

+
+
+ @if($latestHumidity >= 75) + Die Luftfeuchtigkeit liegt bei {!! $latestHumidity !!} %. Es besteht Schimmelgefahr! + @else + Es besteht keine Schimmelgefahr! Luftfeuchtigkeit: {!! $latestHumidity !!} %. + @endif +
- - {!! Charts::scripts() !!} - {!! $chart->script() !!} + @if($air) +
+ @else +
+ @endif +
+

Lüftungsempfehlung

+
+
+ @if($air) + Es kann gelüftet werden, um die Luftfeuchtigkeit zu verringern. + @else + Es sollte nicht gelüftet werde. Die Luftfeuchtigkeit würde sich erhöhen. + @endif +
+
@endsection diff --git a/Laravel/resources/views/details.blade.php b/Laravel/resources/views/details.blade.php new file mode 100644 index 0000000..ffae8d1 --- /dev/null +++ b/Laravel/resources/views/details.blade.php @@ -0,0 +1,61 @@ +@extends('layouts.master') + +@section('title', $pagetitle) + +@section('content') + {!! Charts::styles() !!} +

Details Genauere Infos

+ + + + + + + +
+
+
+

Temperatur

+
+
+

{!! $latestTemp !!} °C

+
+
+ 		+ +
+
+

Luftfeuchtigkeit

+
+
+

{!! $latestHumidity !!} %

+
+
+ + 		+ +
+
+

Absoluter Feuchtegehalt

+
+
+

{!! $latestGM3 !!} g/m³

+
+
+ +
+ + +
+ @foreach($chart as $ch) + {!! $ch->html() !!} +
+ @endforeach +
+ + + {!! Charts::scripts() !!} + @foreach($chart as $ch) + {!! $ch->script() !!} + @endforeach +@endsection diff --git a/Laravel/resources/views/layouts/master.blade.php b/Laravel/resources/views/layouts/master.blade.php index 47eaf69..5bdffdc 100644 --- a/Laravel/resources/views/layouts/master.blade.php +++ b/Laravel/resources/views/layouts/master.blade.php @@ -55,12 +55,12 @@ {{-- Left Side Of Navbar --}}
    {{-- Navlink Startseite --}} - @if(isset($activeNav) && $activeNav == 'dashboard') + @if(isset($activeNav) && $activeNav == 'details')
  • @else
  • @endif - Dashboard + Details
    • diff --git a/Laravel/routes/web.php b/Laravel/routes/web.php index 4bb46fa..b4df998 100644 --- a/Laravel/routes/web.php +++ b/Laravel/routes/web.php @@ -12,6 +12,6 @@ */ -Route::get('/', 'PagesController@welcome'); +Route::get('/', 'PagesController@dashboard'); -Route::get('/dashboard', 'PagesController@dashboard'); +Route::get('/details', 'PagesController@details');