From de3ed9c32669550d513de88c2607d3f5f34434b4 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Thu, 10 Sep 2020 15:31:06 +0200 Subject: [PATCH] v1.1.0b -Added guides categorys --- skolehjem/app/GuidesCategory.php | 12 ++ .../Controllers/GuidesCategoryController.php | 148 ++++++++++++++++++ ..._110533_create_guides_categories_table.php | 32 ++++ .../admin/guides-category/create.blade.php | 84 ++++++++++ .../admin/guides-category/delete.blade.php | 13 ++ .../admin/guides-category/edit.blade.php | 86 ++++++++++ .../admin/guides-category/index.blade.php | 1 + .../admin/guides-category/show.blade.php | 68 ++++++++ .../admin/guides-category/store.blade.php | 14 ++ .../admin/guides-category/update.blade.php | 14 ++ .../views/admin/guides/create.blade.php | 10 ++ .../views/admin/guides/index.blade.php | 29 ++++ skolehjem/routes/web.php | 3 + 13 files changed, 514 insertions(+) create mode 100644 skolehjem/app/GuidesCategory.php create mode 100644 skolehjem/app/Http/Controllers/GuidesCategoryController.php create mode 100644 skolehjem/database/migrations/2020_09_10_110533_create_guides_categories_table.php create mode 100644 skolehjem/resources/views/admin/guides-category/create.blade.php create mode 100644 skolehjem/resources/views/admin/guides-category/delete.blade.php create mode 100644 skolehjem/resources/views/admin/guides-category/edit.blade.php create mode 100644 skolehjem/resources/views/admin/guides-category/index.blade.php create mode 100644 skolehjem/resources/views/admin/guides-category/show.blade.php create mode 100644 skolehjem/resources/views/admin/guides-category/store.blade.php create mode 100644 skolehjem/resources/views/admin/guides-category/update.blade.php diff --git a/skolehjem/app/GuidesCategory.php b/skolehjem/app/GuidesCategory.php new file mode 100644 index 0000000..f9298e2 --- /dev/null +++ b/skolehjem/app/GuidesCategory.php @@ -0,0 +1,12 @@ +middleware([ "auth" ]); + $this->middleware([ "lang" ]); + + $this->middleware([ "check.auth:guides.show" ])->only("show", "index"); + $this->middleware([ "check.auth:guides.create" ])->only("create", "store"); + $this->middleware([ "check.auth:guides.edit" ])->only("edit", "update"); + $this->middleware([ "check.auth:guides.delete" ])->only("delete"); + } + + + /** + * Display a listing of the resource. + * + * @return \Illuminate\Http\Response + */ + public function index() + { + $guideCate = GuidesCategory::query()->paginate(20); + return Response::detect("guides-category.index", [ "guidesCategory" => $guideCate]); + } + + /** + * Show the form for creating a new resource. + * + * @return \Illuminate\Http\Response + */ + public function create() + { + return Response::detect("guides-category.create"); + } + + /** + * Store a newly created resource in storage. + * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\Response + */ + public function store(Request $request) + { + $requestGuideCategory = $request->validate([ + "guidesCategoryName" => "required|max:255", + ]); + + $guideCate = new GuidesCategory($requestGuideCategory); + $saved = $guideCate->save(); + + if(!$saved) { + return redirect()->route("guides-category.store"); + } else { + $guides = GuidesCategory::query()->paginate(20); + + return redirect()->route("guides.index", ['guides' => $guides]); + } + } + + /** + * Display the specified resource. + * + * @param \App\GuidesCategory $guidesCategory + * @return \Illuminate\Http\Response + */ + public function show(GuidesCategory $guidesCategory) + { + return Response::detect("guides-category.show", [ "guideCategory" => $guidesCategory]); + } + + /** + * Show the form for editing the specified resource. + * + * @param \App\GuidesCategory $guidesCategory + * @return \Illuminate\Http\Response + */ + public function edit(GuidesCategory $guidesCategory) + { + $guideCate = GuidesCategory::query()->where("id", "=", $guidesCategory->id)->first(); + return Response::detect("guides-category.edit", ["guideCategory" => $guideCate]); + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param \App\GuidesCategory $guidesCategory + * @return \Illuminate\Http\Response + */ + public function update(Request $request, GuidesCategory $guidesCategory) + { + $data = $request->validate([ + "name" => "required|max:255", + "guide_articles" => "required", + ]); + + $guideCate = Guide::query()->where("id", "=", $guidesCategory->id)->first(); + $guideCate->update($data); + $saved = $guideCate->save(); + + if(!$saved){ + return redirect()->route("guides-category.update", [ "guideCategory" => $guide ]); + }else{ + $guides = Guide::query()->paginate(20); + + return redirect()->route("guides.index", ['guidesCategory' => $guides]); + } + } + + /** + * Remove the specified resource from storage. + * + * @param \App\GuidesCategory $guidesCategory + * @return \Illuminate\Http\Response + */ + public function destroy(GuidesCategory $guidesCategory) + { + $guide = Guide::find($guidesCategory); //$guidesCategory = $id + $guide->delete(); + + + return redirect()->route("guides.index"); + } + + public function nameCheck(Request $request) { + $guide = GuidesCategory::query()->where('guidesCategoryName', 'LIKE',$request->nameCheck)->get(); + if(count($guide) > 0 && $request->nameCheck !== NULL){ + return 1; + } + } + + public function nameCheckUpdate(Request $request) { + $guide = GuidesCategory::query()->where('guidesCategoryName', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get(); + if(count($guide) > 0 && $request->nameCheck !== NULL){ + return 1; + } + } + +} diff --git a/skolehjem/database/migrations/2020_09_10_110533_create_guides_categories_table.php b/skolehjem/database/migrations/2020_09_10_110533_create_guides_categories_table.php new file mode 100644 index 0000000..8b5e495 --- /dev/null +++ b/skolehjem/database/migrations/2020_09_10_110533_create_guides_categories_table.php @@ -0,0 +1,32 @@ +id(); + $table->string('guidesCategoryName')->unique(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('guides_categories'); + } +} diff --git a/skolehjem/resources/views/admin/guides-category/create.blade.php b/skolehjem/resources/views/admin/guides-category/create.blade.php new file mode 100644 index 0000000..b7e1f36 --- /dev/null +++ b/skolehjem/resources/views/admin/guides-category/create.blade.php @@ -0,0 +1,84 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Opret vejlednings kategori +@endsection + +@section("path") + Opret ny kategori / +@endsection + +@section("content") +

Opret vejlednigns kategori

+
+ @csrf + + + + +
+@endsection +@section("scripts") + +@endsection diff --git a/skolehjem/resources/views/admin/guides-category/delete.blade.php b/skolehjem/resources/views/admin/guides-category/delete.blade.php new file mode 100644 index 0000000..cf31266 --- /dev/null +++ b/skolehjem/resources/views/admin/guides-category/delete.blade.php @@ -0,0 +1,13 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Vejledning - Fjern +@endsection + +@section("path") + Fjern Guide / +@endsection + +@section("content") +@endsection diff --git a/skolehjem/resources/views/admin/guides-category/edit.blade.php b/skolehjem/resources/views/admin/guides-category/edit.blade.php new file mode 100644 index 0000000..e4ecfb1 --- /dev/null +++ b/skolehjem/resources/views/admin/guides-category/edit.blade.php @@ -0,0 +1,86 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Lokation - Rediger +@endsection + +@section("path") + Rediger lokation / +@endsection + +@section("content") +

Rediger Lokation

+
$location ]) }}"> + @csrf + @method("put") + + + + +
+@endsection +@section("scripts") + +@endsection diff --git a/skolehjem/resources/views/admin/guides-category/index.blade.php b/skolehjem/resources/views/admin/guides-category/index.blade.php new file mode 100644 index 0000000..9d3495b --- /dev/null +++ b/skolehjem/resources/views/admin/guides-category/index.blade.php @@ -0,0 +1 @@ +<--No data--> diff --git a/skolehjem/resources/views/admin/guides-category/show.blade.php b/skolehjem/resources/views/admin/guides-category/show.blade.php new file mode 100644 index 0000000..07215b2 --- /dev/null +++ b/skolehjem/resources/views/admin/guides-category/show.blade.php @@ -0,0 +1,68 @@ + + + + @yield("title") + + + + + + +
+ Syddansk Erhvervsskole +

Lokation: {{ $location->name }}

+
+
+ +
+ @foreach(\App\WashingReservation::query()->join('washing_machines', 'washing_machines.id', '=', 'washing_reservations.machine_id')->where("location_id", "=", $location->id)->where("time", "LIKE", date("Y-m-d"). "%")->orderBy("time", "asc")->get() as $reservation) + @if (date('Y-m-d H:i:s', strtotime('-1 hour')) < $reservation->time) + @if($i % 3 == 1) +
+
+ @endif +
+

{{ \App\WashingMachine::query()->find($reservation->machine_id)->name }}

+
+ Dato: {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y') }} + Tid: {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('\k\l\. H:i') }} - {{ \App\User::query()->where("id", "=", $reservation->user_id)->first()->name_first }} {{ \App\User::query()->where("id", "=", $reservation->user_id)->first()->name_last }} +
+
+ + @else + {{ \App\WashingReservation::query()->join('washing_machines', 'washing_machines.id', '=', 'washing_reservations.machine_id')->where("location_id", "=", $location->id)->where('time', '<', date('Y-m-d H:i:s'). '%')->delete() }} + @endif + @endforeach + @if($i == 1) + Der er ingen vaskemaskine reservationer for i dag. + @endif +
+
+ + + +@yield("scripts") + + diff --git a/skolehjem/resources/views/admin/guides-category/store.blade.php b/skolehjem/resources/views/admin/guides-category/store.blade.php new file mode 100644 index 0000000..239ca01 --- /dev/null +++ b/skolehjem/resources/views/admin/guides-category/store.blade.php @@ -0,0 +1,14 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Vejledning - Opret +@endsection + +@section("path") + Opret vejledning / +@endsection + +@section("content") + vejledning blev (ikke) oprettet. +@endsection diff --git a/skolehjem/resources/views/admin/guides-category/update.blade.php b/skolehjem/resources/views/admin/guides-category/update.blade.php new file mode 100644 index 0000000..4b9788d --- /dev/null +++ b/skolehjem/resources/views/admin/guides-category/update.blade.php @@ -0,0 +1,14 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Vejledning - Rediger +@endsection + +@section("path") + $link]) }}" class="text-white">Vejledning / +@endsection + +@section("content") + Din vejledning blev (ikke) redigeret. +@endsection diff --git a/skolehjem/resources/views/admin/guides/create.blade.php b/skolehjem/resources/views/admin/guides/create.blade.php index ac8a3ce..c7d09ba 100644 --- a/skolehjem/resources/views/admin/guides/create.blade.php +++ b/skolehjem/resources/views/admin/guides/create.blade.php @@ -29,6 +29,16 @@ +
+ + CreateOpret kategori +