Merge pull request #47 from datasektionen/rank-entities

Fixat så att det går att ranka entities >:)
datasektionen · Sep 12, 2024 · 0c59a2d · 0c59a2d
2 parents 6ab5eb4 + b3ea99f
commit 0c59a2d
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 0 deletions.
diff --git a/app/Http/Controllers/Admin/EntityAdminController.php b/app/Http/Controllers/Admin/EntityAdminController.php
@@ -72,6 +72,7 @@ public function postNew(Request $request)
         $entity->part_of = $request->input('part_of');
         $entity->fa_icon = $request->input('fa_icon');
         $entity->contract_url = $request->input('contract') === 'yes' ? $request->input('contract_url') : null;
+        $entity->rank = $request->input('rank');
         $entity->save();
 
         return redirect('/admin/entities')
@@ -115,6 +116,7 @@ public function postEdit($id, Request $request)
         $entity->part_of = $request->input('part_of');
         $entity->fa_icon = $request->input('fa_icon');
         $entity->contract_url = $request->input('contract') === 'yes' ? $request->input('contract_url') : null;
+        $entity->rank = $request->input('rank');
         $entity->save();
 
         return redirect('/admin/entities')

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
@@ -27,8 +27,10 @@ public function getIndex(Request $request)
     {
         $hidden = $request->query('hidden');
         $entities = Entity::query();
+        $entities->orderBy("rank");
         if (!$hidden) {
             $entities->orWhere("id", "<>", 15);
+            // Tack Adam
         }
 
         return view('welcome')

diff --git a/database/migrations/2024_09_12_180106_add_rank.php b/database/migrations/2024_09_12_180106_add_rank.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddRank extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('entities', function (Blueprint $table) {
+            $table->text('rank')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('entities', function (Blueprint $table) {
+            $table->dropColumn('rank');
+        });
+    }
+}
diff --git a/resources/views/admin/entities/edit.blade.php b/resources/views/admin/entities/edit.blade.php
@@ -123,6 +123,18 @@
             </div>
         </div>
 
+        <div class="form-entry">
+                <span class="description">
+                    Rank:
+                </span>
+                <p>
+                Hur högt upp ska denna entitet vara på startsidan?
+                    </p>
+            <div class="input">
+                {!! Form::number('rank', $entity->rank, array('placeholder' => '1 = viktigast <-> 100 = mindre prioriterad')) !!}
+            </div>
+        </div>
+
         <div class="form-entry">
             <div class="input">
                 {!! Form::submit('Ändra entitet', NULL) !!}

diff --git a/resources/views/admin/entities/new.blade.php b/resources/views/admin/entities/new.blade.php
@@ -111,6 +111,18 @@
                 </div>
             </div>
         </div>
+
+        <div class="form-entry">
+                <span class="description">
+                    Rank:
+                </span>
+                <p>
+                Hur högt upp ska denna entitet vara på startsidan?
+                    </p>
+            <div class="input">
+                {!! Form::number('rank', NULL, array('placeholder' => '1 = viktigast <-> 100 = mindre prioriterad')) !!}
+            </div>
+        </div>
 
         <div class="form-entry">
             <div class="input">