diff --git a/skolehjem/app/ExternalLink.php b/skolehjem/app/ExternalLink.php
deleted file mode 100644
index 7a0076a..0000000
--- a/skolehjem/app/ExternalLink.php
+++ /dev/null
@@ -1,25 +0,0 @@
-
".
"
 | ".
"";
+
+
+
+ if($request->isCheck === "navn")
+ $users = Contact::query()->where('contactname', 'LIKE',$request->search.'%')->get();
+ elseif ($request->isCheck === "titel")
+ $users = Contact::query()->where('title', 'LIKE',$request->search.'%')->get();
+ elseif ($request->isCheck === "email")
+ $users = Contact::query()->where('email', 'LIKE',$request->search.'%')->get();
+ elseif ($request->isCheck === "tf")
+ $users = Contact::query()->where('phone', 'LIKE',$request->search.'%')->get();
+ else
$users = DB::table('contacts')->where('contactname', 'LIKE',$request->search.'%')
->orWhere('title','LIKE', $request->search.'%')
->orWhere('phone','LIKE', $request->search.'%')
@@ -170,7 +182,7 @@ class ContactController extends Controller
}
}else{
$output.=''.
- 'Din søgning matchede ikke nogen personer | '.
+ 'Intet match | '.
' | '.
' | '.
' | '.
diff --git a/skolehjem/app/Http/Controllers/ExternalLinkController.php b/skolehjem/app/Http/Controllers/ExternalLinkController.php
deleted file mode 100644
index 0df95e4..0000000
--- a/skolehjem/app/Http/Controllers/ExternalLinkController.php
+++ /dev/null
@@ -1,130 +0,0 @@
-middleware([ "auth" ]);
-
- $this->middleware("permission:link.external.list")->only("index");
- $this->middleware("permission:link.external.create")->only(["create", "store"]);
- $this->middleware("permission:link.external.show")->only("show");
- $this->middleware("permission:link.external.edit")->only(["edit", "update"]);
- $this->middleware("permission:link.external.delete")->only("destroy");
- }
-
- /**
- * Display a listing of the resource.
- *
- * @param Request $request
- * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
- */
- public function index(Request $request)
- {
- $externalLink = ExternalLink::query()->paginate($request->input("limit", 20));
-
- return Response::detect("external-links.index", [ "links" => $externalLink ]);
- }
-
- /**
- * Show the form for creating a new resource.
- *
- * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
- */
- public function create()
- {
- return Response::detect("external-links.create");
- }
-
- /**
- * Store a newly created resource in storage.
- *
- * @param \Illuminate\Http\Request $request
- * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
- */
- public function store(Request $request)
- {
- $requestBody = $request->validate([
- "name" => "required|max:255",
- "link" => "required|max:255"
- ]);
-
- $externalLink = new ExternalLink($requestBody);
- $saved = $externalLink->save();
-
- if(!$saved){
- return Response::detect("external-links.store");
- }else{
- $externalLink = ExternalLink::query()->paginate($request->input("limit", 20));
- return Response::detect("external-links.index", ['links' => $externalLink]);
- }
-
- }
-
- /**
- * Display the specified resource.
- *
- * @param int $id
- * @return \Illuminate\Http\Response
- */
- public function show($id)
- {
- return Response::detect("external-links.show", [ "link" => $id]);
- }
-
- /**
- * Show the form for editing the specified resource.
- *
- * @param int $id
- * @return \Illuminate\Http\Response
- */
- public function edit($id)
- {
- $link = ExternalLink::find($id);
- return Response::detect("external-links.edit", ["link" => $link]);
- }
-
- /**
- * Update the specified resource in storage.
- *
- * @param \Illuminate\Http\Request $request
- * @param int $id
- * @return \Illuminate\Http\Response
- */
- public function update(Request $request, $id)
- {
- $data = $request->all();
-
- $link = ExternalLink::find($id);
- $link->update($data);
- $saved = $link->save();
-
- if(!$saved){
- return Response::detect("external-links.update", [ "link" => $link]);
- }else{
- $externalLink = ExternalLink::query()->paginate($request->input("limit", 20));
- return Response::detect("external-links.index", ['links' => $externalLink]);
- }
-
- }
-
- /**
- * Remove the specified resource from storage.
- *
- * @param int $id
- * @return \Illuminate\Http\Response
- */
- public function destroy($id)
- {
- $link = ExternalLink::find($id);
- $link->delete();
- return redirect()->route("external-links.index");
- }
-}
diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php
index 5e1ba8a..f0ff297 100644
--- a/skolehjem/app/Http/Controllers/WashingReservationController.php
+++ b/skolehjem/app/Http/Controllers/WashingReservationController.php
@@ -67,15 +67,13 @@ class WashingReservationController extends Controller
$machineReservation = new WashingReservation($data);
$machineReservation->user_id = auth()->user()->id;
- $machineReservation->save();
- $saved = $machineReservation->save();
+ $allMachineReservations = WashingReservation::query()->where('time', '=', $request->time)->where('machine_id', '=', $request->machine_id)->get();
- if (!$saved) {
- return Response::detect("washing-reservations.store", [
- "washing_reservation" => $machineReservation
- ]);
+ if (count($allMachineReservations) > 0) {
+ return redirect()->route("washing-reservations.create", ["washing_reservation" => $machineReservation])->with('ReservationExists', 'Der findes allerede en reservation til denne tid, men denne vaskemaskine!
');
} else {
+ $machineReservation->save();
$reservations = WashingReservation::query()->paginate($request->input("limit", 20));
return redirect()->route('washing-reservations.appindex', ["reservations" => $reservations]);
@@ -175,7 +173,7 @@ class WashingReservationController extends Controller
foreach ($reservations as $reservation){
array_push($times, $reservation->time);
}
- //2020-07-28%
+
$output = json_encode(['date' => $date, 'washingmachines' => $machines, 'unavailable_times' => $times ]);
return Response($output);
}
@@ -232,7 +230,6 @@ class WashingReservationController extends Controller
' | '.
' | '.
' | '.
- ' | '.
'
';
}
return Response($output);
diff --git a/skolehjem/database/migrations/2020_06_24_064840_create_external_links.php b/skolehjem/database/migrations/2020_06_24_064840_create_external_links.php
deleted file mode 100644
index b6da609..0000000
--- a/skolehjem/database/migrations/2020_06_24_064840_create_external_links.php
+++ /dev/null
@@ -1,35 +0,0 @@
-id();
- $table->string("name");
- $table->string("link");
- $table->timestamps();
- });
- }
-
- /**
- * Reverse the migrations.
- *
- * @return void
- */
- public function down()
- {
- Schema::dropIfExists('external_links');
- }
-}
diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php
index 04442cd..0a44909 100644
--- a/skolehjem/resources/views/admin/contacts/index.blade.php
+++ b/skolehjem/resources/views/admin/contacts/index.blade.php
@@ -2,7 +2,7 @@
@extends("admin.layout.header")
@section("title")
- Events - Vis
+ Kontakt - Vis
@endsection
@section("path")
@@ -15,9 +15,18 @@
+
+
+
+
+
+
+
+
+
@@ -51,11 +60,13 @@
+
+
+
+
@endsection
diff --git a/skolehjem/resources/views/admin/external-links/create.blade.php b/skolehjem/resources/views/admin/external-links/create.blade.php
deleted file mode 100644
index 318a6a6..0000000
--- a/skolehjem/resources/views/admin/external-links/create.blade.php
+++ /dev/null
@@ -1,22 +0,0 @@
-@extends("admin.layout.base")
-@extends("admin.layout.header")
-
-@section("title")
- Link - Opret
-@endsection
-
-@section("path")
- Opret Link /
-@endsection
-
-@section("content")
- Opret Link:
-
-@endsection
diff --git a/skolehjem/resources/views/admin/external-links/delete.blade.php b/skolehjem/resources/views/admin/external-links/delete.blade.php
deleted file mode 100644
index 2573007..0000000
--- a/skolehjem/resources/views/admin/external-links/delete.blade.php
+++ /dev/null
@@ -1,13 +0,0 @@
-@extends("admin.layout.base")
-@extends("admin.layout.header")
-
-@section("title")
- Link - Fjern
-@endsection
-
-@section("path")
- Fjern Link /
-@endsection
-
-@section("content")
-@endsection
diff --git a/skolehjem/resources/views/admin/external-links/edit.blade.php b/skolehjem/resources/views/admin/external-links/edit.blade.php
deleted file mode 100644
index 250ec21..0000000
--- a/skolehjem/resources/views/admin/external-links/edit.blade.php
+++ /dev/null
@@ -1,23 +0,0 @@
-@extends("admin.layout.base")
-@extends("admin.layout.header")
-
-@section("title")
- Link - Rediger
-@endsection
-
-@section("path")
- Rediger Link /
-@endsection
-
-@section("content")
- Rediger Link:
-
-@endsection
diff --git a/skolehjem/resources/views/admin/external-links/index.blade.php b/skolehjem/resources/views/admin/external-links/index.blade.php
deleted file mode 100644
index 4e4dcad..0000000
--- a/skolehjem/resources/views/admin/external-links/index.blade.php
+++ /dev/null
@@ -1,40 +0,0 @@
-@extends("admin.layout.base")
-@extends("admin.layout.header")
-
-@section("title")
- Link - Vis
-@endsection
-
-@section("path")
- Vis Link /
-@endsection
-
-@section("content")
-
-
-
- {{ $links->links() }}
-@endsection
diff --git a/skolehjem/resources/views/admin/external-links/store.blade.php b/skolehjem/resources/views/admin/external-links/store.blade.php
deleted file mode 100644
index efdc62b..0000000
--- a/skolehjem/resources/views/admin/external-links/store.blade.php
+++ /dev/null
@@ -1,14 +0,0 @@
-@extends("admin.layout.base")
-@extends("admin.layout.header")
-
-@section("title")
- Link - Opret
-@endsection
-
-@section("path")
- Opret External Link /
-@endsection
-
-@section("content")
- Link blev (ikke) oprettet.
-@endsection
diff --git a/skolehjem/resources/views/admin/external-links/update.blade.php b/skolehjem/resources/views/admin/external-links/update.blade.php
deleted file mode 100644
index d0f6663..0000000
--- a/skolehjem/resources/views/admin/external-links/update.blade.php
+++ /dev/null
@@ -1,14 +0,0 @@
-@extends("admin.layout.base")
-@extends("admin.layout.header")
-
-@section("title")
- link - Rediger
-@endsection
-
-@section("path")
- $link]) }}" class="text-white">External link /
-@endsection
-
-@section("content")
- Din link blev (ikke) redigeret.
-@endsection
diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php
index 81e0863..554104c 100644
--- a/skolehjem/resources/views/admin/layout/base.blade.php
+++ b/skolehjem/resources/views/admin/layout/base.blade.php
@@ -29,9 +29,6 @@
-
diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php
index e0ae2a5..6afe65d 100644
--- a/skolehjem/resources/views/admin/washing-reservations/index.blade.php
+++ b/skolehjem/resources/views/admin/washing-reservations/index.blade.php
@@ -15,14 +15,14 @@
-
+
diff --git a/skolehjem/resources/views/app/washing-reservations/create.blade.php b/skolehjem/resources/views/app/washing-reservations/create.blade.php
index ac01d4f..54ab577 100644
--- a/skolehjem/resources/views/app/washing-reservations/create.blade.php
+++ b/skolehjem/resources/views/app/washing-reservations/create.blade.php
@@ -7,6 +7,7 @@
@section("content")
Booking Liste
+ {!! session()->get('ReservationExists') !!}