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
Download Patch File Download Diff File Expand all files Collapse all files

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