From bac43417dab6a045e7a746dda8ca4706599a9617 Mon Sep 17 00:00:00 2001
From: Flavio Barachino <flavio.barachino@gmail.com>
Date: Wed, 3 May 2023 13:15:46 +0200
Subject: [PATCH] aggiunto selezione anno per il report per categorie

Per riuscire a vedere il report degli anni anche passati
---
 app/Http/Controllers/MovimentiController.php   | 14 +++++++++++++-
 app/Models/Movimenti.php                       |  8 ++++++++
 resources/views/conti/report/catanno.blade.php | 11 +++++++++++
 routes/admin.php                               |  5 +++--
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/MovimentiController.php b/app/Http/Controllers/MovimentiController.php
index 2de60be..8fc49bf 100644
--- a/app/Http/Controllers/MovimentiController.php
+++ b/app/Http/Controllers/MovimentiController.php
@@ -200,12 +200,15 @@ class MovimentiController extends Controller
             unset($collx);
         }
          /*dd($totale);*/
+        $anni=Movimenti::getYearsFromMovimenti();
+       // dd($anni);
         return view('conti.report.catanno',[
                 'categorie'=>$categorie,
                 'mesi'=>$mesi,
                 'matrice'=>array_chunk($coll, 12),
                 'totale'=>$totale,
-                'anno'=>$anno
+                'anno'=>$anno,
+                'sel_anni'=>$anni,
         ]);
     }
     
@@ -308,5 +311,14 @@ class MovimentiController extends Controller
         return view('conti.importCR');
     }
     
+    public function test()
+    {
+        Movimenti::getYearsFromMovimenti();
+    }
+    
+    public function manageRedirect(Request $request)
+    {
+        return redirect('/admin/reportbudget/'.$request['anno']);
+    }
 
 }
diff --git a/app/Models/Movimenti.php b/app/Models/Movimenti.php
index c7195fa..5e7c3c0 100644
--- a/app/Models/Movimenti.php
+++ b/app/Models/Movimenti.php
@@ -203,6 +203,14 @@ class Movimenti extends Model
         });
     }
     
+    public static function getYearsFromMovimenti()
+    {
+        $anni=DB::table('movimentis')->select(DB::raw('DISTINCT YEAR(mov_data) as anno'))->get();
+        // dd($anni); // for test purposes
+        return $anni;
+    }
+    
+    
     private static function dateFormat($type,$string)
     {
         if($type)
diff --git a/resources/views/conti/report/catanno.blade.php b/resources/views/conti/report/catanno.blade.php
index 2e40aae..42ffb30 100644
--- a/resources/views/conti/report/catanno.blade.php
+++ b/resources/views/conti/report/catanno.blade.php
@@ -18,6 +18,17 @@
                 Rapporto spese per categoria nell'arco dell'anno {{ $anno ?? '' }}
             </div>
             <div class="panel-body">
+            <div class="row">
+            	<form action="" method="POST">
+            	@csrf
+            	<select name="anno">
+            		@foreach($sel_anni as $sel)
+            		<option value="{{ $sel->anno }}">{{ $sel->anno }}</option>
+            		@endforeach
+            	</select>
+            	<input type="submit" name="Seleziona">
+            	</form>
+            </div>
             <table class="table table-striped table-bordered table-hover" id="listrapporto">
             	<thead>
             		<tr>
diff --git a/routes/admin.php b/routes/admin.php
index 73404e9..dea85b1 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -40,9 +40,10 @@ Route::get('/', [MovimentiController::class,'dashboard']);
     Route::get('movmodify',[MovimentiController::class,'updateMovimenti']);
     Route::post('movmodify',[MovimentiController::class,'updatePostMovimenti']);
     Route::get('movdelete',[MovimentiController::class,'deleteMovimenti']);
-    Route::get('reportbudget',[MovimentiController::class,'reportCategorieAnno'])->name('budget');
+    Route::get('reportbudget/{anno?}',[MovimentiController::class,'reportCategorieAnno'])->name('budget');
+    Route::post('reportbudget/{anno?}',[MovimentiController::class,'manageRedirect']);
     Route::get('reportbudgetxls',[MovimentiController::class,'reportCategorieAnnoXLS'])->name('budgetxls');
-    
+    Route::get('movimenti/test', [MovimentiController::class,'test']);
     
     Route::get('categorie', [CategorieController::class,'listCategorie'])->name('categorie');
     Route::post('categorie', [CategorieController::class,'insCategorie']);