diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 204cbf9..b0bb6bc 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -145,8 +145,8 @@ class ContactController extends Controller "Titel". "E-mail". "Tlf". - "\"Update\"". - "\"Delete\"". + "\"Update\"". + "\"Delete\"". ""; diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 08dd555..bbfb2af 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -244,9 +244,9 @@ class EventController extends Controller "Event Navn". "Event Ansvarlig". "Event Dato". - "\"Update\"". - "\"Update\"". - "\"Delete\"". + "\"see\"". + "\"Update\"". + "\"Delete\"". ""; $events = DB::table('events')->orderBY('date' , 'asc')->where('name', 'LIKE',$request->search.'%') ->orWhere('date','LIKE', $request->search.'%') diff --git a/skolehjem/app/Http/Controllers/FeedbackController.php b/skolehjem/app/Http/Controllers/FeedbackController.php index 6fbedac..ded3ca6 100644 --- a/skolehjem/app/Http/Controllers/FeedbackController.php +++ b/skolehjem/app/Http/Controllers/FeedbackController.php @@ -133,8 +133,9 @@ class FeedbackController extends Controller public function search(Request $request){ if($request->ajax()){ $output = "". + "Dato". "Feedback Besked". - "Ris el. Ros". + "Ris el. Ros". "\"Delete\"". ""; @@ -149,6 +150,7 @@ class FeedbackController extends Controller if(count($feedbacks) !== 0){ foreach ($feedbacks as $key => $feedback){ $output.=''. + '' . date('d-m-Y', strtotime($feedback->created_at)) . ''. '' . $feedback->message . ''. '' . $feedback->suggestion_form . ''. '
$feedback ]). '" class="w-100 nostyle">'. diff --git a/skolehjem/app/Http/Controllers/LocationController.php b/skolehjem/app/Http/Controllers/LocationController.php index 94fa600..d60aba5 100644 --- a/skolehjem/app/Http/Controllers/LocationController.php +++ b/skolehjem/app/Http/Controllers/LocationController.php @@ -174,8 +174,8 @@ class LocationController extends Controller $output = "". "Navn". "Lokation". - "\"Update\"". - "\"Delete\"". + "\"Update\"". + "\"Delete\"". ""; if($request->option !== 'all') { diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php index 29216a2..79262d7 100644 --- a/skolehjem/app/Http/Controllers/RolesController.php +++ b/skolehjem/app/Http/Controllers/RolesController.php @@ -140,8 +140,8 @@ class rolesController extends Controller $output = "". "Navn". "Beskrivelse". - "\"Update\"". - "\"Delete\"". + "\"Update\"". + "\"Delete\"". ""; $roles = DB::table('roles')->where('name', 'LIKE',$request->search.'%')->get(); diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 7639d0e..6d73690 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -414,8 +414,8 @@ class UserController extends Controller "Email". "Tlf nr". "Rolle(r)". - "\"Update\"". - "\"Delete\"". + "\"Update\"". + "\"Delete\"". ""; diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php index c566f53..63fef18 100644 --- a/skolehjem/resources/views/admin/events/index.blade.php +++ b/skolehjem/resources/views/admin/events/index.blade.php @@ -10,6 +10,9 @@ @endsection @section("content") +
CreateOpret Aktivitet @@ -29,20 +32,22 @@ Delete @foreach($events as $event) - - {{ $event->name }} - {{ $event->accountable }} - {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }} - $event ]) }}">Show - $event ]) }}">Update - $event ]) }}" class="w-100 nostyle"> - @csrf - @method("delete") + @if (date('Y-m-d H:i', strtotime('-1 day')) < date('Y-m-d H:i', strtotime($event->date))) + + {{ $event->name }} + {{ $event->accountable }} + {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }} + $event ]) }}">Show + $event ]) }}">Update + $event ]) }}" class="w-100 nostyle"> + @csrf + @method("delete") - - - - + + + + + @endif @endforeach diff --git a/skolehjem/resources/views/admin/events/signups.blade.php b/skolehjem/resources/views/admin/events/signups.blade.php index 3bf7443..53a77ae 100644 --- a/skolehjem/resources/views/admin/events/signups.blade.php +++ b/skolehjem/resources/views/admin/events/signups.blade.php @@ -10,15 +10,7 @@ @endsection @section("content") -
- -
- @csrf - -
- -
- +
diff --git a/skolehjem/resources/views/admin/feedbacks/index.blade.php b/skolehjem/resources/views/admin/feedbacks/index.blade.php index 9eb667d..34e32f8 100644 --- a/skolehjem/resources/views/admin/feedbacks/index.blade.php +++ b/skolehjem/resources/views/admin/feedbacks/index.blade.php @@ -20,6 +20,12 @@ + diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index 49e291b..b34963c 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -77,80 +77,91 @@ @if(\Illuminate\Support\Facades\Request::route()->getName() == "users.index")
+

Brugere

@else
- @endif

Brugere

+ @endif
@if(\Illuminate\Support\Facades\Request::route()->getName() == "roles.index")
+

Roller

@else
- @endif

Roller

+ @endif
@if(\Illuminate\Support\Facades\Request::route()->getName() == "news.index")
+

Nyheder

@else
- @endif

Nyheder

+ @endif
@if(\Illuminate\Support\Facades\Request::route()->getName() == "menu-plans.index")
+

Menuplan

@else
- @endif

Menuplan

+ @endif
@if(\Illuminate\Support\Facades\Request::route()->getName() == "events.index")
+

Aktiviteter

@else
- @endif

Aktiviteter

+ @endif
@if(\Illuminate\Support\Facades\Request::route()->getName() == "locations.index")
+

Lokationer

@else
- @endif

Lokationer

+ @endif
@if(\Illuminate\Support\Facades\Request::route()->getName() == "washing-machines.index")
+

Vaskemaskiner

@else
- @endif

Vaskemaskiner

+ @endif
@if(\Illuminate\Support\Facades\Request::route()->getName() == "washing-reservations.index")
+

Reservationer

@else
- @endif

Reservationer

+ @endif
@if(\Illuminate\Support\Facades\Request::route()->getName() == "contacts.index")
+

Kontakter

@else
- @endif

Kontakter

+ @endif
@if(\Illuminate\Support\Facades\Request::route()->getName() == "guides.index")
+

Vejledning

@else
- @endif

Vejledning

+ @endif
@if(\Illuminate\Support\Facades\Request::route()->getName() == "feedbacks.index")
+

Feedback

@else
- @endif

Feedback

+ @endif
diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index b8af390..16db481 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -32,7 +32,7 @@
-
+
Tilmeldtes Fornavn Tilmeldtes Efternavn
diff --git a/skolehjem/resources/views/app/about/index.blade.php b/skolehjem/resources/views/app/about/index.blade.php index 2bd79a1..fdab4ff 100644 --- a/skolehjem/resources/views/app/about/index.blade.php +++ b/skolehjem/resources/views/app/about/index.blade.php @@ -12,9 +12,9 @@

Denne app er udviklet til Odense erhvervskollegie.

{{__("msg.programmedby")}}:

Anders Rasmussen,anders164a@gmail.com - Frederik Milling Pytlick, frederikpyt@gmail.com - Vedran Zelen, vedr0021@gmail.com - Victor Neerholt, victorneerholt@gmail.com - Sebastian Davaris, seba4928@edu.sde.dk + Frederik Milling Pytlick,frederikpyt@gmail.com + Vedran Zelen,vedr0021@gmail.com + Victor Neerholt,victorneerholt@gmail.com + Sebastian Davaris,seba4928@edu.sde.dk @endsection