fbarachino/bubofamily
1
1
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

Compare commits

base: fbarachino:user_role
Branches Tags
fbarachino:master fbarachino:devel fbarachino:user_role
fbarachino:0.1.1.a fbarachino:v0.1.0-alpha
..
compare: fbarachino:20f050044be59c3a0b977c10b0784a1cbddf843b
Branches Tags
fbarachino:master fbarachino:devel fbarachino:user_role
fbarachino:0.1.1.a fbarachino:v0.1.0-alpha

6 Commits
user_role ... 20f050044b

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
18 changed files with 98 additions and 293 deletions
Expand all files Collapse all files

2
app/Http/Controllers/MovimentiController.php
View File

@@ -81,7 +81,7 @@ class MovimentiController extends Controller
foreach ($movimenti as $movimento) foreach ($movimenti as $movimento)
{ {
$lista[]=[ $lista[]=[
'Data'=>$movimento->Data, 'Data'=> date_format(date_create($movimento->Data),'d/m/Y'),
'Categoria'=>$movimento->Categoria, 'Categoria'=>$movimento->Categoria,
'Tag'=>$movimento->Tag, 'Tag'=>$movimento->Tag,
'Descrizione'=>$movimento->Descrizione, 'Descrizione'=>$movimento->Descrizione,

6
app/Models/User.php
View File

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

3
composer.json
View File

@@ -10,10 +10,7 @@
"require" : { "require" : {
"php": "^7.3|^8.0", "php": "^7.3|^8.0",
"barryvdh/laravel-dompdf": "^2.0", "barryvdh/laravel-dompdf": "^2.0",
<<<<<<< HEAD
"directorytree/ldaprecord": "^2.9", "directorytree/ldaprecord": "^2.9",
=======
>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
"fruitcake/laravel-cors": "^2.0", "fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1", "guzzlehttp/guzzle": "^7.0.1",
"laravel-notification-channels/telegram": "^2.0", "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", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
<<<<<<< HEAD
"content-hash": "e6ac2be787f145ea140b72b55e302e90", "content-hash": "e6ac2be787f145ea140b72b55e302e90",
=======
"content-hash": "04bb6926c8a763a3a3da227f31661f3d",
>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
"packages": [ "packages": [
{ {
"name": "asm89/stack-cors", "name": "asm89/stack-cors",
@@ -67,157 +63,6 @@
"time": "2022-01-18T09:12:03+00:00" "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", "name": "barryvdh/laravel-dompdf",
"version": "v2.0.1", "version": "v2.0.1",
"source": { "source": {
@@ -581,7 +426,6 @@
"time": "2022-10-27T11:44:00+00:00" "time": "2022-10-27T11:44:00+00:00"
}, },
{ {
<<<<<<< HEAD
"name": "directorytree/ldaprecord", "name": "directorytree/ldaprecord",
"version": "v2.20.4", "version": "v2.20.4",
"source": { "source": {
@@ -656,8 +500,6 @@
"time": "2023-05-19T20:13:32+00:00" "time": "2023-05-19T20:13:32+00:00"
}, },
{ {
=======
>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
"name": "doctrine/inflector", "name": "doctrine/inflector",
"version": "2.0.6", "version": "2.0.6",
"source": { "source": {
@@ -3918,7 +3760,6 @@
}, },
{ {
"name": "psy/psysh", "name": "psy/psysh",
<<<<<<< HEAD
"version": "v0.11.18", "version": "v0.11.18",
"source": { "source": {
"type": "git", "type": "git",
@@ -3929,18 +3770,6 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/4f00ee9e236fa6a48f4560d1300b9c961a70a7ec", "url": "https://api.github.com/repos/bobthecow/psysh/zipball/4f00ee9e236fa6a48f4560d1300b9c961a70a7ec",
"reference": "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": "" "shasum": ""
}, },
"require": { "require": {
@@ -4001,15 +3830,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/bobthecow/psysh/issues", "issues": "https://github.com/bobthecow/psysh/issues",
<<<<<<< HEAD
"source": "https://github.com/bobthecow/psysh/tree/v0.11.18" "source": "https://github.com/bobthecow/psysh/tree/v0.11.18"
}, },
"time": "2023-05-23T02:31:11+00:00" "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", "name": "ralouphie/getallheaders",
@@ -7689,7 +7512,6 @@
} }
], ],
"time": "2023-05-25T13:05:00+00:00" "time": "2023-05-25T13:05:00+00:00"
<<<<<<< HEAD
}, },
{ {
"name": "tightenco/collect", "name": "tightenco/collect",
@@ -7744,8 +7566,6 @@
"source": "https://github.com/tighten/collect/tree/v9.52.7" "source": "https://github.com/tighten/collect/tree/v9.52.7"
}, },
"time": "2023-04-14T21:51:36+00:00" "time": "2023-04-14T21:51:36+00:00"
=======
>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
}, },
{ {
"name": "tijsverkoyen/css-to-inline-styles", "name": "tijsverkoyen/css-to-inline-styles",
@@ -9329,7 +9149,6 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
<<<<<<< HEAD
"version": "9.6.8", "version": "9.6.8",
"source": { "source": {
"type": "git", "type": "git",
@@ -9340,18 +9159,6 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/17d621b3aff84d0c8b62539e269e87d8d5baa76e", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/17d621b3aff84d0c8b62539e269e87d8d5baa76e",
"reference": "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": "" "shasum": ""
}, },
"require": { "require": {
@@ -9425,11 +9232,7 @@
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues", "issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy", "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.8"
=======
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.7"
>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
}, },
"funding": [ "funding": [
{ {
@@ -9445,11 +9248,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
<<<<<<< HEAD
"time": "2023-05-11T05:14:45+00:00" "time": "2023-05-11T05:14:45+00:00"
=======
"time": "2023-04-14T08:58:40+00:00"
>>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
}, },
{ {
"name": "sebastian/cli-parser", "name": "sebastian/cli-parser",

4
public/js/app/altrocontatto.js vendored
View File

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

2
public/js/app/auto.js vendored
View File

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

10
public/js/app/enel.js vendored
View File

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

10
public/js/app/gas.js vendored
View File

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

6
public/js/app/movimenti.js vendored
View File

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

2
public/js/app/progetti.js vendored
View File

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

6
public/js/app/rigaProgetti.js vendored
View File

@@ -1,6 +1,6 @@
$(document).ready(function() { $(document).ready(function() {
$('#tab_progetti').DataTable({ $('#tab_progetti').DataTable({
responsive: true responsive: true,
fields: [ fields: [
{ {
label:"Data", label:"Data",
@@ -8,7 +8,7 @@ $(document).ready(function() {
} }
] ]
}); });
});
$('#form').click(function() { $('#form').click(function() {
$('form').toggle(); $('form').toggle();
}); });
@@ -41,4 +41,4 @@ $(document).ready(function() {
$('#myModal_addRow').modal('show'); $('#myModal_addRow').modal('show');
// $('#form_new').attr('action', 'progetti/new'); // $('#form_new').attr('action', 'progetti/new');
}); });
});

54
resources/views/auto/detail.blade.php
View File

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

44
resources/views/auto/detailpdf.blade.php
View File

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

2
resources/views/conti/movimenti/list.blade.php
View File

@@ -31,7 +31,7 @@
<tbody> <tbody>
@foreach( $movimenti as $movimento ) @foreach( $movimenti as $movimento )
<tr> <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->cat_name; }}</td>
<td>{{ $movimento->mov_descrizione; }}</td> <td>{{ $movimento->mov_descrizione; }}</td>
<td>&euro; {{ $movimento->mov_importo; }}</td> <td>&euro; {{ $movimento->mov_importo; }}</td>

11
resources/views/conti/report/list.blade.php
View File

@@ -25,9 +25,9 @@
<tbody> <tbody>
@foreach( $dataSpesa as $dato ) @foreach( $dataSpesa as $dato )
<tr> <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> <td>{{ $dato->resoconto; }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
@@ -55,9 +55,9 @@
<tbody> <tbody>
@foreach( $dataEntrate as $dato ) @foreach( $dataEntrate as $dato )
<tr> <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> <td>{{ $dato->resoconto; }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
@@ -67,9 +67,8 @@
</div> </div>
</div> </div>
</div> </div>
@endsection @endsection
@section('script') @section('script')
<script src="/js/app/conti_categorie.js"></script> <script src="/js/app/conti_categorie.js"></script>
@endsection @endsection

5
resources/views/letture/enel/list.blade.php
View File

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

17
resources/views/letture/gas/list.blade.php
View File

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

6
resources/views/progetti/list.blade.php
View File

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