6 Commits

18 changed files with 98 additions and 293 deletions

View File

@@ -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,

View File

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

View File

@@ -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",

201
composer.lock generated
View File

@@ -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",

View File

@@ -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",

View File

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

View File

@@ -1,5 +1,11 @@
$(document).ready(function() {
$('#listaLettureEnel').DataTable({
responsive: true
responsive: true,
fields: [
{
label:"Data lettura",
type: "datetime"
}
]
});
});

View File

@@ -1,5 +1,11 @@
$(document).ready(function() {
$('#listaLettureGas').DataTable({
responsive: true
responsive: true,
fields: [
{
label:"Data lettura",
type: "datetime"
}
]
});
});

View File

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

View File

@@ -1,7 +1,7 @@
$(document).ready(function() {
$('#tab_progetti').DataTable({
responsive: true
responsive: true,
fields: [
{
label:"Data",

View File

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

View File

@@ -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>
@@ -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>
@@ -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>
@@ -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>

View File

@@ -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>
@@ -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>
@@ -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>
@@ -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>

View File

@@ -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>

View File

@@ -25,7 +25,7 @@
<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>
@@ -55,7 +55,7 @@
<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>
@@ -72,4 +72,3 @@
@section('script')
<script src="/js/app/conti_categorie.js"></script>
@endsection

View File

@@ -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>
@@ -83,4 +83,3 @@
@section('script')
<script src="/js/app/enel.js"></script>
@endsection

View File

@@ -71,7 +71,7 @@
}
@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>
@@ -101,4 +101,3 @@
@section('script')
<script src="/js/app/gas.js"></script>
@endsection

View File

@@ -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>