From cab8ad604c7a7a12a211f4b7a1c0570ec6bc9b71 Mon Sep 17 00:00:00 2001 From: Anders Date: Fri, 11 Sep 2020 12:30:37 +0200 Subject: [PATCH] v1.2.0 - You can now create and edit guides --- skolehjem/app/Guide.php | 2 +- .../app/Http/Controllers/GuideController.php | 2 ++ .../Controllers/GuidesCategoryController.php | 3 +- .../2020_08_04_062259_create_guides_table.php | 1 + skolehjem/database/seeds/DatabaseSeeder.php | 1 + .../database/seeds/GuidesCategoriesSeeder.php | 28 +++++++++++++++++++ .../admin/guides-category/edit.blade.php | 10 +++---- .../views/admin/guides/create.blade.php | 3 +- .../views/admin/guides/edit.blade.php | 13 +++++++++ .../views/admin/guides/index.blade.php | 7 ++--- 10 files changed, 56 insertions(+), 14 deletions(-) create mode 100644 skolehjem/database/seeds/GuidesCategoriesSeeder.php diff --git a/skolehjem/app/Guide.php b/skolehjem/app/Guide.php index 86730ee..20c690b 100644 --- a/skolehjem/app/Guide.php +++ b/skolehjem/app/Guide.php @@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model; class Guide extends Model { protected $fillable = [ - 'name', 'guide_articles','resource_id' + 'name', 'guide_articles', 'guide_category_id', 'resource_id' ]; } diff --git a/skolehjem/app/Http/Controllers/GuideController.php b/skolehjem/app/Http/Controllers/GuideController.php index 705bd57..00a8a89 100644 --- a/skolehjem/app/Http/Controllers/GuideController.php +++ b/skolehjem/app/Http/Controllers/GuideController.php @@ -58,6 +58,7 @@ class GuideController extends Controller $requestGuide = $request->validate([ "name" => "required|max:255", "guide_articles" => "required", + "guide_category_id" => "required", ]); $guide = new Guide($requestGuide); @@ -128,6 +129,7 @@ class GuideController extends Controller $data = $request->validate([ "name" => "required|max:255", "guide_articles" => "required", + "guide_category_id" => "required", ]); $guidee = Guide::query()->where("id", "=", $guide->id)->first(); diff --git a/skolehjem/app/Http/Controllers/GuidesCategoryController.php b/skolehjem/app/Http/Controllers/GuidesCategoryController.php index 73c8b34..167ae67 100644 --- a/skolehjem/app/Http/Controllers/GuidesCategoryController.php +++ b/skolehjem/app/Http/Controllers/GuidesCategoryController.php @@ -86,7 +86,8 @@ class GuidesCategoryController extends Controller public function edit(GuidesCategory $guidesCategory) { $guideCate = GuidesCategory::query()->where("id", "=", $guidesCategory->id)->first(); - return Response::detect("guides-category.edit", ["guideCategory" => $guideCate]); + dd($guideCate); + return redirect()->route("guides-category.edit", ["guideCategory" => $guideCate]); } /** diff --git a/skolehjem/database/migrations/2020_08_04_062259_create_guides_table.php b/skolehjem/database/migrations/2020_08_04_062259_create_guides_table.php index 4473fd8..dafc0dc 100644 --- a/skolehjem/database/migrations/2020_08_04_062259_create_guides_table.php +++ b/skolehjem/database/migrations/2020_08_04_062259_create_guides_table.php @@ -18,6 +18,7 @@ class CreateGuidesTable extends Migration $table->timestamps(); $table->string('name')->unique(); $table->longText('guide_articles'); + $table->foreignId('guide_category_id')->nullable()->constrained('guides_categories', 'id'); $table->foreignId('resource_id')->nullable()->constrained('resources', 'id'); }); } diff --git a/skolehjem/database/seeds/DatabaseSeeder.php b/skolehjem/database/seeds/DatabaseSeeder.php index bed1391..3fb9437 100644 --- a/skolehjem/database/seeds/DatabaseSeeder.php +++ b/skolehjem/database/seeds/DatabaseSeeder.php @@ -19,5 +19,6 @@ class DatabaseSeeder extends Seeder $this->call(WashingMachineSeeder::class); $this->call(NewsTypeSeeder::class); $this->call(ResourceCategorySeeder::class); + $this->call(GuidesCategoriesSeeder::class); } } diff --git a/skolehjem/database/seeds/GuidesCategoriesSeeder.php b/skolehjem/database/seeds/GuidesCategoriesSeeder.php new file mode 100644 index 0000000..1e77ab7 --- /dev/null +++ b/skolehjem/database/seeds/GuidesCategoriesSeeder.php @@ -0,0 +1,28 @@ + 'Ingen Kategori' + ] + ]; + + foreach ($GuidesCategoriesdata as $data) { + $GuidesCategory = new \App\GuidesCategory(); + + $GuidesCategory->guidesCategoryName = $data["guidesCategoryName"]; + + $GuidesCategory->save(); + } + } +} diff --git a/skolehjem/resources/views/admin/guides-category/edit.blade.php b/skolehjem/resources/views/admin/guides-category/edit.blade.php index 1f8317c..8be17a8 100644 --- a/skolehjem/resources/views/admin/guides-category/edit.blade.php +++ b/skolehjem/resources/views/admin/guides-category/edit.blade.php @@ -6,17 +6,17 @@ @endsection @section("path") - Rediger kategori / + Rediger kategori / @endsection @section("content")

Rediger vejlednings kategori

-
$guidesCate ]) }}"> + $guideCategory ]) }}"> @csrf @method("put") - +
@endsection @@ -37,7 +37,7 @@ $.ajax({ type: 'get', url: '{{route('guides-category.nameCheckUpdate')}}', - data: {'nameCheck':$value, 'id':{{$guidesCate->id}}}, + data: {'nameCheck':$value, 'id':{{$guideCategory->id}}}, success:function (data) { if(data){ $("#error").show(100); @@ -62,7 +62,7 @@ $.ajax({ type: 'get', url: '{{route('guides-category.nameCheckUpdate')}}', - data: {'nameCheck':$value, 'id':{{$guidesCate->id}}}, + data: {'nameCheck':$value, 'id':{{$guideCategory->id}}}, success:function (data) { if(data){ $("#error").show(100); diff --git a/skolehjem/resources/views/admin/guides/create.blade.php b/skolehjem/resources/views/admin/guides/create.blade.php index c7d09ba..0f21d05 100644 --- a/skolehjem/resources/views/admin/guides/create.blade.php +++ b/skolehjem/resources/views/admin/guides/create.blade.php @@ -30,9 +30,8 @@
- - @foreach(\App\GuidesCategory::query()->get() as $guideCategory) @endforeach diff --git a/skolehjem/resources/views/admin/guides/edit.blade.php b/skolehjem/resources/views/admin/guides/edit.blade.php index 603ece5..eeb1d71 100644 --- a/skolehjem/resources/views/admin/guides/edit.blade.php +++ b/skolehjem/resources/views/admin/guides/edit.blade.php @@ -30,6 +30,19 @@ +
+ + CreateOpret kategori +
{!! $guide->guide_articles !!}
diff --git a/skolehjem/resources/views/admin/guides/index.blade.php b/skolehjem/resources/views/admin/guides/index.blade.php index dec8e2e..7fd2ec9 100644 --- a/skolehjem/resources/views/admin/guides/index.blade.php +++ b/skolehjem/resources/views/admin/guides/index.blade.php @@ -21,6 +21,7 @@ + @if(auth()->user()->can('guides.edit')) @endif @@ -31,6 +32,7 @@ @foreach($guides as $guide) + @if(auth()->user()->can('guides.edit')) @endif @@ -63,11 +65,6 @@ @foreach(\App\GuidesCategory::query()->get() as $guideCategory) - @endforeach
NavnKategoriUpdate
{{$guide->name}}{{ \App\GuidesCategory::query()->where('id', '=', $guide->guide_category_id)->first()->guidesCategoryName }} $guide ]) }}">Update
{{$guideCategory->guidesCategoryName}}