Modificato il runs-on

Signed-off-by: Flavio Barachino <flavio.barachino@lavorain.cloud>
pulizia config/app.php
2024-12-10 12:39:56 +00:00 · 2024-07-24 10:05:01 +00:00 · 2024-07-24 09:58:55 +00:00 · 2024-07-24 08:51:39 +00:00 · 2024-07-23 10:14:01 +00:00 · 2024-07-23 08:09:06 +00:00
37 changed files with 496 additions and 181 deletions
--- a/.gitea/workflows/test.yaml
+++ b/.gitea/workflows/test.yaml
@ -4,7 +4,7 @@ on: [push]

 jobs:
  Explore-Gitea-Actions:
-    runs-on: linux_amd64
+    runs-on: ubuntu_latest
    steps:
      - run: echo "The job was automatically triggered by a ${{ gitea.event_name }} event."
      - run: echo "This job is now running on a ${{ runner.os }} server hosted by Gitea!"
--- a/.gitignore
+++ b/.gitignore
@ -14,10 +14,27 @@ Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
-*.sql
-/.idea
-/.vscode
-resources/views/tmp/*
+
+# Laravel 4 specific
+bootstrap/compiled.php
+app/storage/
+
+# Laravel 5 & Lumen specific
+public/storage
+public/hot
+
+# Laravel 5 & Lumen specific with changed public path
+public_html/storage
+public_html/hot
+
+storage/*.key
+storage/app/*
+storage/logs
+.env
+Homestead.yaml
+Homestead.json
+/.vagrant
+.phpunit.result.cache

 public/ovpn_config.ovpn
 *.txt
--- a/app/Http/Controllers/FullCalenderController.php
+++ b/app/Http/Controllers/FullCalenderController.php
@ -48,6 +48,7 @@ class FullCalenderController extends Controller
           case 'add':
              $event = Event::create([
                  'title' => $request->title,
+                  'description' => $request->description,
                  'start' => $request->start,
                  'end' => $request->end,
              ]);
@ -57,6 +58,7 @@ class FullCalenderController extends Controller
           case 'update':
              $event = Event::find($request->id)->update([
                  'title' => $request->title,
+                  'description' => $request->description,
                  'start' => $request->start,
                  'end' => $request->end,
              ]);
--- a/app/Models/Categorie.php
+++ b/app/Models/Categorie.php
@ -21,7 +21,8 @@ class Categorie extends Model
    }
    public static function listCategorieAPI()
 	{
-	 return self::select('cat_name')->pluck('cat_name');
+	 // return self::select('cat_name')->pluck('cat_name');
+     return Categorie::orderBy('cat_name')->get();
 	}
    public static function listSpesa()
    {
--- a/app/Models/Event.php
+++ b/app/Models/Event.php
@ -21,7 +21,7 @@ class Event extends Model
  

    protected $fillable = [
-        'title', 'start', 'end'
+        'title','description', 'start', 'end'
    ];

 }
--- a/app/Models/Movimenti.php
+++ b/app/Models/Movimenti.php
@ -184,31 +184,43 @@ JOIN categories as c ON a.mov_fk_categoria=c.id';
    public static function importEstrattoIng($filename)
    {
        $inputPath='/var/www/html/bubofamily/public/storage/'.$filename;
-        $outputPath='/var/www/html/bubofamily/public/'.$filename;
+        // $outputPath='/var/www/html/bubofamily/public/'.$filename.'.csv';
+        $outputPath = $inputPath.'.csv';
        rename($inputPath,$outputPath);
-
-        $collection = (new FastExcel)->import($filename, function ($line){
-            if($line['Data valuta'])
+        $collection = (new FastExcel)->configureCsv(";")->import($outputPath, function ($line){
+            if($line['DATA VALUTA'])
            {
+                if($line['ENTRATE']!=null)
+                {
+                    $importo = $line['ENTRATE'];
+                } elseif($line['USCITE']!=null)
+                {
+                    $importo = $line['USCITE'];
+                }
+                $euro=str_replace(',','.',str_replace('+','',str_replace('.','', $importo)));
+                list($giorno,$mese,$anno) = explode('/',$line['DATA VALUTA']);
+                $data="$anno-$mese-$giorno";
                self::insEntrata([
-                    'mov_data'=>self::dateFormat(0,$line['Data valuta']),
+                    'mov_data'=>self::dateFormat(0,$line['DATA VALUTA']),
                    'mov_fk_categoria'=>1,
-                    'mov_descrizione'=>$line['Descrizione operazione'],
-                    'mov_importo'=>trim(str_replace(',','.',(str_replace('.','',str_replace('€', '', $line['Importo']))))),
+                    'mov_descrizione'=>$line['DESCRIZIONE OPERAZIONE'],
+                    'mov_importo'=>$euro,
                    'mov_fk_tags'=>1,
                    'userid'=>1,
                ]);
            }
        });
+        unlink($outputPath);
    }

    public static function importEstrattoCR($filename)
    {
        $inputPath='/var/www/html/bubofamily/public/storage/'.$filename;
-        $outputPath='/var/www/html/bubofamily/public/'.$filename.'.csv';
+        // $outputPath='/var/www/html/bubofamily/public/'.$filename.'.csv';
+        $outputPath = $inputPath.'.csv';
        rename($inputPath,$outputPath);

-        $collection = (new FastExcel)->configureCsv(';')->import($filename.'.csv', function ($line){
+        $collection = (new FastExcel)->configureCsv(';')->import($outputPath, function ($line){
            if($line['VALUTA'])
            {
                if($line['DARE']<>'')
@ -239,6 +251,7 @@ JOIN categories as c ON a.mov_fk_categoria=c.id';
                self::insEntrata($dati);
            }
        });
+        unlink($outputPath);
    }

    public static function getYearsFromMovimenti()
--- a/app/Models/tag.php
+++ b/app/Models/tag.php
@ -16,7 +16,9 @@ class tag extends Model

 	public static function getApiList()
 	{
-		return self::select('tag_name')->pluck('tag_name');
+		//return self::select('tag_name')->pluck('tag_name');
+        return tag::orderBy('tag_name')->get();
+        // return self::select('tag_name');
 	}

    public static function inserisci($param) {
--- a/composer.json
+++ b/composer.json
@ -8,7 +8,7 @@
 	],
 	"license" : "MIT",
 	"require" : {
-		"php": "^7.3|^8.0",
+		"php": "^7.3|^8.0|^8.3",
 		"barryvdh/laravel-dompdf": "^2.0",
 		"creativeorange/gravatar": "^1.0",
 		"directorytree/ldaprecord": "^2.9",
@ -22,6 +22,7 @@
 		"laravel/tinker": "^2.5",
 		"laravel/ui": "^3.4",
 		"laraveldaily/laravel-charts": "^0.1.29",
+		"milon/barcode": "^11.0",
 		"nesbot/carbon": "^2.71",
 		"pcloud/pcloud-php-sdk": "^3.0",
 		"rap2hpoutre/fast-excel": "^3.2",
--- 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": "c58658999463fa4485159d5f4dde1d96",
+    "content-hash": "00d6550702f98e31543eea85f7e7e646",
    "packages": [
        {
            "name": "almasaeed2010/adminlte",
@ -3283,6 +3283,80 @@
            },
            "time": "2024-03-31T07:05:07+00:00"
        },
+        {
+            "name": "milon/barcode",
+            "version": "v11.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/milon/barcode.git",
+                "reference": "1f4031adb52146bb7fbe88ef42214011376f9cbe"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/milon/barcode/zipball/1f4031adb52146bb7fbe88ef42214011376f9cbe",
+                "reference": "1f4031adb52146bb7fbe88ef42214011376f9cbe",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/support": "^7.0|^8.0|^9.0|^10.0 | ^11.0",
+                "php": "^7.3 | ^8.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Milon\\Barcode\\BarcodeServiceProvider"
+                    ],
+                    "aliases": {
+                        "DNS1D": "Milon\\Barcode\\Facades\\DNS1DFacade",
+                        "DNS2D": "Milon\\Barcode\\Facades\\DNS2DFacade"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Milon\\Barcode": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Nuruzzaman Milon",
+                    "email": "contact@milon.im"
+                }
+            ],
+            "description": "Barcode generator like Qr Code, PDF417, C39, C39+, C39E, C39E+, C93, S25, S25+, I25, I25+, C128, C128A, C128B, C128C, 2-Digits UPC-Based Extention, 5-Digits UPC-Based Extention, EAN 8, EAN 13, UPC-A, UPC-E, MSI (Variation of Plessey code)",
+            "keywords": [
+                "CODABAR",
+                "CODE 128",
+                "CODE 39",
+                "barcode",
+                "datamatrix",
+                "ean",
+                "laravel",
+                "pdf417",
+                "qr code",
+                "qrcode"
+            ],
+            "support": {
+                "issues": "https://github.com/milon/barcode/issues",
+                "source": "https://github.com/milon/barcode/tree/v11.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://paypal.me/nuruzzamanmilon",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/milon",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-02-28T18:14:32+00:00"
+        },
        {
            "name": "monolog/monolog",
            "version": "2.9.3",
@ -11542,8 +11616,8 @@
    "prefer-stable": true,
    "prefer-lowest": false,
    "platform": {
-        "php": "^7.3|^8.0"
+        "php": "^7.3|^8.0|^8.3"
    },
    "platform-dev": [],
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.3.0"
 }
--- a/config/app.php
+++ b/config/app.php
@ -162,7 +162,7 @@ return [
        Illuminate\Validation\ValidationServiceProvider::class,
        Illuminate\View\ViewServiceProvider::class,
        Creativeorange\Gravatar\GravatarServiceProvider::class,
-       
+        Milon\Barcode\BarcodeServiceProvider::class,

        /*
         * Package Service Providers...
@ -192,7 +192,6 @@ return [
    */

    'aliases' => [
-
        'App' => Illuminate\Support\Facades\App::class,
        'Arr' => Illuminate\Support\Arr::class,
        'Artisan' => Illuminate\Support\Facades\Artisan::class,
@ -234,7 +233,7 @@ return [
        'View' => Illuminate\Support\Facades\View::class,
        'FastExcel' => Rap2hpoutre\FastExcel\Facades\FastExcel::class,
        'Gravatar' => Creativeorange\Gravatar\Facade\Gravatar::class,
-
+        'DNS1D' => Milon\Barcode\Facades\DNS1DFacade::class,
+        'DNS2D' => Milon\Barcode\Facades\DNS2DFacade::class,
    ],
-
 ];
--- a/config/barcode.php
+++ b/config/barcode.php
@ -0,0 +1,5 @@
+<?php
+
+return [
+    'store_path' => public_path("/"),
+];
--- a/config/imap.php
+++ b/config/imap.php
@ -0,0 +1,199 @@
+<?php
+/*
+* File:     imap.php
+* Category: config
+* Author:   M. Goldenbaum
+* Created:  24.09.16 22:36
+* Updated:  -
+*
+* Description:
+*  -
+*/
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | IMAP default account
+    |--------------------------------------------------------------------------
+    |
+    | The default account identifier. It will be used as default for any missing account parameters.
+    | If however the default account is missing a parameter the package default will be used.
+    | Set to 'false' [boolean] to disable this functionality.
+    |
+    */
+    'default' => env('IMAP_DEFAULT_ACCOUNT', 'default'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default date format
+    |--------------------------------------------------------------------------
+    |
+    | The default date format is used to convert any given Carbon::class object into a valid date string.
+    | These are currently known working formats: "d-M-Y", "d-M-y", "d M y"
+    |
+    */
+    'date_format' => 'd-M-Y',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Available IMAP accounts
+    |--------------------------------------------------------------------------
+    |
+    | Please list all IMAP accounts which you are planning to use within the
+    | array below.
+    |
+    */
+    'accounts' => [
+
+        'default' => [// account identifier
+            'host'  => env('IMAP_HOST', 'localhost'),
+            'port'  => env('IMAP_PORT', 993),
+            'protocol'  => env('IMAP_PROTOCOL', 'imap'), //might also use imap, [pop3 or nntp (untested)]
+            'encryption'    => env('IMAP_ENCRYPTION', 'ssl'), // Supported: false, 'ssl', 'tls', 'notls', 'starttls'
+            'validate_cert' => env('IMAP_VALIDATE_CERT', true),
+            'username' => env('IMAP_USERNAME', 'root@example.com'),
+            'password' => env('IMAP_PASSWORD', ''),
+            'authentication' => env('IMAP_AUTHENTICATION', null),
+            'proxy' => [
+                'socket' => null,
+                'request_fulluri' => false,
+                'username' => null,
+                'password' => null,
+            ]
+        ],
+
+        /*
+        'gmail' => [ // account identifier
+            'host' => 'imap.gmail.com',
+            'port' => 993,
+            'encryption' => 'ssl',
+            'validate_cert' => true,
+            'username' => 'example@gmail.com',
+            'password' => 'PASSWORD',
+            'authentication' => 'oauth',
+        ],
+
+        'another' => [ // account identifier
+            'host' => '',
+            'port' => 993,
+            'encryption' => false,
+            'validate_cert' => true,
+            'username' => '',
+            'password' => '',
+            'authentication' => null,
+        ]
+        */
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Available IMAP options
+    |--------------------------------------------------------------------------
+    |
+    | Available php imap config parameters are listed below
+    |   -Delimiter (optional):
+    |       This option is only used when calling $oClient->
+    |       You can use any supported char such as ".", "/", (...)
+    |   -Fetch option:
+    |       IMAP::FT_UID  - Message marked as read by fetching the message body
+    |       IMAP::FT_PEEK - Fetch the message without setting the "seen" flag
+    |   -Fetch sequence id:
+    |       IMAP::ST_UID  - Fetch message components using the message uid
+    |       IMAP::ST_MSGN - Fetch message components using the message number
+    |   -Body download option
+    |       Default TRUE
+    |   -Flag download option
+    |       Default TRUE
+    |   -Message key identifier option
+    |       You can choose between 'id', 'number' or 'list'
+    |       'id'     - Use the MessageID as array key (default, might cause hickups with yahoo mail)
+    |       'number' - Use the message number as array key (isn't always unique and can cause some interesting behavior)
+    |       'list'   - Use the message list number as array key (incrementing integer (does not always start at 0 or 1)
+    |       'uid'    - Use the message uid as array key (isn't always unique and can cause some interesting behavior)
+    |   -Fetch order
+    |       'asc'  - Order all messages ascending (probably results in oldest first)
+    |       'desc' - Order all messages descending (probably results in newest first)
+    |   -Disposition types potentially considered an attachment
+    |       Default ['attachment', 'inline']
+    |   -Common folders
+    |       Default folder locations and paths assumed if none is provided
+    |   -Open IMAP options:
+    |       DISABLE_AUTHENTICATOR - Disable authentication properties.
+    |                               Use 'GSSAPI' if you encounter the following
+    |                               error: "Kerberos error: No credentials cache
+    |                               file found (try running kinit) (...)"
+    |                               or ['GSSAPI','PLAIN'] if you are using outlook mail
+    |   -Decoder options (currently only the message subject and attachment name decoder can be set)
+    |       'utf-8' - Uses imap_utf8($string) to decode a string
+    |       'mimeheader' - Uses mb_decode_mimeheader($string) to decode a string
+    |
+    */
+    'options' => [
+        'delimiter' => '/',
+        'fetch' => \Webklex\PHPIMAP\IMAP::FT_PEEK,
+        'sequence' => \Webklex\PHPIMAP\IMAP::ST_MSGN,
+        'fetch_body' => true,
+        'fetch_flags' => true,
+        'message_key' => 'list',
+        'fetch_order' => 'asc',
+        'dispositions' => ['attachment', 'inline'],
+        'common_folders' => [
+            "root" => "INBOX",
+            "junk" => "INBOX/Junk",
+            "draft" => "INBOX/Drafts",
+            "sent" => "INBOX/Sent",
+            "trash" => "INBOX/Trash",
+        ],
+        'open' => [
+            // 'DISABLE_AUTHENTICATOR' => 'GSSAPI'
+        ],
+        'decoder' => [
+            'message' => 'utf-8', // mimeheader
+            'attachment' => 'utf-8' // mimeheader
+        ]
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Available events
+    |--------------------------------------------------------------------------
+    |
+    */
+    'events' => [
+        "message" => [
+            'new' => \Webklex\IMAP\Events\MessageNewEvent::class,
+            'moved' => \Webklex\IMAP\Events\MessageMovedEvent::class,
+            'copied' => \Webklex\IMAP\Events\MessageCopiedEvent::class,
+            'deleted' => \Webklex\IMAP\Events\MessageDeletedEvent::class,
+            'restored' => \Webklex\IMAP\Events\MessageRestoredEvent::class,
+        ],
+        "folder" => [
+            'new' => \Webklex\IMAP\Events\FolderNewEvent::class,
+            'moved' => \Webklex\IMAP\Events\FolderMovedEvent::class,
+            'deleted' => \Webklex\IMAP\Events\FolderDeletedEvent::class,
+        ],
+        "flag" => [
+            'new' => \Webklex\IMAP\Events\FlagNewEvent::class,
+            'deleted' => \Webklex\IMAP\Events\FlagDeletedEvent::class,
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Available masking options
+    |--------------------------------------------------------------------------
+    |
+    | By using your own custom masks you can implement your own methods for
+    | a better and faster access and less code to write.
+    |
+    | Checkout the two examples custom_attachment_mask and custom_message_mask
+    | for a quick start.
+    |
+    | The provided masks below are used as the default masks.
+    */
+    'masks' => [
+        'message' => \Webklex\PHPIMAP\Support\Masks\MessageMask::class,
+        'attachment' => \Webklex\PHPIMAP\Support\Masks\AttachmentMask::class
+    ]
+];
--- a/public/css/app.css
+++ b/public/css/app.css
@ -1,5 +1,4 @@
@import url(https://fonts.googleapis.com/css?family=Nunito);
-
@charset "UTF-8";
 /*!
 * Bootstrap v5.1.3 (https://getbootstrap.com/)
--- a/resources/views/admin.blade.php
+++ b/resources/views/admin.blade.php
@ -33,7 +33,7 @@
            <!-- Navigation -->
            <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
                <div class="navbar-header">
-                    <a class="navbar-brand" href="#">{{ env('APP_NAME'); }}</a>
+                    <a class="navbar-brand" href="#">{{ env('APP_NAME') }}</a>
                </div>

                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
@ -59,7 +59,7 @@
                        <ul class="nav" id="side-menu">
                            <li class="sidebar-search">
                            <!-- input group
-                                <!--<div class="input-group custom-search-form">
+                                <div class="input-group custom-search-form">
                                    <input type="text" class="form-control" placeholder="Search...">
                                    <span class="input-group-btn">
                                        <button class="btn btn-primary" type="button">
--- a/resources/views/anagrafica/altrocontatto.blade.php
+++ b/resources/views/anagrafica/altrocontatto.blade.php
@ -22,7 +22,7 @@
                    		<label for="ang_nome" class="form-label">Tipo:</label>
                    		<select name="cnt_tipo" id="cnt_tipo">
                    		@foreach($tipo as $typeid=>$value)
-                    			<option value="{{ $typeid; }}">{{ $value }}</option>
+                    			<option value="{{ $typeid }}">{{ $value }}</option>
                    		@endforeach
                    		</select>
                    	</div>
--- a/resources/views/anagrafica/list.blade.php
+++ b/resources/views/anagrafica/list.blade.php
@ -35,13 +35,13 @@
                    		<tbody>
                    		@foreach($anagrafiche ?? '' as $anagrafica)
                        		<tr>
-                        			<td><a href="contatti/scheda?id={{ $anagrafica->id; }}">{{ $anagrafica->ang_cognome; }}</a></td>
-                        			<td>{{ $anagrafica->ang_nome; }}</td>
-                        			<td>{{ $anagrafica->ang_Citta; }}</td>
-                        			<td>{{ $anagrafica->ang_telefono; }}</td>
+                        			<td><a href="contatti/scheda?id={{ $anagrafica->id }}">{{ $anagrafica->ang_cognome }}</a></td>
+                        			<td>{{ $anagrafica->ang_nome }}</td>
+                        			<td>{{ $anagrafica->ang_Citta }}</td>
+                        			<td>{{ $anagrafica->ang_telefono }}</td>
                        			<td>
-                        				<a class="btn btn-primary" href="contatti/modifica?id={{ $anagrafica->id; }}">Modifica</a>&nbsp;
-                        				<a class="btn btn-danger" href="contatti/cancella?id={{ $anagrafica->id; }}">Cancella</a>&nbsp;
+                        				<a class="btn btn-primary" href="contatti/modifica?id={{ $anagrafica->id }}">Modifica</a>&nbsp;
+                        				<a class="btn btn-danger" href="contatti/cancella?id={{ $anagrafica->id }}">Cancella</a>&nbsp;
                        			</td>
                        		</tr>
                    		@endforeach
--- a/resources/views/auto/detail.blade.php
+++ b/resources/views/auto/detail.blade.php
@ -1,7 +1,7 @@
@extends('adminlte::page')

@section('content_header')
-	<h1>{{ $dettagli->marca; }} {{ $dettagli->modello; }} targa: {{ $dettagli->targa; }}</h1>
+	<h1>{{ $dettagli->marca }} {{ $dettagli->modello }} targa: {{ $dettagli->targa }}</h1>
@endsection

@section('content')
@ -10,7 +10,7 @@

 <div class="row">
 	<div class="col-lg-12">
- 	<a class="btn btn-primary" href="operazioni/pdf?id={{ $dettagli->id; }}">Esporta PDF</a>
+ 	<a class="btn btn-primary" href="operazioni/pdf?id={{ $dettagli->id }}">Esporta PDF</a>
 	</div>
 	</div>
 	<div class="row">
@ -41,17 +41,17 @@
            		<tbody>

            		<tr>
-            			<td>{{ $dettagli->marca; }}</td>
-            			<td>{{ $dettagli->modello; }}</td>
-            			<td>{{ $dettagli->targa; }}</td>
-            			<td>{{ $dettagli->alimentazione; }}</td>
-            			<td>{{ $dettagli->cilindrata; }}</td>
-            			<td>{{ $dettagli->cvfiscali; }}</td>
-            			<td>{{ $dettagli->ntelaio; }}</td>
-            			<td>{{ $dettagli->nmotore; }}</td>
-            			<td>{{ $dettagli->data_acquisto; }}</td>
-            			<td>{{ $km ?? ''; }}</td>
-            			<td>{{ $dettagli->note; }}</td>
+            			<td>{{ $dettagli->marca }}</td>
+            			<td>{{ $dettagli->modello }}</td>
+            			<td>{{ $dettagli->targa }}</td>
+            			<td>{{ $dettagli->alimentazione }}</td>
+            			<td>{{ $dettagli->cilindrata }}</td>
+            			<td>{{ $dettagli->cvfiscali }}</td>
+            			<td>{{ $dettagli->ntelaio }}</td>
+            			<td>{{ $dettagli->nmotore }}</td>
+            			<td>{{ $dettagli->data_acquisto }}</td>
+            			<td>{{ $km ?? '' }}</td>
+            			<td>{{ $dettagli->note }}</td>
            		</tr>

            		</tbody>
@ -88,17 +88,17 @@
            		@foreach($operazione as $operazioni)
            		@if ($operazioni->type =='revisione')
            		<tr>
-            			<td>{{ date_format(date_create($operazioni->data),'d/m/Y'); }}</td>
-            			<td>{{ $operazioni->km; }}</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>
            			@else
            			<td>Non superata</td>
            			@endif
-            			<td>{{ $revisione[$operazioni->id][0]->centrorevisione; }}</td>
-            			<td>{{ $revisione[$operazioni->id][0]->descrizione; }}</td>
-            			<td>{{ $revisione[$operazioni->id][0]->dataproxrevisione; }}</td>
-            			<td>{{ $operazioni->importo; }}</td>
+            			<td>{{ $revisione[$operazioni->id][0]->centrorevisione }}</td>
+            			<td>{{ $revisione[$operazioni->id][0]->descrizione }}</td>
+            			<td>{{ $revisione[$operazioni->id][0]->dataproxrevisione }}</td>
+            			<td>{{ $operazioni->importo }}</td>
            		</tr>
            		@endif
            		@endforeach
@ -135,10 +135,10 @@
            		@foreach($operazione as $operazioni)
            		@if ($operazioni->type =='manutenzione')
            		<tr>
-            			<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>
+            			<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>
            		</tr>
            		@endif
            		@endforeach
@ -175,10 +175,10 @@
            		@foreach($operazione as $operazioni)
            		@if ($operazioni->type=='accessori')
            		<tr>
-            			<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>
+            			<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>
            		</tr>
            		@endif
            		@endforeach
@ -217,12 +217,12 @@
            		@foreach($operazione as $operazioni)
            		@if ($operazioni->type =='rifornimento')
            		<tr>
-            			<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>
-            			<td>{{ $rifornimento[$operazioni->id][0]->litri; }}</td>
-            			<td>{{ $operazioni->importo; }}</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>
+            			<td>{{ $rifornimento[$operazioni->id][0]->litri }}</td>
+            			<td>{{ $operazioni->importo }}</td>
            		</tr>
            		@endif
            		@endforeach
--- a/resources/views/auto/detailpdf.blade.php
+++ b/resources/views/auto/detailpdf.blade.php
@ -34,7 +34,7 @@ table{
 	<div class="container">
    	<!-- Content here -->

-	<span class="titolo"><h1>Scheda {{ $dettagli->marca; }} {{ $dettagli->modello; }} - {{ $dettagli->targa; }}</h1></span>
+	<span class="titolo"><h1>Scheda {{ $dettagli->marca}} {{ $dettagli->modello}} - {{ $dettagli->targa}}</h1></span>
 	<div class="row">
 	<div class="col-lg-12">
    	<div class="panel panel-default">
@ -45,24 +45,24 @@ table{
            	<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>
+            				<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>
-            				<th>Cilindrata:</th><td>{{ $dettagli->cilindrata; }}</td>
-            				<th>Cavalli Fisc.:</th><td>{{ $dettagli->cvfiscali; }}</td>
+            				<th>Alimentazione:</th><td>{{ $dettagli->alimentazione}}</td>
+            				<th>Cilindrata:</th><td>{{ $dettagli->cilindrata}}</td>
+            				<th>Cavalli Fisc.:</th><td>{{ $dettagli->cvfiscali}}</td>
            			</tr>
            			<tr>
-            				<th>Num.Telaio:</th><td>{{ $dettagli->ntelaio; }}</td>
-            				<th>Num. Motore:</th><td>{{ $dettagli->nmotore; }}</td>
-            				<th>Data acquisto:</th><td>{{ $dettagli->data_acquisto; }}</td>
+            				<th>Num.Telaio:</th><td>{{ $dettagli->ntelaio}}</td>
+            				<th>Num. Motore:</th><td>{{ $dettagli->nmotore}}</td>
+            				<th>Data acquisto:</th><td>{{ $dettagli->data_acquisto}}</td>
            			</tr>
            			<tr>
-            				<th>Kilometraggio:</th><td>{{ $km ?? ''; }}</td>
-            				<th>Note:</th><td>{{ $dettagli->note; }}</td>
+            				<th>Kilometraggio:</th><td>{{ $km ?? ''}}</td>
+            				<th>Note:</th><td>{{ $dettagli->note}}</td>
            			</tr>
            		</table>
            	</div>
@ -97,13 +97,13 @@ table{
            		@foreach($operazione as $operazioni)
            		@if ($operazioni->type =='revisione')
            		<tr>
-            			<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>
-            			<td>{{ $revisione[$operazioni->id][0]->descrizione; }}</td>
-            			<td>{{ $revisione[$operazioni->id][0]->dataproxrevisione; }}</td>
-            			<td>{{ $operazioni->importo; }}</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>
+            			<td>{{ $revisione[$operazioni->id][0]->descrizione}}</td>
+            			<td>{{ $revisione[$operazioni->id][0]->dataproxrevisione}}</td>
+            			<td>{{ $operazioni->importo}}</td>
            		</tr>
            		@endif
            		@endforeach
@ -140,10 +140,10 @@ table{
            		@foreach($operazione as $operazioni)
            		@if ($operazioni->type =='manutenzione')
            		<tr>
-            			<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>
+            			<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>
            		</tr>
            		@endif
            		@endforeach
@ -180,10 +180,10 @@ table{
            		@foreach($operazione as $operazioni)
            		@if ($operazioni->type=='accessori')
            		<tr>
-            			<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>
+            			<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>
            		</tr>
            		@endif
            		@endforeach
@ -222,12 +222,12 @@ table{
            		@foreach($operazione as $operazioni)
            		@if ($operazioni->type =='rifornimento')
            		<tr>
-            			<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>
-            			<td>{{ $rifornimento[$operazioni->id][0]->litri; }}</td>
-            			<td>{{ $operazioni->importo; }}</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>
+            			<td>{{ $rifornimento[$operazioni->id][0]->litri}}</td>
+            			<td>{{ $operazioni->importo}}</td>
            		</tr>
            		@endif
            		@endforeach
--- a/resources/views/auto/list.blade.php
+++ b/resources/views/auto/list.blade.php
@ -41,32 +41,32 @@
 								@foreach($automobili ?? '' as $automobile)
 								<tr>
 									<td><a href="auto/detail?id={{ $automobile->id }}">{{
-											$automobile->marca; }}</a></td>
-									<td>{{ $automobile->modello; }}</td>
-									<td>{{ $automobile->targa; }}</td>
+											$automobile->marca}}</a></td>
+									<td>{{ $automobile->modello}}</td>
+									<td>{{ $automobile->targa}}</td>
 									<td>
 										<button class="btn btn-primary open_modal_rifornimento"
-											value="{{ $automobile->id; }}">
+											value="{{ $automobile->id}}">
 											<span class="material-symbols-outlined">local_gas_station</span>
 										</button>&nbsp;
 										<button class="btn btn-primary open_modal_revisione"
-											value="{{ $automobile->id; }}">
+											value="{{ $automobile->id}}">
 											<span class="material-symbols-outlined"> checklist </span>
 										</button>&nbsp;
 										<button class="btn btn-primary open_modal_manutenzione"
-											value="{{ $automobile->id; }}">
+											value="{{ $automobile->id}}">
 											<span class="material-symbols-outlined"> plumbing </span>
 										</button>&nbsp;
 										<button class="btn btn-primary open_modal_accessori"
-											value="{{ $automobile->id; }}">
+											value="{{ $automobile->id}}">
 											<span class="material-symbols-outlined"> park </span>
 										</button>&nbsp;
 									</td>
 									<td>
 										<button class="btn btn-primary open_modal_modify"
-											value="{{ $automobile->id; }}">Edit</button>
+											value="{{ $automobile->id}}">Edit</button>
                                            &nbsp; <a class="btn btn-danger"
-										href="auto/delete?id={{ $automobile->id; }}">Canc.</a>&nbsp;
+										href="auto/delete?id={{ $automobile->id}}">Canc.</a>&nbsp;
 									</td>
 								</tr>
 								@endforeach
--- a/resources/views/calendario/fullcalendar.blade.php
+++ b/resources/views/calendario/fullcalendar.blade.php
@ -27,7 +27,7 @@
 					Titolo:
 					<input type='text' class="form-control" name="title"/>
 					Descrizione:
-					<textarea class="form-control" name="descrizione"></textarea>
+					<textarea class="form-control" name="description"></textarea>
 					<hr>
 					<input type="submit" name="Submit">
 				</form>
--- a/resources/views/components/chartGas.blade.php
+++ b/resources/views/components/chartGas.blade.php
@ -23,7 +23,7 @@
 				$mediagg =($differenza/$diffdate);
 			}
 			@endphp
-          ['{{ $lettura->gas_date; }}', {{ $mediagg ?? '0' }}],
+          ['{{ $lettura->gas_date }}', {{ $mediagg ?? '0' }}],
        	 @php
 				$dateprec=$lettura->gas_date; 
 				$lettprec=$lettura->gas_lettura;
--- a/resources/views/components/charts.blade.php
+++ b/resources/views/components/charts.blade.php
@ -10,7 +10,7 @@
    var data = google.visualization.arrayToDataTable([
      ['Categoria', 'resoconto'],
      @foreach($dataSpesa as $dato)
-      ['{{ $dato->cat_name; }}', {{ $dato->resoconto }}],
+      ['{{ $dato->cat_name }}', {{ $dato->resoconto }}],
      @endforeach
    ]);

@ -32,7 +32,7 @@
    var data = google.visualization.arrayToDataTable([
      ['Categoria', 'resoconto'],
      @foreach($dataEntrate as $dato)
-      ['{{ $dato->cat_name; }}', {{ $dato->resoconto }}],
+      ['{{ $dato->cat_name }}', {{ $dato->resoconto }}],
      @endforeach
    ]);

--- a/resources/views/components/menu.blade.php
+++ b/resources/views/components/menu.blade.php
@ -5,25 +5,25 @@
 		class="fa arrow"></span></a>

 	<ul class="nav nav-second-level">
-		<li><a href="{{ route('movimenti'); }}">Lista Movimenti</a></li>
-		<li><a href="{{ route('categorie'); }}">Categorie</a></li>
-		<li><a href="{{ route('tags'); }}">Tags</a></li>
-		<li><a href="{{ route('resoconto'); }}">Resoconto Movimenti</a></li>
-		<li><a href="{{ route('budget'); }}">Report Annuale Movimenti</a></li>
+		<li><a href="{{ route('movimenti') }}">Lista Movimenti</a></li>
+		<li><a href="{{ route('categorie') }}">Categorie</a></li>
+		<li><a href="{{ route('tags') }}">Tags</a></li>
+		<li><a href="{{ route('resoconto') }}">Resoconto Movimenti</a></li>
+		<li><a href="{{ route('budget') }}">Report Annuale Movimenti</a></li>
 		<li><a href="#">Import / Export<span class="fa arrow"></span></a>
 			<ul class="nav nav-third-level">
-				<li><a href="{{ route('export'); }}"><i
+				<li><a href="{{ route('export') }}"><i
 						class="fa fa-download  fa-fw"></i>Esporta tutti i movimenti</a></li>
-				<li><a href="{{ route('importING'); }}"><i
+				<li><a href="{{ route('importING') }}"><i
 						class="fa fa-upload  fa-fw"></i>Importa Estratto ING</a></li>
-				<li><a href="{{ route('importCR'); }}"><i
+				<li><a href="{{ route('importCR') }}"><i
 						class="fa fa-upload  fa-fw"></i>Importa Estratto CR</a></li>
 			</ul></li>

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

 	<ul class="nav nav-second-level">
-		<li><a href="{{ route('gas'); }}"><i class="fa fa-fire  fa-fw"></i>GAS</a>
+		<li><a href="{{ route('gas') }}"><i class="fa fa-fire  fa-fw"></i>GAS</a>

 		</li>
-		<li><a href="{{ route('enel'); }}"><i class="fa fa-flash  fa-fw"></i>Energia
+		<li><a href="{{ route('enel')}}"><i class="fa fa-flash  fa-fw"></i>Energia
 				Elettrica</a></li>
 	</ul>
 </li>
@endcan @can('automobili')
-<li><a href="{{ route('auto_list'); }}"><i class="fa fa-car fa-fw"></i>
+<li><a href="{{ route('auto_list')}}"><i class="fa fa-car fa-fw"></i>
 		Automobili <span class="fa arrow"></span></a></li>
@endcan @can('contatti')
 <li><a href="#"><i class="fa fa-phone-square fa-fw"></i> Contatti <span
 		class="fa arrow"></span></a>

 	<ul class="nav nav-second-level">
-		<li><a href="{{ route('contatti'); }}"><i class="fa fa-list  fa-fw"></i>Rubrica</a>
+		<li><a href="{{ route('contatti')}}"><i class="fa fa-list  fa-fw"></i>Rubrica</a>

 		</li>
-		<li><a href="{{ route('newContact'); }}"><i class="fa fa-plus  fa-fw"></i>Nuovo
+		<li><a href="{{ route('newContact')}}"><i class="fa fa-plus  fa-fw"></i>Nuovo
 				contatto</a></li>
 	</ul></li>
@endcan @can('progetti')
-<li><a href="{{ route('progetti'); }}"><i class="fa fa-list fa-fw"></i>
+<li><a href="{{ route('progetti')}}"><i class="fa fa-list fa-fw"></i>
 		Progetti <span class="fa arrow"></span></a></li>

@endcan
@can('tasks')
-<li><a href="{{ route('tasks'); }}"><i class="fa fa-list fa-fw"></i>
+<li><a href="{{ route('tasks')}}"><i class="fa fa-list fa-fw"></i>
 		Attività <span class="fa arrow"></span></a></li>

@endcan
--- a/resources/views/components/usermenu.blade.php
+++ b/resources/views/components/usermenu.blade.php
@ -14,7 +14,7 @@
 		<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>
-		<li><a href="{{ route('logout'); }}"><i class="fa fa-sign-out fa-fw"></i>
+		<li><a href="{{ route('logout') }}"><i class="fa fa-sign-out fa-fw"></i>
 				Logout</a></li>
 	</ul></li>
    <!-- https://spatie.be/docs/laravel-permission/v5/basic-usage/new-app -->
--- a/resources/views/conti/categorie/list.blade.php
+++ b/resources/views/conti/categorie/list.blade.php
@ -24,6 +24,7 @@
 									<th>Categoria</th>
 									<th>Classificazione</th>
 									<th>Azione</th>
+									<!--<th>Test</th>-->
 								</tr>
 							</thead>
 							<tbody>
@ -31,7 +32,7 @@
 								<tr>
 									<td><a
 										href="movimenti/report/movimentibycat?cat={{ $categoria->id }}">{{
-											$categoria->cat_name; }}</a></td>
+											$categoria->cat_name}}</a></td>
 									<td>
 											@if($categoria->cat_entrata == 1)
 											Entrata ,
@ -44,9 +45,11 @@
 										<button class="btn btn-warning btn-detail open_modal"
 											value="{{$categoria->id}}">Edit</button>&nbsp; <a
 										class="btn btn-danger"
-										href="/admin/categorie/delete?id={{ $categoria->id; }}"><i
-											class="fa fa-trash-o fa-fw"></i></a>&nbsp;
+										href="/admin/categorie/delete?id={{ $categoria->id}}">Canc</a>&nbsp;
 									</td>
+									<!--<td>
+										<img src="data:image/png;base64,{{ DNS2D::getBarcodePNG('https://gestionale.lavorain.cloud/admin/movimenti/report/movimentibycat?cat='.$categoria->id, 'QRCODE');}}" alt="barcode"   />
+									</td>-->
 								</tr>
 								@endforeach
 							</tbody>
--- a/resources/views/conti/documenti/gendoc.blade.php
+++ b/resources/views/conti/documenti/gendoc.blade.php
@ -50,10 +50,10 @@
    					<tbody>
    					@foreach($documenti as $documento)
    					<tr>
-    						<td><a href="/storage/{{ $documento->filename; }}">{{ $documento->descrizione; }}</a></td>
+    						<td><a href="/storage/{{ $documento->filename}}">{{ $documento->descrizione}}</a></td>
    						<td>
-                				<a class="btn btn-primary" href="/admin/doc_update?id={{ $documento->id; }}"><i class="fa fa-pencil-square-o fw"></i></a>&nbsp;
-                				<a class="btn btn-danger" href="/admin/doc_delete?id={{ $documento->id; }}"><i class="fa fa-trash-o fa-fw"></i></a>&nbsp;
+                				<a class="btn btn-primary" href="/admin/doc_update?id={{ $documento->id}}"><i class="fa fa-pencil-square-o fw"></i></a>&nbsp;
+                				<a class="btn btn-danger" href="/admin/doc_delete?id={{ $documento->id}}"><i class="fa fa-trash-o fa-fw"></i></a>&nbsp;
            				</td>
    					</tr>
    					@endforeach
--- a/resources/views/conti/documenti/insert.blade.php
+++ b/resources/views/conti/documenti/insert.blade.php
@ -50,10 +50,10 @@
    					<tbody>
    					@foreach($documenti as $documento)
    					<tr>
-    						<td><a href="/storage/{{ $documento->filename; }}">{{ $documento->descrizione; }}</a></td>
+    						<td><a href="/storage/{{ $documento->filename}}">{{ $documento->descrizione}}</a></td>
    						<td>
-                				<a class="btn btn-primary" href="/admin/doc_update?id={{ $documento->id; }}"><i class="fa fa-pencil-square-o fw"></i></a>&nbsp;
-                				<a class="btn btn-danger" href="/admin/doc_delete?id={{ $documento->id; }}"><i class="fa fa-trash-o fa-fw"></i></a>&nbsp;
+                				<a class="btn btn-primary" href="/admin/doc_update?id={{ $documento->id}}"><i class="fa fa-pencil-square-o fw"></i></a>&nbsp;
+                				<a class="btn btn-danger" href="/admin/doc_delete?id={{ $documento->id}}"><i class="fa fa-trash-o fa-fw"></i></a>&nbsp;
            				</td>
    					</tr>
    					@endforeach
--- a/resources/views/conti/movimenti/list.blade.php
+++ b/resources/views/conti/movimenti/list.blade.php
@ -38,15 +38,15 @@
            		<tr>

            			<td>{{ $movimento->mov_data}}</td>
-                        <td>{{ $movimento->cat_name; }}</td>
-            			<td>{{ $movimento->mov_descrizione; }}</td>
-            			<td>&euro; {{ $movimento->mov_importo; }}</td>
+                        <td>{{ $movimento->cat_name}}</td>
+            			<td>{{ $movimento->mov_descrizione}}</td>
+            			<td>&euro; {{ $movimento->mov_importo}}</td>
            			<td>
-            				<button class="btn btn-warning btn-detail open_modal_modifica" value="{{ $movimento->id; }}">Edit</button>&nbsp;
-            				<a class="btn btn-danger" href="/admin/movimenti/delete?id={{ $movimento->id; }}">Canc.</a>&nbsp;
-            				<a class="btn btn-warning" href="/admin/movimenti/docs?entity=0&entity_id={{ $movimento->id; }}">Doc.</a>&nbsp;
+            				<button class="btn btn-warning btn-detail open_modal_modifica" value="{{ $movimento->id}}">Edit</button>&nbsp;
+            				<a class="btn btn-danger" href="/admin/movimenti/delete?id={{ $movimento->id}}">Canc.</a>&nbsp;
+            				<a class="btn btn-warning" href="/admin/movimenti/docs?entity=0&entity_id={{ $movimento->id}}">Doc.</a>&nbsp;
            				<!-- Definisce quanti documenti sono presenti per il record -->
-            				( {{ $movimento->quanti ?? ''; }} )
+            				( {{ $movimento->quanti ?? ''}} )
            			</td>
            		</tr>
            		@endforeach
@ -81,7 +81,7 @@
 								<div class="col-xs-6">
 									<label for="data" class="form-label">Data</label> <input
 										type="date" class="form-control" id="data" name="mov_data"
-										value="{{ date('Y-m-d'); }}">
+										value="{{ date('Y-m-d')}}">
 								</div>
 								<div class="col-xs-6">
 									<label for="categoria" class="form-label">Categoria</label> <select
--- a/resources/views/conti/movimenti/new.blade.php
+++ b/resources/views/conti/movimenti/new.blade.php
@ -17,13 +17,13 @@
                	<div class="row">
                    	<div class="col-xs-6">
                    		<label for="data" class="form-label">Data</label>
-                    		<input type="date" class="form-control" id="data" name="mov_data" value="{{ date('Y-m-d'); }}">
+                    		<input type="date" class="form-control" id="data" name="mov_data" value="{{ date('Y-m-d')}}">
                        </div>
                        <div class="col-xs-6">
                    		<label for="categoria" class="form-label">Categoria</label>
                    		<select name="mov_fk_categoria" class="form-control selectpicker" id="categoria" data-live-search="true" data-live-search-placeholder="Cerca opzioni">
                    			@foreach($categorie as $categoria)
-                    			<option value="{{ $categoria->id; }}">{{ $categoria->cat_name }}</option>
+                    			<option value="{{ $categoria->id}}">{{ $categoria->cat_name }}</option>
                    			@endforeach 
                    		</select>
                        </div>
@ -49,7 +49,7 @@
                        <label for="tags" class="form-label">Tag</label>
                		<select name="mov_fk_tags" class="form-control" id="tags">
                			@foreach($tags as $tag)
-                			<option value="{{ $tag->id; }}">{{ $tag->tag_name }}</option>
+                			<option value="{{ $tag->id}}">{{ $tag->tag_name }}</option>
                			@endforeach
                		</select>
                		</div>
--- a/resources/views/conti/report/list.blade.php
+++ b/resources/views/conti/report/list.blade.php
@ -26,8 +26,8 @@
            		<tbody>
            		@foreach( $dataSpesa as $dato )
            		<tr>
-            			<td><a href="/admin/movimenti/report/movimenti_categoria?cat={{ $dato->id }}&month={{ $_GET['Month'] ?? date('m')}}&year={{ date('Y') }}">{{ $dato->cat_name; }}</a> </td>
-            			<td>{{ $dato->resoconto; }}</td>
+            			<td><a href="/admin/movimenti/report/movimenti_categoria?cat={{ $dato->id }}&month={{ $_GET['Month'] ?? date('m')}}&year={{ date('Y') }}">{{ $dato->cat_name}}</a> </td>
+            			<td>{{ $dato->resoconto}}</td>

            		</tr>
            		@endforeach
@ -56,8 +56,8 @@
            		<tbody>
            		@foreach( $dataEntrate as $dato )
            		<tr>
-            			<td><a href="/admin/movimenti/report/movimenti_categoria?cat={{ $dato->id }}&month={{ $_GET['Month'] ?? date('m')}}&year={{ date('Y')}}">{{ $dato->cat_name; }}</a> </td>
-            			<td>{{ $dato->resoconto; }}</td>
+            			<td><a href="/admin/movimenti/report/movimenti_categoria?cat={{ $dato->id }}&month={{ $_GET['Month'] ?? date('m')}}&year={{ date('Y')}}">{{ $dato->cat_name}}</a> </td>
+            			<td>{{ $dato->resoconto}}</td>

            		</tr>
            		@endforeach
--- a/resources/views/conti/tags/list.blade.php
+++ b/resources/views/conti/tags/list.blade.php
@ -22,10 +22,10 @@
 				@foreach($tags as $tag)
 				<tr>
 					<td><a href="movimenti/filter/tags?tag={{ $tag->id }}">{{
-							$tag->tag_name; }}</a></td>
+							$tag->tag_name}}</a></td>
 					<td><button class="btn btn-warning btn-detail open_modal"
-							value="{{ $tag->id; }}">Edit</button>&nbsp; <a
-						class="btn btn-danger" href="/admin/tags/delete/{{ $tag->id; }}"><i
+							value="{{ $tag->id}}">Edit</button>&nbsp; <a
+						class="btn btn-danger" href="/admin/tags/delete/{{ $tag->id}}"><i
 							class="fa fa-trash-o fa-fw"></i></a>&nbsp;</td>
 				</tr>
 				@endforeach
--- a/resources/views/layouts/dashboard.blade.php
+++ b/resources/views/layouts/dashboard.blade.php
@ -12,7 +12,7 @@
@section('content')

 <div class="row">
-@hasanyrole('user|admin')
+@can('conti')

    <div class="col-lg-3 col-md-8 draggable">
        <div class="info-box bg-success">
@ -69,7 +69,7 @@
            </div>
        </div>
    </div>
-	@endhasanyrole
+	@endcan
 </div>

@can('tasks')
--- a/resources/views/letture/enel/list.blade.php
+++ b/resources/views/letture/enel/list.blade.php
@ -16,7 +16,7 @@
            		@csrf
                	<div class="mb-3">
                		<label for="data" class="form-label">Data</label>
-                		<input type="date" class="form-control" id="data" name="enel_date" value="{{ date('Y-m-d'); }}">
+                		<input type="date" class="form-control" id="data" name="enel_date" value="{{ date('Y-m-d')}}">
                    </div>
                    <div class="mb-3">
                		<label for="Attiva" class="form-label">Attiva (A)</label>
@ -63,11 +63,11 @@
            		@foreach($lettureEnel as $lettura)
            			<tr>
            				<td>{{ $lettura->enel_date }}</td>
-            				<td>{{ $lettura->enel_A; }}</td>
-            				<td>{{ $lettura->enel_R; }}</td>
-            				<td>{{ $lettura->enel_F1; }}</td>
-            				<td>{{ $lettura->enel_F2; }}</td>
-            				<td>{{ $lettura->enel_F3; }}</td>
+            				<td>{{ $lettura->enel_A}}</td>
+            				<td>{{ $lettura->enel_R}}</td>
+            				<td>{{ $lettura->enel_F1}}</td>
+            				<td>{{ $lettura->enel_F2}}</td>
+            				<td>{{ $lettura->enel_F3}}</td>
            				<td></td>
            			</tr>
            		@endforeach
--- a/resources/views/letture/gas/list.blade.php
+++ b/resources/views/letture/gas/list.blade.php
@ -31,7 +31,7 @@
            		@csrf
                	<div class="mb-3">
                		<label for="data" class="form-label">Data</label>
-                		<input type="date" class="form-control" id="data" name="gas_date" value="{{ date('Y-m-d'); }}">
+                		<input type="date" class="form-control" id="data" name="gas_date" value="{{ date('Y-m-d')}}">
                    </div>
                    <div class="mb-3">
                		<label for="Lettura" class="form-label">Lettura</label>
@ -74,7 +74,7 @@
            			@endphp
            			<tr>
            				<td>{{ $lettura->gas_date }}</td>
-            				<td>{{ $lettura->gas_lettura; }}</td>
+            				<td>{{ $lettura->gas_lettura}}</td>
            				@if(!is_null($dateprec))
                				<td>{{ $diffdate ?? '' }}</td>
            					<td>{{ $differenza ?? '' }}</td>
--- a/resources/views/progetti/dettaglio.blade.php
+++ b/resources/views/progetti/dettaglio.blade.php
@ -22,14 +22,14 @@
 					<div class="row">
 						<div class="col-xs-2">Nome:</div>
 						<div class="col-xs-8">
-							<b>{{ $progetto->nome; }}</b>
+							<b>{{ $progetto->nome}}</b>
 						</div>
 					</div>

 					<div class="row" hidable="">
 						<div class="col-xs-2">Descrizione</div>
 						<div class="col-xs-8">
-							<b>{{ $progetto->descrizione; }}</b>
+							<b>{{ $progetto->descrizione}}</b>
 						</div>
 					</div>
 					<div class="row" hidable="">
@ -73,7 +73,7 @@
 					<div class="row" hidable="">
 						<div class="col-xs-2">Note</div>
 						<div class="col-xs-8">
-							<b>{{ $progetto->note; }}</b>
+							<b>{{ $progetto->note}}</b>
 						</div>
 					</div>
 					@endforeach
--- a/resources/views/progetti/list.blade.php
+++ b/resources/views/progetti/list.blade.php
@ -38,11 +38,11 @@
 								@foreach($progetti ?? '' as $progetto)
 								<tr>
 									<td><a href="progetti/detail/{{ $progetto->progetto }}">{{
-											$progetto->nome; }}</a></td>
+											$progetto->nome}}</a></td>
 									<td>{{ $progetto->data_creazione}}</td>
-									<td>{{ $progetto->stato; }}</td>
-									<td>{{ $progetto->name; }}</td>
-									<td>{{ $progetto->budget; }}</td>
+									<td>{{ $progetto->stato}}</td>
+									<td>{{ $progetto->name}}</td>
+									<td>{{ $progetto->budget}}</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 }}"
--- a/resources/views/tasks/list.blade.php
+++ b/resources/views/tasks/list.blade.php
@ -90,7 +90,7 @@
 						<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">
+							<input type="date" name="termine_il" class="form-control" value="{{ date('Y-m-d')}}" id="termine_il">
 						</div>
 							
 					</div>
@ -99,8 +99,8 @@
 				<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'); }}">
+					<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 -->
Author	SHA1	Message	Date
Flavio Barachino	537a9f73f8	Modificato il runs-on Some checks failed Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled Details Signed-off-by: Flavio Barachino <flavio.barachino@lavorain.cloud>	2024-12-10 12:39:56 +00:00
fbarachino	00a89f6b6d	pulizia config/app.php	2024-07-24 10:05:01 +00:00
fbarachino	8928383f95	Configurazione Barcode e test sulla visualizzazione delle categorie.	2024-07-24 09:58:55 +00:00
fbarachino	036981f16e	Risolto piccole problematiche ai file e installato libreria milon/barcode per generazione barcodes	2024-07-24 08:51:39 +00:00
fbarachino	fafb02488e	Rivisto il sorting di categorie e tag nel form di modifica di un movimento.	2024-07-23 10:14:01 +00:00
fbarachino	1bdc1b76c6	Cambiamento nelle funzioni di importazione degli estratticonto	2024-07-23 08:09:06 +00:00
fbarachino	337504b127	Modifiche all'importazione dei file di ING e visualizzazioni categorie	2024-07-19 11:35:38 +00:00
fbarachino	53c984c315	Sistemato permessi	2024-05-25 09:04:55 +00:00
fbarachino	0155be2654	Allineamento devel con Master	2024-05-25 08:56:11 +00:00
fbarachino	a6a64fd39a	messo in .gitignore la cartella storage	2024-05-25 08:46:59 +00:00
Flavio Barachino	0330c1d0da	sistemato import file csv per ING Direct	2024-05-07 18:26:29 +02:00