calendar - fix creazione manuale + rimossi campi "corso", "durata", "frequenza", "livello"

app/Http/Livewire/Calendar.php

@@ -147,17 +147,25 @@ class Calendar extends Component
     {
 
         $calendar = new \App\Models\Calendar();
-        $calendar->course_id = null;
-        $calendar->court_id = $this->court_id != '' ? $this->court_id : null;
         $calendar->name = $this->name;
-        $calendar->course_type_id = $this->course_type_id != '' ? $this->course_type_id : null;
-        $calendar->course_duration_id = $this->course_duration_id != '' ? $this->course_duration_id : null;
-        $calendar->course_frequency_id = $this->course_frequency_id != '' ? $this->course_frequency_id : null;
-        $calendar->course_level_id = $this->course_level_id != '' ? $this->course_level_id : null;
-        $calendar->instructor_id = $this->instructor_id != '' ? $this->instructor_id : null;
         $calendar->from = $this->from;
         $calendar->to = $this->to;
-        $calendar->note = $this->note;
+        // $calendar->court_id = $this->court_id != '' ? $this->court_id : null;
+        // $calendar->course_id = null;
+        // $calendar->course_type_id = $this->course_type_id != '' ? $this->course_type_id : null;
+        // $calendar->course_duration_id = $this->course_duration_id != '' ? $this->course_duration_id : null;
+        // $calendar->course_frequency_id = $this->course_frequency_id != '' ? $this->course_frequency_id : null;
+        // $calendar->course_level_id = $this->course_level_id != '' ? $this->course_level_id : null;
+        // $calendar->instructor_id = $this->instructor_id != '' ? $this->instructor_id : null;
+        // $calendar->note = $this->note;
+        $calendar->court_id = null;
+        $calendar->course_id = null;
+        $calendar->course_type_id = null;
+        $calendar->course_duration_id = null;
+        $calendar->course_frequency_id = null;
+        $calendar->course_level_id = null;
+        $calendar->instructor_id = null;
+        $calendar->note = null;
         $calendar->status = 0;
         $calendar->manual = 1;
         $calendar->save();

resources/views/livewire/calendar.blade.php

@@ -8,7 +8,7 @@
 
 
     <section id="resume-table">
-        
+
         <div class="compare--chart_wrapper d-none"></div>
 
         <div class="row">
@@ -70,7 +70,7 @@
                             <label class="form-label date text-primary">Martdì aaa</label>
                             <h3 class="title mb-0">Padel</h3>
                         </div>
-                    </div>                    
+                    </div>
                     <div class="row mt-2 showDelete" style="display:none">
                         <br>
                         <div class="col-md-12">
@@ -82,7 +82,7 @@
                                 @endforeach
                             </select>
                         </div>
-                    </div>                
+                    </div>
                 </div>
                 <div class="modal-footer mt-2 justify-content-between">
                     <button class="btn--ui lightGrey hideDelete hideDeleteButton activeCalendarButton" onclick="showDelete()">Annulla Lezione</a>
@@ -114,13 +114,13 @@
                             <input class="form-control" type="date" id="date" placeholder="Data">
                         </div>
                         <div class="col-md-6">
-                            <label for="date" class="form-label">Nome</label>
+                            <label for="name" class="form-label">Nome</label>
                             <input class="form-control js-keyupTitle" type="name" id="name" placeholder="Nome">
                         </div>
-                    </div>                    
+                    </div>
                     <div class="row">
                         <div class="col-md-6">
-                            <label for="course_subscription_id" class="form-label">Ora inizio</label>
+                            <label for="from" class="form-label">Ora inizio</label>
                             <select class="form-select" id="from">
                                 <option value="">--Seleziona--
                                 @for($c=6;$c<=23;$c++)
@@ -130,7 +130,7 @@
                             </select>
                         </div>
                         <div class="col-md-6">
-                            <label for="course_subscription_id" class="form-label">Ora fine</label>
+                            <label for="to" class="form-label">Ora fine</label>
                             <select class="form-select" id="to">
                                 <option value="">--Seleziona--
                                 @for($c=6;$c<=23;$c++)
@@ -139,8 +139,8 @@
                                 @endfor
                             </select>
                         </div>
-                    </div>                    
-                    <div class="row">
+                    </div>
+                    {{-- <div class="row">
                         <div class="col-md-6">
                             <label for="course_type_id" class="form-label">Corso</label>
                             <select class="form-select form-select-lg me-1" id="course_type_id">
@@ -158,9 +158,9 @@
                                     <option value="{{$c["id"]}}">{{$c["name"]}}</option>
                                 @endforeach
                             </select>
-                            
+
                         </div>
-                    </div>    
+                    </div>
                     <div class="row">
                         <div class="col-md-6">
                             <label for="course_frequency_id" class="form-label">Frequenza</label>
@@ -179,9 +179,9 @@
                                     <option value="{{$c["id"]}}">{{$c["name"]}}</option>
                                 @endforeach
                             </select>
-                            
+
                         </div>
-                    </div>  
+                    </div> --}}
                     {{-- <div class="row">
                         <div class="col-md-6">
                             <label for="course_frequency_id" class="form-label">Campo</label>
@@ -200,13 +200,13 @@
                                     <option value="{{$c["id"]}}">{{$c["name"]}}</option>
                                 @endforeach
                             </select>
-                            
+
                         </div>
-                    </div>  
+                    </div>
                     <div class="row">
                         <div class="col-md-12">
                             <label for="note" class="form-label">Note</label>
-                            <input class="form-control" type="name" id="note" placeholder="Note">                            
+                            <input class="form-control" type="name" id="note" placeholder="Note">
                         </div>
                     </div> --}}
                 </div>
@@ -221,7 +221,7 @@
 </div>
 
 @push('scripts')
-    
+
     <script src="/assets/js/fullcalendar.js"></script>
     <script src="/assets/js/fullcalendar_locales.js"></script>
 @endpush
@@ -238,25 +238,24 @@
         }
 
         function createCalendar()
-        {                        
-            
-            console.log($("#course_type_id").val());
-            @this.set('course_type_id',$("#course_type_id").val());
-            console.log($("#course_duration_id").val());
-            @this.set('course_duration_id', $("#course_duration_id").val());
-            console.log($("#course_frequency_id").val());
-            @this.set('course_frequency_id', $("#course_frequency_id").val());
-            console.log($("#course_level_id").val());
-            @this.set('course_level_id', $("#course_level_id").val());
+        {
+            console.log($("#name").val());
+            @this.set('name', $("#name").val());
             console.log($("#date").val() + " " + $("#from").val() + ":00");
             @this.set('from', $("#date").val() + " " + $("#from").val() + ":00");
             console.log($("#date").val() + " " + $("#to").val() + ":00");
             @this.set('to', $("#date").val() + " " + $("#to").val() + ":00");
-            console.log($("#name").val());
-            @this.set('name', $("#name").val());
-            @this.set('note', $("#note").val());
-            @this.set('court_id', $("#court_id").val());
-            @this.set('instructor_id', $("#instructor_id").val());
+            // console.log($("#course_type_id").val());
+            // @this.set('course_type_id',$("#course_type_id").val());
+            // console.log($("#course_duration_id").val());
+            // @this.set('course_duration_id', $("#course_duration_id").val());
+            // console.log($("#course_frequency_id").val());
+            // @this.set('course_frequency_id', $("#course_frequency_id").val());
+            // console.log($("#course_level_id").val());
+            // @this.set('course_level_id', $("#course_level_id").val());
+            // @this.set('note', $("#note").val());
+            // @this.set('court_id', $("#court_id").val());
+            // @this.set('instructor_id', $("#instructor_id").val());
             @this.createCalendar();
         }
 
@@ -286,7 +285,7 @@
                     $('.openNewModal').trigger('click');
                 },
                 eventClick: function(info) {
-                    var eventDate = new Date(info.event.start); 
+                    var eventDate = new Date(info.event.start);
                     var datestring = eventDate.getFullYear() + "-" + pad(eventDate.getMonth()+1, 2) + "-" + pad(eventDate.getDate(), 2) + " " + pad(eventDate.getHours(), 2) + ":" + pad(eventDate.getMinutes(), 2) + ":00";
                     var title = info.event.title;
                     $(".title").html(title);
@@ -303,20 +302,20 @@
                     $(".time").html(pad(eventDate.getHours(), 2) + ":" + pad(eventDate.getMinutes(), 2));
                     $(".date").html(eventDate.toLocaleDateString('it-IT', { weekday: 'long' }) + " " + pad(eventDate.getDate(), 2) + " " + eventDate.toLocaleDateString('it-IT', { month: 'long' }));
                     currentCalendar = info.event.id;
-                    params = '?calendarId=' + info.event.id;// + "&date=" + datestring; 
+                    params = '?calendarId=' + info.event.id;// + "&date=" + datestring;
                     if (info.event.id > 0)
                         $('.openModal').trigger('click');
                 },
                 locale: 'it',
                 events: @json($records),
-            });            
+            });
             calendar.render();
         });
 
         $(document).ready(function() {
 
-            
-            
+
+
         } );
 
         function showDelete() {
@@ -333,19 +332,19 @@
         function deleteCalendar()
         {
             var motivation = jQuery("#motivation_id").val();
-            @this.cancelCalendar(currentCalendar, motivation);            
+            @this.cancelCalendar(currentCalendar, motivation);
         }
 
         function revertCalendarDeletion()
         {
-            @this.revertCalendarDeletion(currentCalendar);            
+            @this.revertCalendarDeletion(currentCalendar);
         }
 
         function reloadCalendar()
         {
             document.location.href = '/calendar?name_filter=' + $("#name_filter").val();
         }
-        
+
     </script>
 @endpush
 

resources/views/livewire/presence.blade.php

@@ -186,7 +186,7 @@
     <div class="row">
         @if($calendar->status == 0)
         <div class="col">
-            @if(!$manual)
+            {{-- @if(!$manual) --}}
             <div class="col-lg-4 col-md-7 col-sm-12 showDelete" style="display:none">
                 <label for="newMotivation" class="form-label">Motivazione</label>
                 <select class="form-select form-select-lg me-1 " id="motivation_id">
@@ -199,13 +199,15 @@
             <button type="button" class="btn--ui lightGrey btSave" onclick="showHideDelete()">Annulla lezione per selezionati</button>
             {{-- <button type="button" class="btn--ui btSave" onclick="saveAndStay()">Salva presenze</button> --}}
 
-            @endif
+            {{-- @endif --}}
         </div>
-        @if(!$manual)
+        {{-- @if(!$manual) --}}
         <div class="col-auto mt-2 text-end">
             <a href="/calendar?last_date={{$last_date}}" class="btn--ui lightGrey btSave">Chiudi</a>
             {{-- <button type="button" class="btn--ui btSave" onclick="saveAndQuit()">Salva e chiudi</button> --}}
+            @if(!$manual)
             <button type="button" class="btn--ui btSave" onclick="saveAndStay()">Salva presenze</button>
+            @endif
         </div>
         <div class="col-xs-12 mt-2">
             <div class="showDelete" style="float:left;display:none;">
@@ -213,16 +215,16 @@
                 <button type="button" class="btn--ui btSaveDelete" onclick="cancel()">Conferma</button>
             </div>
         </div>
-        @endif
+        {{-- @endif --}}
         @endif
     </div>
 
     <div class="row mt-3">
         @if($calendar->status == 0)
-        @if(!$manual)
+        {{-- @if(!$manual) --}}
         <div class="col-md-6">
         </div>
-        @endif
+        {{-- @endif --}}
         @else
         LEZIONE ANNULLATA ({{$calendar->motivation ? $calendar->motivation->name : ''}})
         @endif
@@ -672,10 +674,10 @@
                 }
             });
 
-            @if($manual)
-                var motivation_manual_id = $("#motivation_manual_id").val();
-                @this.set('motivation_manual_id', motivation_manual_id);
-            @endif
+            // @if($manual)
+            //     var motivation_manual_id = $("#motivation_manual_id").val();
+            //     @this.set('motivation_manual_id', motivation_manual_id);
+            // @endif
 
             
             var save_court_id = $("#save_court_id").val();