Compare commits

..

No commits in common. "920584d779de77f2ea76f552d31b90302bddf7f1" and "3dc54235c5ad57e647ce70a2a088533607ccdc1f" have entirely different histories.

13 changed files with 76 additions and 61 deletions

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

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

View File

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

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

@ -1,12 +1,11 @@
$(document).ready(function() {
$('#listaLettureEnel').DataTable({
"responsive": true,
columnDefs: [
{
target: 0,
render: DataTable.render.date(),
}
],
"order": [[0, "desc"]]
responsive: true,
fields: [
{
label:"Data lettura",
type: "datetime"
}
]
});
});

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

@ -1,12 +1,11 @@
$(document).ready(function() {
$('#listaLettureGas').DataTable({
"responsive": true,
columnDefs: [
{
target: 0,
render: DataTable.render.date(),
}
],
"order": [[0, "desc"]]
responsive: true,
fields: [
{
label:"Data lettura",
type: "datetime"
}
]
});
});

View File

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

View File

@ -1,14 +1,13 @@
$(document).ready(function() {
$('#tab_progetti').DataTable({
"responsive": true,
columnDefs: [
{
target: 1,
render: DataTable.render.date(),
}
],
"order": [[1, "desc"]]
responsive: true,
fields: [
{
label:"Data",
type: "datetime"
}
]
});
});

View File

@ -1,13 +1,12 @@
$(document).ready(function() {
$('#tab_progetti').DataTable({
"responsive": true,
columnDefs: [
{
target: 0,
render: DataTable.render.date(),
}
],
"order": [[0, "desc"]]
responsive: true,
fields: [
{
label:"Data",
type: "datetime"
}
]
});
});
$('#form').click(function() {

View File

View File

@ -20,9 +20,22 @@
<!-- Custom Fonts -->
<link href="/css/font-awesome.min.css" rel="stylesheet" type="text/css">
<!-- Latest compiled and minified CSS
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/css/bootstrap-select.min.css">
-->
<!-- Latest compiled and minified JavaScript
<script src="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/js/bootstrap-select.min.js"></script>-->
<!-- Datatables with datetime and locales -->
<link href="https://cdn.datatables.net/v/dt/dt-1.13.4/date-1.4.1/r-2.4.1/sb-1.4.2/sp-2.1.2/datatables.min.css" rel="stylesheet"/>
<!-- (Optional) Latest compiled and minified JavaScript translation files
<script src="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/js/i18n/defaults-*.min.js"></script>-->
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->
@section('head_additional')
@show
</head>
@ -103,13 +116,11 @@
<!-- Metis Menu Plugin JavaScript -->
<script src="/js/metisMenu.min.js"></script>
<!-- DataTables JavaScript
<!-- DataTables JavaScript -->
<script src="/js/dataTables/jquery.dataTables.min.js"></script>
<script src="/js/dataTables/dataTables.bootstrap.min.js"></script>-->
<script src="/js/dataTables/dataTables.bootstrap.min.js"></script>
<!-- Custom Theme JavaScript -->
<script src="https://cdn.datatables.net/v/dt/dt-1.13.4/date-1.4.1/r-2.4.1/sb-1.4.2/sp-2.1.2/datatables.min.js"></script>
<script src="/js/momentjs.js"></script>
<script src="/js/startmin.js"></script>
@section('script')
@show

View File

@ -31,9 +31,8 @@
<tbody>
@foreach( $movimenti as $movimento )
<tr>
<!-- <td>{{ date_format(date_create($movimento->mov_data),'d/m/Y'); }}</td>-->
<td>{{$movimento->mov_data}}</td>
<td>{{ $movimento->cat_name; }}</td>
<td>{{ date_format(date_create($movimento->mov_data),'d/m/Y'); }}</td>
<td>{{ $movimento->cat_name; }}</td>
<td>{{ $movimento->mov_descrizione; }}</td>
<td>&euro; {{ $movimento->mov_importo; }}</td>
<td>

View File

@ -62,7 +62,7 @@
<tbody>
@foreach($lettureEnel as $lettura)
<tr>
<td>{{ $lettura->enel_date }}</td>
<td>{{ date_format(date_create($lettura->enel_date),'d/m/Y'); }}</td>
<td>{{ $lettura->enel_A; }}</td>
<td>{{ $lettura->enel_R; }}</td>
<td>{{ $lettura->enel_F1; }}</td>

View File

@ -71,7 +71,7 @@
}
@endphp
<tr>
<td>{{ $lettura->gas_date }}</td>
<td>{{ date_format(date_create($lettura->gas_date),'d/m/Y'); }}</td>
<td>{{ $lettura->gas_lettura; }}</td>
@if(!is_null($dateprec))
<td>{{ $diffdate ?? '' }}</td>

View File

@ -38,7 +38,7 @@
<tr>
<td><a href="progetti/detail/{{ $progetto->progetto }}">{{
$progetto->nome; }}</a></td>
<td>{{ $progetto->data_creazione}}</td>
<td>{{ date_format(date_create($progetto->data_creazione),'d/m/Y'); }}</td>
<td>{{ $progetto->stato; }}</td>
<td>{{ $progetto->name; }}</td>
<td>{{ $progetto->budget; }}</td>