sistemazione di alcuni file js per data Tables

app/Models/User.php

@@ -8,24 +8,14 @@ use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 use Laravel\Sanctum\HasApiTokens;
-<<<<<<< HEAD
 use Spatie\Permission\Traits\HasRoles;
 use Illuminate\Foundation\Auth\Access\Authorizable;
 
-=======
- //use LdapRecord\Laravel\Auth\Authenticatable;
-
-use Junges\ACL\Concerns\HasGroups;
->>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
 
 
 class User extends Authenticatable
 {
-<<<<<<< HEAD
     use HasApiTokens, HasFactory, Notifiable, HasRoles,Authorizable;
-=======
-    use HasApiTokens, HasFactory, Notifiable, HasGroups, SoftDeletes;
->>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
 
     /**
      * The attributes that are mass assignable.
@@ -85,7 +75,6 @@ class User extends Authenticatable
     {
         return DB::table('users')->orderBy('name')->get();
     }
-<<<<<<< HEAD
 
     // Aggiunge un utente e assegna un ruolo
     public static function addUser($params)
@@ -99,10 +88,6 @@ class User extends Authenticatable
     }
 
 
-=======
-
-
->>>>>>> 3ebca7bb4a04430aecf781bee6ba7b1a1ec56a41
 
 
 }

public/js/app/altrocontatto.js

@@ -1,10 +1,21 @@
 $(document).ready(function() {
 	$('#automobili').DataTable({
 		responsive: true
+        fields: [
+			{
+				label:"Data",
+				type: "datetime"
+			}
+		]
 	});
-});
+
-$(document).ready(function() {
 	$('#contatti').DataTable({
 		responsive: true
+        fields: [
+			{
+				label:"Data",
+				type: "datetime"
+			}
+		]
 	});
 });

public/js/app/auto.js

@@ -1,6 +1,12 @@
 $(document).ready(function() {
 	$('#automobili').DataTable({
 		responsive: true
+        fields: [
+			{
+				label:"Data",
+				type: "datetime"
+			}
+		]
 	});
 });
 

public/js/app/conti_categorie.js

@@ -1,19 +1,28 @@
 $(document).ready(function() {
 	$('#listrapportoS').DataTable({
-		responsive: true
+		responsive: true,
-	});
+        fields: [
-});
+			{
-$(document).ready(function() {
+				label:"Data",
-	$('#listrapportoE').DataTable({
+				type: "datetime"
-		responsive: true
+			}
-	});
+		]
+	});
+
+	$('#listrapportoE').DataTable({
+		responsive: true,
+        fields: [
+			{
+				label:"Data",
+				type: "datetime"
+			}
+		]
 	});
 
- $(document).ready(function() {
     $('#categorie').DataTable({
             responsive: true
     });
-
+ });
 $(document).on('click','.open_modal',function(){
     var url = "/admin/categorie/modify";
     var riga_id= $(this).val();
@@ -30,4 +39,4 @@ $(document).ready(function() {
         $('#myModal_new').modal('show');
 
 });
-   });
+