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/app/Http/Controllers/MultipleEventsController.php

@@ -83,7 +83,6 @@ class MultipleEventsController extends Controller
             $multi_event->description = $requestBody['description'][$i];
             $multi_event->accountable = $requestBody['accountable'][$i];
             $multi_event->name = $requestBody['name'][$i];
-            $multi_event->event_end = "2021-27-04 16:00:00";
             $multi_event->multiple_events_parent_id = $multipleParent->id;
             $multi_event->save();
         }
@@ -127,20 +126,20 @@ class MultipleEventsController extends Controller
      */
     public function edit($id)
     {
-        $multiEvent = MultipleEvents::find($id);
+        $multiEvents = MultipleEvents::where('multiple_events_parent_id', '=', $id)->get();
-        return Response::detect("multiple-events.edit", ["multiEvent" => $multiEvent]);
+        return Response::detect("multiple-events.edit", ["multiEvents" => $multiEvents, "parentEvent" => $id]);
     }
 
     /**
      * Update the specified resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \App\MultipleEvents  $multipleeventsController
+     * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, MultipleeventsController $multipleeventsController)
+    public function update(Request $request, $id)
     {
-        //
+        dd($request);
     }
 
 
@@ -161,18 +160,17 @@ class MultipleEventsController extends Controller
      * @param  \App\MultipleEvents  $multipleeventsController
      * @return \Illuminate\Http\Response
      */
-    public function destroy(Request $request, MultipleeventsController $multipleeventsController)
+    public function destroy(Request $request, $id)
     {
         if ($request->signup != null) { // If input signup is not empty, which has been set when you look at the individuel signup, then delete the user who have signed up for the event
-            $UserEvent = UserEvent::query()->where('user_id', "=", $request->signup)->where('multiple_event_id', "=", $multipleeventsController);
+            $UserEvent = UserEvent::find($id);
-
             $UserEvent->delete();
 
-            return redirect()->route("multiple-events.signups", [ "event" => $multipleeventsController ]);
+            return 1;
         } else { // Else if you are deleting an event. Then delete all the sign ups AND the event
-            $userEvents = UserEvent::where('multiple_event_id', "=", $multipleeventsController)->get();
+            $userEvents = UserEvent::where('multiple_event_id', "=", $id)->get();
-            $multiparent = MultipleEventsParent::where('id', '=', $multipleeventsController)->get();
+            $multiparent = MultipleEventsParent::find($id);
-            $multievent = MultipleEvents::where('multiple_events_parent_id', '=', $multiparent->id)->get();
+            $multievent = MultipleEvents::where('multiple_events_parent_id', '=', $id)->get();
 
             foreach ($userEvents as $userEvent) {
                 $userEvent->delete();
@@ -181,13 +179,12 @@ class MultipleEventsController extends Controller
             foreach ($multievent as $me) {
                 $me->delete();
             }
-
+            $news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->where("type", "=", "MultipleEvent")->where("arrangement_id", "=", $id);
-            $news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->where("type", "=", "MultipleEvent")->where("arrangement_id", "=", $multipleeventsController);
             $news->delete();
 
             $multiparent->delete();
 
-            return redirect()->route("multiple-events.index");
+            return 1;
         }
     }
 
@@ -197,7 +194,7 @@ class MultipleEventsController extends Controller
             $multipleEvents = MultipleEvents::where('multiple_events_parent_id', '=', $multipleEventsParent->id)->get();
         } else {*/
             //$multipleEventsParent = MultipleEventsParent::find($request->preview);
-        $multipleEventsParent = MultipleEventsParent::leftJoin('resources', 'resources.id', '=', 'multiple_events_parent.resource_id')->where('multiple_events_parent.id', '=', $request->preview)->first();
+        $multipleEventsParent = MultipleEventsParent::leftJoin('resources', 'resources.id', '=', 'multiple_events_parent.resource_id')->where('multiple_events_parent.id', '=', $request->preview)->select('multiple_events_parent.*', 'resources.filename')->first();
         $multipleEvents = MultipleEvents::where('multiple_events_parent_id', '=', $multipleEventsParent->id)->get();
         //}
 
@@ -213,7 +210,6 @@ class MultipleEventsController extends Controller
         $multiEvent->accountable = substr($multiEvent->accountable, 0, $var);
         $multiEvent->description = substr($multiEvent->description, 0, $var);
         $multiEvent->date = substr($multiEvent->date, 0, $var);
-        $multiEvent->event_end = substr($multiEvent->event_end, 0, $var);
 
         $pdf = PDF::loadView('multipdf.multipleevent', ["multiEvent" => $multiEvent]);
 
@@ -225,12 +221,12 @@ class MultipleEventsController extends Controller
 
     public function signups(Request $request)
     {
-        dd("K");
         // Find every event you have clicked on. And find all users to that event, and the event name itself.
-        $multiEvents = MultipleEvents::join('users', 'users.id', '=', 'user_events.user_id')->join('multiple_event', 'multiple_event_id.id', '=', 'user_events.multiple_event_id')->where('multiple_event_id', $request->event)->get();
+        //$multiEvents = UserEvent::join('users', 'users.id', '=', 'user_events.user_id')->join('multiple_events', 'multiple_events.id', '=', 'user_events.multiple_event_id')->where('multiple_event_id', '=', $request->multipleEvent)->get();
 
-        if (count($multiEvents) == 0)
+        $multiEvents = MultipleEvents::where('multiple_events_parent_id', '=', $request->multipleEvent)->get();
-            $multiEvents = MultipleEvents::where('id', $request->event)->get();
+        //if (count($multiEvents) == 0)
+        //    $multiEvents = MultipleEvents::where('id', '=', $request->multipleEvent)->get();
 
         return Response::detect("multiple-events.signups", [ "multiEvent" => $multiEvents ]);
     }

skolehjem/app/MultipleEvents.php

@@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model;
 class MultipleEvents extends Model
 {
     protected $fillable = [
-        'date', 'event_end', 'event_name', 'accountable', 'week', 'description', 'multiple_events_parent_id'
+        'date', 'event_name', 'accountable', 'week', 'description', 'multiple_events_parent_id'
     ];
 }

skolehjem/database/migrations/2021_04_20_142356_create_multiple_events.php

@@ -20,7 +20,6 @@ class CreateMultipleEvents extends Migration
             $table->string("accountable");
             $table->longText("description");
             $table->dateTime("date");
-            $table->dateTime('event_end');
             $table->timestamps();
         });
     }

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

skolehjem/resources/views/admin/multiple-events/edit.blade.php

@@ -34,48 +34,27 @@
     </style>
     <link href="{{ asset("/css/quill/quill.snow.css") }}" rel="stylesheet">
     <h1 id="errormesseages" >Opret ugentligt  aktivitet: [Vi er i uge <?php echo date('W'); ?>]</h1>
-    <form method="post" action="{{ route("multiple-events.store") }}" enctype="multipart/form-data">
+    <form method="post" action="{{ route("multiple-events.update", $parentEvent) }}" enctype="multipart/form-data">
-        <!--datetime-local-->
         @csrf
+        @method("PUT")
         <input type="text" name="week" placeholder="Uge">
         <label id="fileuploadee"for="fileuploade">Baggrundsbillede til nyheden (Valgfri)</label>
         <input id="fileuploade" type="file" name="resource" accept="image/*">
         <table>
             <tr>
-                <th>Ugedag</th>
                 <th>Aktivitets navn</th>
                 <th>Aktivitets beskrivelse</th>
                 <th>Tovholder</th>
                 <th>Tidsrum (Start)</th>
             </tr>
-            <tr>
+            @foreach($multiEvents as $multiEvent)
-                <td>Mandag</td>
+                <tr>
-                <td><input type="text" name="name[]" max="255" value="{{ $multiEvent->name[1] }}"></td>
+                    <td><input type="text" name="name[][]" max="255" value="{{ $multiEvent->name }}"></td>
-                <td><input type="text" name="description[]" max="255" value="{{ old("description.0") }}"></td>
+                    <td><input type="text" name="description[][]" max="255" value="{{ $multiEvent->description }}"></td>
-                <td><input type="text" name="accountable[]" value="{{ old("accountable.0") }}"></td>
+                    <td><input type="text" name="accountable[][]" value="{{ $multiEvent->accountable }}"></td>
-                <td><input type="datetime-local" name="date[]" value="{{ old("date.0") }}"></td>
+                    <td><input type="datetime-local" name="date[][]" value="{{ $multiEvent->date }}"></td>
-            </tr>
+                </tr>
-            <tr>
+            @endforeach
-                <td>Tirsdag</td>
-                <td><input type="text" name="name[]" max="255" value="{{ old("name.1") }}"></td>
-                <td><input type="text" name="description[]" max="255" value="{{ old("description.1") }}"></td>
-                <td><input type="text" name="accountable[]" value="{{ old("accountable.1") }}"></td>
-                <td><input type="datetime-local" name="date[]" value="{{ old("date.1") }}"></td>
-            </tr>
-            <tr>
-                <td>Onsdag</td>
-                <td><input type="text" name="name[]" max="255" value="{{ old("name.2") }}"></td>
-                <td><input type="text" name="description[]" max="255" value="{{ old("description.2") }}"></td>
-                <td><input type="text" name="accountable[]" value="{{ old("accountable.2") }}"></td>
-                <td><input type="datetime-local" name="date[]" value="{{ old("date.2") }}"></td>
-            </tr>
-            <tr>
-                <td>Torsdag</td>
-                <td><input type="text" name="name[]" max="255" value="{{ old("name.3") }}"></td>
-                <td><input type="text" name="description[]" max="255" value="{{ old("description.3") }}"></td>
-                <td><input type="text" name="accountable[]" value="{{ old("accountable.3") }}"></td>
-                <td><input type="datetime-local" name="date[]" value="{{ old("date.3") }}"></td>
-            </tr>
         </table>
 
         <label class="toggle">

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

@@ -73,7 +73,7 @@
 
                     for (var i = 0; i < data[1].length; i++) {
                         $("#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'>"+data[1][i].date+"</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/multiple-events/signups.blade.php

@@ -6,45 +6,80 @@
 @endsection
 
 @section("path")
-    <a href="{{ route("multiple-events.index") }}" class="text-white">Vis Events</a> / <a href="" class="text-white">Vis Tilmeldte - {{ $multiEvent[0]->name }}</a> /
+    <a href="{{ route("events.index") }}" class="text-white">Vis Events</a> / <a href="" class="text-white">Vis Tilmeldte</a> /
 @endsection
 
 @section("content")
-    <table class="tbl mt-1" id="table_id">
+    @foreach($multiEvent as $event)
-        <thead>
+        <h1 class="text-center">{{ $event->name }}</h1>
+        <table class="tbl mt-1" id="table_id{{ $event->id }}">
+            <thead>
             <th>Tilmeldtes Fornavn</th>
             <th>Tilmeldtes Efternavn</th>
             <th>Tilmeldtes Tlf Nr</th>
             <th class="w-1em"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
-        </thead>
+            </thead>
-        <tbody>
+            <tbody>
-            @foreach($multiEvent as $event)
+            @foreach (\App\UserEvent::join('users', 'users.id', '=', 'user_events.user_id')->where('multiple_event_id', '=', $event->id)->select('user_events.*', 'users.name_first', 'users.name_last', 'users.phone')->get() as $ue)
-                @if ($event->name_first != null && $event->name_last != null && $event->phone != null && $event->multiple_event_id != null && $event->user_id != null)
+                <tr id="row_{{ $ue->id }}">
-                    <tr>
+                    <td>{{ $ue->name_first }}</td>
-                        <td>{{ $event->name_first }}</td>
+                    <td>{{ $ue->name_last }}</td>
-                        <td>{{ $event->name_last }}</td>
+                    <td>{{ $ue->phone }}</td>
-                        <td>{{ $event->phone }}</td>
+                    <td>
-                        <td><form method="post" action="{{ route("multiple-events.destroy", [ "multiEvent" => $event->event_id ]) }}" class="w-100 nostyle">
+                        @csrf
-                                @csrf
+                        <a class="w-100 nostyle" onclick="delete_userevent({{ $ue->id }}, {{ $event->id }})"><img class="w-100 cursor-pointer" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a>
-                                @method("delete")
+                    </td>
-
+                </tr>
-                                <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>
-                            </form>
-                        </td>
-                    </tr>
-                @endif
             @endforeach
-        </tbody>
+            </tbody>
-    </table>
+        </table>
+    @endforeach
 @endsection
 @section('scripts')
     <script>
-        $(document).ready( function () {
+        @foreach($multiEvent as $event)
-            $('#table_id').DataTable({
+            $(document).ready( function () {
-                columnDefs: [
+                $('#table_id'+{{ $event->id }}).DataTable({
-                    { orderable: false, targets: [-1] }
+                    columnDefs: [
-                ]
+                        { orderable: false, targets: [-1] }
+                    ]
+                });
             });
-        });
+        @endforeach
+
+        function delete_userevent(id, tableid) {
+            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: 'Fjern brugeren fra aktiviteten',
+                cancelButtonText: 'Annuller'
+            }).then((result) => {
+                if (result.isConfirmed) {
+                    $.ajax({
+                        type: "POST",
+                        url: "/multiple-events/"+id,
+                        data:{'_token':token, _method: 'DELETE', 'signup': true},
+                        success: function () {
+                            $('#table_id'+tableid).DataTable().row($('#row_'+id)[0]).remove().draw();
+
+                            Swal.fire(
+                                'Brugeren er hermed fjernet fra aktiviteten!',
+                                '',
+                                'success'
+                            )
+                        },
+                        error:function (data) {
+                            console.log(data);
+                        }
+                    });
+                }
+            })
+        }
     </script>
 @endsection

skolehjem/resources/views/app/events/yourevents.blade.php

@@ -38,7 +38,6 @@
         @if(!$userevents['events']->isEmpty() || !$userevents['multiple']->isEmpty())
             @foreach($userevents as $key => $allevents)
                 @foreach($allevents as $userevent)
-                    {{ $key }}
                     <form method="post" action="{{ route("userevents.destroy", $userevent) }}">
                         @csrf
                         @method("delete")

skolehjem/resources/views/multipdf/multipleevent.blade.php

@@ -29,9 +29,6 @@
 
             <h2 class="ql-align-center"><strong>date:</strong></h2>
             <p class="ql-align-center">{{$multiEvent->date}}</p>
-
-            <h2 class="ql-align-center"><strong>event_end:</strong></h2>
-            <p class="ql-align-center">{{$multiEvent->event_end}}</p>
         </div>
 
     </body>

skolehjem/routes/web.php

@@ -29,7 +29,7 @@ Route::get("/account/editpass", "UserController@accounteditpass")->name("users.a
 Route::put("/account/update", "UserController@accountupdate")->name("users.accountupdate");
 Route::get("/account/editpic", "UserController@accounteditpic")->name("users.accounteditpic");
 Route::get("/events/signups/{event}", "EventController@signups")->name("events.signups");
-Route::get("/multiple-events/signups/{multiple-event}", "MultipleEventsController@signups")->name("multiple-events.signups");
+Route::get("/multiple-events/signups/{multipleEvent}", "MultipleEventsController@signups")->name("multiple-events.signups");
 Route::get("/events/accountsignups", "EventController@accountsignups")->name("events.accountsignups");
 Route::get("/multiple-events/accountsignups", "MultipleEventsController@accountsignups")->name("multiple-events.accountsignups");
 Route::get("phones", "PhoneController@index")->name("phones.index");