diff --git a/app/Http/Controllers/MovimentiController.php b/app/Http/Controllers/MovimentiController.php index da81706..6569ec4 100644 --- a/app/Http/Controllers/MovimentiController.php +++ b/app/Http/Controllers/MovimentiController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers; use App\Models\Categorie; use App\Models\Movimenti; use App\Models\tag; +use App\Models\Task; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; use Rap2hpoutre\FastExcel\FastExcel; @@ -41,11 +42,15 @@ class MovimentiController extends Controller $entrate=Movimenti::getEntrate(date('Y')); $uscite=Movimenti::getUscite(date('Y')); $saldo=Movimenti::getSaldoTot(); + // $mieiTasks=Task::getTaskAssignedToUser(Auth::user()->id); + // $TasksAssegnati=Task::getTaskAssignedByUser(Auth::user()->id); return view('layouts.dashboard',[ 'entrate'=>$entrate, 'uscite'=>$uscite, 'saldo'=>$saldo, + 'mieitask' => $mieiTasks, + 'assegnati' => $TasksAssegnati, ]); } diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php index 65f393f..44f3ef6 100644 --- a/app/Http/Controllers/TaskController.php +++ b/app/Http/Controllers/TaskController.php @@ -12,4 +12,6 @@ class TaskController extends Controller { return Task::all(); } + + } diff --git a/app/Models/Task.php b/app/Models/Task.php index 5458207..df3d8ce 100644 --- a/app/Models/Task.php +++ b/app/Models/Task.php @@ -8,4 +8,39 @@ use Illuminate\Database\Eloquent\Model; class Task extends Model { use HasFactory; + + protected $fillable=['titolo','descrizione','creato_da','assegnato_a','creato_il','termine_il','chiuso_il','stato']; + + public function getAllTasks() + { + return self::all(); + } + + // + public static function getTaskAssignedToUser($userid) + { + return self::where('assegnato_a',$userid)->get(); + } + + // + public static function getTaskAssignedByUser($userid) + { + return self::where('creato_da',$userid)->get(); + } + + public static function saveTask($collection) + { + self::create( + [ + 'titolo' => $collection['titolo'], + 'descrizione'=>$collection['descrizione'], + 'creato_da'=>$collection['creato_da'], + 'assegnato_a'=>$collection['assegnato_a'], + 'creato_il'=>date('Y-m-d'), + 'termine_il'=>$collection['termine_il'], + 'stato'=>'Aperto', + ] + ); + } + } diff --git a/resources/views/layouts/dashboard.blade.php b/resources/views/layouts/dashboard.blade.php index 3b86dbb..76001e3 100644 --- a/resources/views/layouts/dashboard.blade.php +++ b/resources/views/layouts/dashboard.blade.php @@ -100,7 +100,48 @@ @endhasanyrole + + +@can('tasks') + +