loviuz/openstamanager
loviuz
/
openstamanager
mirror of https://github.com/devcode-it/openstamanager.git
1
0
Fork 0
Code Issues Releases Activity

Bugfix ore Consuntivo Contratti

This commit is contained in:
Thomas Zilio 2020-07-02 15:37:22 +02:00
parent 3f7c3e42c1
commit 95550baa4b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/contratti/plugins/contratti.consuntivo.php
View File

@ -6,6 +6,7 @@ use Modules\Interventi\Intervento;
// Tabella con riepilogo interventi
$interventi = Intervento::where('id_contratto', $id_record)->get();
$totale_ore_completate = 0;
if (!empty($interventi)) {
echo '
<table class="table table-bordered table-condensed">
@ -20,6 +21,8 @@ if (!empty($interventi)) {
// Tabella con i dati
foreach ($interventi as $intervento) {
$totale_ore_completate += !empty($intervento->stato->is_completato) ? $intervento->ore_totali : 0;
// Riga per il singolo intervento
echo '
<tr style="background:'.$intervento->stato->colore.';">
@ -165,11 +168,11 @@ if (!empty($interventi)) {
}
$array_interventi = $interventi->toArray();
$totale_ore = sum(array_column($array_interventi, 'ore_totali'));
$totale_km = sum(array_column($array_interventi, 'km_totali'));
$totale_costo = sum(array_column($array_interventi, 'spesa'));
$totale_addebito = sum(array_column($array_interventi, 'imponibile'));
$totale = sum(array_column($array_interventi, 'totale_imponibile'));
$totale_ore = sum(array_column($array_interventi, 'ore_totali'));
// Totali
echo '
@ -274,10 +277,10 @@ if (!empty($totale_ore_contratto)) {
<tr>
<td>'.tr('Ore erogate totali').':</td>
<td class="text-right">'.Translator::numberToLocale($totale_ore_interventi).'</td>
<td class="text-right">'.Translator::numberToLocale($totale_ore).'</td>
<td>'.tr('Ore residue totali').':</td>
<td class="text-right">'.Translator::numberToLocale(floatval($totale_ore_contratto) - floatval($totale_ore_interventi)).'</td>
<td class="text-right">'.Translator::numberToLocale(floatval($totale_ore_contratto) - floatval($totale_ore)).'</td>
</tr>
<tr>