Compare commits

...

2 Commits

4 changed files with 8 additions and 15 deletions

View File

@ -11,8 +11,6 @@ use Laravel\Sanctum\HasApiTokens;
use Spatie\Permission\Traits\HasRoles; use Spatie\Permission\Traits\HasRoles;
use Illuminate\Foundation\Auth\Access\Authorizable; use Illuminate\Foundation\Auth\Access\Authorizable;
class User extends Authenticatable class User extends Authenticatable
{ {
use HasApiTokens, HasFactory, Notifiable, HasRoles,Authorizable; use HasApiTokens, HasFactory, Notifiable, HasRoles,Authorizable;
@ -86,8 +84,4 @@ class User extends Authenticatable
])->assignRole($params['role']); ])->assignRole($params['role']);
} }
} }

View File

@ -1,6 +1,6 @@
$(document).ready(function() { $(document).ready(function() {
$('#tab_progetti').DataTable({ $('#tab_progetti').DataTable({
responsive: true responsive: true,
fields: [ fields: [
{ {
label:"Data", label:"Data",
@ -8,7 +8,7 @@ $(document).ready(function() {
} }
] ]
}); });
});
$('#form').click(function() { $('#form').click(function() {
$('form').toggle(); $('form').toggle();
}); });
@ -41,4 +41,4 @@ $(document).ready(function() {
$('#myModal_addRow').modal('show'); $('#myModal_addRow').modal('show');
// $('#form_new').attr('action', 'progetti/new'); // $('#form_new').attr('action', 'progetti/new');
}); });
});

View File

@ -62,7 +62,7 @@
<tbody> <tbody>
@foreach($lettureEnel as $lettura) @foreach($lettureEnel as $lettura)
<tr> <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_A; }}</td>
<td>{{ $lettura->enel_R; }}</td> <td>{{ $lettura->enel_R; }}</td>
<td>{{ $lettura->enel_F1; }}</td> <td>{{ $lettura->enel_F1; }}</td>
@ -83,4 +83,3 @@
@section('script') @section('script')
<script src="/js/app/enel.js"></script> <script src="/js/app/enel.js"></script>
@endsection @endsection

View File

@ -38,7 +38,7 @@
<tr> <tr>
<td><a href="progetti/detail/{{ $progetto->progetto }}">{{ <td><a href="progetti/detail/{{ $progetto->progetto }}">{{
$progetto->nome; }}</a></td> $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->stato; }}</td>
<td>{{ $progetto->name; }}</td> <td>{{ $progetto->name; }}</td>
<td>{{ $progetto->budget; }}</td> <td>{{ $progetto->budget; }}</td>