Merge branch 'devel'

sistemazione della vista delle attività e configurato la default language dell'app in IT
modifica stringa riconoscimento issue per modifiche
2023-07-28 10:29:56 +02:00 · 2023-07-28 10:29:11 +02:00 · 2023-07-28 08:50:47 +02:00 · 2023-07-28 08:46:17 +02:00 · 2023-07-27 16:45:10 +02:00 · 2023-07-27 15:31:18 +02:00
71 changed files with 2060 additions and 452 deletions
--- a/README.md
+++ b/README.md
@@ -1,29 +1,21 @@
-# Gestionale di Famiglia
-Piccolo sistema di gestione famigliare. 
+# Gestionale per le famiglie
+Piccolo sistema di gestione. 
 Al momento sono presenti:

 - Gestione delle Entrate e uscite con possibilità di inserimento delle foto degli scontrini ed eventuali documenti in PDF.
 - Possibilità di importare gli estratti conto da un file excel o csv.
- - Un sistema di gestione delle letture dei contatori per il GAS e per l'Energia elettrica
- - Un sistema di gestione delle autovetture e relative operazioni effettuate su di esse.
+ - Un sistema di gestione delle letture dei contatori per il GAS e per l'Energia elettrica [Da rivedere]
+ - Un sistema di gestione delle autovetture e relative operazioni effettuate su di esse. [Da rivedere]
 - Una rubrica telefonica e degli indirizzi
- - Una gestione dei progetti (ancora in sviluppo) 
- - Una gestione degli utenti e dei gruppi e relativi permessi.
+ - Una gestione dei progetti (ancora in sviluppo) [Da rivedere]
+ - Una gestione degli utenti e dei gruppi e relativi permessi. [Da migliorare]

 *Sviluppato in php, mysql, jquery su framework Laravel*.

-
-## Installazione
- - clonare il repository
- - copiare il file ```.env.example``` in ```.env```
- - inserire le informazioni del database (username,password,dbname)
- - lanciare ``` composer install ```
- - lanciare ``` php artisan migrate --seed``` 
- - di default si crea l'utente ``` admin ``` con password ```admin ``` per accedere la prima volta.
- 
-
 ## Sviluppatori (attualmente)
 Flavio Barachino <flavio.barachino@lavorain.cloud>

+
 ### Vuoi partecipare?
-Scrivimi con le tue proposte, le tue critiche, i tuoi suggerimenti.
+Scrivici con le tue proposte, le tue critiche, i tuoi suggerimenti.
+Gestionale <bubofamily@lavorain.cloud>
--- a/app/Http/Controllers/AssociazioneController.php
+++ b/app/Http/Controllers/AssociazioneController.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class AssociazioneController extends Controller
+{
+    //
+}
--- a/app/Http/Controllers/AvvisoController.php
+++ b/app/Http/Controllers/AvvisoController.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Models\Avviso;
+
+class AvvisoController extends Controller
+{
+    //
+    public function saveAvviso(Request $request)
+    {
+        Avviso::newAvviso($request);
+       return redirect()->back();
+    }
+}
--- a/app/Http/Controllers/CategorieController.php
+++ b/app/Http/Controllers/CategorieController.php
@@ -18,7 +18,7 @@ class CategorieController extends Controller
    
    public static function insCategorie(Request $request)
    {
-        Categorie::inserisci($request['cat_name']);
+        Categorie::inserisci($request);
        return view('conti.categorie.list',['categorie'=>Categorie::list()]);
    }
    
@@ -32,7 +32,7 @@ class CategorieController extends Controller
    
    public function updatePostCategorie(Request $request)
    {
-        Categorie::updateNameById($request['id'],$request['cat_name']);
+        Categorie::updateNameById($request);
        return redirect(route('categorie'));
    }
    
@@ -48,4 +48,16 @@ class CategorieController extends Controller
        $categorie = Categorie::getById($id);
        return json_encode($categorie);
    }
+
+    public function apiListSpesa()
+    {
+        $categorie=Categorie::listSpesa();
+        return json_encode($categorie);
+    }
+ 
+    public function apiListEntrata()
+    {
+        $categorie=Categorie::listEntrata();
+        return json_encode($categorie);
+    }
 }
--- a/app/Http/Controllers/ContrattiController.php
+++ b/app/Http/Controllers/ContrattiController.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Models\Contratti;
+
+class ContrattiController extends Controller
+{
+    //
+    public function contratti()
+    {
+        return view('contratti.lista',['data'=>Contratti::all()]);
+    }
+}
--- a/app/Http/Controllers/DocumentiController.php
+++ b/app/Http/Controllers/DocumentiController.php
@@ -28,4 +28,21 @@ class DocumentiController extends Controller
            'documenti'=>$documenti
        ]);
    }
+
+    /*
+    // {issue #5} Proposta cambiamento per generalizzazione documenti
+    // NB: cambiare anche in routes/admin.php il riferimento alla funzione da richiamare
+    public function fileMovimentiForm(Request $request){
+        $documenti = Documenti::getList($request->input('id'),'Movimenti');  
+        return view('conti.documenti.insert', [
+            'id'=>$request['id']),
+            'documenti'=>$documenti
+        ]);
+    }
+    */
+
+    public function listaDocumenti()
+    {
+        return view('documenti.lista',['data'=>Documenti::all()]);
+    } 
 }
--- a/app/Http/Controllers/GruppiController.php
+++ b/app/Http/Controllers/GruppiController.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class GruppiController extends Controller
+{
+    //
+}
--- a/app/Http/Controllers/MovimentiController.php
+++ b/app/Http/Controllers/MovimentiController.php
@@ -5,8 +5,12 @@ namespace App\Http\Controllers;
 use App\Models\Categorie;
 use App\Models\Movimenti;
 use App\Models\tag;
+use App\Models\Task;
+use App\Models\Avviso;
+// use App\Http\Controllers\Auth;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 use Rap2hpoutre\FastExcel\FastExcel;

 class MovimentiController extends Controller
@@ -37,11 +41,21 @@ class MovimentiController extends Controller

    public static function dashboard()
    {
-        $bilancio=Movimenti::getSaldo(date('Y'));
+        /*$bilancio=Movimenti::getSaldo(date('Y'));*/
+        $entrate=Movimenti::getEntrate(date('Y'));
+        $uscite=Movimenti::getUscite(date('Y'));
        $saldo=Movimenti::getSaldoTot();
+        $mieiTasks=Task::getTaskAssignedToUser(Auth::id());
+        // $TasksAssegnati=Task::getTaskAssignedByUser(Auth::id());
+        $avvisi=Avviso::getAvvisi();
+
        return view('layouts.dashboard',[
-            'bilancio'=>$bilancio,
+            'entrate'=>$entrate,
+            'uscite'=>$uscite,
            'saldo'=>$saldo,
+            'mieitask' => $mieiTasks,
+           // 'assegnati' => $TasksAssegnati,
+           'avvisi'=>$avvisi,
        ]);
    }

@@ -49,7 +63,7 @@ class MovimentiController extends Controller
    {
        Movimenti::insSpesa($request);
        $mov=Movimenti::getList();
-        $categorie=Categorie::list();
+        $categorie=Categorie::listSpesa();
        $tags=tag::getList();
        return view('conti.movimenti.list',
            [
@@ -64,7 +78,7 @@ class MovimentiController extends Controller
    {
        Movimenti::insEntrata($request);
        $mov=Movimenti::getList();
-        $categorie=Categorie::list();
+        $categorie=Categorie::listEntrata();
        $tags=tag::getList();
        return view('conti.movimenti.list',
            [
@@ -119,30 +133,16 @@ class MovimentiController extends Controller
        ]);
    }

-    /*public function updateMovimenti(Request $request)
-    {
-        $id=$request['id'];
-        $mov=Movimenti::getMovimentoById($id);
-        $categorie=Categorie::list();
-        $tags=tag::getList();
-        return view('conti.movimenti.update',
-            [
-                'categorie'=> $categorie,
-                'movimenti'=> $mov,
-                'tags'=>$tags,
-            ]);
-    }*/
-
    public function updatePostMovimenti(Request $request)
    {
        Movimenti::updateMovimenti($request);
-        return redirect(route('movimenti'));
+        return redirect()->back();
    }

    public function deleteMovimenti(Request $request)
    {
        Movimenti::deleteMovimento($request['id']);
-        return redirect(route('movimenti'));
+        return redirect()->back();

    }

--- a/app/Http/Controllers/ProgettiController.php
+++ b/app/Http/Controllers/ProgettiController.php
@@ -7,6 +7,7 @@ use App\Models\User;
 use Illuminate\Http\Request;
 use App\Models\RigaProgetto;
 use function GuzzleHttp\json_encode;
+use Barryvdh\DomPDF\Facade\Pdf;

 class ProgettiController extends Controller
 {
@@ -19,28 +20,28 @@ class ProgettiController extends Controller
            'progetti'=>Progetti::getProgetti()
        ]);
    }
-    
+
    public function nuovoProgetto()
    {
        return view('progetti.new',['coordinatori'=>User::getUsers()]);
    }
-    
+
    public function getCoordinatori()
    {
        return json_encode(User::getUsers());
    }
-    
+
    public function salvaProgetto(Request $request)
    {
        Progetti::saveProgetto($request);
        return redirect(Route('progetti'));
    }
-    
+
    public function deleteProgetto(Request $param) {
        Progetti::delProgetto($param['id']);
        return redirect(Route('progetti'));
    }
-    
+

    public function dettaglioProgetto($id)
    {
@@ -51,5 +52,27 @@ class ProgettiController extends Controller
        return view('progetti.dettaglio',['dettaglio'=>$progetto, 'righe'=>$righe, 'tot'=>$costo_tot]);
        //dd($righe);
    }
-    
+
+    public function chiudiProgetto(Request $id)
+    {
+        Progetti::chiudiProgetto($id['id']);
+        return redirect(Route('progetti'));
+    }
+
+    public function riapriProgetto(Request $id)
+    {
+        Progetti::riapriProgetto($id['id']);
+        return redirect(Route('progetti'));
+    }
+
+    public function stampaPDFProgetto(Request $id)
+    {
+        $progetto_id=$id['id'];
+        $progetto = Progetti::getProgettoById($progetto_id);
+        $righe = RigaProgetto::getRigheProgetto($progetto_id);
+        $costo_tot=RigaProgetto::getCostoRighe($progetto_id);
+        $pdf=Pdf::loadview('progetti.PDF.scheda',['dettaglio'=>$progetto,'righe'=>$righe, 'tot'=>$costo_tot]);  
+        return $pdf->stream();
+    }
+
 }
--- a/app/Http/Controllers/RivistaController.php
+++ b/app/Http/Controllers/RivistaController.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class RivistaController extends Controller
+{
+    //
+}
--- a/app/Http/Controllers/TaskController.php
+++ b/app/Http/Controllers/TaskController.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Models\Task;
+
+class TaskController extends Controller
+{
+    //
+    public function listTask()
+    {
+        return Task::all();
+        // debug
+        // return get_class_methods($this);
+    }
+
+    public function Task()
+    {
+        return view('tasks.list',['tasks'=>$this->listTask()]);
+    }
+
+    public function newTask(Request $data)
+    {
+        Task::create([
+            'titolo'=>$data['titolo'],
+            'descrizione'=>$data['descrizione'],
+            'assegnato_a'=>$data['assegnato_a'],
+            'creato_da'=>$data['creato_da'],
+            'termine_il'=>$data['termine_il'],
+            'creato_il'=>$data['creato_il'],
+            'chiuso_il'=>$data['chiuso_il'],
+            'stato'=>$data['stato'],
+        ]);
+        return redirect()->back();
+    }
+
+
+    
+}
--- a/app/Http/Controllers/Utenti.php
+++ b/app/Http/Controllers/Utenti.php
@@ -12,7 +12,7 @@ use App\Models\User;

 class Utenti extends Controller
 {
-    
+
    public function createRole($ruolo)
    {
        $role=Role::create(['name'=>$ruolo]);
@@ -23,40 +23,87 @@ class Utenti extends Controller
        $permission=Permission::create(['name'=>$permesso]);
        return json_encode(Permission::all()->pluck('name'));
    }
-    
+
    function userClass() {
        $user=new User();
        return get_class_methods($user);
    }
-    
+
    // post del create user
    function createUser(Request $params){
        User::addUser($params);
        return redirect('/admin/users/new');
    }
-    
+
    // mostra il form della creazione dell'utente
    function addUser(){
        $roles = Role::all();
        $users = User::all();
        return view('users.create',['ruoli'=>$roles,'users'=>$users]);
    }
-    
+
    function listUser(){
        $users = User::all();
-        return view('users.list',['users'=>$users]);       
+        return view('users.list',['users'=>$users]);
    }
-    
+
+    function getUsers(){
+        return User::getUsers();
+    }
+
    function listRoles(){
        $roles = Role::all();
        return $roles;
    }
-    
+
    function deleteUser($id) {
        User::destroy($id);
-        
+
        return redirect('/admin/users/new');
    }
-        
+
+    function givePermissionToUser()
+    {
+        $users=User::all();
+        $permissions=Permission::all();
+        return view('users.assignperm',['users'=>$users,'permissions'=>$permissions]);
+    }
+
+    function assignPermission(Request $request)
+    {
+       //$user=User::getUserbyId($request['user']);
+       $user=User::findOrFail($request['user']);
+       foreach($request['permesso'] as $key => $value){
+            if($value=='true')
+            {
+               $key=str_replace('\'','',$key);
+                $user->givePermissionTo($key);
+                // $permission['allowed'][]=$key;
+            }
+            else
+            {
+                $key=str_replace('\'','',$key);
+                $user->revokePermissionTo($key);
+                // $permission['denied'][]=$key;
+            }
+
+        }
+        return redirect('/admin/users/givepermission');
+    }
+
+    function giveRoleToUser()
+    {
+        $users=User::all();
+        $roles=Role::all();
+        return view('users.assignrole',['users'=>$users,'roles'=>$roles]);
+    }
    
+    function assignRole(Request $request)
+    {
+       //$user=User::getUserbyId($request['user']);
+       $user=User::findOrFail($request['user']);
+       $user->assignRole($request['role']);
+       return redirect('/admin/users/giverole');
+    }
 }
+
--- a/app/Models/Associazione.php
+++ b/app/Models/Associazione.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Associazione extends Model
+{
+    use HasFactory;
+}
--- a/app/Models/Avviso.php
+++ b/app/Models/Avviso.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Avviso extends Model
+{
+    use HasFactory;
+
+    protected $fillable=['avviso','creato_il', 'creato_da', 'urgente'];
+
+    public static function newAvviso($data)
+    {
+        self::create([
+            'avviso'=>$data['avviso'],
+            'creato_da'=>$data['creato_da'],
+            'creato_il'=>date('Y-m-d'),
+            'urgente'=>$data['urgente'],
+        ]);
+    }
+
+    public static function getAvvisi()
+    {
+        return self::all();
+    }
+}
--- a/app/Models/Categorie.php
+++ b/app/Models/Categorie.php
@@ -17,17 +17,49 @@ class Categorie extends Model
    
    public static function list()
    {
-        return DB::table('categories')->orderBy('cat_name')->get();
+        return self::all();
+    }
+
+    public static function listSpesa()
+    {
+        return DB::table('categories')->where('cat_uscita','=',1)->orderBy('cat_name')->get(); 
+    }
+
+    public static function listEntrata()
+    {
+        return DB::table('categories')->where('cat_entrata','=',1)->orderBy('cat_name')->get();
    }
    
-    public static function inserisci($name){
-       return DB::table('categories')->insert(['cat_name'=> $name]);
+    public static function inserisci($request){
+        if ($request['cat_entrata']==='on')
+        {
+            $entrata=1;
+        }
+        else
+        {
+            $entrata=0;
+        }
+
+        if ($request['cat_uscita']==='on')
+        {
+            $uscita=1;
+        }
+        else
+        {
+            $uscita=0;
+        }
+        
+       return DB::table('categories')->insert([
+        'cat_name'=> $request['cat_name'],
+        'cat_entrata'=>$entrata,
+        'cat_uscita'=>$uscita
+        ]);
    }
    
    public static function deleteById($id){
-    DB::table('categories')
-    ->where('id','=', $id)
-    ->delete();
+        DB::table('categories')
+        ->where('id','=', $id)
+        ->delete();
    }
    
    public static function getById($id) {
@@ -36,11 +68,31 @@ class Categorie extends Model
        ->get();
    }
    
-    public static function updateNameById($id,$name) {
+    public static function updateNameById($request) {
+        if ($request['cat_entrata']==='on')
+        {
+            $entrata=1;
+        }
+        else
+        {
+            $entrata=0;
+        }
+
+        if ($request['cat_uscita']==='on')
+        {
+            $uscita=1;
+        }
+        else
+        {
+            $uscita=0;
+        }
+
        DB::table('categories')
-        ->where('id','=', $id)
+        ->where('id','=', $request['id'])
        ->update([
-            'cat_name' => $name,
+            'cat_name' => $request['cat_name'],
+            'cat_entrata' => $entrata,
+            'cat_uscita'=>$uscita,
        ]);
        
    }
--- a/app/Models/Contratti.php
+++ b/app/Models/Contratti.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Contratti extends Model
+{
+    use HasFactory;
+}
--- a/app/Models/Documenti.php
+++ b/app/Models/Documenti.php
@@ -16,6 +16,14 @@ class Documenti extends Model
        ->count();
        return $quanti;
    }
+
+    // Proposta modifica {issue #5} gitea (generalizzazione del documento)
+    /*
+    public static function countDocument($id,$entity)
+    {
+        return self::where('entita','=',$entity)->where('entita_id','=',$id)->count();
+    }
+    */
    
    public static function store($req) {
        $movimento_id=$req->input('id');
@@ -27,6 +35,20 @@ class Documenti extends Model
            'filename'=>$filename,
        ]);
    }
+
+    // Proposta modifica {issue #5} gitea (generalizzazione del documento)
+    /*
+    public static function store($req) {
+        $movimento_id=$req->input('id');
+        $filename=$req->file('filename')->store('Documenti');
+        self::create([
+            'entità'=>$req['entita'],           // aggiunto per determinare il tipo di entità a cui si riferisce il documento
+            'entita_id'=>$req['entita_id'],     // aggiunto per identificare il record al quale associare il documento (al posto di id_movimento)
+            'descrizione'=>$req['descrizione'],
+            'filename'=>$filename
+        ]);
+    }
+    */
    
    public static function getList($id)
    {
@@ -35,4 +57,11 @@ class Documenti extends Model
        ->get();
    }

+    // Proposta modifica issue {#5 gitea} (generalizzazione del documento)
+    /*
+    public static function getList($id,$entity)
+    {
+        self::where('entita','=',$entity)->where('entita_id','=',$id)->get();
+    }
+    */
 }
--- a/app/Models/Gruppi.php
+++ b/app/Models/Gruppi.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Gruppi extends Model
+{
+    use HasFactory;
+}
--- a/app/Models/Movimenti.php
+++ b/app/Models/Movimenti.php
@@ -10,6 +10,8 @@ use Rap2hpoutre\FastExcel\FastExcel;
 class Movimenti extends Model
 {
    use HasFactory;
+    protected $dates = ['mov_data'];
+    protected $casts = [ 'mov_data'=>'datetime'];

    public static function getList() {
        return DB::table('movimentis')
@@ -20,15 +22,15 @@ class Movimenti extends Model
        ->groupBy('movimentis.id','mov_data','mov_descrizione','mov_importo','cat_name','tag_name')
        ->get();
    }
-    
+
    public static function getSaldo($date) {
        return DB::table('movimentis')->whereYear('mov_data','=',$date)->sum('mov_importo');
    }
-    
+
    public static function getSaldoTot() {
        return DB::table('movimentis')->sum('mov_importo');
    }
-    
+
    public static function insSpesa($request) {
        DB::table('movimentis')->insert(
            [
@@ -40,7 +42,7 @@ class Movimenti extends Model
                'mov_inserito_da'=>$request['userid'],
            ]);
    }
-    
+
    public static function insEntrata($request) {
        DB::table('movimentis')->insert(
            [
@@ -52,7 +54,7 @@ class Movimenti extends Model
                'mov_inserito_da'=>$request['userid'],
            ]);
    }
-    
+
    public static function export() {
        return DB::table('movimentis')
        ->join('categories','movimentis.mov_fk_categoria','=','categories.id')
@@ -61,7 +63,7 @@ class Movimenti extends Model
        ->orderBy('Data','asc')
        ->get();
    }
-    
+
    public static function reportSpesa($year,$month) {
        return DB::table('movimentis')
        ->selectRaw('ABS(Sum(movimentis.mov_importo)) as resoconto, categories.cat_name,categories.id')
@@ -72,7 +74,7 @@ class Movimenti extends Model
        ->groupBy('cat_name','categories.id')
        ->get();
    }
-    
+
    public static function reportEntrate($year,$month) {
        return DB::table('movimentis')
        ->selectRaw('ABS(Sum(movimentis.mov_importo)) as resoconto, categories.cat_name,categories.id')
@@ -83,7 +85,7 @@ class Movimenti extends Model
        ->groupBy('cat_name','categories.id')
        ->get();
    }
-    
+
    public static function getMovimentoById($id) {
        return DB::table('movimentis')
        ->join('categories','movimentis.mov_fk_categoria','=','categories.id')
@@ -91,7 +93,7 @@ class Movimenti extends Model
        ->where('movimentis.id','=',$id)
        ->get();
    }
-    
+
    public static function updateMovimenti($request) {
        DB::table('movimentis')
        ->where('id','=', $request['id'])
@@ -104,13 +106,13 @@ class Movimenti extends Model
            'mov_inserito_da'=>$request['userid'],
        ]);
    }
-    
+
    public static function deleteMovimento($id) {
        DB::table('movimentis')
        ->where('id','=', $id)
        ->delete();
    }
-    
+
    public static function listByCatMonth($month,$cat,$year) {
        return DB::table('movimentis')
        ->join('categories','movimentis.mov_fk_categoria','=','categories.id')
@@ -123,7 +125,7 @@ class Movimenti extends Model
        ->groupBy('movimentis.id','mov_data','mov_descrizione','mov_importo','cat_name','tag_name')
        ->get();
    }
-    
+
    public static function listByCategory($cat) {
       return DB::table('movimentis')
        ->join('categories','movimentis.mov_fk_categoria','=','categories.id')
@@ -134,7 +136,7 @@ class Movimenti extends Model
        ->groupBy('movimentis.id','mov_data','mov_descrizione','mov_importo','cat_name','tag_name')
        ->get();
    }
-    
+
    public static function getByTag($tag) {
       return DB::table('movimentis')
        ->where('mov_fk_tags','=',$tag)
@@ -151,12 +153,12 @@ class Movimenti extends Model
        $inputPath='/var/www/html/bubofamily/public/storage/'.$filename;
        $outputPath='/var/www/html/bubofamily/public/'.$filename;
        rename($inputPath,$outputPath);
-       
+
        $collection = (new FastExcel)->import($filename, function ($line){
            if($line['Data valuta'])
            {
                self::insEntrata([
-                    'mov_data'=>self::dateFormat(0,$line['Data valuta']),
+                    'mov_data'=>$line['Data valuta'],
                    'mov_fk_categoria'=>1,
                    'mov_descrizione'=>$line['Descrizione operazione'],
                    'mov_importo'=>trim(str_replace(',','.',(str_replace('.','',str_replace('€', '', $line['Importo']))))),
@@ -166,20 +168,21 @@ class Movimenti extends Model
            }
           });
    }
-    
+
    public static function importEstrattoCR($filename)
    {
        $inputPath='/var/www/html/bubofamily/public/storage/'.$filename;
        $outputPath='/var/www/html/bubofamily/public/'.$filename.'.csv';
        rename($inputPath,$outputPath);
-        
+
        $collection = (new FastExcel)->configureCsv(';')->import($filename.'.csv', function ($line){
            if($line['VALUTA'])
            {
                if($line['DARE']<>'')
                {
                $dati=[
-                    'mov_data'=>self::dateFormat(0,$line['VALUTA']),
+                    'mov_data'=>self::dateFormat(0,$line['VALUTA']), //      date_format(date_create($movimento->mov_data),'d/m/Y'
+                //    'mov_data'=>date_format(date_create($line['VALUTA']),'Y-m-d'),
                    'mov_fk_categoria'=>1,
                    'mov_descrizione'=>$line['DESCRIZIONE OPERAZIONE'],
                    'mov_importo'=>'-'.trim(str_replace(',','.',(str_replace('.','',$line['DARE'])))),
@@ -191,6 +194,7 @@ class Movimenti extends Model
                {
                    $dati=[
                        'mov_data'=>self::dateFormat(0,$line['VALUTA']),
+                        //'mov_data'=>date_format(date_create($line['VALUTA']),'Y-m-d'),
                        'mov_fk_categoria'=>1,
                        'mov_descrizione'=>$line['DESCRIZIONE OPERAZIONE'],
                        'mov_importo'=>trim(str_replace(',','.',(str_replace('.','',$line['AVERE'])))),
@@ -202,28 +206,48 @@ class Movimenti extends Model
            }
        });
    }
-    
+
    public static function getYearsFromMovimenti()
    {
        $anni=DB::table('movimentis')->select(DB::raw('DISTINCT YEAR(mov_data) as anno'))->get();
        // dd($anni); // for test purposes
        return $anni;
    }
-    
-    
+
+
    private static function dateFormat($type,$string)
    {
-        
+        // $string=(string)$string;
        if($type)
        {
-            $string=$string->format('Y-m-d');
+           // $string=$string->format('Y-m-d');
            list($year,$month,$day) = explode('-',$string);
            return $day.'/'.$month.'/'.$year;
        } else {
-            $string=$string->format('d/m/Y');
+           // $string=$string->format('d/m/Y');
            list($day,$month,$year) =explode('/',$string);
            return $year.'-'.$month.'-'.$day;
        }
    }

+    public static function getEntrate($year)
+    {
+        $entrate_anno=DB::table('movimentis')
+            ->where('mov_importo','>',0)
+            ->whereYear('mov_data', '=' , $year)
+            ->sum('mov_importo');
+            //->get();
+        return $entrate_anno;
+    }
+
+    public static function getUscite($year)
+    {
+        $uscite_anno=DB::table('movimentis')
+        ->where('mov_importo','<',0)
+        ->whereYear('mov_data', '=' , $year)
+        ->sum('mov_importo');
+        //->get();
+        return ($uscite_anno);
+    }
+
 }
--- a/app/Models/Progetti.php
+++ b/app/Models/Progetti.php
@@ -9,7 +9,7 @@ use Illuminate\Support\Facades\DB;
 class Progetti extends Model
 {
    use HasFactory;
-    
+
    public static function getProgetti() {
        return DB::table('progettis')
        ->select(
@@ -23,9 +23,9 @@ class Progetti extends Model
            'budget',
            'stato',
            'note')
-        ->join('users','progettis.fk_user','=','users.id')->get(); 
+        ->join('users','progettis.fk_user','=','users.id')->get();
    }
-    
+
    public static function getProgettoById($id){
        return DB::table('progettis')->
            join('users','progettis.fk_user','=','users.id')->
@@ -33,7 +33,7 @@ class Progetti extends Model
            where('progettis.id','=',$id)->
            get();
    }
-    
+
    public static function saveProgetto($progetto){
        DB::table('progettis')->insert([
           'nome'=>$progetto['nome'],
@@ -46,12 +46,35 @@ class Progetti extends Model
            'stato'=>$progetto['stato'],
            'note'=>$progetto['note']
        ]);
-     
+
    }
-    
+
    public static function delProgetto($progetto_id)
     {
         DB::table('progettis')->delete($progetto_id);
     }
-    
+
+    public static function chiudiProgetto($progetto_id)
+    {
+        // chiude il progetto e lo rende non cancellabile e non più editabile
+        // potrà solo essere esportato in PDF
+        DB::table('progettis')
+        ->where('id','=', $progetto_id)
+        ->update([
+            'stato'=>'chiuso',
+            'data_fine'=>date('Y-m-d'),
+        ]);
+
+    }
+
+    public static function riapriProgetto($progetto_id)
+    {
+        DB::table('progettis')
+        ->where('id','=', $progetto_id)
+        ->update([
+            'stato'=>'aperto',
+            'data_fine'=>null,
+        ]);
+    }
+
 }
--- a/app/Models/Rivista.php
+++ b/app/Models/Rivista.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Rivista extends Model
+{
+    use HasFactory;
+}
--- a/app/Models/Task.php
+++ b/app/Models/Task.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+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',
+            ]
+            );
+    }
+
+}
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -66,7 +66,7 @@ class User extends Authenticatable

    public static function getUserById($id)
    {
-        return DB::table('users')->where('id','=',$id)->get();
+        return DB::table('users')->where('id','=',$id)->first();
    }

    public static function getUsers()
--- a/composer.json
+++ b/composer.json
@@ -10,6 +10,7 @@
 	"require" : {
 		"php": "^7.3|^8.0",
 		"barryvdh/laravel-dompdf": "^2.0",
+		"creativeorange/gravatar": "^1.0",
 		"directorytree/ldaprecord": "^2.9",
 		"fruitcake/laravel-cors": "^2.0",
 		"guzzlehttp/guzzle": "^7.0.1",
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "e6ac2be787f145ea140b72b55e302e90",
+    "content-hash": "acd096c2d0a14521dd551b39dde1ef28",
    "packages": [
        {
            "name": "asm89/stack-cors",
@@ -350,6 +350,69 @@
            ],
            "time": "2022-04-01T19:23:25+00:00"
        },
+        {
+            "name": "creativeorange/gravatar",
+            "version": "v1.0.23",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/creativeorange/gravatar.git",
+                "reference": "3a1b227c48091b039b967265ec13c0800c70ac79"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/creativeorange/gravatar/zipball/3a1b227c48091b039b967265ec13c0800c70ac79",
+                "reference": "3a1b227c48091b039b967265ec13c0800c70ac79",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/support": "^5|^6|^7|^8|^9|^10.0",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "nunomaduro/larastan": "^0.6.2|^2.4",
+                "orchestra/testbench": "^5.4|^8.0",
+                "php": ">=7.2"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Creativeorange\\Gravatar\\GravatarServiceProvider"
+                    ],
+                    "aliases": {
+                        "Gravatar": "Creativeorange\\Gravatar\\Facades\\Gravatar"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Creativeorange\\Gravatar\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaco Tijssen",
+                    "email": "jaco@creativeorange.nl",
+                    "homepage": "https://www.creativeorange.nl",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A Laravel Gravatar package for retrieving gravatar image URLs or checking the existance of an image.",
+            "keywords": [
+                "avatar",
+                "gravatar",
+                "laravel"
+            ],
+            "support": {
+                "issues": "https://github.com/creativeorange/gravatar/issues",
+                "source": "https://github.com/creativeorange/gravatar/tree/v1.0.23"
+            },
+            "time": "2023-02-06T07:57:20+00:00"
+        },
        {
            "name": "dflydev/dot-access-data",
            "version": "v3.0.2",
@@ -501,28 +564,28 @@
        },
        {
            "name": "doctrine/inflector",
-            "version": "2.0.6",
+            "version": "2.0.8",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/inflector.git",
-                "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024"
+                "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
-                "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/f9301a5b2fb1216b2b08f02ba04dc45423db6bff",
+                "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff",
                "shasum": ""
            },
            "require": {
                "php": "^7.2 || ^8.0"
            },
            "require-dev": {
-                "doctrine/coding-standard": "^10",
+                "doctrine/coding-standard": "^11.0",
                "phpstan/phpstan": "^1.8",
                "phpstan/phpstan-phpunit": "^1.1",
                "phpstan/phpstan-strict-rules": "^1.3",
                "phpunit/phpunit": "^8.5 || ^9.5",
-                "vimeo/psalm": "^4.25"
+                "vimeo/psalm": "^4.25 || ^5.4"
            },
            "type": "library",
            "autoload": {
@@ -572,7 +635,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/inflector/issues",
-                "source": "https://github.com/doctrine/inflector/tree/2.0.6"
+                "source": "https://github.com/doctrine/inflector/tree/2.0.8"
            },
            "funding": [
                {
@@ -588,7 +651,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-10-20T09:10:12+00:00"
+            "time": "2023-06-16T13:40:37+00:00"
        },
        {
            "name": "doctrine/lexer",
@@ -2342,33 +2405,36 @@
        },
        {
            "name": "maennchen/zipstream-php",
-            "version": "v2.4.0",
+            "version": "3.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/maennchen/ZipStream-PHP.git",
-                "reference": "3fa72e4c71a43f9e9118752a5c90e476a8dc9eb3"
+                "reference": "b8174494eda667f7d13876b4a7bfef0f62a7c0d1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/3fa72e4c71a43f9e9118752a5c90e476a8dc9eb3",
-                "reference": "3fa72e4c71a43f9e9118752a5c90e476a8dc9eb3",
+                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/b8174494eda667f7d13876b4a7bfef0f62a7c0d1",
+                "reference": "b8174494eda667f7d13876b4a7bfef0f62a7c0d1",
                "shasum": ""
            },
            "require": {
                "ext-mbstring": "*",
-                "myclabs/php-enum": "^1.5",
-                "php": "^8.0",
-                "psr/http-message": "^1.0"
+                "ext-zlib": "*",
+                "php-64bit": "^8.1"
            },
            "require-dev": {
                "ext-zip": "*",
-                "friendsofphp/php-cs-fixer": "^3.9",
-                "guzzlehttp/guzzle": "^6.5.3 || ^7.2.0",
+                "friendsofphp/php-cs-fixer": "^3.16",
+                "guzzlehttp/guzzle": "^7.5",
                "mikey179/vfsstream": "^1.6",
-                "php-coveralls/php-coveralls": "^2.4",
-                "phpunit/phpunit": "^8.5.8 || ^9.4.2",
+                "php-coveralls/php-coveralls": "^2.5",
+                "phpunit/phpunit": "^10.0",
                "vimeo/psalm": "^5.0"
            },
+            "suggest": {
+                "guzzlehttp/psr7": "^2.4",
+                "psr/http-message": "^2.0"
+            },
            "type": "library",
            "autoload": {
                "psr-4": {
@@ -2404,7 +2470,7 @@
            ],
            "support": {
                "issues": "https://github.com/maennchen/ZipStream-PHP/issues",
-                "source": "https://github.com/maennchen/ZipStream-PHP/tree/v2.4.0"
+                "source": "https://github.com/maennchen/ZipStream-PHP/tree/3.1.0"
            },
            "funding": [
                {
@@ -2416,7 +2482,7 @@
                    "type": "open_collective"
                }
            ],
-            "time": "2022-12-08T12:29:14+00:00"
+            "time": "2023-06-21T14:59:35+00:00"
        },
        {
            "name": "markbaker/complex",
@@ -2694,81 +2760,18 @@
            ],
            "time": "2023-02-06T13:44:46+00:00"
        },
-        {
-            "name": "myclabs/php-enum",
-            "version": "1.8.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/myclabs/php-enum.git",
-                "reference": "a867478eae49c9f59ece437ae7f9506bfaa27483"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/php-enum/zipball/a867478eae49c9f59ece437ae7f9506bfaa27483",
-                "reference": "a867478eae49c9f59ece437ae7f9506bfaa27483",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "php": "^7.3 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.5",
-                "squizlabs/php_codesniffer": "1.*",
-                "vimeo/psalm": "^4.6.2"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "MyCLabs\\Enum\\": "src/"
-                },
-                "classmap": [
-                    "stubs/Stringable.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP Enum contributors",
-                    "homepage": "https://github.com/myclabs/php-enum/graphs/contributors"
-                }
-            ],
-            "description": "PHP Enum implementation",
-            "homepage": "http://github.com/myclabs/php-enum",
-            "keywords": [
-                "enum"
-            ],
-            "support": {
-                "issues": "https://github.com/myclabs/php-enum/issues",
-                "source": "https://github.com/myclabs/php-enum/tree/1.8.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/mnapoli",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/myclabs/php-enum",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-08-04T09:53:51+00:00"
-        },
        {
            "name": "nesbot/carbon",
-            "version": "2.67.0",
+            "version": "2.68.1",
            "source": {
                "type": "git",
                "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "c1001b3bc75039b07f38a79db5237c4c529e04c8"
+                "reference": "4f991ed2a403c85efbc4f23eb4030063fdbe01da"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/c1001b3bc75039b07f38a79db5237c4c529e04c8",
-                "reference": "c1001b3bc75039b07f38a79db5237c4c529e04c8",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4f991ed2a403c85efbc4f23eb4030063fdbe01da",
+                "reference": "4f991ed2a403c85efbc4f23eb4030063fdbe01da",
                "shasum": ""
            },
            "require": {
@@ -2857,7 +2860,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-05-25T22:09:47+00:00"
+            "time": "2023-06-20T18:29:04+00:00"
        },
        {
            "name": "nette/schema",
@@ -3010,16 +3013,16 @@
        },
        {
            "name": "nikic/php-parser",
-            "version": "v4.15.5",
+            "version": "v4.16.0",
            "source": {
                "type": "git",
                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e"
+                "reference": "19526a33fb561ef417e822e85f08a00db4059c17"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e",
-                "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17",
+                "reference": "19526a33fb561ef417e822e85f08a00db4059c17",
                "shasum": ""
            },
            "require": {
@@ -3060,9 +3063,9 @@
            ],
            "support": {
                "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0"
            },
-            "time": "2023-05-19T20:20:00+00:00"
+            "time": "2023-06-25T14:52:30+00:00"
        },
        {
            "name": "opis/closure",
@@ -3221,16 +3224,16 @@
        },
        {
            "name": "phpoffice/phpspreadsheet",
-            "version": "1.28.0",
+            "version": "1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
-                "reference": "6e81cf39bbd93ebc3a4e8150444c41e8aa9b769a"
+                "reference": "fde2ccf55eaef7e86021ff1acce26479160a0fa0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/6e81cf39bbd93ebc3a4e8150444c41e8aa9b769a",
-                "reference": "6e81cf39bbd93ebc3a4e8150444c41e8aa9b769a",
+                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/fde2ccf55eaef7e86021ff1acce26479160a0fa0",
+                "reference": "fde2ccf55eaef7e86021ff1acce26479160a0fa0",
                "shasum": ""
            },
            "require": {
@@ -3248,7 +3251,7 @@
                "ext-zip": "*",
                "ext-zlib": "*",
                "ezyang/htmlpurifier": "^4.15",
-                "maennchen/zipstream-php": "^2.1",
+                "maennchen/zipstream-php": "^2.1 || ^3.0",
                "markbaker/complex": "^3.0",
                "markbaker/matrix": "^3.0",
                "php": "^7.4 || ^8.0",
@@ -3260,12 +3263,12 @@
                "dealerdirect/phpcodesniffer-composer-installer": "dev-main",
                "dompdf/dompdf": "^1.0 || ^2.0",
                "friendsofphp/php-cs-fixer": "^3.2",
-                "mitoteam/jpgraph": "^10.2.4",
+                "mitoteam/jpgraph": "^10.3",
                "mpdf/mpdf": "^8.1.1",
                "phpcompatibility/php-compatibility": "^9.3",
                "phpstan/phpstan": "^1.1",
                "phpstan/phpstan-phpunit": "^1.0",
-                "phpunit/phpunit": "^8.5 || ^9.0",
+                "phpunit/phpunit": "^8.5 || ^9.0 || ^10.0",
                "squizlabs/php_codesniffer": "^3.7",
                "tecnickcom/tcpdf": "^6.5"
            },
@@ -3320,9 +3323,9 @@
            ],
            "support": {
                "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
-                "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.28.0"
+                "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.29.0"
            },
-            "time": "2023-02-25T12:24:49+00:00"
+            "time": "2023-06-14T22:48:31+00:00"
        },
        {
            "name": "phpoption/phpoption",
@@ -3606,16 +3609,16 @@
        },
        {
            "name": "psr/http-message",
-            "version": "1.1",
+            "version": "2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
-                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
                "shasum": ""
            },
            "require": {
@@ -3624,7 +3627,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "2.0.x-dev"
                }
            },
            "autoload": {
@@ -3639,7 +3642,7 @@
            "authors": [
                {
                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                }
            ],
            "description": "Common interface for HTTP messages",
@@ -3653,9 +3656,9 @@
                "response"
            ],
            "support": {
-                "source": "https://github.com/php-fig/http-message/tree/1.1"
+                "source": "https://github.com/php-fig/http-message/tree/2.0"
            },
-            "time": "2023-04-04T09:50:52+00:00"
+            "time": "2023-04-04T09:54:51+00:00"
        },
        {
            "name": "psr/log",
@@ -4825,16 +4828,16 @@
        },
        {
            "name": "spatie/db-dumper",
-            "version": "3.3.1",
+            "version": "3.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/spatie/db-dumper.git",
-                "reference": "3b9fd47899bf6a59d3452392121c9ce675d55d34"
+                "reference": "bbd5ae0f331d47e6534eb307e256c11a65c8e24a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/db-dumper/zipball/3b9fd47899bf6a59d3452392121c9ce675d55d34",
-                "reference": "3b9fd47899bf6a59d3452392121c9ce675d55d34",
+                "url": "https://api.github.com/repos/spatie/db-dumper/zipball/bbd5ae0f331d47e6534eb307e256c11a65c8e24a",
+                "reference": "bbd5ae0f331d47e6534eb307e256c11a65c8e24a",
                "shasum": ""
            },
            "require": {
@@ -4872,7 +4875,7 @@
                "spatie"
            ],
            "support": {
-                "source": "https://github.com/spatie/db-dumper/tree/3.3.1"
+                "source": "https://github.com/spatie/db-dumper/tree/3.4.0"
            },
            "funding": [
                {
@@ -4884,7 +4887,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-05-02T11:05:31+00:00"
+            "time": "2023-06-27T08:34:52+00:00"
        },
        {
            "name": "spatie/laravel-backup",
@@ -5041,16 +5044,16 @@
        },
        {
            "name": "spatie/laravel-permission",
-            "version": "5.10.1",
+            "version": "5.10.2",
            "source": {
                "type": "git",
                "url": "https://github.com/spatie/laravel-permission.git",
-                "reference": "d08b3ffc5870cce4a47a39f22174947b33c191ae"
+                "reference": "671e46e079cbd4990a98427daaa09f4977b57ca9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/d08b3ffc5870cce4a47a39f22174947b33c191ae",
-                "reference": "d08b3ffc5870cce4a47a39f22174947b33c191ae",
+                "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/671e46e079cbd4990a98427daaa09f4977b57ca9",
+                "reference": "671e46e079cbd4990a98427daaa09f4977b57ca9",
                "shasum": ""
            },
            "require": {
@@ -5111,7 +5114,7 @@
            ],
            "support": {
                "issues": "https://github.com/spatie/laravel-permission/issues",
-                "source": "https://github.com/spatie/laravel-permission/tree/5.10.1"
+                "source": "https://github.com/spatie/laravel-permission/tree/5.10.2"
            },
            "funding": [
                {
@@ -5119,7 +5122,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-04-12T17:08:32+00:00"
+            "time": "2023-07-04T13:38:13+00:00"
        },
        {
            "name": "spatie/laravel-signal-aware-command",
@@ -5924,16 +5927,16 @@
        },
        {
            "name": "symfony/http-foundation",
-            "version": "v5.4.24",
+            "version": "v5.4.25",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "3c59f97f6249ce552a44f01b93bfcbd786a954f5"
+                "reference": "f66be2706075c5f6325d2fe2b743a57fb5d23f6b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/3c59f97f6249ce552a44f01b93bfcbd786a954f5",
-                "reference": "3c59f97f6249ce552a44f01b93bfcbd786a954f5",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f66be2706075c5f6325d2fe2b743a57fb5d23f6b",
+                "reference": "f66be2706075c5f6325d2fe2b743a57fb5d23f6b",
                "shasum": ""
            },
            "require": {
@@ -5980,7 +5983,7 @@
            "description": "Defines an object-oriented layer for the HTTP specification",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v5.4.24"
+                "source": "https://github.com/symfony/http-foundation/tree/v5.4.25"
            },
            "funding": [
                {
@@ -5996,20 +5999,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-05-19T07:21:23+00:00"
+            "time": "2023-06-22T08:06:06+00:00"
        },
        {
            "name": "symfony/http-kernel",
-            "version": "v5.4.24",
+            "version": "v5.4.25",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "f38b722e1557eb3f487d351b48f5a1279b50e9d1"
+                "reference": "f6c92fe64bbdad7616cb90663c24f6350f3ca464"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f38b722e1557eb3f487d351b48f5a1279b50e9d1",
-                "reference": "f38b722e1557eb3f487d351b48f5a1279b50e9d1",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f6c92fe64bbdad7616cb90663c24f6350f3ca464",
+                "reference": "f6c92fe64bbdad7616cb90663c24f6350f3ca464",
                "shasum": ""
            },
            "require": {
@@ -6092,7 +6095,7 @@
            "description": "Provides a structured process for converting a Request into a Response",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v5.4.24"
+                "source": "https://github.com/symfony/http-kernel/tree/v5.4.25"
            },
            "funding": [
                {
@@ -6108,7 +6111,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-05-27T08:06:30+00:00"
+            "time": "2023-06-26T05:58:08+00:00"
        },
        {
            "name": "symfony/mime",
@@ -6996,16 +6999,16 @@
        },
        {
            "name": "symfony/routing",
-            "version": "v5.4.22",
+            "version": "v5.4.25",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/routing.git",
-                "reference": "c2ac11eb34947999b7c38fb4c835a57306907e6d"
+                "reference": "56bfc1394f7011303eb2e22724f9b422d3f14649"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/c2ac11eb34947999b7c38fb4c835a57306907e6d",
-                "reference": "c2ac11eb34947999b7c38fb4c835a57306907e6d",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/56bfc1394f7011303eb2e22724f9b422d3f14649",
+                "reference": "56bfc1394f7011303eb2e22724f9b422d3f14649",
                "shasum": ""
            },
            "require": {
@@ -7066,7 +7069,7 @@
                "url"
            ],
            "support": {
-                "source": "https://github.com/symfony/routing/tree/v5.4.22"
+                "source": "https://github.com/symfony/routing/tree/v5.4.25"
            },
            "funding": [
                {
@@ -7082,7 +7085,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-03-14T14:59:20+00:00"
+            "time": "2023-06-05T14:18:47+00:00"
        },
        {
            "name": "symfony/service-contracts",
@@ -7427,16 +7430,16 @@
        },
        {
            "name": "symfony/var-dumper",
-            "version": "v5.4.24",
+            "version": "v5.4.25",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "8e12706bf9c68a2da633f23bfdc15b4dce5970b3"
+                "reference": "82269f73c0f0f9859ab9b6900eebacbe54954ede"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/8e12706bf9c68a2da633f23bfdc15b4dce5970b3",
-                "reference": "8e12706bf9c68a2da633f23bfdc15b4dce5970b3",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/82269f73c0f0f9859ab9b6900eebacbe54954ede",
+                "reference": "82269f73c0f0f9859ab9b6900eebacbe54954ede",
                "shasum": ""
            },
            "require": {
@@ -7495,7 +7498,7 @@
                "dump"
            ],
            "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v5.4.24"
+                "source": "https://github.com/symfony/var-dumper/tree/v5.4.25"
            },
            "funding": [
                {
@@ -7511,7 +7514,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-05-25T13:05:00+00:00"
+            "time": "2023-06-20T20:56:26+00:00"
        },
        {
            "name": "tightenco/collect",
@@ -8309,16 +8312,16 @@
        },
        {
            "name": "filp/whoops",
-            "version": "2.15.2",
+            "version": "2.15.3",
            "source": {
                "type": "git",
                "url": "https://github.com/filp/whoops.git",
-                "reference": "aac9304c5ed61bf7b1b7a6064bf9806ab842ce73"
+                "reference": "c83e88a30524f9360b11f585f71e6b17313b7187"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/aac9304c5ed61bf7b1b7a6064bf9806ab842ce73",
-                "reference": "aac9304c5ed61bf7b1b7a6064bf9806ab842ce73",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/c83e88a30524f9360b11f585f71e6b17313b7187",
+                "reference": "c83e88a30524f9360b11f585f71e6b17313b7187",
                "shasum": ""
            },
            "require": {
@@ -8368,7 +8371,7 @@
            ],
            "support": {
                "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.15.2"
+                "source": "https://github.com/filp/whoops/tree/2.15.3"
            },
            "funding": [
                {
@@ -8376,7 +8379,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-04-12T12:00:00+00:00"
+            "time": "2023-07-13T12:00:00+00:00"
        },
        {
            "name": "hamcrest/hamcrest-php",
@@ -8431,16 +8434,16 @@
        },
        {
            "name": "laravel/sail",
-            "version": "v1.22.0",
+            "version": "v1.23.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/sail.git",
-                "reference": "923e1e112b6a8598664dbb0ee79dd3137f1c9d56"
+                "reference": "62582606f80466aa81fba40b193b289106902853"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sail/zipball/923e1e112b6a8598664dbb0ee79dd3137f1c9d56",
-                "reference": "923e1e112b6a8598664dbb0ee79dd3137f1c9d56",
+                "url": "https://api.github.com/repos/laravel/sail/zipball/62582606f80466aa81fba40b193b289106902853",
+                "reference": "62582606f80466aa81fba40b193b289106902853",
                "shasum": ""
            },
            "require": {
@@ -8492,7 +8495,7 @@
                "issues": "https://github.com/laravel/sail/issues",
                "source": "https://github.com/laravel/sail"
            },
-            "time": "2023-05-04T14:52:56+00:00"
+            "time": "2023-06-28T18:31:28+00:00"
        },
        {
            "name": "mockery/mockery",
@@ -9149,16 +9152,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "9.6.9",
+            "version": "9.6.10",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "a9aceaf20a682aeacf28d582654a1670d8826778"
+                "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a9aceaf20a682aeacf28d582654a1670d8826778",
-                "reference": "a9aceaf20a682aeacf28d582654a1670d8826778",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a6d351645c3fe5a30f5e86be6577d946af65a328",
+                "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328",
                "shasum": ""
            },
            "require": {
@@ -9232,7 +9235,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.9"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.10"
            },
            "funding": [
                {
@@ -9248,7 +9251,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-06-11T06:13:56+00:00"
+            "time": "2023-07-10T04:04:23+00:00"
        },
        {
            "name": "sebastian/cli-parser",
@@ -10345,5 +10348,5 @@
        "php": "^7.3|^8.0"
    },
    "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }
--- a/config/app.php
+++ b/config/app.php
@@ -80,7 +80,7 @@ return [
    |
    */

-    'locale' => 'en',
+    'locale' => 'it',

    /*
    |--------------------------------------------------------------------------
@@ -106,7 +106,7 @@ return [
    |
    */

-    'faker_locale' => 'en_US',
+    'faker_locale' => 'it_IT',

    /*
    |--------------------------------------------------------------------------
@@ -161,6 +161,7 @@ return [
        Illuminate\Translation\TranslationServiceProvider::class,
        Illuminate\Validation\ValidationServiceProvider::class,
        Illuminate\View\ViewServiceProvider::class,
+        Creativeorange\Gravatar\GravatarServiceProvider::class,
       

        /*
@@ -232,6 +233,7 @@ return [
        'Validator' => Illuminate\Support\Facades\Validator::class,
        'View' => Illuminate\Support\Facades\View::class,
        'FastExcel' => Rap2hpoutre\FastExcel\Facades\FastExcel::class,
+        'Gravatar' => Creativeorange\Gravatar\Facade\Gravatar::class,

    ],

--- a/database/migrations/2022_03_14_151214_create_documentis_table.php
+++ b/database/migrations/2022_03_14_151214_create_documentis_table.php
@@ -20,6 +20,18 @@ class CreateDocumentisTable extends Migration
            $table->string('descrizione');
            $table->string('filename');
        });
+
+        /*
+        {issue #5} GITEA - proposta modifica
+        Schema::create('documentis', function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+            $table->string('entita');
+            $table->bigInteger('entita_id');
+            $table->string('descrizione');
+            $table->string('filename');
+        });
+        */
    }

    /**
--- a/database/migrations/2023_06_08_162605_columns_anagrafica.php
+++ b/database/migrations/2023_06_08_162605_columns_anagrafica.php
@@ -13,14 +13,14 @@ class ColumnsAnagrafica extends Migration
     */
    public function up()
    {
-        Schema::table('anagraficas', function (Blueprint $table) {
-            //
-		$table->longText('ang_indirizzo');
+        /*Schema::table('anagraficas', function (Blueprint $table) {
+         /*   //
+	//		$table->longText('ang_indirizzo');
 		$table->string('ang_CAP');
 		$table->string('ang_Citta');  
 		$table->string('ang_Provincia'); 
 		$table->string('ang_telefono');
-        });
+        });*/
    }

    /**
--- a/database/migrations/2023_06_19_084521_create_rivistas_table.php
+++ b/database/migrations/2023_06_19_084521_create_rivistas_table.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateRivistasTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('rivistas', function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('rivistas');
+    }
+}
--- a/database/migrations/2023_06_19_084538_create_associaziones_table.php
+++ b/database/migrations/2023_06_19_084538_create_associaziones_table.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateAssociazionesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('associaziones', function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('associaziones');
+    }
+}
--- a/database/migrations/2023_06_19_094609_create_gruppis_table.php
+++ b/database/migrations/2023_06_19_094609_create_gruppis_table.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateGruppisTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('gruppis', function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('gruppis');
+    }
+}
--- a/database/migrations/2023_07_06_142451_update_categories_adding_spesa_entrata.php
+++ b/database/migrations/2023_07_06_142451_update_categories_adding_spesa_entrata.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class UpdateCategoriesAddingSpesaEntrata extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        //
+        Schema::table('categories', function (Blueprint $table) {
+     
+            $table->smallInteger('cat_entrata')->after('cat_name')->default(0); 
+            $table->smallInteger('cat_uscita')->after('cat_entrata')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+        Schema::table('categories', function (Blueprint $table) {
+        $table->dropColumn('cat_entrata');
+        $table->dropColumn('cat_uscita');
+        });
+    }
+}
--- a/database/migrations/2023_07_14_123253_create_tasks_table.php
+++ b/database/migrations/2023_07_14_123253_create_tasks_table.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateTasksTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('tasks', function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+            $table->string('titolo',255);
+            $table->longText('descrizione')->nullable();
+            $table->bigInteger('creato_da');
+            $table->bigInteger('assegnato_a');
+            $table->date('creato_il');
+            $table->date('termine_il');
+            $table->date('chiuso_il');
+            $table->enum('stato', ['Aperto', 'Chiuso'])->nullable()->default('Aperto');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('tasks');
+    }
+}
--- a/database/migrations/2023_07_14_123350_subtask.php
+++ b/database/migrations/2023_07_14_123350_subtask.php
@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class Subtask extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        //
+        Schema::create('subtasks', function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+           // $table->bigInteger('tasks_id');
+            $table->foreignId('tasks_id')->onDelete('cascade');
+            $table->string('titolo',255);
+            $table->longText('descrizione')->nullable();
+            $table->bigInteger('creato_da');
+            $table->bigInteger('assegnato_a');
+            $table->date('creato_il');
+            $table->date('termine_il');
+            $table->date('chiuso_il');
+            $table->enum('stato', ['Aperto', 'Chiuso'])->nullable()->default('Aperto');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
--- a/database/migrations/2023_07_18_145041_create_avvisos_table.php
+++ b/database/migrations/2023_07_18_145041_create_avvisos_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateAvvisosTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('avvisos', function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+            $table->longtext('avviso');
+            $table->date('creato_il')->nullable()->default(date('Y-m-d'));
+            $table->bigInteger('creato_da');
+            $table->boolean('urgente')->nullable()->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('avvisos');
+    }
+}
--- a/database/migrations/2023_07_27_083822_create_contrattis_table.php
+++ b/database/migrations/2023_07_27_083822_create_contrattis_table.php
@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateContrattisTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('contrattis', function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+            $table->string('numero', 100)->nullable();
+            $table->string('nome', 100);
+            $table->date('datainizio');
+            $table->date('datatermine');
+            $table->string('fornitore', 100)->default('text');
+            $table->string('tipo', 100)->default('utenze');
+            $table->decimal('importo', 5, 2);
+            $table->date('scadenzapagamento');
+            $table->string('stato', 100)->default('attivo');
+            $table->longText('note')->nullable();
+            $table->string('filename',255)->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('contrattis');
+    }
+}
--- a/database/seeders/CategorieSeeder.php
+++ b/database/seeders/CategorieSeeder.php
@@ -16,13 +16,23 @@ class CategorieSeeder extends Seeder
    {
        // Inserisce le categorie necessarie
        DB::table('categories')->insert(
-            ['cat_name'=>'Automobili']
+            [
+                'cat_name'=>'Automobili',
+                'cat_uscita'=>1,
+                'cat_entrata'=>0,
+                ]
            );
        DB::table('categories')->insert(
-            ['cat_name'=>'Stipendio']
+            [
+                'cat_name'=>'Stipendio',
+                'cat_uscita'=>0,
+                'cat_entrata'=>1]
            );
        DB::table('categories')->insert(
-            ['cat_name'=>'Utenze']
+            [
+                'cat_name'=>'Utenze',
+                'cat_uscita'=>1,
+                'cat_entrata'=>0]
            );
    }
 }
--- a/database/seeders/OnlySeeder.php
+++ b/database/seeders/OnlySeeder.php
@@ -0,0 +1,84 @@
+<?php
+namespace Database\Seeders;
+
+use App\Models\User;
+use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\Hash;
+use Spatie\Permission\Models\Permission;
+use Spatie\Permission\Models\Role;
+use Spatie\Permission\PermissionRegistrar;
+
+class OnlySeeder extends Seeder
+{
+
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+       // Role Creation
+        $role_admin = Role::create([
+            'name' => 'admin'
+        ]);
+        $role_user = Role::create([
+            'name' => 'user'
+        ]);
+        $role_guest = Role::create([
+            'name' => 'guest'
+        ]);
+
+        // Permission Creation
+        Permission::create([
+            'name' => 'conti'
+        ]);
+        Permission::create([
+            'name' => 'consumi'
+        ]);
+        Permission::create([
+            'name' => 'automobili'
+        ]);
+        Permission::create([
+            'name' => 'contatti'
+        ]);
+        Permission::create([
+            'name' => 'affitti'
+        ]);
+        Permission::create([
+            'name' => 'progetti'
+        ]);
+        Permission::create([
+            'name' => 'amministrazione'
+        ]);
+
+        // Assegnazione permessi al ruolo user
+        $role_user->givePermissionTo('affitti');
+        $role_user->givePermissionTo('automobili');
+        $role_user->givePermissionTo('contatti');
+        $role_user->givePermissionTo('consumi');
+        $role_user->givePermissionTo('conti');
+        $role_user->givePermissionTo('progetti');
+        // Assegnazione permessi al ruolo guest
+        $role_guest->givePermissionTo('affitti');
+        // Il ruolo admin ha già tutti i permessi da middleware
+       
+        $admin = User::create([            
+            'name'=>'Amministratore',
+            'email'=>'admin@localhost.local',
+            'password'=>Hash::make('admin'),
+            ])->assignRole('admin');
+        
+        $user = User::create([
+            'name'=>'Utente',
+            'email'=>'user@localhost.local',
+            'password'=>Hash::make('user'),
+        ])->assignRole('user');
+        
+        $guest = User::create([
+            'name'=>'Guest',
+            'email'=>'guest@localhost.local',
+            'password'=>Hash::make('guest'),
+        ])->assignRole('guest');
+    }
+}
--- a/public/js/app/auto.js
+++ b/public/js/app/auto.js
@@ -1,12 +1,19 @@
+$(document).ready(function() {
+	$('#listaAutomobili').DataTable({
+		responsive: true
+	});
+});
+
 $(document).ready(function() {
 	$('#automobili').DataTable({
 		responsive: true,
-        fields: [
-			{
-				label:"Data",
-				type: "datetime"
-			}
-		]
+        columnDefs: [
+            {
+                target: 0,
+                render: DataTable.render.date(),
+            }
+        ],
+		"order": [[0, "desc"]]
 	});
 });

--- a/public/js/app/conti_categorie.js
+++ b/public/js/app/conti_categorie.js
@@ -1,41 +1,50 @@
 $(document).ready(function() {
 	$('#listrapportoS').DataTable({
-		responsive: true,
-        fields: [
-			{
-				label:"Data",
-				type: "datetime"
-			}
-		]
+		"responsive": true,
+		"order": [[0, "asc"]]
 	});

 	$('#listrapportoE').DataTable({
-		responsive: true,
-        fields: [
-			{
-				label:"Data",
-				type: "datetime"
-			}
-		]
+		"responsive": true,
+		"order": [[0, "asc"]]
 	});

    $('#categorie').DataTable({
            responsive: true
    });
 });
+
 $(document).on('click','.open_modal',function(){
    var url = "/admin/categorie/modify";
    var riga_id= $(this).val();
    $.getJSON(url + '/' + riga_id, function (data) {
        //success data
+        $('#cat_entrata').prop('checked', false);
+        $('#cat_uscita').prop('checked', false);
+       
+       
        console.log(data[0]);
        console.log(data[0].cat_name);
-        $('#H_cat_cat_name').val(data[0].cat_name);
+
+       
+
+        if (data[0].cat_uscita === 1)
+        {
+            // $('.myCheckbox').prop('checked', true);
+            $('#cat_uscita').prop('checked', true);
+        } 
+        if (data[0].cat_entrata ===1)
+        {
+            $('#cat_entrata').prop('checked', true);
+        }
        $('#H_cat_id').val(data[0].id);
+        $('#H_cat_cat_name').val(data[0].cat_name);
        $('#myModal').modal('show');
    });
 });
+
 $(document).on('click','.open_modal_new',function(){
+        console.log('richiesto apertura form');
        $('#myModal_new').modal('show');

 });
--- a/public/js/app/contratti.js
+++ b/public/js/app/contratti.js
@@ -0,0 +1,10 @@
+$('#contratti').DataTable({
+    responsive: true,
+    fields: [
+        {
+            label:"Data",
+            type: "datetime"
+        }
+    ]
+});
+$(".draggable").draggable();
--- a/public/js/app/dashboard.js
+++ b/public/js/app/dashboard.js
@@ -1,6 +1,8 @@

 $(document).ready(function() {
-	$('#categorie').DataTable({
-		responsive: true
-	});
+
 });
+// Rende spostabili le varie finestre
+$(".draggable").draggable();
+
+	
--- a/public/js/app/enel.js
+++ b/public/js/app/enel.js
@@ -1,11 +1,12 @@
 $(document).ready(function() {
 	$('#listaLettureEnel').DataTable({
-		responsive: true,
-        fields: [
-			{
-				label:"Data lettura",
-				type: "datetime"
-			}
-		]
+		"responsive": true,
+        columnDefs: [
+            {
+                target: 0,
+                render: DataTable.render.date(),
+            }
+        ],
+		"order": [[0, "desc"]]
 	});
 });
--- a/public/js/app/gas.js
+++ b/public/js/app/gas.js
@@ -1,11 +1,12 @@
 $(document).ready(function() {
 	$('#listaLettureGas').DataTable({
-		responsive: true,
-        fields: [
-			{
-				label:"Data lettura",
-				type: "datetime"
-			}
-		]
+		"responsive": true,
+        columnDefs: [
+            {
+                target: 0,
+                render: DataTable.render.date(),
+            }
+        ],
+		"order": [[0, "desc"]]
 	});
 });
--- a/public/js/app/movimenti.js
+++ b/public/js/app/movimenti.js
@@ -1,16 +1,18 @@
 $(document).ready(function() {
 	$('#listamovimenti').DataTable({
 		"responsive": true,
-        fields: [
-			{
-				label:"Data",
-				type: "datetime"
-			}
-		],
+        columnDefs: [
+            {
+                target: 0,
+                render: DataTable.render.date(),
+            }
+        ],
 		"order": [[0, "desc"]]
 	});
 });

+$(".draggable").draggable();
+
 var d = new Date();

 var month = d.getMonth()+1;
@@ -23,55 +25,101 @@ var strDate = d.getFullYear() + '-' +

 $(document).on('click', '.open_modal_spesa', function() {
 	console.log(strDate);
-	$('#form').find('input[type="text"], textarea, input[type="number"],input[type="date"]').val("");
+	$("#categoria").empty();
+	$("#tags").empty();
+	$('#form').find('input[type="text"], textarea, input[type="number"],input[type="date"],option').val("");
 	$('#form').find('input[type="date"]').val(strDate);
 	$('#myModal').modal('show');
 	$('.modal-title').text(' Nuovo movimento in uscita');
 	$('#form').attr('action', '/admin/movimenti/spesa');
+	$.getJSON("/admin/service/catlistSpesa", {}, function(cats) {
+		$.each(cats, function(i, cat) {
+			$("select[name='mov_fk_categoria']").append(
+				new Option(cat.cat_name, cat.id)
+			)
+		}
+		);
+	});
+	$.getJSON("/admin/service/taglist", {}, function(tags) {
+		$.each(tags, function(i, tag) {
+			$("select[name='mov_fk_tags']").append(
+				new Option(tag.tag_name, tag.id)
+			)
+		});
+});
 });
-
 $(document).on('click', '.open_modal_entrata', function() {
 	console.log(strDate);
-	$('#form').find('input[type="text"], textarea, input[type="number"]').val("");
+	$("#categoria").empty();
+	$("#tags").empty();
+	$('#form').find('input[type="text"], textarea, input[type="number"],option').val("");
 	$('#form').find('input[type="date"]').val(strDate);
 	$('#myModal').modal('show');
 	$('.modal-title').text('Nuovo movimento in entrata');
 	$('#form').attr('action', '/admin/movimenti/entrata');
+	$.getJSON("/admin/service/catlistEntrata", {}, function(data) {
+		$.each(data, function(i, item) {
+			$("select[name='mov_fk_categoria']").append(
+				new Option(item.cat_name, item.id)
+			)
+		}
+		);
+	});
+	$.getJSON("/admin/service/taglist", {}, function(data) {
+		$.each(data, function(i, item) {
+			$("select[name='mov_fk_tags']").append(
+				new Option(item.tag_name, item.id)
+			)
+		});
+});
 });

 $(document).on('click', '.open_modal_modifica', function() {
 	var url = "/admin/movimenti/modify";
 	var riga_id = $(this).val();
+	$("#categoria").empty();
+	$("#tags").empty();
 	$.getJSON(url + '/' + riga_id, function(data) {
 		// success data
 		console.log(data[0]);
+		$.getJSON("/admin/service/taglist", {}, function(tags) {
+			$.each(tags, function(i, tag) {
+				$("select[name='mov_fk_tags']").append(
+					new Option(tag.tag_name, tag.id)
+				)
+				$('#tags')
+					.find('option:contains(' + data[0].tag_name + ')')
+					.prop('selected', true)
+					.trigger('change');
+			});
+		});
+		$.getJSON("/admin/service/catlist", {}, function(cats) {
+			$.each(cats, function(i, cat) {
+				$("select[name='mov_fk_categoria']").append(
+					new Option(cat.cat_name, cat.id)
+				)
+				$('#categoria')
+					.find('option:contains(' + data[0].cat_name + ')')
+					.prop('selected', true)
+					.trigger('change');
+			}
+			);
+		});
 		$('.modal-title').text('Modifica movimento');
 		$('#data').val(data[0].mov_data);
 		$('#descrizione').val(data[0].mov_descrizione);
 		$('#importo').val(data[0].mov_importo);
-		$('#tags')
-			.find('option:contains(' + data[0].tag_name + ')')
-			.prop('selected', true)
-			.trigger('change');
-		$('#categoria')
-			.find('option:contains(' + data[0].cat_name + ')')
-			.prop('selected', true)
-			.trigger('change');
+		
 		$('#myModal').modal('show');
 		// $('.panel-heading').text('Modifica movimento');
 		$('#form').attr('action', '/admin/movimenti/modify');
 		$('#form').append('<input type="hidden" name="id" value="' + riga_id + '">');
+		
 	});
+		
 });

-$.getJSON("/admin/service/catlist", {}, function(data) {
-	$.each(data, function(i, item) {
-		$("select[name='mov_fk_categoria']").append(
-			new Option(item.cat_name, item.id)
-		)
-	}
-	);
-});
+/*

 $.getJSON("/admin/service/taglist", {}, function(data) {
 	$.each(data, function(i, item) {
@@ -80,3 +128,5 @@ $.getJSON("/admin/service/taglist", {}, function(data) {
 		)
 	});
 });
+
+*/
--- a/public/js/app/progetti.js
+++ b/public/js/app/progetti.js
@@ -1,13 +1,14 @@
 $(document).ready(function() {

 	$('#tab_progetti').DataTable({
-		responsive: true,
-		fields: [
-			{
-				label:"Data",
-				type: "datetime"
-			}
-		]
+		"responsive": true,
+        columnDefs: [
+            {
+                target: 1,
+                render: DataTable.render.date(),
+            }
+        ],
+		"order": [[1, "desc"]]
 	});
 });

--- a/public/js/app/rigaProgetti.js
+++ b/public/js/app/rigaProgetti.js
@@ -1,12 +1,13 @@
 $(document).ready(function() {
 	$('#tab_progetti').DataTable({
-		responsive: true,
-        fields: [
-			{
-				label:"Data",
-				type: "datetime"
-			}
-		]
+		"responsive": true,
+        columnDefs: [
+            {
+                target: 0,
+                render: DataTable.render.date(),
+            }
+        ],
+		"order": [[0, "desc"]]
 	});
 });
 	$('#form').click(function() {
--- a/public/js/app/task.js
+++ b/public/js/app/task.js
@@ -0,0 +1,127 @@
+$(document).ready(function() {
+	$('#listatask').DataTable({
+		"responsive": true,
+        columnDefs: [
+            {
+                target: 0,
+                render: DataTable.render.date(),
+            }
+        ],
+		"order": [[0, "desc"]]
+	});
+});
+$(".draggable").draggable();
+var d = new Date();
+
+var month = d.getMonth()+1;
+var day = d.getDate();
+
+var strDate = d.getFullYear() + '-' +
+    (month<10 ? '0' : '') + month + '-' +
+    (day<10 ? '0' : '') + day;
+
+
+$(document).on('click', '.open_modal_new', function() {
+	console.log(strDate);
+	$("#titolo").empty();
+	$("#descrizione").empty();
+	$('#form').find('input[type="text"], textarea, input[type="number"],input[type="date"],option').val("");
+	$('#form').find('input[type="date"]').val(strDate);
+	$('#myModal').modal('show');
+	$('.modal-title').text(' Nuova attività');
+	$('#form').attr('action', '/admin/task/new');
+	$.getJSON("/admin/service/getUsers", {}, function(users) {
+		$.each(users, function(i, users) {
+			$("select[name='assegnato_a']").append(
+				new Option(users.name, users.id)
+			)
+		}
+		);
+	});
+	
+});
+
+
+/*
+$(document).on('click', '.open_modal_entrata', function() {
+	console.log(strDate);
+	$("#titolo").empty();
+	$("#tags").empty();
+	$('#form').find('input[type="text"], textarea, input[type="number"],option').val("");
+	$('#form').find('input[type="date"]').val(strDate);
+	$('#myModal_new').modal('show');
+	$('.modal-title').text('Nuovo movimento in entrata');
+	$('#form').attr('action', '/admin/movimenti/entrata');
+	$.getJSON("/admin/service/catlistEntrata", {}, function(data) {
+		$.each(data, function(i, item) {
+			$("select[name='mov_fk_categoria']").append(
+				new Option(item.cat_name, item.id)
+			)
+		}
+		);
+	});
+	$.getJSON("/admin/service/taglist", {}, function(data) {
+		$.each(data, function(i, item) {
+			$("select[name='mov_fk_tags']").append(
+				new Option(item.tag_name, item.id)
+			)
+		});
+});
+});
+
+$(document).on('click', '.open_modal_modifica', function() {
+	var url = "/admin/movimenti/modify";
+	var riga_id = $(this).val();
+	$("#categoria").empty();
+	$("#tags").empty();
+	$.getJSON(url + '/' + riga_id, function(data) {
+		// success data
+		console.log(data[0]);
+		$.getJSON("/admin/service/taglist", {}, function(tags) {
+			$.each(tags, function(i, tag) {
+				$("select[name='mov_fk_tags']").append(
+					new Option(tag.tag_name, tag.id)
+				)
+				$('#tags')
+					.find('option:contains(' + data[0].tag_name + ')')
+					.prop('selected', true)
+					.trigger('change');
+			});
+		});
+		$.getJSON("/admin/service/catlist", {}, function(cats) {
+			$.each(cats, function(i, cat) {
+				$("select[name='mov_fk_categoria']").append(
+					new Option(cat.cat_name, cat.id)
+				)
+				$('#categoria')
+					.find('option:contains(' + data[0].cat_name + ')')
+					.prop('selected', true)
+					.trigger('change');
+			}
+			);
+		});
+		$('.modal-title').text('Modifica movimento');
+		$('#data').val(data[0].mov_data);
+		$('#descrizione').val(data[0].mov_descrizione);
+		$('#importo').val(data[0].mov_importo);
+		
+		$('#myModal').modal('show');
+		// $('.panel-heading').text('Modifica movimento');
+		$('#form').attr('action', '/admin/movimenti/modify');
+		$('#form').append('<input type="hidden" name="id" value="' + riga_id + '">');
+		
+	});
+		
+});
+
+/*
+
+$.getJSON("/admin/service/taglist", {}, function(data) {
+	$.each(data, function(i, item) {
+		$("select[name='mov_fk_tags']").append(
+			new Option(item.tag_name, item.id)
+		)
+	});
+});
+
+*/
--- a/public/js/momentjs.js
+++ b/public/js/momentjs.js
--- a/resources/views/admin.blade.php
+++ b/resources/views/admin.blade.php
@@ -7,7 +7,7 @@
        <meta name="description" content="">
        <meta name="author" content="">

-        <title>BuBo Family - made with <3 - </title>
+        <title>{{env('APP_NAME')}}</title>

        <!-- Bootstrap Core CSS -->
        <link href="/css/bootstrap.min.css" rel="stylesheet">
@@ -20,22 +20,9 @@

        <!-- Custom Fonts -->
        <link href="/css/font-awesome.min.css" rel="stylesheet" type="text/css">
-<!-- Latest compiled and minified CSS 
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/css/bootstrap-select.min.css">
-->
-<!-- Latest compiled and minified JavaScript 
-<script src="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/js/bootstrap-select.min.js"></script>-->

-<!-- (Optional) Latest compiled and minified JavaScript translation files 
-<script src="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/js/i18n/defaults-*.min.js"></script>-->
-
-
-        <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-        <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-        <!--[if lt IE 9]>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.min.js"></script>
-        <![endif]-->
+        <!-- Datatables with datetime and locales -->
+        <link href="https://cdn.datatables.net/v/dt/dt-1.13.4/date-1.4.1/r-2.4.1/sb-1.4.2/sp-2.1.2/datatables.min.css" rel="stylesheet"/>
        @section('head_additional')
        @show
    </head>
@@ -71,7 +58,7 @@
                    <div class="sidebar-nav navbar-collapse">
                        <ul class="nav" id="side-menu">
                            <li class="sidebar-search">
-                            <!-- input group 
+                            <!-- input group
                                <!--<div class="input-group custom-search-form">
                                    <input type="text" class="form-control" placeholder="Search...">
                                    <span class="input-group-btn">
@@ -83,7 +70,7 @@
                                <!-- /input-group -->
                            </li>
                            <!-- MENU -->
-                           @include('components.menu') 
+                           @include('components.menu')
                        <!-- / Menu -->
                        </ul>
                    </div>
@@ -98,7 +85,7 @@
                    @section('content')
                    	Contenuto
                    @show
-                    
+
                </div>
                <!-- /.container-fluid -->
            </div>
@@ -108,19 +95,22 @@
        <!-- /#wrapper -->

        <!-- jQuery -->
-        <script src="/js/jquery.min.js"></script>
-
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.13.1/jquery-ui.min.js"></script>
        <!-- Bootstrap Core JavaScript -->
        <script src="/js/bootstrap.min.js"></script>

        <!-- Metis Menu Plugin JavaScript -->
        <script src="/js/metisMenu.min.js"></script>
        
-        <!-- DataTables JavaScript -->
+        <script src="https://cdn.datatables.net/v/dt/dt-1.13.4/date-1.4.1/r-2.4.1/sb-1.4.2/sp-2.1.2/datatables.min.js"></script>
+        <!-- DataTables JavaScript
        <script src="/js/dataTables/jquery.dataTables.min.js"></script>
-        <script src="/js/dataTables/dataTables.bootstrap.min.js"></script>
+        <script src="/js/dataTables/dataTables.bootstrap.min.js"></script>-->

        <!-- Custom Theme JavaScript -->
+        
+        <script src="/js/momentjs.js"></script>
        <script src="/js/startmin.js"></script>
 	@section('script')
 	@show
--- a/resources/views/auto/list.blade.php
+++ b/resources/views/auto/list.blade.php
@@ -24,7 +24,7 @@

 					<div class="table-responsive">
 						<table class="table table-striped table-bordered table-hover"
-							id="automobili">
+							id="listaAutomobili">

 							<thead>
 								<tr>
@@ -147,7 +147,7 @@
 										type="text" class="form-control" id="note" name="note">
 								</div>
 							</div>
-					
+
 					</div>
 				</div>
 			</div>
--- a/resources/views/components/menu.blade.php
+++ b/resources/views/components/menu.blade.php
@@ -21,7 +21,13 @@
 			</ul></li>

 	</ul> <!-- /.nav-second-level --></li>
-@endcan @can('consumi')
+@endcan 
+@can('contratti')
+<li><a href="{{ route('contratti'); }}"><i class="fa fa-list fa-fw"></i>
+		Contratti <span class="fa arrow"></span></a>
+</li>
+@endcan
+@can('consumi')
 <li><a href="#"><i class="fa fa-industry fa-fw"></i> Consumi <span
 		class="fa arrow"></span></a>

@@ -31,7 +37,8 @@
 		</li>
 		<li><a href="{{ route('enel'); }}"><i class="fa fa-flash  fa-fw"></i>Energia
 				Elettrica</a></li>
-	</ul></li>
+	</ul>
+</li>
@endcan @can('automobili')
 <li><a href="{{ route('auto_list'); }}"><i class="fa fa-car fa-fw"></i>
 		Automobili <span class="fa arrow"></span></a></li>
@@ -49,7 +56,14 @@
@endcan @can('progetti')
 <li><a href="{{ route('progetti'); }}"><i class="fa fa-list fa-fw"></i>
 		Progetti <span class="fa arrow"></span></a></li>
-@endcan @can('amministrazione')
+
+@endcan
+@can('tasks')
+<li><a href="{{ route('tasks'); }}"><i class="fa fa-list fa-fw"></i>
+		Attività <span class="fa arrow"></span></a></li>
+
+@endcan
+@can('amministrazione')
 <li><a href="#"><i class="fa fa-gears fa-fw"></i>Amministrazione<span
 		class="fa arrow"></span></a>
 	<ul class="nav nav-second-level">
@@ -58,9 +72,10 @@
 		<li><a class="active" href="/admin/users/newRole">Gruppi</a></li>
 		<li><a class="active" href="/admin/users/newPermission">Permessi</a></li>
 		-->
-		<li><a class="active" href="/admin/users/assignRole">Assegna Ruoli</a></li>
-		<!--  
-		<li><a href="/login">Login Page</a></li> 
+		<li><a class="active" href="/admin/users/givepermission">Assegna Permessi</a></li>
+		<li><a class="active" href="/admin/users/giverole">Assegna Ruoli</a></li>
+		<!--
+		<li><a href="/login">Login Page</a></li>
 		-->
 	</ul> <!-- /.nav-second-level --></li>
@endcan
--- a/resources/views/components/usermenu.blade.php
+++ b/resources/views/components/usermenu.blade.php
@@ -7,10 +7,10 @@
 	<ul class="dropdown-menu dropdown-user">
 		<li><a href="#"><i class="fa fa-user fa-fw"></i> Profilo utente</a></li>
 		<li><a href="#"><i class="fa fa-gear fa-fw"></i> Impostazioni</a></li>
-	@role('admin')
+	@can('amministrazione')
        <li class="divider"></li>
        <li><a href="/admin/users/new"><i class="fa fa-gear fa-fw"></i> Gestisci Utenti</a></li>
-	@endrole
+	@endcan
 		<li class="divider"></li>
 		<li><a href="https://github.com/fbarachino/bubofamily/issues/new/choose" target="new"><i class="fa fa-bug fa-fw"></i> Segnala un bug</a></li>
 		<li class="divider"></li>
--- a/resources/views/conti/categorie/list.blade.php
+++ b/resources/views/conti/categorie/list.blade.php
@@ -21,6 +21,7 @@
 							<thead>
 								<tr>
 									<th>Categoria</th>
+									<th>Classificazione</th>
 									<th>Azione</th>
 								</tr>
 							</thead>
@@ -30,6 +31,14 @@
 									<td><a
 										href="movimenti/report/movimentibycat?cat={{ $categoria->id }}">{{
 											$categoria->cat_name; }}</a></td>
+									<td>
+											@if($categoria->cat_entrata == 1)
+											Entrata ,
+											@endif
+											@if($categoria->cat_uscita == 1)
+											Uscita
+											@endif
+									</td>
 									<td>
 										<button class="btn btn-warning btn-detail open_modal"
 											value="{{$categoria->id}}">Edit</button>&nbsp; <a
@@ -47,38 +56,54 @@
 			</div>
 		</div>
 	</div>
-</div>
-<!-- MODAL MODIFICA -->
-<div class="modal fade" id="myModal" tabindex="-1" role="dialog"
-	aria-labelledby="myModalLabel" aria-hidden="true">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h4 class="modal-title">Modifica Categoria</h4>
-			</div>
-			<div class="modal-body">
-				<div class="row">
-					<div class="col-md-8">
-						<form action="/admin/categorie/modify" method="POST">
-							@csrf <label for="H_cat_cat_name" class="form-label">Categoria</label>
-							<input type="text" class="form-control" id="H_cat_cat_name"
-								size="50" name="cat_name" value="" size="50">

+	<!-- MODAL MODIFICA -->
+	<div class="modal fade" id="myModal" tabindex="-1" role="dialog"
+		aria-labelledby="myModalLabel" aria-hidden="true">
+		<div class="modal-dialog" role="document">
+		<form action="/admin/categorie/modify" method="POST">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h4 class="modal-title">Modifica Categoria</h4>
+				</div>
+				<div class="modal-body">
+					
+					<div class="row">
+						<div class="col-md-8">
+							
+								@csrf 
+								<label for="H_cat_cat_name" class="form-label">Categoria</label>
+								<input type="text" class="form-control" id="H_cat_cat_name"	size="50" name="cat_name">
+
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-check form-switch">
+								<input class="form-check-input" type="checkbox" role="switch" id="cat_entrata" name="cat_entrata" >
+								<label class="form-check-label" for="cat_entrata">Entrata</label>
+							</div>
+						</div>
+						<div class="col-md-4">
+							<div class="form-check form-switch">
+								<input class="form-check-input" type="checkbox" role="switch" id="cat_uscita" name="cat_uscita">
+								<label class="form-check-label" for="cat_uscita">Uscita</label>
+							</div>
+						</div>		
 					</div>
 				</div>
+				<div class="modal-footer">
+					<input type="hidden" name="id" id="H_cat_id">
+					<button type="submit" class="btn btn-primary">Modifica</button>
+				</div>
+				
 			</div>
-			<div class="modal-footer">
-				<input type="hidden" name="id" id="H_cat_id">
-				<button type="submit" class="btn btn-primary">Modifica</button>
-			</div>
-			</form>
+		</form>
 		</div>
 	</div>
-</div>
-<!-- FINE MODAL MODIFICA -->
-<!-- MODAL INSERIMENTO -->
-	<div class="modal fade" id="myModal_new" tabindex="-1" role="dialog"
-		aria-labelledby="myModalLabel" aria-hidden="true">
+	<!-- FINE MODAL MODIFICA -->
+	<!-- MODAL INSERIMENTO -->
+	<div class="modal fade" id="myModal_new" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 		<div class="modal-dialog" role="document">
 			<div class="modal-content">
 				<div class="modal-header">
@@ -89,11 +114,26 @@
 						<div class="col-md-8">
 							<!-- FORM INSERIMENTO NUOVA CATEGORIA -->
 							<form action="" method="POST">
-								@csrf <label for="categoria" class="form-label">Categoria</label>
+								@csrf 
+								<label for="categoria" class="form-label">Categoria</label>
 								<input type="text" class="form-control" id="categoria"
 									name="cat_name" size="50">

 						</div>
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-check form-switch">
+									<input class="form-check-input" type="checkbox" role="switch" id="cat_entrata" name="cat_entrata" >
+									<label class="form-check-label" for="cat_entrata">Entrata</label>
+								</div>
+							</div>
+							<div class="col-md-4">
+								<div class="form-check form-switch">
+									<input class="form-check-input" type="checkbox" role="switch" id="cat_uscita" name="cat_uscita">
+									<label class="form-check-label" for="cat_uscita">Uscita</label>
+								</div>
+							</div>		
+						</div>
 					</div>
 				</div>
 				<div class="modal-footer">
@@ -103,11 +143,9 @@
 				</div>
 			</div>
 		</div>
+	</div>
+</div>
 <!-- FINE MODAL INSERIMENTO -->
-
-
-
-
 <!-- /.col-lg-12 -->

@endsection
--- a/resources/views/conti/documenti/insert.blade.php
+++ b/resources/views/conti/documenti/insert.blade.php
@@ -21,6 +21,10 @@
                	</div>
                	<div class="mb-3">
                		<input type="hidden" name="movimenti_id" value="{{ $id }}">
+						<!-- {issue #5}
+						<input type="hidden" name="entita" value="Movimenti">
+						<input type="hidden" name="entita_id" value="{{$id}}">
+						-->
                		<button type="submit" class="btn btn-primary">Submit</button>
                	</div>
            	</form>
--- a/resources/views/conti/movimenti/list.blade.php
+++ b/resources/views/conti/movimenti/list.blade.php
@@ -31,8 +31,9 @@
            		<tbody>
            		@foreach( $movimenti as $movimento )
            		<tr>
-            			<td>{{  date_format(date_create($movimento->mov_data),'d/m/Y'); }}</td>
-            			<td>{{ $movimento->cat_name; }}</td>
+            			<!-- <td>{{  date_format(date_create($movimento->mov_data),'d/m/Y'); }}</td>-->
+            			<td>{{ $movimento->mov_data}}</td>
+                        <td>{{ $movimento->cat_name; }}</td>
            			<td>{{ $movimento->mov_descrizione; }}</td>
            			<td>&euro; {{ $movimento->mov_importo; }}</td>
            			<td>
@@ -58,9 +59,9 @@
 	</div>
 </div>
 <!-- MODAL NEW -->
-<div class="modal fade" id="myModal" tabindex="-1" role="dialog"
+<div class="modal fade " id="myModal" tabindex="-1" role="dialog"
 	aria-labelledby="myModalLabel" aria-hidden="true">
-	<div class="modal-dialog" role="document">
+	<div class="modal-dialog draggable" role="document">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Nuovo movimento</h4>
--- a/resources/views/contratti/lista.blade.php
+++ b/resources/views/contratti/lista.blade.php
@@ -0,0 +1,55 @@
+@extends('admin')
+@section('content')
+<div class="row">
+    <div class="col-lg-12">
+        <h1 class="page-header">Lista dei Contratti</h1>
+    </div>
+</div>
+<div class="row">
+	<div class="col-lg-12">
+    	<div class="panel panel-default">
+            <div class="panel-heading">
+                Lista contratti
+            </div>
+            <div class="panel-body">
+                <table  class="table table-striped table-bordered table-hover" id="contratti" data-page-length='25'>
+                    <thead>
+                        <tr>
+                            <th>Numero contratto</th>
+                            <th>Data Contratto</th>
+                            <th>Data Termine</th>
+                            <th>Fornitore</th>
+                            <th>Tipo contratto</th>
+                            <th>Importo</th>
+                            <th>Stato</th>
+                            <th>Documento</th>
+                            
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach($data as $contratto)
+                        <tr>
+                            <td>{{$contratto->numero}}</td>
+                            <td>{{$contratto->datainizio}}</td>
+                            <td>{{$contratto->datatermine}}</td>
+                            <td>{{$contratto->fornitore}}</td>
+                            <td>{{$contratto->tipo}}</td>
+                            <td>{{$contratto->importo}}</td>
+                            <td>{{$contratto->stato}}</td>
+                            <td>{{$contratto->filename}}</td>
+                            
+                        </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
+            <div class="panel-footer">
+                <!-- Footer del pannello -->
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
+@section('script')
+<script src="/js/app/contratti.js"></script>
+@endsection
--- a/resources/views/documenti/lista.blade.php
+++ b/resources/views/documenti/lista.blade.php
@@ -0,0 +1,26 @@
+@extends('admin')
+@section('content')
+<div class="row">
+    <div class="col-lg-12">
+        <h1 class="page-header">Lista dei Documenti</h1>
+    </div>
+</div>
+<div class="row">
+	<div class="col-lg-12">
+    	<div class="panel panel-default">
+            <div class="panel-heading">
+                Lista documenti
+            </div>
+            <div class="panel-body">
+                <!-- Corpo del pannello -->
+            </div>
+            <div class="panel-footer">
+                <!-- Footer del pannello -->
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
+@section('script')
+<script src="/js/app/documenti.js"></script>
+@endsection
--- a/resources/views/layouts/dashboard.blade.php
+++ b/resources/views/layouts/dashboard.blade.php
@@ -8,16 +8,16 @@
 <div class="row">
@hasanyrole('user|admin')
 <!-- WIDGET Bilancio -->
-	<div class="col-lg-4 col-md-8">
-        <div class="panel panel-primary">
+	<div class="col-lg-3 col-md-8 draggable">
+        <div class="panel panel-success">
            <div class="panel-heading">
                <div class="row">
                           <div class="col-xs-3">
-                                       <i class="fa fa-balance-scale fa-5x"></i>
+                                       <i class="fa fa-plus-square fa-5x"></i>
                           </div>
                           <div class="col-xs-9 text-right">
-                                       <div class="huge">{{ $bilancio }}</div>
-                                       <div>Bilancio attuale anno {{ date('Y') }}</div>
+                                       <div class="huge">{{ $entrate }}</div>
+                                       <div>Entrate attuale anno {{ date('Y') }}</div>
                           </div>
                </div>
            </div>
@@ -30,9 +30,55 @@
           </a>
     	</div>
 	</div>
+    <!-- WIDGET Bilancio -->
+	<div class="col-lg-3 col-md-8 draggable">
+        <div class="panel panel-danger">
+            <div class="panel-heading">
+                <div class="row">
+                           <div class="col-xs-3">
+                                       <i class="fa fa-minus-square fa-5x"></i>
+                           </div>
+                           <div class="col-xs-9 text-right">
+                                       <div class="huge">{{ $uscite }}</div>
+                                       <div>Uscite attuale anno {{ date('Y') }}</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-4 col-md-8">
-        <div class="panel panel-green">
+	<div class="col-lg-3 col-md-8 draggable">
+        <div class="panel panel-primary">
+            <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">{{ $entrate + $uscite }}</div>
+                       <div>Saldo attuale nell'anno</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 class="col-lg-3 col-md-8 draggable">
+        <div class="panel panel-yellow">
            <div class="panel-heading">
                <div class="row">
                   <div class="col-xs-3">
@@ -52,11 +98,84 @@
                </div>
           </a>
     	</div>
-	</div>	
+	</div>
 	@endhasanyrole
+    
 </div>
+
+@can('tasks')
+<!-- Se ha i permessi task -->
+<div class="row">
+    <div class="col-lg-6 col-md-8 draggable">
+        <div class="chat-panel panel panel-default">
+            <div class="panel-heading">
+                Attività da svolgere
+            </div>
+            <div class="panel-body" id="mieitask">
+                <ul class="chat">
+                    @foreach($mieitask as $task)
+                    <span class="chat-img pull-left">
+                        <!-- rendere immagine dinamica -->
+                        <img src="{{ Gravatar::get(App\Models\User::getUserById($task->assegnato_a)->email)}}" width="32" class="img-circle">
+                    </span>
+                    <div class="chat-body clearfix">
+                    <li class="left clearfix">
+                        @if($task->stato==='Chiuso')
+                            <s>
+                                <a href="#{{ $task->id }}"> {{ $task->titolo }}</a>
+                            </s><br>
+                            <h6>{{$task->descrizione}}</h6>
+                        @else
+                        <b><a href="#{{ $task->id }}"> {{ $task->titolo }}</a></b><br>
+                        <h6>{{$task->descrizione}}</h6>
+                        @endif
+                    </li>
+                    </div>
+                    @endforeach
+                </ul>
+            </div>
+            <div class="panel-footer">
+
+            </div>
+        </div>
+    </div>
+    <div class="col-lg-6 col-md-8 draggable">
+        <div class="chat-panel panel panel-default" >
+            <div class="panel-heading">
+                <i class="fa fa-arrow-circle-right"></i> Avvisi e informazioni
+            </div>
+            <div class="panel-body">
+                <ul class="chat">
+                    @foreach($avvisi as $avviso)
+                    <span class="chat-img pull-left">
+                        <!-- rendere immagine dinamica -->
+                        <img src="{{ Gravatar::get(App\Models\User::getUserById($avviso->creato_da)->email)}}" width="32" class="img-circle">
+                    </span>
+                    <div class="chat-body clearfix">
+                        <li class="left clearfix">
+                           
+                            <a href="#{{ $avviso->id }}"><i>{{date_format(date_create($avviso->creato_il),'d/m/Y')}}</i> - {{ $avviso->avviso }}</a>
+                           
+                        </li>
+                    </div>
+                    @endforeach
+                </ul>
+            </div>
+            <div class="panel-footer">
+                <form action="{{ Route('newAvviso') }}" method="POST">
+                    @csrf
+                    <label for="avviso" class="form-label">Nuovo Avviso:</label>
+                    <textarea class="form-control" name="avviso"></textarea>
+                    <input type="hidden" name="creato_da" value="{{ Auth::user()->id }}">
+                    <input type="submit" name="submit" class="button btn-primary">
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+@endcan
@endsection

@section('script')
-<script src="/js/app/dashboard.js"></script>
-@endsection
+<script src="js/app/dashboard.js"></script> 
+@endsection
--- a/resources/views/letture/enel/list.blade.php
+++ b/resources/views/letture/enel/list.blade.php
@@ -62,7 +62,7 @@
            		<tbody>
            		@foreach($lettureEnel as $lettura)
            			<tr>
-            				<td>{{ date_format(date_create($lettura->enel_date),'d/m/Y'); }}</td>
+            				<td>{{ $lettura->enel_date }}</td>
            				<td>{{ $lettura->enel_A; }}</td>
            				<td>{{ $lettura->enel_R; }}</td>
            				<td>{{ $lettura->enel_F1; }}</td>
--- a/resources/views/letture/gas/list.blade.php
+++ b/resources/views/letture/gas/list.blade.php
@@ -71,7 +71,7 @@
            			}
            			@endphp
            			<tr>
-            				<td>{{ date_format(date_create($lettura->gas_date),'d/m/Y'); }}</td>
+            				<td>{{ $lettura->gas_date }}</td>
            				<td>{{ $lettura->gas_lettura; }}</td>
            				@if(!is_null($dateprec))
                				<td>{{ $diffdate ?? '' }}</td>
--- a/resources/views/mail/test.blade.php
+++ b/resources/views/mail/test.blade.php
@@ -2,9 +2,7 @@

 Ciao {{ Auth::user()->name ?? $name }},
 Hai configurato correttamente la posta elettronica!
-@component('mail::button', ['url' => 'https://gestionale.lavorain.cloud/'])
-Ciao.
-@endcomponent
+

 Buona giornata,<br>
 {{ config('app.name') }}
--- a/resources/views/progetti/PDF/scheda.blade.php
+++ b/resources/views/progetti/PDF/scheda.blade.php
@@ -0,0 +1,93 @@
+<!doctype html>
+<html lang="en">
+<head>
+<meta charset="UTF-8">
+<title>Scheda Progetto</title>
+
+<style type="text/css">
+    * {
+        font-family: Verdana, Arial, sans-serif;
+    }
+    table{
+        font-size: x-small;
+    }
+    tfoot tr td{
+        font-weight: bold;
+        font-size: x-small;
+    }
+    .gray {
+        background-color: lightgray
+    }
+</style>
+
+</head>
+<body>
+    @foreach($tot as $totale) @endforeach @foreach($dettaglio ?? '' as $progetto)
+  <table width="100%">
+    <tr>
+       <!-- <td valign="top"><img src="{{asset('images/meteor-logo.png')}}" alt="" width="150"/></td> -->
+        <td>
+            <h3>Progetto: #{{$progetto->id}}:{{$progetto->nome}}</h3>
+            
+             <p>  {{$progetto->descrizione}}</p>
+            
+        </td>
+    </tr>
+
+  </table>
+<hr>
+  <table width="100%">
+    <tr>
+        <td><strong>Creato il:</strong> {{ date('d/m/Y',strtotime($progetto->data_creazione)) }}</td>
+        <td><strong>Inizio:</strong> {{ date('d/m/Y',strtotime($progetto->data_inizio)) }}</td>
+        <td><strong>Termine:</strong> {{ date('d/m/Y',strtotime($progetto->data_fine)) }}</td>
+        <td><strong>Stato:</strong> {{ $progetto->stato }}</td>
+    </tr>
+    <tr>
+        <td><strong>Budget iniziale:</strong> {{ $progetto->budget }}</td>
+        <td><strong>Costi sostenuti:</strong> {{ $totale->costo}}</td>
+        <td><strong>Scostamento:</strong>{{ $progetto->budget - $totale->costo}}</td>
+        <td><strong>Coordinatore:</strong> {{ $progetto->name }}</td>
+    </tr>
+    <tr>
+        <td colspan="4" class="gray">DESCRIZIONE:</td>
+    </tr>
+    <tr>
+        <td colspan="4">{{ $progetto->note }}</td>
+    </tr>
+   
+  </table>
+  @endforeach
+  <br/>
+
+  <table width="100%">
+    <thead style="background-color: lightgray;">
+      <tr>
+        <th>Data</th>
+        <th>Descrizione</th>
+        <th>Ore</th>
+        <th>Costi</th>
+      </tr>
+    </thead>
+    <tbody>
+    @foreach($righe as $riga) 
+    <tr>
+        <td>{{ date('d/m/Y',strtotime($riga->data)) }}</td>
+        <td>{{ $riga->descrizione }}</td>
+        <td>{{ $riga->ore }}</td>
+        <td>{{ $riga->prezzo }}</td>
+    </tr>
+    @endforeach
+    </tbody>
+
+    <tfoot>
+        <tr>
+            <td colspan="2"></td>
+            <td align="right">Totale</td>
+            <td align="right" class="gray">{{ $totale->costo}} &euro;</td>
+        </tr>
+    </tfoot>
+  </table>
+
+</body>
+</html>
--- a/resources/views/progetti/dettaglio.blade.php
+++ b/resources/views/progetti/dettaglio.blade.php
@@ -86,7 +86,7 @@
 <div class="row">
 	<div class="col-xs-10">
 		<div class="row p-3">
-			<button class="btn btn-primary open_modal_addRow">Nuova riga</button>
+			@if($progetto->stato !='chiuso')<button class="btn btn-primary open_modal_addRow">Nuova riga</button>@endif
 		</div>
 		<div class="row">
 			<table class="table table-striped table-bordered table-hover"
@@ -107,11 +107,11 @@
 						<td>{{ $riga->descrizione }}</td>
 						<td>{{ $riga->ore }}</td>
 						<td>{{ $riga->prezzo }}</td>
-						<td><a
+						<td>@if($progetto->stato !='chiuso')<a
 							href="/admin/progetti/delete_row/{{ $riga->id }}/return/{{ $progetto->id }}"
 							class="btn btn-danger">X</a> &nbsp;
 							<button class="btn btn-warning btn-detail open_modal"
-								value="{{$riga->id}}">Edit</button></td>
+								value="{{$riga->id}}">Edit</button>@endif</td>

 					</tr>
 					@else
@@ -138,7 +138,7 @@
 </div>

 <!-- MODAL EDIT Riga-->
-<div class="modal fade" id="myModal" tabindex="-1" role="dialog" 
+<div class="modal fade" id="myModal" tabindex="-1" role="dialog"
 	aria-labelledby="myModalLabel" aria-hidden="true">
 	<form method="POST" action="/admin/progetti/rigaupdate">
 		<div class="modal-dialog" role="document">
@@ -182,8 +182,8 @@

 				<div class="modal-footer">
 					<div class="col-xs-12">
-						<input type="hidden" name="fk_id_progetto" id="id_progetto_u"> 
-						<input type="hidden" name="idriga" id="idriga"> 
+						<input type="hidden" name="fk_id_progetto" id="id_progetto_u">
+						<input type="hidden" name="idriga" id="idriga">
 						<input type="submit" name="Submit" class="form-control" value="Aggiorna">

 					</div>
--- a/resources/views/progetti/list.blade.php
+++ b/resources/views/progetti/list.blade.php
@@ -38,12 +38,17 @@
 								<tr>
 									<td><a href="progetti/detail/{{ $progetto->progetto }}">{{
 											$progetto->nome; }}</a></td>
-									<td>{{ date_format(date_create($progetto->data_creazione),'d/m/Y'); }}</td>
+									<td>{{ $progetto->data_creazione}}</td>
 									<td>{{ $progetto->stato; }}</td>
 									<td>{{ $progetto->name; }}</td>
 									<td>{{ $progetto->budget; }}</td>
-									<td><a href="progetti/delete?id={{ $progetto->progetto }}"
-										class="btn btn-danger">Cancella</a></td>
+									<td>@if($progetto->stato != 'chiuso')<a href="progetti/delete?id={{ $progetto->progetto }}"
+										class="btn btn-danger">Cancella</a>&nbsp;<a href="progetti/close?id={{ $progetto->progetto }}"
+                                            class="btn btn-danger">Chiudi</a>@endif
+                                        @if($progetto->stato == 'chiuso')<a href="progetti/reopen?id={{ $progetto->progetto }}"
+                                            class="btn btn-danger">Riapri</a>@endif
+                                            <a href="progetti/print?id={{ $progetto->progetto }}"
+                                                class="btn btn-primary">Stampa PDF</a></td>
 								</tr>
 								@endforeach
 							</tbody>
--- a/resources/views/tasks/list.blade.php
+++ b/resources/views/tasks/list.blade.php
@@ -0,0 +1,104 @@
+@extends('admin') 
+@section('content')
+<div class="row">
+	<div class="col-lg-12">
+		<h1 class="page-header">Lista Attività</h1>
+
+	</div>
+</div>
+<div class="container">
+	<!-- Content here -->
+	<div class="row">
+		<div class="col-xs-12 ">
+			<button class="btn btn-primary open_modal_new "><i
+				class="fa fa-pencil-square-o fw"></i>Nuova Attività</button>
+		</div>
+	</div>
+	<div class ="row">
+		<div class="col">
+			<div class="panel panel-default ">
+				<div class="panel panel-heading">
+					Tutte le Attività
+				</div>
+				<div class="panel-body">
+					<ul class="chat">
+					@foreach($tasks as $task)
+						<li class="left" clearfix>
+							<span class="chat-img pull-left">
+								<!-- rendere immagine dinamica -->
+								<img src="{{ Gravatar::get(App\Models\User::getUserById($task->assegnato_a)->email )}}" width="32" class="img-circle">
+							</span>
+							<div class="chat-body clearfix">
+								{{ $task->titolo}}
+							</div>
+						</li>
+					@endforeach	
+					</ul>
+				</div>
+				<div class="panel-footer">
+
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+	<!-- HIDDEN -->
+	<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+		<div class="modal-dialog draggable" role="document">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h4 class="modal-title">Nuova Attività</h4>
+				</div>
+				<div class="modal-body">
+					<div class="row">
+						<div class="col-md-10">
+							<!-- FORM INSERIMENTO NUOVA ATTIVITA -->
+							<form action="" method="POST" id="form">
+								@csrf 
+								<label for="titolo" class="form-label">Titolo:</label>
+								<input type="text" class="form-control" id="titolo"
+									name="titolo" size="50">
+
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-10">
+							<label for="descrizione" class="form-label">Descrizione:</label>
+							<textarea class="form-control" name="descrizione" id="descrizione"></textarea>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-5">
+							<label for="assegnato_a" class="form-label">Assegna a:</label>
+							<!-- SELECT USER -->
+							<select name="assegnato_a" id="assegnato_a" class="form-control">
+
+							</select>
+						</div>	
+						<div class="col-md-5">
+							<!-- Data termine datetimepicker -->
+							<label for="termine_il" class="form-label">Termine:</label>
+							<input type="date" name="termine_il" class="form-control" value="{{ date('Y-m-d'); }}" id="termine_il">
+						</div>
+							
+					</div>
+					
+				</div>
+				<div class="modal-footer">
+					<input type="hidden" name="creato_da" value="{{ Auth::user()->id }}">
+					<input type="hidden" name="stato" value="Aperto">
+					<input type="hidden" name="creato_il" value="{{ date('Y-m-d'); }}">
+					<input type="hidden" name="chiuso_il" value="{{ date('Y-m-d'); }}">
+					<button type="submit" class="btn btn-primary">Submit</button>
+					</form>
+					<!-- FINE FORM INSERIMENTO NUOVA CATEGORIA -->
+				</div>
+			</div>
+		</div>
+	</div>
+
+
+@endsection
+@section('script')
+	<script src="/js/app/task.js"></script>
+@endsection
--- a/resources/views/users/assignperm.blade.php
+++ b/resources/views/users/assignperm.blade.php
@@ -0,0 +1,47 @@
+@extends('admin')
+@section('content')
+<div class="row">
+	<div class="col-lg-12">
+		<h1 class="page-header">Assegnazione permessi</h1>
+	</div>
+</div>
+<div class="container">
+    <div class="row">
+         <div class="col-lg-12">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    Nuova assegnazione permessi
+                </div>
+                <div class="panel-body">
+                    <!-- Form -->
+                    <form action="" method="POST">
+                        <select name="user" class="form-control">
+                            @foreach($users as $user)
+                            <option value="{{$user->id}}"> {{$user->name}}</option>
+                            @endforeach
+                        </select>
+                        <table>
+                            <tr>
+                                <th>Permesso</th>
+                                <th>Azione</th>
+                            </tr>
+                        @foreach($permissions as $perm)
+                            <tr>
+                                <td>{{$perm->name}}</td>
+                                <td>
+                                    Attiva<input type="radio" name="permesso['{{$perm->name}}']" value="true">
+                                    &nbsp;
+                                    Disattiva <input type="radio" name="permesso['{{$perm->name}}']" value="false">
+                                </td>
+                            </tr>
+                        @endforeach
+                        </table>
+                        @csrf
+                        <input type="Submit" name="submit" value="associa">
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
--- a/resources/views/users/assignrole.blade.php
+++ b/resources/views/users/assignrole.blade.php
@@ -0,0 +1,38 @@
+@extends('admin')
+@section('content')
+<div class="row">
+	<div class="col-lg-12">
+		<h1 class="page-header">Assegnazione permessi</h1>
+	</div>
+</div>
+<div class="container">
+    <div class="row">
+         <div class="col-lg-12">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    Nuova assegnazione permessi
+                </div>
+                <div class="panel-body">
+                    <!-- Form -->
+                    <form action="" method="POST">
+                        <select name="user" class="form-control">
+                            @foreach($users as $user)
+                            <option value="{{$user->id}}"> {{$user->name}}</option>
+                            @endforeach
+                        </select>
+                        <select name="role" class="form-control">
+                        @foreach($roles as $role)
+                                <option value="{{$role->name}}">{{$role->name}}</td>
+                        @endforeach
+                        </select>
+                        
+                        @csrf
+                        <input type="Submit" name="submit" value="associa">
+                    </form>
+                    
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -15,6 +15,9 @@ use App\Http\Controllers\AutoController;
 use App\Http\Controllers\AnagraficaController;
 use App\Http\Controllers\Utenti;
 use App\Http\Controllers\ProgettiController;
+use App\Http\Controllers\TaskController;
+use App\Http\Controllers\AvvisoController;
+use App\Http\Controllers\ContrattiController;
 use App\Mail\myTestEmail;

 /*
@@ -49,6 +52,8 @@ Route::group(['middleware'=>['permission:conti']], function(){
    Route::get('movimenti/report/movimenti_categoria', [MovimentiController::class,'listMovPerCateg']);
    Route::get('movimenti/report/movimentibycat', [MovimentiController::class,'listMovbyCat']);
    Route::get('movimenti/docs', [DocumentiController::class,'fileForm'])->name('documenti');
+    // {issue #5}
+    // Route::get('movimenti/docs', [DocumentiController::class,'fileMovimentiForm'])->name('documenti');
    Route::post('movimenti/docs', [DocumentiController::class,'storeFile']);
    Route::get('movimenti/import', [MovimentiController::class,'importFile'])->name('importING');
    Route::post('movimenti/import', [MovimentiController::class,'importEC_ING']);
@@ -67,6 +72,8 @@ Route::group(['middleware'=>['permission:conti']], function(){
    Route::get('service/catlist', [CategorieController::class,'apiList']);
    Route::get('service/taglist', [TagController::class,'apiList']);
    Route::get('service/rolesList', [Utenti::class,'listRoles']);
+    Route::get('service/catlistSpesa', [CategorieController::class,'apiListSpesa']);
+    Route::get('service/catlistEntrata', [CategorieController::class,'apiListEntrata']);

 // TAGS
    Route::get('tags', [TagController::class,'listTags'])->name('tags');
@@ -116,19 +123,17 @@ Route::group(['middleware'=>['permission:contatti']], function(){

 // GRUPPI E PERMESSI
 Route::group(['middleware'=>['permission:amministrazione']], function(){
-    /*
-    Route::get('role/new/{ruolo}', [Utenti::class, 'createRole']);
-    Route::post('group/new', [Utenti::class, 'saveNuovoGruppo']);
-    Route::get('permesso/new/{permesso}', [Utenti::class, 'createPermission']);
-    Route::post('permesso/new', [Utenti::class, 'saveNuovoPermesso']);
-    Route::get('permesso/assign', [Utenti::class, 'vw_assignToGroup']);
-    Route::post('permesso/assign', [Utenti::class, 'assignPermissionToGroup']);
-    */
+    
    Route::get('users/new',[Utenti::class,'addUser']);
    Route::post('users/new',[Utenti::class,'createUser']);
    Route::get('users/roles',[Utenti::class,'listRoles']);
    Route::get('users/delete/{id}',[Utenti::class,'deleteUser']);
+    Route::get('users/givepermission',[Utenti::class,'givePermissionToUser']);
+    Route::post('users/givepermission',[Utenti::class,'assignPermission']);
+    Route::get('users/giverole',[Utenti::class,'giveRoleToUser']);
+    Route::post('users/giverole',[Utenti::class,'assignRole']);
 });
+
 // PROGETTI
 Route::group(['middleware'=>['permission:progetti']], function(){
    Route::get('progetti', [ProgettiController::class, 'listaProgetto'])->name('progetti');
@@ -141,14 +146,34 @@ Route::group(['middleware'=>['permission:progetti']], function(){
    Route::get('progetti/detail/edit/{id}', [RigaProgettoController::class, 'editRiga']);
    Route::post('progetti/rigaupdate', [RigaProgettoController::class, 'updateRiga']);
    Route::get('progetti/coordinatori', [ProgettiController::class, 'getCoordinatori']);
+    Route::get('progetti/close',[ProgettiController::class, 'chiudiProgetto']);
+    Route::get('progetti/reopen',[ProgettiController::class, 'riapriProgetto']);
+    Route::get('progetti/print',[ProgettiController::class,'stampaPDFProgetto']);
 });

+// TASKS
+Route::group(['middleware'=>['permission:tasks']], function(){
+    Route::get('tasks', [TaskController::class, 'Task'])->name('tasks');
+    Route::post('task/new',[TaskController::class, 'newTask']);
+    Route::get('service/getUsers', [Utenti::class,'getUsers']);
+});
+
+
+// CONTRATTI
+Route::group(['middleware'=>['permission:contratti']], function(){
+    Route::get('contratti', [ContrattiController::class, 'Contratti'])->name('contratti');
+});
+
+Route::group(['middleware'=>['permission:avvisi']], function(){
+    Route::post('avvisi/new',[AvvisoController::class,'saveAvviso'])->name('newAvviso');
+});
+// -- ONLY FOR TEST -- TO BE REMOVED //

 /// TEST ROUTES
    Route::get('test/fullcalendar', [FullCalenderController::class, 'index']);
    Route::post('test/fullcalendar', [FullCalenderController::class, 'ajax']);
    Route::get('test/condominio',[CondominioController::class,'testPdf']);
-    Route::get('test/err403',[CondominioController::class,'err403']);
+    Route::get('test/err403',[CondominioController::class,'err403'])->name('errore-403');
    Route::get('test/user_role',[CondominioController::class,'user_role']);
    Route::get('test/userclass',[Utenti::class,'userClass']);

--- a/routes/api.php
+++ b/routes/api.php
@@ -20,6 +20,9 @@ use App\Http\Controllers\MovimentiController;
 Route::middleware('auth:sanctum')->get('/user', function (Request $request) {
    return $request->user();
 });
+
+Route::group(['middleware'=>['permission:conti']], function(){
    Route::get('categories', [CategorieController::class,'apiList']);
    Route::get('tags', [TagController::class,'apiList']);
-    Route::get('movements', [MovimentiController::class,'apiList']);
+    Route::get('movements', [MovimentiController::class,'apiList']);
+});
--- a/routes/web.php
+++ b/routes/web.php
@@ -24,5 +24,5 @@ Route::get('/', function () {
 Auth::routes(['register' => false]); // Production only
 //   Auth::routes();    //development mode
 Route::get('/calendar', [TagController::class,'calendartest'])->name('calendar');
-Route::get('/home', [App\Http\Controllers\HomeController::class, 'index'])->name('home');
+// Route::get('/home', [App\Http\Controllers\HomeController::class, 'index'])->name('home');
 Route::get('/home', [App\Http\Controllers\HomeController::class, 'index'])->name('home');
Author	SHA1	Message	Date
FlavioBarachino	9cf1f9a388	Merge branch 'devel'	2023-07-28 10:29:56 +02:00
FlavioBarachino	109ead8daa	sistemazione della vista delle attività e configurato la default language dell'app in IT	2023-07-28 10:29:11 +02:00
FlavioBarachino	60e9f77d2c	modifica stringa riconoscimento issue per modifiche	2023-07-28 08:50:47 +02:00
FlavioBarachino	2b8a9c0d4d	#5 alcune modifiche commentate per preparazione a generalizzazione documenti.	2023-07-28 08:46:17 +02:00
FlavioBarachino	a174a31b0d	#5 messo nei commenti le proposte di cambiamento da effettuare per la generalizzazione dei documenti	2023-07-27 16:45:10 +02:00
FlavioBarachino	717e1be95d	Creazione lista contratti	2023-07-27 15:31:18 +02:00
FlavioBarachino	0668026eb7	reso draggabile la parte modale di inserimento/modifica movimento	2023-07-27 11:49:30 +02:00
FlavioBarachino	bd6d7046db	aggiunto campo per filename in contratti	2023-07-27 11:39:28 +02:00
FlavioBarachino	d3629f1e75	rivista migrazione per tabella contratti	2023-07-27 11:07:04 +02:00
FlavioBarachino	a827342a30	aggiunta funzionalità draggable su div in dashboard, creato nuovo MVC per "gestione contratti"	2023-07-27 10:54:55 +02:00
FlavioBarachino	8381aa068d	Merge branch 'devel'	2023-07-19 11:14:30 +02:00
FlavioBarachino	58e9344180	Creato pagine Avvisi e sistemato dashboard (creato permesso "Avvisi")	2023-07-19 11:09:25 +02:00
FlavioBarachino	b5eb6c383b	Creato Avvisi e terminato task (manca editing)	2023-07-18 17:00:08 +02:00
FlavioBarachino	48606856c4	struttura base task	2023-07-17 15:40:24 +02:00
FlavioBarachino	9f0c93c921	correzioni varie	2023-07-17 13:31:46 +02:00
FlavioBarachino	8dff2e0853	Corretto problemi precedente pubblicazione	2023-07-17 13:20:06 +02:00
FlavioBarachino	0f382d4182	Modificato view su dashboard inserendo i tasks	2023-07-17 12:13:28 +02:00
FlavioBarachino	0050c3547e	Modificato route per errore battitura	2023-07-14 16:44:10 +02:00
FlavioBarachino	350c5737b7	Task Controllers	2023-07-14 16:19:40 +02:00
FlavioBarachino	fabf85ffb5	Creazione Tasks	2023-07-14 16:01:14 +02:00
FlavioBarachino	4f9378899b	Problema risolto su editing categorie	2023-07-07 15:00:47 +02:00
FlavioBarachino	031e4957b4	Inizializzazione dei dropdown di categoria e tags	2023-07-07 13:36:33 +02:00
FlavioBarachino	957cc88a3f	commento su seeder permessi	2023-07-07 10:15:01 +02:00
FlavioBarachino	6a26529bbf	sistemazione dei seeder sia per le categorie di default che per i permessi	2023-07-07 10:12:47 +02:00
FlavioBarachino	ff39c80f27	pulizia	2023-07-07 09:51:46 +02:00
FlavioBarachino	e4f3834488	#4 Sistemato anche view per lista categorie	2023-07-07 09:21:39 +02:00
FlavioBarachino	beec4b8dce	#4 suddivisione categorie per entrata/uscita rivisto inserimento e modifica.	2023-07-07 09:15:26 +02:00
FlavioBarachino	a773b825d0	Merge branch 'devel'	2023-07-06 19:18:51 +02:00
FlavioBarachino	b3df3f0b47	Risolto Javascript per categoria entrata/uscita nei nuovi movimenti	2023-07-06 18:32:31 +02:00
FlavioBarachino	8d0576099c	creazione della separazzione delle categorie	2023-07-06 17:39:23 +02:00
FlavioBarachino	69b93bc3f6	Merge branch 'devel'	2023-07-06 15:34:34 +02:00
FlavioBarachino	75761353ca	Modifica file Readme	2023-07-06 15:33:01 +02:00
FlavioBarachino	ea11579670	Aggiustato i return back dalle operazioni ai movimenti	2023-07-06 15:19:47 +02:00
FlavioBarachino	1e2b85910c	Sistemato il return back dalla cancellazione di un movimento.	2023-07-06 15:18:15 +02:00
FlavioBarachino	c020fe86f0	Aggiornamento redirect dell'update dei movimenti	2023-07-06 14:42:13 +02:00
FlavioBarachino	03449a5c27	Merge del branch devel	2023-07-06 13:46:14 +02:00
FlavioBarachino	1318b50fcc	Assegnazione ruoli ad utente	2023-07-06 13:44:41 +02:00
FlavioBarachino	d3f0695866	Merging 'devel' branch	2023-07-06 12:16:16 +02:00
FlavioBarachino	4850b5bbef	Creato scheda PDF progetti	2023-07-06 12:06:03 +02:00
Flavio Barachino	0ee7d4d363	Problema su colonna auto	2023-06-20 16:30:04 +02:00
FlavioBarachino	83ccd7ec19	Merge branch 'master' of https://bitbucket.org/FlavioBarachino/bubofamily	2023-06-20 16:17:07 +02:00
Flavio Barachino	920584d779	sistemato le date nelle view delle tabelle DataTable	2023-06-20 16:12:55 +02:00
Flavio Barachino	54b2dda9ea	sistemato ordinamento date (dataTable) nei js	2023-06-20 15:55:20 +02:00
FlavioBarachino	f90974ba09	problema che mi sono tagliato fuori l'utente amministrativo	2023-06-20 11:14:15 +02:00
FlavioBarachino	36a863eafd	Merge branch 'master' of https://bitbucket.org/FlavioBarachino/bubofamily	2023-06-20 11:06:25 +02:00
FlavioBarachino	7f80290ff8	Aggiunto OnlySeeder	2023-06-20 11:06:08 +02:00
Flavio Barachino	3dc54235c5	ripristinato conflitti	2023-06-20 09:28:23 +02:00
Flavio Barachino	8f5ccad560	sistemazione	2023-06-20 09:22:06 +02:00
Flavio Barachino	7a85f2280a	Merge pull request 'Aggiunto sezione della gestione dei permessi diretti assegnabili all'utente' (#1 ) from adim/adimgest:master into master Reviewed-on: #1	2023-06-20 06:48:49 +00:00
Flavio Barachino	d5f4d5c827	Creato link al menu per la gestione dei permessi	2023-06-20 08:29:13 +02:00
Flavio Barachino	b82ec0adc0	Aggiunto assegnazione permessi diretti ad utente	2023-06-20 08:27:20 +02:00
Flavio Barachino	fcbe1e1a4e	cambiato titolo dell'applicazione	2023-06-20 08:18:20 +02:00
Flavio Barachino	66157c3477	creazione tabelle models e controller per Rivista Gruppi e Associazioni, generato sistema di assegnazione permessi diretti ad un utente	2023-06-20 08:08:47 +02:00
adim	792d1a0580	Aggiornare 'README.md'	2023-06-18 10:07:58 +00:00
adim	84c0eaa48b	Aggiornato Readme Aggiornato readme Signed-off-by: adim <alert@lavorain.cloud>	2023-06-18 10:07:19 +00:00
Flavio Barachino	30cf03bd7d	aggiunto disabilitazione modifica e cancellazione progetto in caso in cui esso sia in stato di chiuso	2023-06-16 14:35:51 +02:00
FlavioBarachino	dd62afe67c	composer.lock modificato	2023-06-16 12:23:22 +02:00