Commit 5e7a3582 authored by alissonalbuquerque's avatar alissonalbuquerque
Browse files

fix view de atividades

parent ad863605
...@@ -237,6 +237,11 @@ class TaskTime extends Model ...@@ -237,6 +237,11 @@ class TaskTime extends Model
// - - - - - - - - - - // - - - - - - - - - -
} }
/* @return boolean */
public function has_tarefa() {
return $this->tarefa !== null ? true : false;
}
public function userPad() { public function userPad() {
return $this->hasOne(UserPad::class, 'id', 'user_pad_id'); return $this->hasOne(UserPad::class, 'id', 'user_pad_id');
} }
......
{{-- {{--
@include('components.buttons.btn-delete-by-alert', [ @include('components.buttons.btn-delete-by-alert', [
'_id' => '', '_id' => '',
'_class' => '', '_class' => '',
'_route' => route('') '_route' => route('')
'_remove_default_class' => true | false
]) ])
--}} --}}
<!-- Button trigger alert --> <!-- Button trigger alert -->
<button type="button" id="{{ $_id }}" class="btn btn-danger {{$_class}}"> <button
type="button" id="{{ $_id }}"
@if(isset($_remove_default_class) && $_remove_default_class == true)
class="btn {{$_class}}"
@else
class="btn btn-danger {{$_class}}"
@endif
>
<i class="bi bi-trash"></i> <i class="bi bi-trash"></i>
</button> </button>
...@@ -21,4 +29,4 @@ ...@@ -21,4 +29,4 @@
$('#form-delete-'+_id).submit() $('#form-delete-'+_id).submit()
} }
}) })
</script> </script>
\ No newline at end of file
...@@ -38,10 +38,10 @@ ...@@ -38,10 +38,10 @@
$weekColumn = TaskTime::whereUserPadId($user_pad_id)->whereWeekday($weekday)->orderBy('start_time', 'ASC')->get(); $weekColumn = TaskTime::whereUserPadId($user_pad_id)->whereWeekday($weekday)->orderBy('start_time', 'ASC')->get();
$weekColumn = // $weekColumn =
$weekColumn->filter(function(TaskTIme $model) { // $weekColumn->filter(function(TaskTIme $model) {
return $model->tarefa !== null; // return $model->tarefa !== null;
}); // });
$weekColumns[$weekday] = $weekColumn->isNotEmpty() ? $weekColumn : collect(['--']); $weekColumns[$weekday] = $weekColumn->isNotEmpty() ? $weekColumn : collect(['--']);
...@@ -81,14 +81,38 @@ ...@@ -81,14 +81,38 @@
<p class="text-center"> <i class="bi bi-clock"></i> {{ $model->formatStartTime() }} </p> <p class="text-center"> <i class="bi bi-clock"></i> {{ $model->formatStartTime() }} </p>
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="text-center"> @if($model->has_tarefa())
<a href="#modal" class="btn btn-edit_task" id="{{ $model->id }}"> <div class="text-center">
{{ "{$model->getCode()} : {$model->getName()}" }} <i class="bi bi-pencil"></i> <a href="#modal" class="btn btn-edit_task" id="{{ $model->id }}">
</a> {{ "{$model->getCode()} : {$model->getName()}" }} <i class="bi bi-pencil"></i>
{{-- --}} </a>
<p class="text-center"> </i> DIA: {{ $model->getWeekdayAsText() }} </p> {{-- --}}
{{-- --}} <p class="text-center"> </i> DIA: {{ $model->getWeekdayAsText() }} </p>
</div> {{-- --}}
</div>
@endif
@if(!$model->has_tarefa())
<div class="text-center">
<form id="form-delete-{{$model->id}}" action="{{ route('task_time_delete', ['id' => $model->id]) }}" method="post">
@method('DELETE')
@csrf
</form>
{{ "ATIVIDADE APAGADA !" }}
@include('components.buttons.btn-delete-by-alert', [
'_id' => $model->id,
'_class' => "delete_task_time",
'_remove_default_class' => true
])
{{-- --}}
<p class="text-center"> </i> DIA: {{ $model->getWeekdayAsText() }} </p>
{{-- --}}
</div>
@endif
</div> </div>
<div class="card-header"> <div class="card-header">
<p class="text-center"> <i class="bi bi-clock-fill"></i> {{ $model->formatEndTime() }} </p> <p class="text-center"> <i class="bi bi-clock-fill"></i> {{ $model->formatEndTime() }} </p>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment