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

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