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

Risolto piccole problematiche ai file e installato libreria milon/barcode per generazione barcodes

Browse Source
This commit is contained in:
Amministratore 2024-07-24 08:51:39 +00:00
parent fafb02488e
commit 036981f16e
24 changed files with 226 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

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

187
composer.lock generated
View File

@ -4,21 +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": "687cd004c9e85a059f97bef99a50fbef",
"packages": [
{
"name": "asm89/stack-cors",
"version": "v2.2.0",
"source": {
"type": "git",
"url": "https://github.com/asm89/stack-cors.git",
"reference": "50f57105bad3d97a43ec4a485eb57daf347eafea"
},
"dist": {
"type": "zip",
=======
"content-hash": "c58658999463fa4485159d5f4dde1d96",
"content-hash": "00d6550702f98e31543eea85f7e7e646",
"packages": [
{
"name": "almasaeed2010/adminlte",
@ -73,7 +59,6 @@
},
"dist": {
"type": "zip",
>>>>>>> devel
"url": "https://api.github.com/repos/asm89/stack-cors/zipball/50f57105bad3d97a43ec4a485eb57daf347eafea",
"reference": "50f57105bad3d97a43ec4a485eb57daf347eafea",
"shasum": ""
@ -176,18 +161,6 @@
},
{
"name": "aws/aws-sdk-php",
<<<<<<< HEAD
"version": "3.306.0",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "dc228b55a4224fe3160a0a2ca430b80c5348d943"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/dc228b55a4224fe3160a0a2ca430b80c5348d943",
"reference": "dc228b55a4224fe3160a0a2ca430b80c5348d943",
=======
"version": "3.308.1",
"source": {
"type": "git",
@ -198,7 +171,6 @@
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/bf5f1221d4c5c67d3213150fb91dfb5ce627227b",
"reference": "bf5f1221d4c5c67d3213150fb91dfb5ce627227b",
>>>>>>> devel
"shasum": ""
},
"require": {
@ -278,28 +250,6 @@
"support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues",
<<<<<<< HEAD
"source": "https://github.com/aws/aws-sdk-php/tree/3.306.0"
},
"time": "2024-05-06T18:11:49+00:00"
},
{
"name": "barryvdh/laravel-dompdf",
"version": "v2.1.1",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/laravel-dompdf.git",
"reference": "cb37868365f9b937039d316727a1fced1e87b31c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/cb37868365f9b937039d316727a1fced1e87b31c",
"reference": "cb37868365f9b937039d316727a1fced1e87b31c",
"shasum": ""
},
"require": {
"dompdf/dompdf": "^2.0.3",
=======
"source": "https://github.com/aws/aws-sdk-php/tree/3.308.1"
},
"time": "2024-05-22T18:05:56+00:00"
@ -320,7 +270,6 @@
},
"require": {
"dompdf/dompdf": "^2.0.7",
>>>>>>> devel
"illuminate/support": "^6|^7|^8|^9|^10|^11",
"php": "^7.2 || ^8.0"
},
@ -368,11 +317,7 @@
],
"support": {
"issues": "https://github.com/barryvdh/laravel-dompdf/issues",
<<<<<<< HEAD
"source": "https://github.com/barryvdh/laravel-dompdf/tree/v2.1.1"
=======
"source": "https://github.com/barryvdh/laravel-dompdf/tree/v2.2.0"
>>>>>>> devel
},
"funding": [
{
@ -384,11 +329,7 @@
"type": "github"
}
],
<<<<<<< HEAD
"time": "2024-03-15T12:48:39+00:00"
=======
"time": "2024-04-25T13:16:04+00:00"
>>>>>>> devel
},
{
"name": "box/spout",
@ -1305,8 +1246,6 @@
"source": "https://github.com/ezyang/htmlpurifier/tree/v4.17.0"
},
"time": "2023-11-17T15:01:25+00:00"
<<<<<<< HEAD
=======
},
{
"name": "firebase/php-jwt",
@ -1370,7 +1309,6 @@
"source": "https://github.com/firebase/php-jwt/tree/v6.10.1"
},
"time": "2024-05-18T18:05:11+00:00"
>>>>>>> devel
},
{
"name": "fruitcake/laravel-cors",
@ -1453,17 +1391,6 @@
"time": "2022-02-23T14:25:13+00:00"
},
{
<<<<<<< HEAD
"name": "graham-campbell/result-type",
"version": "v1.1.2",
"source": {
"type": "git",
"url": "https://github.com/GrahamCampbell/Result-Type.git",
"reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862"
},
"dist": {
"type": "zip",
=======
"name": "google/apiclient",
"version": "v2.16.0",
"source": {
@ -1646,7 +1573,6 @@
},
"dist": {
"type": "zip",
>>>>>>> devel
"url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862",
"reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862",
"shasum": ""
@ -2023,8 +1949,6 @@
}
],
"time": "2023-12-03T20:05:35+00:00"
<<<<<<< HEAD
=======
},
{
"name": "jeroennoten/laravel-adminlte",
@ -2084,7 +2008,6 @@
"source": "https://github.com/jeroennoten/Laravel-AdminLTE/tree/v3.11.0"
},
"time": "2024-03-18T14:42:51+00:00"
>>>>>>> devel
},
{
"name": "laravel-notification-channels/telegram",
@ -3360,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",
@ -3907,17 +3904,6 @@
"time": "2022-01-27T09:35:39+00:00"
},
{
<<<<<<< HEAD
"name": "phenx/php-font-lib",
"version": "0.5.6",
"source": {
"type": "git",
"url": "https://github.com/dompdf/php-font-lib.git",
"reference": "a1681e9793040740a405ac5b189275059e2a9863"
},
"dist": {
"type": "zip",
=======
"name": "paragonie/constant_time_encoding",
"version": "v2.7.0",
"source": {
@ -4082,7 +4068,6 @@
},
"dist": {
"type": "zip",
>>>>>>> devel
"url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/a1681e9793040740a405ac5b189275059e2a9863",
"reference": "a1681e9793040740a405ac5b189275059e2a9863",
"shasum": ""
@ -4344,8 +4329,6 @@
"time": "2023-11-12T21:59:55+00:00"
},
{
<<<<<<< HEAD
=======
"name": "phpseclib/phpseclib",
"version": "3.0.37",
"source": {
@ -4505,7 +4488,6 @@
"time": "2021-02-03T23:26:27+00:00"
},
{
>>>>>>> devel
"name": "psr/clock",
"version": "1.0.0",
"source": {
@ -9775,18 +9757,6 @@
},
{
"name": "mockery/mockery",
<<<<<<< HEAD
"version": "1.6.11",
"source": {
"type": "git",
"url": "https://github.com/mockery/mockery.git",
"reference": "81a161d0b135df89951abd52296adf97deb0723d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mockery/mockery/zipball/81a161d0b135df89951abd52296adf97deb0723d",
"reference": "81a161d0b135df89951abd52296adf97deb0723d",
=======
"version": "1.6.12",
"source": {
"type": "git",
@ -9797,7 +9767,6 @@
"type": "zip",
"url": "https://api.github.com/repos/mockery/mockery/zipball/1f4efdd7d3beafe9807b08156dfcb176d18f1699",
"reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699",
>>>>>>> devel
"shasum": ""
},
"require": {
@ -9867,11 +9836,7 @@
"security": "https://github.com/mockery/mockery/security/advisories",
"source": "https://github.com/mockery/mockery"
},
<<<<<<< HEAD
"time": "2024-03-21T18:34:15+00:00"
=======
"time": "2024-05-16T03:13:13+00:00"
>>>>>>> devel
},
{
"name": "myclabs/deep-copy",
@ -11654,5 +11619,5 @@
"php": "^7.3|^8.0|^8.3"
},
"platform-dev": [],
"plugin-api-version": "2.6.0"
"plugin-api-version": "2.3.0"
}

4
resources/views/admin.blade.php
View File

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

2
resources/views/anagrafica/altrocontatto.blade.php
View File

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

12
resources/views/anagrafica/list.blade.php
View File

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

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

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

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

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

18
resources/views/auto/list.blade.php
View File

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

2
resources/views/components/chartGas.blade.php
View File

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

4
resources/views/components/charts.blade.php
View File

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

32
resources/views/components/menu.blade.php
View File

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

2
resources/views/components/usermenu.blade.php
View File

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

4
resources/views/conti/categorie/list.blade.php
View File

@ -31,7 +31,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,7 +44,7 @@
<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
href="/admin/categorie/delete?id={{ $categoria->id}}"><i
class="fa fa-trash-o fa-fw"></i></a>&nbsp;
</td>
</tr>

6
resources/views/conti/documenti/gendoc.blade.php
View File

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

6
resources/views/conti/documenti/insert.blade.php
View File

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

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

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

6
resources/views/conti/movimenti/new.blade.php
View File

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

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

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

6
resources/views/conti/tags/list.blade.php
View File

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

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

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

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

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

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

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

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

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

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

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