Compare commits

..

No commits in common. "7183e9d96c8f382fb302e6ae773595a3caa9c3d0" and "a8a25063ace4f2b08ba11a0bf0dde13e301ff4de" have entirely different histories.

4 changed files with 15 additions and 8 deletions

View File

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

View File

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

View File

@ -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>
@ -78,8 +78,9 @@
</div>
</div>
</div>
@endsection
@section('script')
<script src="/js/app/enel.js"></script>
@endsection

View File

@ -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>
@ -78,7 +78,7 @@
<!-- TODO: Da vedere funzione di select in js -->
<select name="coordinatore" class="form-control selectpicker"
id="coordinatore" data-live-search="true"
data-live-search-placeholder="Cerca">
data-live-search-placeholder="Cerca">
</select>
</div>
</div>
@ -142,4 +142,4 @@
<!-- /MODAL -->
@endsection @section('script')
<script src="/js/app/progetti.js"></script>
@endsection
@endsection