Assegnazione ruoli ad utente

Reviewed-on: #1

README.md

@@ -1,29 +1,23 @@
-# Gestionale di Famiglia
+# Gestionale Per le associazioni
-Piccolo sistema di gestione famigliare. 
+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 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.
+ - 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 dei progetti (ancora in sviluppo) [Da rivedere]
- - Una gestione degli utenti e dei gruppi e relativi permessi.
+ - Una gestione degli utenti e dei gruppi e relativi permessi. [Da rivedere]
 
 *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>
 
+## Consulenza e richiesta
+Mariano Benzi
+
 ### Vuoi partecipare?
-Scrivimi con le tue proposte, le tue critiche, i tuoi suggerimenti.
+Scrivici con le tue proposte, le tue critiche, i tuoi suggerimenti.
+AdimGest <adimgest@lavorain.cloud>

app/Http/Controllers/AssociazioneController.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class AssociazioneController extends Controller
+{
+    //
+}

app/Http/Controllers/GruppiController.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class GruppiController extends Controller
+{
+    //
+}

app/Http/Controllers/MovimentiController.php

@@ -37,10 +37,14 @@ 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();
+
         return view('layouts.dashboard',[
-            'bilancio'=>$bilancio,
+            'entrate'=>$entrate,
+            'uscite'=>$uscite,
             'saldo'=>$saldo,
         ]);
     }
@@ -81,7 +85,7 @@ class MovimentiController extends Controller
         foreach ($movimenti as $movimento)
         {
             $lista[]=[
-                'Data'=>$movimento->Data,
+                'Data'=> date_format(date_create($movimento->Data),'d/m/Y'),
                 'Categoria'=>$movimento->Categoria,
                 'Tag'=>$movimento->Tag,
                 'Descrizione'=>$movimento->Descrizione,

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();
+    }
+
 }

app/Http/Controllers/RivistaController.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class RivistaController extends Controller
+{
+    //
+}

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,83 @@ 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 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');
+    }
 }
+

app/Mail/myTestEmail.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+
+
+class myTestEmail extends Mailable
+{
+    use Queueable, SerializesModels;
+    public $email;
+    /**
+     * Create a new message instance.
+     *
+     * @return void
+     */
+    public function __construct($email)
+    {
+        //
+        $this->email=$email;
+    }
+
+
+    /**
+     * Build the message.
+     *
+     * @return $this
+     */
+    public function build()
+    {
+        $name='none';
+        return $this
+        ->subject('Email di Test')
+        ->markdown('mail.test',['name' => $name]);
+    }
+}

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;
+}

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;
+}

app/Models/Movimenti.php

@@ -20,15 +20,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 +40,7 @@ class Movimenti extends Model
                 'mov_inserito_da'=>$request['userid'],
             ]);
     }
-    
+
     public static function insEntrata($request) {
         DB::table('movimentis')->insert(
             [
@@ -52,7 +52,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 +61,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 +72,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 +83,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 +91,7 @@ class Movimenti extends Model
         ->where('movimentis.id','=',$id)
         ->get();
     }
-    
+
     public static function updateMovimenti($request) {
         DB::table('movimentis')
         ->where('id','=', $request['id'])
@@ -104,13 +104,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 +123,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 +134,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,7 +151,7 @@ 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'])
             {
@@ -166,13 +166,13 @@ 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'])
             {
@@ -202,18 +202,18 @@ 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)
     {
-        
+
         if($type)
         {
             $string=$string->format('Y-m-d');
@@ -226,4 +226,24 @@ class Movimenti extends Model
         }
     }
 
+    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);
+    }
+
 }

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,
+        ]);
+    }
+
 }

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;
+}

app/Models/User.php

@@ -11,8 +11,6 @@ use Laravel\Sanctum\HasApiTokens;
 use Spatie\Permission\Traits\HasRoles;
 use Illuminate\Foundation\Auth\Access\Authorizable;
 
-
-
 class User extends Authenticatable
 {
     use HasApiTokens, HasFactory, Notifiable, HasRoles,Authorizable;
@@ -86,8 +84,4 @@ class User extends Authenticatable
         ])->assignRole($params['role']);
 
     }
-
-
-
-
 }

composer.json

@@ -10,10 +10,7 @@
 	"require" : {
 		"php": "^7.3|^8.0",
 		"barryvdh/laravel-dompdf": "^2.0",
-<<<<<<< HEAD
 		"directorytree/ldaprecord": "^2.9",
-=======
->>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
 		"fruitcake/laravel-cors": "^2.0",
 		"guzzlehttp/guzzle": "^7.0.1",
 		"laravel-notification-channels/telegram": "^2.0",

composer.lock

@@ -4,11 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-<<<<<<< HEAD
     "content-hash": "e6ac2be787f145ea140b72b55e302e90",
-=======
-    "content-hash": "04bb6926c8a763a3a3da227f31661f3d",
->>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -67,157 +63,6 @@
             "time": "2022-01-18T09:12:03+00:00"
         },
         {
-<<<<<<< HEAD
-=======
-            "name": "aws/aws-crt-php",
-            "version": "v1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/awslabs/aws-crt-php.git",
-                "reference": "1926277fc71d253dfa820271ac5987bdb193ccf5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/1926277fc71d253dfa820271ac5987bdb193ccf5",
-                "reference": "1926277fc71d253dfa820271ac5987bdb193ccf5",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35||^5.6.3||^9.5",
-                "yoast/phpunit-polyfills": "^1.0"
-            },
-            "suggest": {
-                "ext-awscrt": "Make sure you install awscrt native extension to use any of the functionality."
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "AWS SDK Common Runtime Team",
-                    "email": "aws-sdk-common-runtime@amazon.com"
-                }
-            ],
-            "description": "AWS Common Runtime for PHP",
-            "homepage": "https://github.com/awslabs/aws-crt-php",
-            "keywords": [
-                "amazon",
-                "aws",
-                "crt",
-                "sdk"
-            ],
-            "support": {
-                "issues": "https://github.com/awslabs/aws-crt-php/issues",
-                "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.1"
-            },
-            "time": "2023-03-24T20:22:19+00:00"
-        },
-        {
-            "name": "aws/aws-sdk-php",
-            "version": "3.263.10",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "d5f40cff8fe2fe75a8415618f04c987472184eba"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d5f40cff8fe2fe75a8415618f04c987472184eba",
-                "reference": "d5f40cff8fe2fe75a8415618f04c987472184eba",
-                "shasum": ""
-            },
-            "require": {
-                "aws/aws-crt-php": "^1.0.4",
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-simplexml": "*",
-                "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
-                "guzzlehttp/promises": "^1.4.0",
-                "guzzlehttp/psr7": "^1.8.5 || ^2.3",
-                "mtdowling/jmespath.php": "^2.6",
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "andrewsville/php-token-reflection": "^1.4",
-                "aws/aws-php-sns-message-validator": "~1.0",
-                "behat/behat": "~3.0",
-                "composer/composer": "^1.10.22",
-                "dms/phpunit-arraysubset-asserts": "^0.4.0",
-                "doctrine/cache": "~1.4",
-                "ext-dom": "*",
-                "ext-openssl": "*",
-                "ext-pcntl": "*",
-                "ext-sockets": "*",
-                "nette/neon": "^2.3",
-                "paragonie/random_compat": ">= 2",
-                "phpunit/phpunit": "^4.8.35 || ^5.6.3 || ^9.5",
-                "psr/cache": "^1.0",
-                "psr/simple-cache": "^1.0",
-                "sebastian/comparator": "^1.2.3 || ^4.0",
-                "yoast/phpunit-polyfills": "^1.0"
-            },
-            "suggest": {
-                "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications",
-                "doctrine/cache": "To use the DoctrineCacheAdapter",
-                "ext-curl": "To send requests using cURL",
-                "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages",
-                "ext-sockets": "To use client-side monitoring"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/functions.php"
-                ],
-                "psr-4": {
-                    "Aws\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Amazon Web Services",
-                    "homepage": "http://aws.amazon.com"
-                }
-            ],
-            "description": "AWS SDK for PHP - Use Amazon Web Services in your PHP project",
-            "homepage": "http://aws.amazon.com/sdkforphp",
-            "keywords": [
-                "amazon",
-                "aws",
-                "cloud",
-                "dynamodb",
-                "ec2",
-                "glacier",
-                "s3",
-                "sdk"
-            ],
-            "support": {
-                "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
-                "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.263.10"
-            },
-            "time": "2023-04-13T18:19:56+00:00"
-        },
-        {
->>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
             "name": "barryvdh/laravel-dompdf",
             "version": "v2.0.1",
             "source": {
@@ -581,7 +426,6 @@
             "time": "2022-10-27T11:44:00+00:00"
         },
         {
-<<<<<<< HEAD
             "name": "directorytree/ldaprecord",
             "version": "v2.20.4",
             "source": {
@@ -656,31 +500,29 @@
             "time": "2023-05-19T20:13:32+00:00"
         },
         {
-=======
->>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
             "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",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/f9301a5b2fb1216b2b08f02ba04dc45423db6bff",
-                "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
+                "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": {
@@ -730,7 +572,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": [
                 {
@@ -746,7 +588,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-10-20T09:10:12+00:00"
+            "time": "2023-06-16T13:40:37+00:00"
         },
         {
             "name": "doctrine/lexer",
@@ -2500,33 +2342,36 @@
         },
         {
             "name": "maennchen/zipstream-php",
-            "version": "v2.4.0",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/maennchen/ZipStream-PHP.git",
-                "reference": "3fa72e4c71a43f9e9118752a5c90e476a8dc9eb3"
+                "reference": "b46726e666b5d2ad32959ae9492ee1034e798162"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/3fa72e4c71a43f9e9118752a5c90e476a8dc9eb3",
+                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/b46726e666b5d2ad32959ae9492ee1034e798162",
-                "reference": "3fa72e4c71a43f9e9118752a5c90e476a8dc9eb3",
+                "reference": "b46726e666b5d2ad32959ae9492ee1034e798162",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
-                "myclabs/php-enum": "^1.5",
+                "ext-zlib": "*",
-                "php": "^8.0",
+                "php-64bit": "^8.1"
-                "psr/http-message": "^1.0"
             },
             "require-dev": {
                 "ext-zip": "*",
-                "friendsofphp/php-cs-fixer": "^3.9",
+                "friendsofphp/php-cs-fixer": "^3.16",
-                "guzzlehttp/guzzle": "^6.5.3 || ^7.2.0",
+                "guzzlehttp/guzzle": "^7.5",
                 "mikey179/vfsstream": "^1.6",
-                "php-coveralls/php-coveralls": "^2.4",
+                "php-coveralls/php-coveralls": "^2.5",
-                "phpunit/phpunit": "^8.5.8 || ^9.4.2",
+                "phpunit/phpunit": "^10.0",
                 "vimeo/psalm": "^5.0"
             },
+            "suggest": {
+                "guzzlehttp/psr7": "^2.4",
+                "psr/http-message": "^2.0"
+            },
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -2562,7 +2407,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.0.2"
             },
             "funding": [
                 {
@@ -2574,7 +2419,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2022-12-08T12:29:14+00:00"
+            "time": "2023-04-19T19:51:03+00:00"
         },
         {
             "name": "markbaker/complex",
@@ -2852,69 +2697,6 @@
             ],
             "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",
@@ -3379,16 +3161,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",
+                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/fde2ccf55eaef7e86021ff1acce26479160a0fa0",
-                "reference": "6e81cf39bbd93ebc3a4e8150444c41e8aa9b769a",
+                "reference": "fde2ccf55eaef7e86021ff1acce26479160a0fa0",
                 "shasum": ""
             },
             "require": {
@@ -3406,7 +3188,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",
@@ -3418,12 +3200,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"
             },
@@ -3478,9 +3260,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",
@@ -3764,16 +3546,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",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
-                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
                 "shasum": ""
             },
             "require": {
@@ -3782,7 +3564,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -3797,7 +3579,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for HTTP messages",
@@ -3811,9 +3593,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",
@@ -3918,7 +3700,6 @@
         },
         {
             "name": "psy/psysh",
-<<<<<<< HEAD
             "version": "v0.11.18",
             "source": {
                 "type": "git",
@@ -3929,18 +3710,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/bobthecow/psysh/zipball/4f00ee9e236fa6a48f4560d1300b9c961a70a7ec",
                 "reference": "4f00ee9e236fa6a48f4560d1300b9c961a70a7ec",
-=======
-            "version": "v0.11.15",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "5350ce0ec8ecf2c5b5cf554cd2496f97b444af85"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/5350ce0ec8ecf2c5b5cf554cd2496f97b444af85",
-                "reference": "5350ce0ec8ecf2c5b5cf554cd2496f97b444af85",
->>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
                 "shasum": ""
             },
             "require": {
@@ -4001,15 +3770,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-<<<<<<< HEAD
                 "source": "https://github.com/bobthecow/psysh/tree/v0.11.18"
             },
             "time": "2023-05-23T02:31:11+00:00"
-=======
-                "source": "https://github.com/bobthecow/psysh/tree/v0.11.15"
-            },
-            "time": "2023-04-07T21:57:09+00:00"
->>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
         },
         {
             "name": "ralouphie/getallheaders",
@@ -7689,7 +7452,6 @@
                 }
             ],
             "time": "2023-05-25T13:05:00+00:00"
-<<<<<<< HEAD
         },
         {
             "name": "tightenco/collect",
@@ -7744,8 +7506,6 @@
                 "source": "https://github.com/tighten/collect/tree/v9.52.7"
             },
             "time": "2023-04-14T21:51:36+00:00"
-=======
->>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -8421,16 +8181,16 @@
         },
         {
             "name": "fakerphp/faker",
-            "version": "v1.22.0",
+            "version": "v1.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FakerPHP/Faker.git",
-                "reference": "f85772abd508bd04e20bb4b1bbe260a68d0066d2"
+                "reference": "e3daa170d00fde61ea7719ef47bb09bb8f1d9b01"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/f85772abd508bd04e20bb4b1bbe260a68d0066d2",
+                "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/e3daa170d00fde61ea7719ef47bb09bb8f1d9b01",
-                "reference": "f85772abd508bd04e20bb4b1bbe260a68d0066d2",
+                "reference": "e3daa170d00fde61ea7719ef47bb09bb8f1d9b01",
                 "shasum": ""
             },
             "require": {
@@ -8483,9 +8243,9 @@
             ],
             "support": {
                 "issues": "https://github.com/FakerPHP/Faker/issues",
-                "source": "https://github.com/FakerPHP/Faker/tree/v1.22.0"
+                "source": "https://github.com/FakerPHP/Faker/tree/v1.23.0"
             },
-            "time": "2023-05-14T12:31:37+00:00"
+            "time": "2023-06-12T08:44:38+00:00"
         },
         {
             "name": "filp/whoops",
@@ -8676,22 +8436,22 @@
         },
         {
             "name": "mockery/mockery",
-            "version": "1.6.0",
+            "version": "1.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "bac1765cb52bbd3364a870e920cb69cd859ee302"
+                "reference": "13a7fa2642c76c58fa2806ef7f565344c817a191"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/bac1765cb52bbd3364a870e920cb69cd859ee302",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/13a7fa2642c76c58fa2806ef7f565344c817a191",
-                "reference": "bac1765cb52bbd3364a870e920cb69cd859ee302",
+                "reference": "13a7fa2642c76c58fa2806ef7f565344c817a191",
                 "shasum": ""
             },
             "require": {
                 "hamcrest/hamcrest-php": "^2.0.1",
                 "lib-pcre": ">=7.0",
-                "php": "^7.3 || ^8.0"
+                "php": "^7.4 || ^8.0"
             },
             "conflict": {
                 "phpunit/phpunit": "<8.0"
@@ -8704,7 +8464,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4.x-dev"
+                    "dev-main": "1.6.x-dev"
                 }
             },
             "autoload": {
@@ -8748,9 +8508,9 @@
             ],
             "support": {
                 "issues": "https://github.com/mockery/mockery/issues",
-                "source": "https://github.com/mockery/mockery/tree/1.6.0"
+                "source": "https://github.com/mockery/mockery/tree/1.6.2"
             },
-            "time": "2023-05-03T12:55:29+00:00"
+            "time": "2023-06-07T09:07:52+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -9329,29 +9089,16 @@
         },
         {
             "name": "phpunit/phpunit",
-<<<<<<< HEAD
+            "version": "9.6.9",
-            "version": "9.6.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e"
+                "reference": "a9aceaf20a682aeacf28d582654a1670d8826778"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/17d621b3aff84d0c8b62539e269e87d8d5baa76e",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a9aceaf20a682aeacf28d582654a1670d8826778",
-                "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e",
+                "reference": "a9aceaf20a682aeacf28d582654a1670d8826778",
-=======
-            "version": "9.6.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "c993f0d3b0489ffc42ee2fe0bd645af1538a63b2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c993f0d3b0489ffc42ee2fe0bd645af1538a63b2",
-                "reference": "c993f0d3b0489ffc42ee2fe0bd645af1538a63b2",
->>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
                 "shasum": ""
             },
             "require": {
@@ -9425,11 +9172,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-<<<<<<< HEAD
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.9"
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.8"
-=======
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.7"
->>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
             },
             "funding": [
                 {
@@ -9445,11 +9188,7 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
+            "time": "2023-06-11T06:13:56+00:00"
-            "time": "2023-05-11T05:14:45+00:00"
-=======
-            "time": "2023-04-14T08:58:40+00:00"
->>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
         },
         {
             "name": "sebastian/cli-parser",

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) {
+        /*Schema::table('anagraficas', function (Blueprint $table) {
-            //
+         /*   //
-		$table->longText('ang_indirizzo');
+	//		$table->longText('ang_indirizzo');
 		$table->string('ang_CAP');
 		$table->string('ang_Citta');  
 		$table->string('ang_Provincia'); 
 		$table->string('ang_telefono');
-        });
+        });*/
     }
 
     /**

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');
+    }
+}

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');
+    }
+}

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');
+    }
+}

public/js/app/altrocontatto.js

@@ -1,6 +1,6 @@
 $(document).ready(function() {
 	$('#automobili').DataTable({
-		responsive: true
+		responsive: true,
         fields: [
 			{
 				label:"Data",
@@ -10,7 +10,7 @@ $(document).ready(function() {
 	});
 
 	$('#contatti').DataTable({
-		responsive: true
+		responsive: true,
         fields: [
 			{
 				label:"Data",

public/js/app/auto.js

@@ -1,12 +1,19 @@
+$(document).ready(function() {
+	$('#listaAutomobili').DataTable({
+		responsive: true
+	});
+});
+
 $(document).ready(function() {
 	$('#automobili').DataTable({
-		responsive: true
+		responsive: true,
-        fields: [
+        columnDefs: [
-			{
+            {
-				label:"Data",
+                target: 0,
-				type: "datetime"
+                render: DataTable.render.date(),
-			}
+            }
-		]
+        ],
+		"order": [[0, "desc"]]
 	});
 });
 

public/js/app/conti_categorie.js

@@ -1,22 +1,12 @@
 $(document).ready(function() {
 	$('#listrapportoS').DataTable({
-		responsive: true,
+		"responsive": true,
-        fields: [
+		"order": [[0, "asc"]]
-			{
-				label:"Data",
-				type: "datetime"
-			}
-		]
 	});
 
 	$('#listrapportoE').DataTable({
-		responsive: true,
+		"responsive": true,
-        fields: [
+		"order": [[0, "asc"]]
-			{
-				label:"Data",
-				type: "datetime"
-			}
-		]
 	});
 
     $('#categorie').DataTable({

public/js/app/enel.js

@@ -1,5 +1,12 @@
 $(document).ready(function() {
 	$('#listaLettureEnel').DataTable({
-		responsive: true
+		"responsive": true,
+        columnDefs: [
+            {
+                target: 0,
+                render: DataTable.render.date(),
+            }
+        ],
+		"order": [[0, "desc"]]
 	});
-});
+});

public/js/app/gas.js

@@ -1,5 +1,12 @@
 $(document).ready(function() {
 	$('#listaLettureGas').DataTable({
-		responsive: true
+		"responsive": true,
+        columnDefs: [
+            {
+                target: 0,
+                render: DataTable.render.date(),
+            }
+        ],
+		"order": [[0, "desc"]]
 	});
-});
+});

public/js/app/movimenti.js

@@ -1,6 +1,12 @@
 $(document).ready(function() {
 	$('#listamovimenti').DataTable({
 		"responsive": true,
+        columnDefs: [
+            {
+                target: 0,
+                render: DataTable.render.date(),
+            }
+        ],
 		"order": [[0, "desc"]]
 	});
 });

public/js/app/progetti.js

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

public/js/app/rigaProgetti.js

@@ -1,14 +1,15 @@
 $(document).ready(function() {
 	$('#tab_progetti').DataTable({
-		responsive: true
+		"responsive": true,
-        fields: [
+        columnDefs: [
-			{
+            {
-				label:"Data",
+                target: 0,
-				type: "datetime"
+                render: DataTable.render.date(),
-			}
+            }
-		]
+        ],
+		"order": [[0, "desc"]]
 	});
-
+});
 	$('#form').click(function() {
 		$('form').toggle();
 	});
@@ -41,4 +42,4 @@ $(document).ready(function() {
 		$('#myModal_addRow').modal('show');
 		// $('#form_new').attr('action', 'progetti/new');
 	});
-});
+

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 
+        <!-- Datatables with datetime and locales -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/js/i18n/defaults-*.min.js"></script>-->
+        <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"/>
-
-
-        <!-- 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]-->
         @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>
@@ -115,12 +102,14 @@
 
         <!-- Metis Menu Plugin JavaScript -->
         <script src="/js/metisMenu.min.js"></script>
-        
+
-        <!-- DataTables JavaScript -->
+        <!-- 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="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>
+        <script src="/js/momentjs.js"></script>
         <script src="/js/startmin.js"></script>
 	@section('script')
 	@show

resources/views/auto/detail.blade.php

@@ -4,10 +4,10 @@
                         <div class="col-lg-12">
                             <h1 class="page-header">{{ $dettagli->marca; }} {{ $dettagli->modello; }} targa: {{ $dettagli->targa; }}</h1>
                         </div>
-</div>                          
+</div>
 	<div class="container">
     	<!-- Content here -->
-    	
+
 <div class="row">
  	<div class="col-lg-12">
  	<a class="btn btn-primary" href="operazioni/pdf?id={{ $dettagli->id; }}">Esporta PDF</a>
@@ -19,10 +19,10 @@
         	<div class="panel-heading">
                 Dettaglio auto {{ $dettagli->targa }}
             </div>
-            <div class="panel-body">  	
+            <div class="panel-body">
             	<div class="table-responsive">
                    <table class="table table-striped table-bordered table-hover" id="">
-            		
+
             		<thead>
             			<tr>
             				<th>Marca:</th>
@@ -39,7 +39,7 @@
             			</tr>
             		</thead>
             		<tbody>
-            		
+
             		<tr>
             			<td>{{ $dettagli->marca; }}</td>
             			<td>{{ $dettagli->modello; }}</td>
@@ -53,9 +53,9 @@
             			<td>{{ $km ?? ''; }}</td>
             			<td>{{ $dettagli->note; }}</td>
             		</tr>
-            		
+
             		</tbody>
-            		
+
             		</table>
             	</div>
     		</div>
@@ -69,10 +69,10 @@
         	<div class="panel-heading">
                 Revisioni auto {{ $dettagli->targa }}
             </div>
-            <div class="panel-body">  	
+            <div class="panel-body">
             	<div class="table-responsive">
                    <table class="table table-striped table-bordered table-hover" id="revisione">
-            		
+
             		<thead>
             			<tr>
             				<th>Data</th>
@@ -88,7 +88,7 @@
             		@foreach($operazione as $operazioni)
             		@if ($operazioni->type =='revisione')
             		<tr>
-            			<td>{{ $operazioni->data; }}</td>
+            			<td>{{ date_format(date_create($operazioni->data),'d/m/Y'); }}</td>
             			<td>{{ $operazioni->km; }}</td>
             			@if($revisione[$operazioni->id][0]->superata >0)
             			<td>Superata</td>
@@ -103,7 +103,7 @@
             		@endif
             		@endforeach
             		</tbody>
-            		
+
             		</table>
             	</div>
     		</div>
@@ -111,7 +111,7 @@
 	</div>
 </div>
 	<!-- Fine Revisioni -->
-	
+
 	<!-- Manutenzioni -->
 	<div class="row">
  	<div class="col-lg-12">
@@ -119,10 +119,10 @@
         	<div class="panel-heading">
                 Manutenzione auto {{ $dettagli->targa }}
             </div>
-            <div class="panel-body">  	
+            <div class="panel-body">
             	<div class="table-responsive">
                    <table class="table table-striped table-bordered table-hover" id="manutenzione">
-            		
+
             		<thead>
             			<tr>
             				<th>Data</th>
@@ -135,7 +135,7 @@
             		@foreach($operazione as $operazioni)
             		@if ($operazioni->type =='manutenzione')
             		<tr>
-            			<td>{{ $operazioni->data; }}</td>
+            			<td>{{ date_format(date_create($operazioni->data),'d/m/Y'); }}</td>
             			<td>{{ $operazioni->km; }}</td>
             			<td>{{ $manutenzione[$operazioni->id][0]->descrizione; }}</td>
             			<td>{{ $operazioni->importo; }}</td>
@@ -143,7 +143,7 @@
             		@endif
             		@endforeach
             		</tbody>
-            		
+
             		</table>
             	</div>
     		</div>
@@ -151,7 +151,7 @@
 	</div>
 	</div>
 	<!-- Fine Manutenzioni -->
-	
+
 	<!-- Accessori -->
 	<div class="row">
  	<div class="col-lg-12">
@@ -159,10 +159,10 @@
         	<div class="panel-heading">
                 Accessori/Ricambi auto {{ $dettagli->targa }}
             </div>
-            <div class="panel-body">  	
+            <div class="panel-body">
             	<div class="table-responsive">
                    <table class="table table-striped table-bordered table-hover" id="accessori">
-            		
+
             		<thead>
             			<tr>
             				<th>Data</th>
@@ -175,7 +175,7 @@
             		@foreach($operazione as $operazioni)
             		@if ($operazioni->type=='accessori')
             		<tr>
-            			<td>{{ $operazioni->data; }}</td>
+            			<td>{{ date_format(date_create($operazioni->data),'d/m/Y'); }}</td>
             			<td>{{ $operazioni->km; }}</td>
             			<td>{{ $accessori[$operazioni->id][0]->descrizione; }}</td>
             			<td>{{ $operazioni->importo; }}</td>
@@ -183,7 +183,7 @@
             		@endif
             		@endforeach
             		</tbody>
-            		
+
             		</table>
             	</div>
     		</div>
@@ -191,7 +191,7 @@
 	</div>
 	</div>
 	<!-- Fine Accessori -->
-	
+
 	<!-- Rifornimenti -->
 	<div class="row">
  	<div class="col-lg-12">
@@ -199,10 +199,10 @@
         	<div class="panel-heading">
                 Rifornimenti auto {{ $dettagli->targa }}
             </div>
-            <div class="panel-body">  	
+            <div class="panel-body">
             	<div class="table-responsive">
                    <table class="table table-striped table-bordered table-hover" id="">
-            		
+
             		<thead>
             			<tr>
             				<th>Data</th>
@@ -217,7 +217,7 @@
             		@foreach($operazione as $operazioni)
             		@if ($operazioni->type =='rifornimento')
             		<tr>
-            			<td>{{ $operazioni->data; }}</td>
+            			<td>{{ date_format(date_create($operazioni->data),'d/m/Y'); }}</td>
             			<td>{{ $operazioni->km; }}</td>
             			<td>{{ $rifornimento[$operazioni->id][0]->distributore; }}</td>
             			<td>{{ $rifornimento[$operazioni->id][0]->eurolitro; }}</td>
@@ -227,7 +227,7 @@
             		@endif
             		@endforeach
             		</tbody>
-            		
+
             		</table>
             	</div>
     		</div>
@@ -235,7 +235,7 @@
 	</div>
 	</div>
 	<!-- Fine Rifornimenti -->
-	
+
 	<!--  -->
 </div>
 

resources/views/auto/detailpdf.blade.php

@@ -30,10 +30,10 @@ table{
 
 </style>
 </head>
-<body>       
+<body>
 	<div class="container">
     	<!-- Content here -->
-    	
+
 	<span class="titolo"><h1>Scheda {{ $dettagli->marca; }} {{ $dettagli->modello; }} - {{ $dettagli->targa; }}</h1></span>
  	<div class="row">
  	<div class="col-lg-12">
@@ -41,14 +41,14 @@ table{
         	<div class="panel-heading">
                 Dettaglio
             </div>
-            <div class="panel-body">  	
+            <div class="panel-body">
             	<div class="table-responsive">
                    <table class="intestazione_doc" id="">
             			<tr>
             				<th>Marca:</th><td>{{ $dettagli->marca; }}</td>
             				<th>Modello:</th><td>{{ $dettagli->modello; }}</td>
             				<th>Targa:</th>	<td>{{ $dettagli->targa; }}</td>
-            	
+
             			</tr>
             			<tr>
             				<th>Alimentazione:</th><td>{{ $dettagli->alimentazione; }}</td>
@@ -78,10 +78,10 @@ table{
         	<div class="panel-heading">
                 Revisioni
             </div>
-            <div class="panel-body">  	
+            <div class="panel-body">
             	<div class="table-responsive">
                    <table class="table table-striped table-bordered table-hover" id="revisione">
-            		
+
             		<thead>
             			<tr>
             				<th>Data</th>
@@ -97,7 +97,7 @@ table{
             		@foreach($operazione as $operazioni)
             		@if ($operazioni->type =='revisione')
             		<tr>
-            			<td>{{ $operazioni->data; }}</td>
+            			<td>{{ date_format(date_create($operazioni->data),'d/m/Y'); }}</td>
             			<td>{{ $operazioni->km; }}</td>
             			<td>{{ $revisione[$operazioni->id][0]->superata; }}</td>
             			<td>{{ $revisione[$operazioni->id][0]->centrorevisione; }}</td>
@@ -108,7 +108,7 @@ table{
             		@endif
             		@endforeach
             		</tbody>
-            		
+
             		</table>
             	</div>
     		</div>
@@ -116,18 +116,18 @@ table{
 	</div>
 </div>
 	<!-- Fine Revisioni -->
-<br><hr>	
+<br><hr>
 	<!-- Manutenzioni -->
 	<div class="row">
  	<div class="col-lg-12">
     	<div class="panel panel-default">
         	<div class="panel-heading">
-                Manutenzione 
+                Manutenzione
             </div>
-            <div class="panel-body">  	
+            <div class="panel-body">
             	<div class="table-responsive">
                    <table class="table table-striped table-bordered table-hover" id="manutenzione">
-            		
+
             		<thead>
             			<tr>
             				<th>Data</th>
@@ -140,7 +140,7 @@ table{
             		@foreach($operazione as $operazioni)
             		@if ($operazioni->type =='manutenzione')
             		<tr>
-            			<td>{{ $operazioni->data; }}</td>
+            			<td>{{ date_format(date_create($operazioni->data),'d/m/Y'); }}</td>
             			<td>{{ $operazioni->km; }}</td>
             			<td>{{ $manutenzione[$operazioni->id][0]->descrizione; }}</td>
             			<td>{{ $operazioni->importo; }}</td>
@@ -148,7 +148,7 @@ table{
             		@endif
             		@endforeach
             		</tbody>
-            		
+
             		</table>
             	</div>
     		</div>
@@ -164,10 +164,10 @@ table{
         	<div class="panel-heading">
                 Accessori/Ricambi
             </div>
-            <div class="panel-body">  	
+            <div class="panel-body">
             	<div class="table-responsive">
                    <table class="table table-striped table-bordered table-hover" id="accessori">
-            		
+
             		<thead>
             			<tr>
             				<th>Data</th>
@@ -180,7 +180,7 @@ table{
             		@foreach($operazione as $operazioni)
             		@if ($operazioni->type=='accessori')
             		<tr>
-            			<td>{{ $operazioni->data; }}</td>
+            			<td>{{ date_format(date_create($operazioni->data),'d/m/Y'); }}</td>
             			<td>{{ $operazioni->km; }}</td>
             			<td>{{ $accessori[$operazioni->id][0]->descrizione; }}</td>
             			<td>{{ $operazioni->importo; }}</td>
@@ -188,7 +188,7 @@ table{
             		@endif
             		@endforeach
             		</tbody>
-            		
+
             		</table>
             	</div>
     		</div>
@@ -204,10 +204,10 @@ table{
         	<div class="panel-heading">
                 Rifornimenti
             </div>
-            <div class="panel-body">  	
+            <div class="panel-body">
             	<div class="table-responsive">
                    <table class="table table-striped table-bordered table-hover" id="">
-            		
+
             		<thead>
             			<tr>
             				<th>Data</th>
@@ -222,7 +222,7 @@ table{
             		@foreach($operazione as $operazioni)
             		@if ($operazioni->type =='rifornimento')
             		<tr>
-            			<td>{{ $operazioni->data; }}</td>
+            			<td>{{ date_format(date_create($operazioni->data),'d/m/Y'); }}</td>
             			<td>{{ $operazioni->km; }}</td>
             			<td>{{ $rifornimento[$operazioni->id][0]->distributore; }}</td>
             			<td>{{ $rifornimento[$operazioni->id][0]->eurolitro; }}</td>
@@ -232,7 +232,7 @@ table{
             		@endif
             		@endforeach
             		</tbody>
-            		
+
             		</table>
             	</div>
     		</div>

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>

resources/views/components/menu.blade.php

@@ -49,7 +49,10 @@
 @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('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 +61,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 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> 
+		<!--
+		<li><a href="/login">Login Page</a></li>
 		-->
 	</ul> <!-- /.nav-second-level --></li>
 @endcan

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>

resources/views/conti/movimenti/list.blade.php

@@ -31,8 +31,9 @@
             		<tbody>
             		@foreach( $movimenti as $movimento )
             		<tr>
-            			<td>{{ $movimento->mov_data; }}</td>
+            			<!-- <td>{{  date_format(date_create($movimento->mov_data),'d/m/Y'); }}</td>-->
-            			<td>{{ $movimento->cat_name; }}</td>
+            			<td>{{$movimento->mov_data}}</td>
+                        <td>{{ $movimento->cat_name; }}</td>
             			<td>{{ $movimento->mov_descrizione; }}</td>
             			<td>&euro; {{ $movimento->mov_importo; }}</td>
             			<td>

resources/views/conti/report/list.blade.php

@@ -25,9 +25,9 @@
             		<tbody>
             		@foreach( $dataSpesa as $dato )
             		<tr>
-            			<td><a href="movimenti/report/movimenti_categoria?cat={{ $dato->id }}&month={{ $_GET['Month'] ?? date('m')}}">{{ $dato->cat_name; }}</a> </td>
+            			<td><a href="/admin/movimenti/report/movimenti_categoria?cat={{ $dato->id }}&month={{ $_GET['Month'] ?? date('m')}}">{{ $dato->cat_name; }}</a> </td>
             			<td>{{ $dato->resoconto; }}</td>
-            			
+
             		</tr>
             		@endforeach
             		</tbody>
@@ -55,9 +55,9 @@
             		<tbody>
             		@foreach( $dataEntrate as $dato )
             		<tr>
-            			<td><a href="movimenti/report/movimenti_categoria?cat={{ $dato->id }}&month={{ $_GET['Month'] ?? date('m')}}">{{ $dato->cat_name; }}</a> </td>
+            			<td><a href="/admin/movimenti/report/movimenti_categoria?cat={{ $dato->id }}&month={{ $_GET['Month'] ?? date('m')}}">{{ $dato->cat_name; }}</a> </td>
             			<td>{{ $dato->resoconto; }}</td>
-            			
+
             		</tr>
             		@endforeach
             		</tbody>
@@ -67,9 +67,8 @@
 		</div>
 	</div>
 </div>
- 
+
 @endsection
 @section('script')
 <script src="/js/app/conti_categorie.js"></script>
 @endsection
-            	

resources/views/layouts/dashboard.blade.php

@@ -9,15 +9,15 @@
 @hasanyrole('user|admin')
 <!-- WIDGET Bilancio -->
 	<div class="col-lg-4 col-md-8">
-        <div class="panel panel-primary">
+        <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 class="huge">{{ $entrate }}</div>
-                                       <div>Bilancio attuale anno {{ date('Y') }}</div>
+                                       <div>Entrate attuale anno {{ date('Y') }}</div>
                            </div>
                 </div>
             </div>
@@ -30,9 +30,55 @@
            </a>
      	</div>
 	</div>
+    <!-- WIDGET Bilancio -->
+	<div class="col-lg-4 col-md-8">
+        <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="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-4 col-md-8">
+        <div class="panel panel-yellow">
             <div class="panel-heading">
                 <div class="row">
                    <div class="col-xs-3">
@@ -52,11 +98,11 @@
                 </div>
            </a>
      	</div>
-	</div>	
+	</div>
 	@endhasanyrole
 </div>
 @endsection
 
 @section('script')
 <script src="/js/app/dashboard.js"></script>
-@endsection
+@endsection

resources/views/letture/enel/list.blade.php

@@ -62,7 +62,7 @@
             		<tbody>
             		@foreach($lettureEnel as $lettura)
             			<tr>
-            				<td>{{ $lettura->enel_date; }}</td>
+            				<td>{{ $lettura->enel_date }}</td>
             				<td>{{ $lettura->enel_A; }}</td>
             				<td>{{ $lettura->enel_R; }}</td>
             				<td>{{ $lettura->enel_F1; }}</td>
@@ -78,9 +78,8 @@
 		</div>
 	</div>
 </div>
- 
+
 @endsection
 @section('script')
 <script src="/js/app/enel.js"></script>
 @endsection
-            				

resources/views/letture/gas/list.blade.php

@@ -24,7 +24,7 @@
                 Nuova lettura Gas
             </div>
             <div class="panel-body">
-            
+
             	<form action="" method="POST">
             		@csrf
                 	<div class="mb-3">
@@ -38,7 +38,7 @@
                     <button type="submit" class="btn btn-primary">Submit</button>
             	</form>
             	</div>
-           
+
           </div>
           <div class="panel-heading">
                 Letture Gas
@@ -57,7 +57,7 @@
             		</thead>
             		<tbody>
             		@php $dateprec=NULL; @endphp
-            		
+
             		@foreach($lettureGas as $lettura)
             		    @php
             			if (!is_null($dateprec))
@@ -65,13 +65,13 @@
             				$diffdate=date_diff(
             					date_create_from_format('Y-m-d',$lettura->gas_date),
             					date_create_from_format('Y-m-d',$dateprec)
-            					)->format('%a'); 
+            					)->format('%a');
             				$differenza=($lettura->gas_lettura)-$lettprec;
             				$mediagg=($differenza/$diffdate);
             			}
             			@endphp
             			<tr>
-            				<td>{{ $lettura->gas_date; }}</td>
+            				<td>{{ $lettura->gas_date }}</td>
             				<td>{{ $lettura->gas_lettura; }}</td>
             				@if(!is_null($dateprec))
                 				<td>{{ $diffdate ?? '' }}</td>
@@ -83,9 +83,9 @@
             					<td></td>
         					@endif
             			</tr>
-            		
+
             			@php
-            				$dateprec=$lettura->gas_date; 
+            				$dateprec=$lettura->gas_date;
             				$lettprec=$lettura->gas_lettura;
             			@endphp
             		@endforeach
@@ -96,9 +96,8 @@
 		</div>
 	</div>
 </div>
- 
+
 @endsection
 @section('script')
 <script src="/js/app/gas.js"></script>
 @endsection
-            				

resources/views/mail/test.blade.php

@@ -0,0 +1,11 @@
+@component('mail::message')
+
+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') }}
+@endcomponent

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>

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="fk_id_progetto" id="id_progetto_u">
-						<input type="hidden" name="idriga" id="idriga"> 
+						<input type="hidden" name="idriga" id="idriga">
 						<input type="submit" name="Submit" class="form-control" value="Aggiorna">
 
 					</div>

resources/views/progetti/list.blade.php

@@ -38,12 +38,17 @@
 								<tr>
 									<td><a href="progetti/detail/{{ $progetto->progetto }}">{{
 											$progetto->nome; }}</a></td>
-									<td>{{ $progetto->data_creazione; }}</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 }}"
+									<td>@if($progetto->stato != 'chiuso')<a href="progetti/delete?id={{ $progetto->progetto }}"
-										class="btn btn-danger">Cancella</a></td>
+										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>
@@ -78,7 +83,7 @@
 								<!-- TODO: Da vedere funzione di select in js -->
 								<select name="coordinatore" class="form-control selectpicker"
 									id="coordinatore" data-live-search="true"
-									data-live-search-placeholder="Cerca"> 
+									data-live-search-placeholder="Cerca">
 								</select>
 							</div>
 						</div>
@@ -142,4 +147,4 @@
 	<!-- /MODAL -->
 	@endsection @section('script')
 	<script src="/js/app/progetti.js"></script>
-	@endsection
+	@endsection

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

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

routes/admin.php

@@ -15,6 +15,7 @@ use App\Http\Controllers\AutoController;
 use App\Http\Controllers\AnagraficaController;
 use App\Http\Controllers\Utenti;
 use App\Http\Controllers\ProgettiController;
+use App\Mail\myTestEmail;
 
 /*
 |--------------------------------------------------------------------------
@@ -127,6 +128,10 @@ Route::group(['middleware'=>['permission:amministrazione']], function(){
     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(){
@@ -140,9 +145,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']);
 
 
+});
+/// RIVISTA
+Route::group(['middleware'=>['permission:rivista']], function(){
+    Route::get('rivista',[RivistaController::class,'rivistaHome'])->name('rivista');
+    Route::get('rivista/pubblica',[RivistaController::class,'rivistaDigCarica']);
+    Route::post('rivista/pubblica',[RivistaController::class,'rivistaDigPubblica']);
+    Route::get('rivista/abbonati',[RivistaController::class,'rivistaAbbonati']);
+    Route::get('rivista/abbonamenti',[RivistaController::class,'rivistaAbbonamenti']);
+    Route::get('rivista/abbonamenti/rinnovo',[RivistaController::class,'rivistaAbbonamentiRinnovo']);
+    Route::get('rivista/abbonamenti/nuovo',[RivistaController::class,'rivistaAbbonamentiNuovo']);
+    Route::get('rivista/abbonamenti/scadenza',[RivistaController::class,'rivistaAbbonamentiScadono']);
+    Route::get('rivista/new',[RivistaController::class,'rivistaNuova']);
+    Route::get('rivista/archivio',[RivistaController::class,'rivistaArchivio']);
+});
+/// ASSOCIAZIONE
+Route::group(['middleware'=>['permission:associazione']], function(){
+    Route::get('associazione',[AssociazioneController::class,'assocHome'])->name('associazione');
+});
+/// GRUPPI
+Route::group(['middleware'=>['permission:gruppi']], function(){
+    Route::get('gruppi',[GruppiController::class,'gruppiHome'])->name('gruppi');
+});
+
 /// TEST ROUTES
     Route::get('test/fullcalendar', [FullCalenderController::class, 'index']);
     Route::post('test/fullcalendar', [FullCalenderController::class, 'ajax']);
@@ -151,3 +181,7 @@ Route::group(['middleware'=>['permission:progetti']], function(){
     Route::get('test/user_role',[CondominioController::class,'user_role']);
     Route::get('test/userclass',[Utenti::class,'userClass']);
 
+    Route::get('testmail',function(){
+        $name='Flavio';
+        Mail::to('git@lavorain.cloud')->send(new myTestEmail($name));
+    });

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');