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

Corretto problemi precedente pubblicazione

Browse Source
This commit is contained in:
Amministratore 2023-07-17 13:20:06 +02:00
parent 0f382d4182
commit 8dff2e0853
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,8 +6,11 @@ use App\Models\Categorie;
use App\Models\Movimenti; use App\Models\Movimenti;
use App\Models\tag; use App\Models\tag;
use App\Models\Task; use App\Models\Task;
// use App\Models\User;
// use App\Http\Controllers\Auth;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Auth;
use Rap2hpoutre\FastExcel\FastExcel; use Rap2hpoutre\FastExcel\FastExcel;
class MovimentiController extends Controller class MovimentiController extends Controller
@ -42,8 +45,8 @@ class MovimentiController extends Controller
$entrate=Movimenti::getEntrate(date('Y')); $entrate=Movimenti::getEntrate(date('Y'));
$uscite=Movimenti::getUscite(date('Y')); $uscite=Movimenti::getUscite(date('Y'));
$saldo=Movimenti::getSaldoTot(); $saldo=Movimenti::getSaldoTot();
// $mieiTasks=Task::getTaskAssignedToUser(Auth::user()->id); $mieiTasks=Task::getTaskAssignedToUser(Auth::id());
// $TasksAssegnati=Task::getTaskAssignedByUser(Auth::user()->id); $TasksAssegnati=Task::getTaskAssignedByUser(Auth::id());
return view('layouts.dashboard',[ return view('layouts.dashboard',[
'entrate'=>$entrate, 'entrate'=>$entrate,

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

@ -8,7 +8,7 @@
<div class="row"> <div class="row">
@hasanyrole('user|admin') @hasanyrole('user|admin')
<!-- WIDGET Bilancio --> <!-- WIDGET Bilancio -->
<div class="col-lg-4 col-md-8"> <div class="col-lg-3 col-md-8">
<div class="panel panel-success"> <div class="panel panel-success">
<div class="panel-heading"> <div class="panel-heading">
<div class="row"> <div class="row">
@ -31,7 +31,7 @@
</div> </div>
</div> </div>
<!-- WIDGET Bilancio --> <!-- WIDGET Bilancio -->
<div class="col-lg-4 col-md-8"> <div class="col-lg-3 col-md-8">
<div class="panel panel-danger"> <div class="panel panel-danger">
<div class="panel-heading"> <div class="panel-heading">
<div class="row"> <div class="row">
@ -55,7 +55,7 @@
</div> </div>
<!-- WIDGET --> <!-- WIDGET -->
<div class="col-lg-4 col-md-8"> <div class="col-lg-3 col-md-8">
<div class="panel panel-primary"> <div class="panel panel-primary">
<div class="panel-heading"> <div class="panel-heading">
<div class="row"> <div class="row">
@ -77,7 +77,7 @@
</a> </a>
</div> </div>
</div> </div>
<div class="col-lg-4 col-md-8"> <div class="col-lg-3 col-md-8">
<div class="panel panel-yellow"> <div class="panel panel-yellow">
<div class="panel-heading"> <div class="panel-heading">
<div class="row"> <div class="row">