fbarachino/bubofamily
1
1
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

Aggiunto riga totali alla lista dei dettagli di progetto e rimanenza da budget su riepilogo dettaglio progetto

Browse Source
This commit is contained in:
Amministratore 2023-05-16 13:40:03 +02:00
parent 3daadec9db
commit b9325820e4
4 changed files with 26 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/ProgettiController.php
View File

@ -46,7 +46,8 @@ class ProgettiController extends Controller
$progetto_id=$id['id']; $progetto_id=$id['id'];
$progetto = Progetti::getProgettoById($progetto_id); $progetto = Progetti::getProgettoById($progetto_id);
$righe = RigaProgetto::getRigheProgetto($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); //dd($righe);
} }

5
app/Models/RigaProgetto.php
View File

@ -30,4 +30,9 @@ class RigaProgetto extends Model
{ {
DB::table('riga_progettos')->delete($id); 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();
}
} }

49
resources/views/layouts/dashboard.blade.php
View File

@ -52,55 +52,6 @@
</a> </a>
</div> </div>
</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 @endsection

21
resources/views/progetti/dettaglio.blade.php
View File

@ -18,6 +18,8 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading" id="dettaglio">Dettaglio Progetto</div> <div class="panel-heading" id="dettaglio">Dettaglio Progetto</div>
<div class="panel-body"> <div class="panel-body">
@foreach($tot as $totale)
@endforeach
@foreach($dettaglio ?? '' as $progetto) @foreach($dettaglio ?? '' as $progetto)
<div class="row"> <div class="row">
<div class="col-xs-2">Nome:</div> <div class="col-xs-2">Nome:</div>
@ -53,9 +55,17 @@
</div> </div>
</div> </div>
<div class="row" hidable=""> <div class="row" hidable="">
<div class="col-xs-2">Budget</div> <div class="col-xs-1">Budget</div>
<div class="col-xs-3"> <div class="col-xs-1">
<b>&euro; {{ $progetto->budget }}</b> <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>
<div class="col-xs-2">Coordinatore</div> <div class="col-xs-2">Coordinatore</div>
<div class="col-xs-3"> <div class="col-xs-3">
@ -160,6 +170,11 @@
</tr> </tr>
@endif @endif
@endforeach @endforeach
<tr>
<td colspan="2">Totale</td>
<td></td>
<td>{{ $totale->costo}} &euro;</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>