v1.5.20 - Removed event_end & Updated Migration

Updated Delete of multiple event
Started on deletion of single event & multiple-event edit
Removed userevent $key variable
Updated multipdf
Fixed web.php

skolehjem/resources/views/admin/events/index.blade.php

@@ -85,7 +85,7 @@
         @foreach(\App\MultipleEventsParent::query()->orderBY('id' , 'desc')->get() as $event)
             <tr id="row2_{{ $event->id }}">
                 <td>{{ $event->week}}</td>
-                <td><a href="{{ route("multiple-events.signups", $event->id) }}"><img class="w-100" src="{{ asset('/images/icons/eye-dark.svg') }}" alt="Show"></a></td>
+                <td><a href="{{ route("multiple-events.signups", ["multipleEvent" => $event->id]) }}"><img class="w-100" src="{{ asset('/images/icons/eye-dark.svg') }}" alt="Show"></a></td>
                 <td><a id="preview" onclick="modalMultiEventContent({{$event->id}})" style="cursor: pointer"><img class="w-100" src="{{ asset('/images/icons/preview-dark.svg') }}" alt="preview"></a></td>
                     <td><a href="{{ route("multiPdf.genPDF", [ "multiEvent" => $event->id ]) }}" target="_blank"><img class="w-100" src="{{ asset('/images/icons/print.svg') }}" alt="Print"></a></td>
                 @if(auth()->user()->can('event.edit'))
@@ -132,6 +132,7 @@
     </div>
 @endsection
 @section('scripts')
+    <script src="{{ asset("/js/moment-with-locales.min.js") }}"></script>
     <script>
         var modalEvent = document.getElementById("eventModal");
         var modalMultiEvent = document.getElementById("eventMultiModal");
@@ -173,8 +174,10 @@
                         $("#eventmultiimg").attr('src', data[0].filename);
 
                     for (var i = 0; i < data[1].length; i++) {
+                        var d = new Date(data[1][i].date);
+                        var day = moment().lang("da").day(d.getDay()).format("dddd");
                         $("#events").append("<div class='container text-center'><div class='row justify-content-center'><div class='col'><h1 class='mb-0'>"+data[1][i].name+"</h1>" +
-                            "<h3 class='mt-0 mb-0'>"+data[1][i].date+" - "+data[1][i].event_end+"</h3>" +
+                            "<h3 class='mt-0 mb-0'>"+d.getDate()+"/"+(d.getMonth()+1)+"/"+d.getFullYear()+" "+d.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })+" ["+ day.charAt(0).toUpperCase() + day.slice(1) +"]</h3>" +
                             "<h3 class='mt-0'>Tovholder: "+data[1][i].accountable+"</h3>" +
                             "<h3 class='mb-0'>Beskrivelse:</h3>" +
                             "<p class='mt-0'>"+data[1][i].description+"</p>" +

skolehjem/resources/views/admin/events/signups.blade.php

@@ -28,7 +28,7 @@
                                 @csrf
                                 @method("delete")
 
-                                <button name="signup" value="{{ $event->user_id }}" class="w-100 nostyle" onclick="return confirm('Are you sure you want to delete?');" type="submit"><img class="w-100 cursor-pointer" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
+                                <button name="signup" value="{{ $event->user_id }}" class="w-100 nostyle" onclick="delete_userevent();" type="submit"><img class="w-100 cursor-pointer" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
                             </form>
                         </td>
                     </tr>
@@ -46,5 +46,43 @@
                 ]
             });
         });
+
+        function delete_userevent() {
+            var token = $("input[name='_token']").val();
+
+            Swal.fire({
+                title: 'Er du sikker?',
+                text: "Dette kan ikke blive ændret tilbage!",
+                icon: 'warning',
+                showCancelButton: true,
+                confirmButtonColor: '#3085d6',
+                cancelButtonColor: '#d33',
+                confirmButtonText: 'Slet Menuplanen',
+                cancelButtonText: 'Annuller'
+            }).then((result) => {
+                if (result.isConfirmed) {
+                    $.ajax({
+                        type: "POST",
+                        url: "menu-plans/"+id,
+                        data:{'_token':token, _method: 'DELETE'},
+                        success: function () {
+                            $('#table_id').DataTable().row($('#row_'+id)[0]).remove().draw();
+
+                            Swal.fire(
+                                'Menuplanen er slettet!',
+                                '',
+                                'success'
+                            )
+
+                            return false;
+                        },
+                        error:function (data) {
+                            console.log(data);
+                        }
+                    });
+                }
+            })
+            return false;
+        }
     </script>
 @endsection