From b268536727190dae8cd51a0ae356549b94ac12a9 Mon Sep 17 00:00:00 2001
From: Flavio Barachino <flavio.barachino@gmail.com>
Date: Mon, 21 Mar 2022 15:34:48 +0100
Subject: [PATCH] Aggiunto colonna totali a report movimenti annui

---
 app/Http/Controllers/MovimentiController.php   | 18 +++++++++++++-----
 resources/views/conti/report/catanno.blade.php |  8 ++++++--
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/MovimentiController.php b/app/Http/Controllers/MovimentiController.php
index ffc7d9b..a883ce7 100644
--- a/app/Http/Controllers/MovimentiController.php
+++ b/app/Http/Controllers/MovimentiController.php
@@ -285,15 +285,22 @@ class MovimentiController extends Controller
                     ->sum('mov_importo');
                 
                     
-                   
-                    $coll[] = ['totale' => $movrow];
+                    $coll[]=$movrow;
+                    $collx[]=$movrow;
+                    //$coll[] = ['totale' => $movrow];
+                    // $coll[]=array_push(array_sum($coll['totale']));
+                    
+                    // $coll[]=array_push($coll,$totale);
                }
-            
+            $totale[]=array_sum($collx);
+            unset($collx);
         }
-         return view('conti.report.catanno',[
+         /*dd($totale);*/
+        return view('conti.report.catanno',[
                 'categorie'=>$categorie,
                 'mesi'=>$mesi,
                 'matrice'=>array_chunk($coll, 12),
+                'totale'=>$totale,
                 'anno'=>$anno
         ]);
     }
@@ -322,8 +329,9 @@ class MovimentiController extends Controller
                 
                 //$coll[] = str_replace(".",",",$movrow);
                 $coll[] = $movrow;
+               
             }
-
+            
             $row[]=array_combine($intestazione,array_merge(array($ncategoria),$coll));
             unset($coll); 
         }
diff --git a/resources/views/conti/report/catanno.blade.php b/resources/views/conti/report/catanno.blade.php
index e1ae2c3..f78e520 100644
--- a/resources/views/conti/report/catanno.blade.php
+++ b/resources/views/conti/report/catanno.blade.php
@@ -25,6 +25,7 @@
             			@foreach($mesi as $mese)
             			<td>{{ $mese }}</td>
             			@endforeach
+            			<td><b>Totale</b></td>
             		</tr>
             	</thead>  
             	<tbody>
@@ -42,13 +43,16 @@
             			{
             		@endphp
             		
-            		<td>{{ $matrice[$cat][$index]['totale'] }}</td>
+            		<td>{{ $matrice[$cat][$index] }}</td>
             		@php
             				$index++;
             			}
-            			$cat++;
             		@endphp
             		
+            		<td align="right"><b>{{ number_format($totale[$cat],2,'.','') }}</b></td>
+            		@php
+            			$cat++;
+            		@endphp
             		</tr>
             		
             	@endforeach