Merge branch 'master' of https://bitbucket.org/FlavioBarachino/bubofamily

public/js/app/auto.js

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

public/js/app/conti_categorie.js

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

public/js/app/enel.js

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

public/js/app/gas.js

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

public/js/app/movimenti.js

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

public/js/app/progetti.js

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

public/js/app/rigaProgetti.js

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

resources/views/admin.blade.php

@@ -20,22 +20,9 @@
 
         <!-- 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>-->
 
-<!-- (Optional) Latest compiled and minified JavaScript translation files
+        <!-- Datatables with datetime and locales -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/js/i18n/defaults-*.min.js"></script>-->
+        <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"/>
-
-
-        <!-- 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>
@@ -116,11 +103,13 @@
         <!-- 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

resources/views/conti/movimenti/list.blade.php

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

resources/views/letture/enel/list.blade.php

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

resources/views/letture/gas/list.blade.php

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

resources/views/progetti/list.blade.php

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