From b9325820e4dfac5bfc75f5dd65e924159bcb1467 Mon Sep 17 00:00:00 2001
From: Flavio Barachino <flavio.barachino@gmail.com>
Date: Tue, 16 May 2023 13:40:03 +0200
Subject: [PATCH] Aggiunto riga totali alla lista dei dettagli di progetto e
 rimanenza da budget su riepilogo dettaglio progetto

---
 app/Http/Controllers/ProgettiController.php  |  3 +-
 app/Models/RigaProgetto.php                  |  5 ++
 resources/views/layouts/dashboard.blade.php  | 51 +-------------------
 resources/views/progetti/dettaglio.blade.php | 21 ++++++--
 4 files changed, 26 insertions(+), 54 deletions(-)

diff --git a/app/Http/Controllers/ProgettiController.php b/app/Http/Controllers/ProgettiController.php
index 176ad13..d5ef284 100644
--- a/app/Http/Controllers/ProgettiController.php
+++ b/app/Http/Controllers/ProgettiController.php
@@ -46,7 +46,8 @@ class ProgettiController extends Controller
         $progetto_id=$id['id'];
         $progetto = Progetti::getProgettoById($progetto_id);
         $righe = RigaProgetto::getRigheProgetto($progetto_id);
-        return view('progetti.dettaglio',['dettaglio'=>$progetto, 'righe'=>$righe,]);
+        $costo_tot=RigaProgetto::getCostoRighe($progetto_id);
+        return view('progetti.dettaglio',['dettaglio'=>$progetto, 'righe'=>$righe, 'tot'=>$costo_tot]);
         //dd($righe);
     }
     
diff --git a/app/Models/RigaProgetto.php b/app/Models/RigaProgetto.php
index 7b2f4a2..d076c6b 100644
--- a/app/Models/RigaProgetto.php
+++ b/app/Models/RigaProgetto.php
@@ -30,4 +30,9 @@ class RigaProgetto extends Model
     {
         DB::table('riga_progettos')->delete($id);
     }
+    
+    public static function getCostoRighe($id)
+    {
+        return DB::table('riga_progettos')->select(DB::raw('SUM(prezzo) as costo'))->where('fk_id_progetto','=',$id)->get();
+    }
 }
diff --git a/resources/views/layouts/dashboard.blade.php b/resources/views/layouts/dashboard.blade.php
index 77585cb..84a24cd 100644
--- a/resources/views/layouts/dashboard.blade.php
+++ b/resources/views/layouts/dashboard.blade.php
@@ -51,56 +51,7 @@
                 </div>
            </a>
      	</div>
-	</div>
-	
-	<!-- WIDGET  -->
-	<!-- <div class="col-lg-3 col-md-6">
-        <div class="panel panel-warning">
-            <div class="panel-heading">
-                <div class="row">
-                   <div class="col-xs-3">
-                       <i class="fa fa-balance-scale fa-5x"></i>
-                   </div>
-                   <div class="col-xs-9 text-right">
-                       <div class="huge">{{ $bilancio }}</div>
-                       <div>Bilancio attuale</div>
-                   </div>
-                </div>
-            </div>
-            <a href="{{ route('budget');}}">
-                <div class="panel-footer">
-                   <span class="pull-left">Report annuo</span>
-                   <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
-                   <div class="clearfix"></div>
-                </div>
-           </a>
-     	</div>
-	</div>-->
-	
-	<!-- WIDGET  -->
-	<!-- <div class="col-lg-3 col-md-6">
-        <div class="panel panel-danger">
-            <div class="panel-heading">
-                <div class="row">
-                   <div class="col-xs-3">
-                               <i class="fa fa-balance-scale fa-5x"></i>
-                   </div>
-                   <div class="col-xs-9 text-right">
-                               <div class="huge">{{ $bilancio }}</div>
-                               <div>Bilancio attuale</div>
-                   </div>
-                </div>
-            </div>
-            <a href="{{ route('budget');}}">
-                <div class="panel-footer">
-                   <span class="pull-left">Report annuo</span>
-                   <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
-                   <div class="clearfix"></div>
-                </div>
-           </a>
-     	</div>
-	</div> -->
-	
+	</div>	
 </div>
 @endsection
 
diff --git a/resources/views/progetti/dettaglio.blade.php b/resources/views/progetti/dettaglio.blade.php
index c037c3e..828804c 100644
--- a/resources/views/progetti/dettaglio.blade.php
+++ b/resources/views/progetti/dettaglio.blade.php
@@ -18,6 +18,8 @@
 			<div class="panel panel-default">
 				<div class="panel-heading" id="dettaglio">Dettaglio Progetto</div>
 				<div class="panel-body">
+				@foreach($tot as $totale)
+				@endforeach
 					@foreach($dettaglio ?? '' as $progetto)
 					<div class="row">
 						<div class="col-xs-2">Nome:</div>
@@ -53,9 +55,17 @@
 						</div>
 					</div>
 					<div class="row" hidable="">
-						<div class="col-xs-2">Budget</div>
-						<div class="col-xs-3">
-							<b>&euro; {{ $progetto->budget }}</b>
+						<div class="col-xs-1">Budget</div>
+						<div class="col-xs-1">
+							<b>{{ $progetto->budget }}</b>
+						</div>
+						<div class="col-xs-1">Costi</div>
+						<div class="col-xs-1">
+							<b> {{ $totale->costo}}</b>
+						</div>
+						<div class="col-xs-1">Rimanenza</div>
+						<div class="col-xs-1">
+							<b>{{ $progetto->budget - $totale->costo}}</b>
 						</div>
 						<div class="col-xs-2">Coordinatore</div>
 						<div class="col-xs-3">
@@ -160,6 +170,11 @@
 						</tr>
 						@endif
 						@endforeach
+						<tr>
+							<td colspan="2">Totale</td>
+							<td></td>
+							<td>{{ $totale->costo}} &euro;</td>
+						</tr>
     				</tbody>
 				</table>
 			</div>