Merge pull request #14 from alissonalbuquerque/fix_calendar_loading

Correção de Renderização de Calendário

resources/views/task-time/create.blade.php

@@ -6,7 +6,6 @@
     @csrf
     @method('POST')
 
-    <div class="row">
 
         <input type="hidden" id="user_pad_id" name="user_pad_id" value="{{ $user_pad_id }}">
 
@@ -16,6 +15,9 @@
 
         <input type="hidden" id="id" name="id" value="">
 
+
+        <div class="row">
+
             <div class="mb-4 col-sm-2">
                 <div class="">
                     <label class="form-label" for="cod_atividade">Cód. Atividade</label>
@@ -28,8 +30,9 @@
             </div>
 
             <div class="col-sm-10">
-            <div class="mt-3">
-                <label for="weekday">Dia da Semana</label>
+                <div class="">
+                    <label class="mb-2" for="weekday">Dia da Semana</label>
+
                     <select name="weekday" id="weekday" class="form-select @error('weekday') is-invalid @enderror ajax-errors">
                         @foreach(TaskTime::listWeekDays() as $id => $text)
                             <option value="{{$id}}">{{$text}}</option>
@@ -39,10 +42,14 @@
                     @include('components.divs.errors', [
                         'field' => 'weekday_create'
                     ])
+
                 </div>
             </div>
 
-        <div class="col-sm-12">
+        </div>
+
+        <div class="row">
+            <div class="col-md-12">
                 <div class="">
                     <label for="slct_tarefa_id">Atividade</label>
                     <select name="slct_tarefa_id" id="slct_tarefa_id" class="form-select @error('slct_tarefa_id') is-invalid @enderror ajax-errors">
@@ -53,6 +60,9 @@
                     'field' => 'slct_tarefa_id_create'
                 ])
             </div>
+        </div>
+
+        <div class="row">
 
             <div class="col-sm-6">
                 <div class="mt-3">
@@ -68,7 +78,7 @@
             <div class="col-sm-6">
                 <div class="mt-3">
                     <label class="form-label" for="end_time">Horário Final</label>
-                <input type="time" min="07:30" max="21:15" name="end_time" id="end_time" class="form-control @error('end_time') is-invalid @enderror ajax-errors" >
+                    <input type="time" min="07:30" max="21:15" name="end_time" id="end_time" class="form-control @error('end_time') is-invalid @enderror ajax-errors">
 
                     @include('components.divs.errors', [
                         'field' => 'end_time_create',
@@ -89,6 +99,8 @@
             </div>
         </div>
 
+    </div>
+
 </form>
 
 @include('pad.components.scripts.ajaxValidation', [
@@ -100,12 +112,12 @@
 
 <script type="text/javascript">
 
-    $('#weekday').select2(
-    {   
-        allowClear: true,
-        placeholder: 'Dia da Semana',
-        dropdownParent: $('#modal')
-    })
+    // $('#weekday').select2(
+    // {
+    //     allowClear: true,
+    //     placeholder: 'Dia da Semana',
+    //     dropdownParent: $('#modal')
+    // })
 
     $('#slct_tarefa_id').select2(
     {

resources/views/task-time/index.blade.php

@@ -38,6 +38,11 @@
 
             $weekColumn = TaskTime::whereUserPadId($user_pad_id)->whereWeekday($weekday)->orderBy('start_time', 'ASC')->get();
 
+            $weekColumn =
+                $weekColumn->filter(function(TaskTIme $model) {
+                    return $model->tarefa !== null;
+                });
+
             $weekColumns[$weekday] = $weekColumn->isNotEmpty() ? $weekColumn : collect(['--']);
 
             if(count($weekColumns[$weekday]) > $max_len_column) {

resources/views/task-time/update.blade.php

@@ -15,8 +15,6 @@
     @csrf
     @method('POST')
 
-    <div class="row">
-
     <input type="hidden" id="user_pad_id" name="user_pad_id" value="{{ $model->user_pad_id }}">
 
     <input type="hidden" id="tarefa_id" name="tarefa_id" value="{{ $model->tarefa_id }}">
@@ -25,6 +23,8 @@
 
     <input type="hidden" id="id" name="id" value="{{ $model->id }}">
 
+    <div class="row">
+
         <div class="mb-4 col-sm-2">
             <div class="">
                 <label class="form-label" for="cod_atividade">Cód. Atividade</label>
@@ -37,8 +37,8 @@
         </div>
 
         <div class="col-sm-10">
-            <div class="mt-3">
-                <label for="weekday">Dia da Semana</label>
+            <div class="">
+                <label class="mb-2" for="weekday">Dia da Semana</label>
                 <select name="weekday" id="weekday" class="form-select @error('weekday') is-invalid @enderror ajax-errors">
                     @foreach(TaskTime::listWeekDays() as $id => $text)
                         @if( $model->weekday == $id)
@@ -55,6 +55,9 @@
             </div>
         </div>
 
+    </div>
+
+    <div class="row">
         <div class="col-sm-12">
             <div class="">
                 <label for="slct_tarefa_id">Atividade</label>
@@ -67,6 +70,9 @@
                 'field' => 'slct_tarefa_id'
             ])
         </div>
+    </div>
+
+    <div class="row">
 
         <div class="col-sm-6">
             <div class="mt-3">
@@ -89,6 +95,7 @@
                 ])
             </div>
         </div>
+
     </div>
 
     <div class="mt-4">
@@ -121,12 +128,12 @@
 
 <script type="text/javascript">
 
-    $('#weekday').select2(
-    {   
-        allowClear: true,
-        placeholder: 'Dia da Semana',
-        dropdownParent: $('#modal')
-    })
+    // $('#weekday').select2(
+    // {
+    //     allowClear: true,
+    //     placeholder: 'Dia da Semana',
+    //     dropdownParent: $('#modal')
+    // })
 
     $('#slct_tarefa_id').select2(
     {