risolto divergenze composer.json e composer.lock

risolto problema js altrocontatto
2023-06-12 10:48:25 +02:00 · 2023-06-12 10:45:25 +02:00 · 2023-06-12 09:55:55 +02:00 · 2023-06-12 09:23:30 +02:00 · 2023-06-12 09:11:58 +02:00 · 2023-06-12 08:26:35 +02:00
18 changed files with 98 additions and 293 deletions
--- a/app/Http/Controllers/MovimentiController.php
+++ b/app/Http/Controllers/MovimentiController.php
@@ -81,7 +81,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,
--- a/app/Models/User.php
+++ b/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']);

    }
-
-
-
-
 }
--- a/composer.json
+++ b/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",
--- a/composer.lock
+++ b/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,8 +500,6 @@
            "time": "2023-05-19T20:13:32+00:00"
        },
        {
-=======
->>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
            "name": "doctrine/inflector",
            "version": "2.0.6",
            "source": {
@@ -3918,7 +3760,6 @@
        },
        {
            "name": "psy/psysh",
-<<<<<<< HEAD
            "version": "v0.11.18",
            "source": {
                "type": "git",
@@ -3929,18 +3770,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 +3830,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 +7512,6 @@
                }
            ],
            "time": "2023-05-25T13:05:00+00:00"
-<<<<<<< HEAD
        },
        {
            "name": "tightenco/collect",
@@ -7744,8 +7566,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",
@@ -9329,7 +9149,6 @@
        },
        {
            "name": "phpunit/phpunit",
-<<<<<<< HEAD
            "version": "9.6.8",
            "source": {
                "type": "git",
@@ -9340,18 +9159,6 @@
                "type": "zip",
                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/17d621b3aff84d0c8b62539e269e87d8d5baa76e",
                "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e",
-=======
-            "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 +9232,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.8"
-=======
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.7"
->>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
            },
            "funding": [
                {
@@ -9445,11 +9248,7 @@
                    "type": "tidelift"
                }
            ],
-<<<<<<< HEAD
            "time": "2023-05-11T05:14:45+00:00"
-=======
-            "time": "2023-04-14T08:58:40+00:00"
->>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
        },
        {
            "name": "sebastian/cli-parser",
--- a/public/js/app/altrocontatto.js
+++ b/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",
--- a/public/js/app/auto.js
+++ b/public/js/app/auto.js
@@ -1,6 +1,6 @@
 $(document).ready(function() {
 	$('#automobili').DataTable({
-		responsive: true
+		responsive: true,
        fields: [
 			{
 				label:"Data",
--- a/public/js/app/enel.js
+++ b/public/js/app/enel.js
@@ -1,5 +1,11 @@
 $(document).ready(function() {
 	$('#listaLettureEnel').DataTable({
-		responsive: true
+		responsive: true,
+        fields: [
+			{
+				label:"Data lettura",
+				type: "datetime"
+			}
+		]
 	});
-});
+});
--- a/public/js/app/gas.js
+++ b/public/js/app/gas.js
@@ -1,5 +1,11 @@
 $(document).ready(function() {
 	$('#listaLettureGas').DataTable({
-		responsive: true
+		responsive: true,
+        fields: [
+			{
+				label:"Data lettura",
+				type: "datetime"
+			}
+		]
 	});
-});
+});
--- a/public/js/app/movimenti.js
+++ b/public/js/app/movimenti.js
@@ -1,6 +1,12 @@
 $(document).ready(function() {
 	$('#listamovimenti').DataTable({
 		"responsive": true,
+        fields: [
+			{
+				label:"Data",
+				type: "datetime"
+			}
+		],
 		"order": [[0, "desc"]]
 	});
 });
--- a/public/js/app/progetti.js
+++ b/public/js/app/progetti.js
@@ -1,7 +1,7 @@
 $(document).ready(function() {

 	$('#tab_progetti').DataTable({
-		responsive: true
+		responsive: true,
 		fields: [
 			{
 				label:"Data",
--- a/public/js/app/rigaProgetti.js
+++ b/public/js/app/rigaProgetti.js
@@ -1,6 +1,6 @@
 $(document).ready(function() {
 	$('#tab_progetti').DataTable({
-		responsive: true
+		responsive: true,
        fields: [
 			{
 				label:"Data",
@@ -8,7 +8,7 @@ $(document).ready(function() {
 			}
 		]
 	});
-
+});
 	$('#form').click(function() {
 		$('form').toggle();
 	});
@@ -41,4 +41,4 @@ $(document).ready(function() {
 		$('#myModal_addRow').modal('show');
 		// $('#form_new').attr('action', 'progetti/new');
 	});
-});
+
--- a/resources/views/auto/detail.blade.php
+++ b/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>

--- a/resources/views/auto/detailpdf.blade.php
+++ b/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>
--- a/resources/views/conti/movimenti/list.blade.php
+++ b/resources/views/conti/movimenti/list.blade.php
@@ -31,7 +31,7 @@
            		<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_descrizione; }}</td>
            			<td>&euro; {{ $movimento->mov_importo; }}</td>
--- a/resources/views/conti/report/list.blade.php
+++ b/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
-            	
--- a/resources/views/letture/enel/list.blade.php
+++ b/resources/views/letture/enel/list.blade.php
@@ -62,7 +62,7 @@
            		<tbody>
            		@foreach($lettureEnel as $lettura)
            			<tr>
-            				<td>{{ $lettura->enel_date; }}</td>
+            				<td>{{ date_format(date_create($lettura->enel_date),'d/m/Y'); }}</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
-            				
--- a/resources/views/letture/gas/list.blade.php
+++ b/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>{{ date_format(date_create($lettura->gas_date),'d/m/Y'); }}</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
-            				
--- a/resources/views/progetti/list.blade.php
+++ b/resources/views/progetti/list.blade.php
@@ -38,7 +38,7 @@
 								<tr>
 									<td><a href="progetti/detail/{{ $progetto->progetto }}">{{
 											$progetto->nome; }}</a></td>
-									<td>{{ $progetto->data_creazione; }}</td>
+									<td>{{ date_format(date_create($progetto->data_creazione),'d/m/Y'); }}</td>
 									<td>{{ $progetto->stato; }}</td>
 									<td>{{ $progetto->name; }}</td>
 									<td>{{ $progetto->budget; }}</td>
@@ -78,7 +78,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 +142,4 @@
 	<!-- /MODAL -->
 	@endsection @section('script')
 	<script src="/js/app/progetti.js"></script>
-	@endsection
+	@endsection
Author	SHA1	Message	Date
Flavio Barachino	20f050044b	risolto divergenze composer.json e composer.lock	2023-06-12 10:48:25 +02:00
Flavio Barachino	dab7869fdf	risolto divergenze composer.json e composer.lock	2023-06-12 10:45:25 +02:00
Flavio Barachino	19ea72be6c	risolto problema js altrocontatto	2023-06-12 09:55:55 +02:00
Flavio Barachino	7183e9d96c	sistemato problema su javascript rigaProgetti.js	2023-06-12 09:23:30 +02:00
Flavio Barachino	d3729c6fe3	sistemato data anche in lista progetti	2023-06-12 09:11:58 +02:00
Flavio Barachino	a8a25063ac	issue #8 : sistemato quanto riportato nella issue	2023-06-12 08:26:35 +02:00