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

Variazioni grafiche

Browse Source
This commit is contained in:
Amministratore 2022-03-18 08:36:31 +01:00
parent 3077d68fa7
commit 3a07259e5a
3 changed files with 56 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/MovimentiController.php
View File

@ -133,10 +133,11 @@ class MovimentiController extends Controller
'Categoria'=>$movimento->Categoria,
'Tag'=>$movimento->Tag,
'Descrizione'=>$movimento->Descrizione,
'Importo'=>$movimento->Importo
//'Importo'=>str_replace(".",",",$movimento->Importo),
'Importo'=>$movimento->Importo,
];
}
return (new FastExcel($lista))->download('movimenti_al_'.date('d-m-Y').'.ods');
return (new FastExcel($lista))->download('movimenti_al_'.date('d-m-Y').'.xls');
// return dd($movimenti);
}
@ -282,6 +283,8 @@ class MovimentiController extends Controller
->whereYear('mov_data','=',$anno)
->where('mov_fk_categoria','=',$id)
->sum('mov_importo');
$coll[] = ['totale' => $movrow];
}
@ -317,13 +320,14 @@ class MovimentiController extends Controller
->where('mov_fk_categoria','=',$id)
->sum('mov_importo');
//$coll[] = str_replace(".",",",$movrow);
$coll[] = $movrow;
}
$row[]=array_combine($intestazione,array_merge(array($ncategoria),$coll));
unset($coll);
}
return (new FastExcel($row))->download('report_al_'.date('d-m-Y').'.ods');
return (new FastExcel($row))->download('report_al_'.date('d-m-Y').'.xls');
}
public function apiList()

6
resources/views/components/menu.blade.php
View File

@ -2,7 +2,7 @@
<a href="/admin"><i class="fa fa-dashboard fa-fw"></i>Riepilogo</a>
</li>
<li>
<a href="#"><i class="fa fa-bar-chart-o fa-fw"></i>Spese/Incassi<span class="fa arrow"></span></a>
<a href="#"><i class="fa fa-money fa-fw"></i>Spese/Incassi<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li>
<a href="{{ route('movimenti'); }}">Lista Movimenti</a>
@ -37,7 +37,7 @@
<!-- /.nav-second-level -->
</li>
<li>
<a href="#"><i class="fa fa-table fa-fw"></i> Letture contatori<span class="fa arrow"></span></a>
<a href="#"><i class="fa fa-industry fa-fw"></i> Consumi <span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li>
@ -108,7 +108,7 @@
<!-- /.nav-second-level -->
<!--</li>-->
<li>
<a href="#"><i class="fa fa-files-o fa-fw"></i>Amministrazione<span class="fa arrow"></span></a>
<a href="#"><i class="fa fa-gears fa-fw"></i>Amministrazione<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li>
<a class="active" href="#">Utenti</a>

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

@ -51,6 +51,52 @@
</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>
@endsection