Compare commits

...

2 Commits

5 changed files with 85 additions and 1 deletions

View File

@ -5,6 +5,7 @@ namespace App\Http\Controllers;
use App\Models\Categorie; 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 Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Rap2hpoutre\FastExcel\FastExcel; use Rap2hpoutre\FastExcel\FastExcel;
@ -41,11 +42,15 @@ 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);
// $TasksAssegnati=Task::getTaskAssignedByUser(Auth::user()->id);
return view('layouts.dashboard',[ return view('layouts.dashboard',[
'entrate'=>$entrate, 'entrate'=>$entrate,
'uscite'=>$uscite, 'uscite'=>$uscite,
'saldo'=>$saldo, 'saldo'=>$saldo,
'mieitask' => $mieiTasks,
'assegnati' => $TasksAssegnati,
]); ]);
} }

View File

@ -12,4 +12,6 @@ class TaskController extends Controller
{ {
return Task::all(); return Task::all();
} }
} }

View File

@ -8,4 +8,39 @@ use Illuminate\Database\Eloquent\Model;
class Task extends Model class Task extends Model
{ {
use HasFactory; 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',
]
);
}
} }

View File

@ -100,7 +100,48 @@
</div> </div>
</div> </div>
@endhasanyrole @endhasanyrole
</div> </div>
@can('tasks')
<!-- Se ha i permessi task -->
<div class="row">
<div class="col-lg-6 col-md-8">
<div class="chat-panel panel panel-default">
<div class="panel-heading">
Attività a me assegnate
</div>
<div class="panel-body">
<ul class="chat">
@foreach($mieitask as $task)
<li class="left" clearfix>{{ $task->titolo }}</li>
@endforeach
</ul>
</div>
<div class="panel-footer">
</div>
</div>
</div>
<div class="col-lg-6 col-md-8">
<div class="chat-panel panel panel-default">
<div class="panel-heading">
Attività da me assegnate ad altri
</div>
<div class="panel-body">
<ul class="chat">
@foreach($assegnati as $assegnato)
<li class="left" clearfix>{{ $assegnato->titolo }}</li>
@endforeach
</ul>
</div>
<div class="panel-footer">
</div>
</div>
</div>
</div>
@endcan
@endsection @endsection
@section('script') @section('script')

View File

@ -15,6 +15,7 @@ use App\Http\Controllers\AutoController;
use App\Http\Controllers\AnagraficaController; use App\Http\Controllers\AnagraficaController;
use App\Http\Controllers\Utenti; use App\Http\Controllers\Utenti;
use App\Http\Controllers\ProgettiController; use App\Http\Controllers\ProgettiController;
use App\Http\Controllers\TaskController;
use App\Mail\myTestEmail; use App\Mail\myTestEmail;
/* /*
@ -148,7 +149,7 @@ Route::group(['middleware'=>['permission:progetti']], function(){
// TASKS // TASKS
Route::group(['middleware'=>['permission:tasks']], function(){ Route::group(['middleware'=>['permission:tasks']], function(){
Route::get('tasks', [TaskController::class, 'listaTask'])->name('tasks'); Route::get('tasks', [TaskController::class, 'listTask'])->name('tasks');
}); });