From 04a6942fc766b9c221d94b48c5fbbc235bec0ea8 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Wed, 16 Mar 2022 11:46:52 +0100 Subject: [PATCH] creazione dashboard --- app/Http/Controllers/MovimentiController.php | 13 ++++- resources/views/components/menu.blade.php | 8 ++- resources/views/layouts/dashboard.blade.php | 61 ++++++++++++++++++++ routes/admin.php | 5 +- routes/web.php | 4 +- 5 files changed, 80 insertions(+), 11 deletions(-) create mode 100644 resources/views/layouts/dashboard.blade.php diff --git a/app/Http/Controllers/MovimentiController.php b/app/Http/Controllers/MovimentiController.php index 1ec2740..778f17a 100644 --- a/app/Http/Controllers/MovimentiController.php +++ b/app/Http/Controllers/MovimentiController.php @@ -40,7 +40,16 @@ class MovimentiController extends Controller ]); } - + public static function dashboard() + { + $bilancio=DB::table('movimentis')->whereYear('mov_data','=',date('Y'))->sum('mov_importo'); + + + return view('layouts.dashboard',[ + 'bilancio'=>$bilancio, + + ]); + } public static function insMovimentiSpesa(Request $request) { @@ -269,10 +278,8 @@ class MovimentiController extends Controller for ($i=1;$i<=12;$i++) { $movrow=DB::table('movimentis') - ->whereMonth('mov_data','=',$i) ->whereYear('mov_data','=',$anno) - ->where('mov_fk_categoria','=',$id) ->sum('mov_importo'); diff --git a/resources/views/components/menu.blade.php b/resources/views/components/menu.blade.php index c57618e..76830be 100644 --- a/resources/views/components/menu.blade.php +++ b/resources/views/components/menu.blade.php @@ -1,5 +1,5 @@
  • - Riepilogo + Riepilogo
  • Spese/Incassi @@ -41,10 +41,12 @@
  • diff --git a/resources/views/layouts/dashboard.blade.php b/resources/views/layouts/dashboard.blade.php new file mode 100644 index 0000000..04b9087 --- /dev/null +++ b/resources/views/layouts/dashboard.blade.php @@ -0,0 +1,61 @@ +@extends('admin') +@section('content') +
    + +
    +
    +
    +
    +
    + +
    +
    +
    {{ $bilancio }}
    +
    Bilancio attuale
    +
    +
    +
    + + + +
    +
    + +
    +
    +
    +
    +
    + +
    +
    +
    {{ $bilancio }}
    +
    Bilancio attuale
    +
    +
    +
    + + + +
    +
    +
    +@endsection + +@section('script') + +@endsection \ No newline at end of file diff --git a/routes/admin.php b/routes/admin.php index 5d182aa..0d85655 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -21,9 +21,8 @@ use App\Http\Controllers\FullCalenderController; | */ -Route::get('/', function () { - return view('admin'); -}); +Route::get('/', [MovimentiController::class,'dashboard']); + Route::get('logout', function(){ Auth::logout(); return redirect('login'); })->name('logout'); diff --git a/routes/web.php b/routes/web.php index 14aa45b..51b5cd8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -21,7 +21,7 @@ Route::get('/', function () { }); - Auth::routes(['register' => false]); // Production only -// Auth::routes(); +Auth::routes(['register' => false]); // Production only +// Auth::routes(); //development mode Route::get('/calendar', [TagController::class,'calendartest'])->name('calendar'); Route::get('/home', [App\Http\Controllers\HomeController::class, 'index'])->name('home');