Merge remote-tracking branch 'origin/master'

skolehjem/resources/lang/dk/msg.php

@@ -84,5 +84,6 @@ return[
     "onsdag" => "Onsdag",
     "torsdag" => "Torsdag",
     "aktivitetaflyst" => "Aktivitet Aflyst :(",
-    "ugentligaktiviteter" => "Ugentlig aktivitet"
+    "ugentligaktiviteter" => "Ugentlig aktivitet",
+    "dereringenugentligeaktiviteter" => "Der er igen ugentlige aktivitet"
 ];

skolehjem/resources/lang/en/msg.php

@@ -86,5 +86,6 @@ return[
     "kategori" => "Category",
     "opret" => "Created at: ",
     "aktivitetaflyst" => "Event Cancelled :(",
-    "ugentligaktiviteter" => "Weekly activities"
+    "ugentligaktiviteter" => "Weekly activities",
+    "dereringenugentligeaktiviteter" => "There is no weekly activity"
 ];

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

@@ -53,6 +53,10 @@
         }
     </style>
 
+    <?php
+    $Week = date('W'); //Current week
+    ?>
+
     <main>
         <h1 class="text-center sde-blue mb-2rem">{{ __('msg.ugentligaktiviteter') }}</h1>
         <!--Alert box, display when a event is delete: start-->
@@ -71,33 +75,22 @@
 
         <!--If there is a images to the event do this: Start-->
         @if(!$multiEvents->isEmpty())
-            @foreach($multiEvents as $event)
-                <div class="card">
-                    @if($event->resource_id !== null)
-                        <div class="header">
-                            <img class="w-100" src="{{ asset(\App\Resource::query()->where("id", "=", $event->resource_id)->first()->filename) }}">
-                        </div>
-                    @endif
-                    <div class="container" class="mt-1">
-                        <p class="m-none">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
-                        <h4 class="m-none">{{ $event->week }}</h4>
-                        <div class="row justify-content-space mt-1">
-                            @if (count(\App\UserEvent::query()->where('event_id', '=', $event->id)->where('user_id', '=', Auth::user()->id)->get()) > 0)
-                                <a class="sde-blue text-center m-none p-none bold" href="javascript:void(0);" onclick="ajaxCall({{ $event->id }}, this)" >{{__('msg.afmeld')}}</a>
-                            @else {{-- ^ If you're already participating in the event, then show a ´cancel´ button - v Else show a ´participate´ button --}}
-                            <a class="sde-blue text-center m-none p-none bold" href="javascript:void(0);" onclick="ajaxCall({{ $event->id }}, this)" >{{__('msg.tilmeld')}}</a>
-                            @endif
-                            <a class="sde-blue text-center m-none p-none bold" href="{{route("events.show", ["event" => $event->id ])}}">{{__('msg.læsmere')}}</a>
-                            <a class="sde-blue text-center m-none p-none bold" href="{{route("events.accountsignups", ["event" => $event->id ])}}">{{__('msg.sedeltagere')}}</a>
-                        </div>
-                    </div>
-                </div>
+            @if($multiEvents->contains('week', $Week)) {{-- If any of the menues in the menu table has the number of the week in the 'week' column, do this --}}
+            @foreach($multiEvents as $multiEvent)
+                @if($multiEvent->week == $Week)
+                    <p>{{$multiEvents->name}}</p>
+                    <p>{{$multiEvents->accountable}}</p>
+                    <p>{{$multiEvents->description}}</p>
+                    <p>{{$multiEvents->date}}</p>
+                    <p>{{$multiEvents->event}}</p>
+
+
+                @endif
             @endforeach
-        @else
-            <p class="text-center mb-auto">{{__('msg.dereringenaktiviteter')}}!</p>
+            @else
+                <p class="text-center">{{__('msg.dereringenugentligeaktiviteter')}}!</p>
+            @endif
         @endif
-        <a href="{{ route("userevents.index") }}" class="mt-auto btn text-center btn-sde-blue" id="tilmeld">{{__('msg.setilmeldteaktiviteter')}}</a>
-        <div id="snackbar"></div>
     </main>
 @endsection
 @section("scripts")

skolehjem/resources/views/app/news/index.blade.php

@@ -220,7 +220,7 @@
                   <!---->
                   @elseif($new->type == 'MultipleEvent')
                       <div class="card">
-                          <div class="img"><a href="{{ route('guides.index') }}"><img src="{{URL::asset('/images/icons/Aktiviteter.svg')}}" alt="Vejledninger:"></a></div>
+                          <div class="img"><a href="{{ route('multiple-events.index') }}"><img src="{{URL::asset('/images/icons/Aktiviteter.svg')}}" alt="aktiviteter:"></a></div>
                           <div class="title">Ugenlig aktiviteter for uge {{ $new->subname }}
                               <span class="createdat">{{__('msg.opret')}}{{ date('Y-m-d H:i:s', strtotime($new->created_at))}}</span>
                           </div>