fix seeder, migration, and admin pnel on report

Author: HaradaKumiko

app/Http/Controllers/Admin/ReportController.php

@@ -31,7 +31,7 @@ public function index()
     public function show($id)
     {
         $jobtask = JobtaskResult::where('report_task_id', $id)
-        ->with('subordinate')
+        ->with(['subordinate', 'sector'])
         ->get();
         return ResponseFormatter::success($jobtask, 'Detail Laporan Pekerjaan', 200);
     }

app/Http/Controllers/Admin/SectorController.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Models\Sector;
+use Illuminate\Http\Request;
+
+class SectorController extends Controller
+{
+    public function getAllSector()
+    {
+        $sectors = Sector::all();
+        return json_encode(['data' => $sectors]);
+    }
+}

app/Models/JobtaskResult.php

@@ -23,4 +23,8 @@ public function subordinate()
     {
         return $this->belongsTo(User::class, 'subordinate', 'user_id');
     }
+
+    public function sector(){
+        return $this->belongsTo(Sector::class, 'sector_id');
+    }
 }

app/Models/Sector.php

@@ -19,4 +19,9 @@ public function news()
     {
         return $this->hasMany(News::class, 'news_id');
     }
+
+    public function jobtaskResult()
+    {
+        return $this->hasMany(JobtaskResult::class, 'job_task_id');
+    }
 }

database/migrations/2022_07_10_155056_create_jobtask_results_table.php

@@ -23,6 +23,9 @@ public function up()
             $table->unsignedBigInteger('job_task_id')->nullable();
             $table->foreign('job_task_id')->references('job_task_id')->on('jobtasks')->onDelete('cascade');
 
+            $table->unsignedBigInteger('sector_id')->nullable();
+            $table->foreign('sector_id')->references('sector_id')->on('sectors')->onDelete('cascade');
+
             $table->unsignedBigInteger('subordinate');
             $table->foreign('subordinate')->references('user_id')->on('users');
 

database/seeders/JobtaskResultSeeder.php

@@ -20,6 +20,7 @@ public function run()
         [
             [
                 'report_task_id' => null,
+                'sector_id' => null,
                 'report_type' => 'Rutin',
                 'job_task_id' => 1,
                 'subordinate' => 3,
@@ -38,6 +39,7 @@ public function run()
             ],
             [
                 'report_task_id' => null,
+                'sector_id' => null,
                 'report_type' => 'Rutin',
                 'job_task_id' => 1,
                 'subordinate' => 4,
@@ -58,6 +60,7 @@ public function run()
 
             [
                 'report_task_id' => null,
+                'sector_id' => null,
                 'report_type' => 'Rutin',
                 'job_task_id' => 2,
                 'subordinate' => 3,
@@ -76,6 +79,7 @@ public function run()
             ],
             [
                 'report_task_id' => null,
+                'sector_id' => null,
                 'report_type' => 'Rutin',
                 'job_task_id' => 2,
                 'subordinate' => 4,
@@ -94,6 +98,7 @@ public function run()
             ],
             [
                 'report_task_id' => null,
+                'sector_id' => null,
                 'report_type' => 'Rutin',
                 'job_task_id' => 2,
                 'subordinate' => 4,
@@ -112,6 +117,7 @@ public function run()
             ],
             [
                 'report_task_id' => null,
+                'sector_id' => null,
                 'report_type' => 'Rutin',
                 'job_task_id' => 3,
                 'subordinate' => 3,
@@ -131,6 +137,7 @@ public function run()
 
             [
                 'report_task_id' => 1,
+                'sector_id' => 5,
                 'report_type' => 'Isidentil',
                 'job_task_id' => null,
                 'subordinate' => 3,
@@ -152,6 +159,7 @@ public function run()
 
             [
                 'report_task_id' => 1,
+                'sector_id' => 5,
                 'report_type' => 'Isidentil',
                 'report_about' => 'Penangkapan Oknum Petugas Bandara Kasus Bobol Koper Penumpang',
                 'report_source_information' => 'Aduan Masyarakat',
@@ -171,6 +179,7 @@ public function run()
 
             [
                 'report_task_id' => 3,
+                'sector_id' => 4,
                 'report_type' => 'Isidentil',
                 'report_about' => 'Tawuran STM di gunung pasir',
                 'report_source_information' => 'Aduan Masyarakat',
@@ -190,6 +199,7 @@ public function run()
 
             [
                 'report_task_id' => 2,
+                'sector_id' => 8,
                 'report_type' => 'Isidentil',
                 'report_about' => 'Laka Lantas Tunggal',
                 'report_source_information' => 'Aduan Masyarakat',

database/seeders/SectorSeeder.php

@@ -23,7 +23,8 @@ public function run()
             ['sector_name' => 'Keamanan'],
             ['sector_name' => 'Kriminal'],
             ['sector_name' => 'Polri'],
-            ['sector_name' => 'Masyarakat']
+            ['sector_name' => 'Masyarakat'],
+            ['sector_name' => 'Laka Lantas']
         ]
     );
     }

resources/views/report/index.blade.php

@@ -65,6 +65,11 @@
                         <p id="report_subordinate"></p>
                     </div>
 
+                    <div class="mb-3">
+                        <label for="report_sector"> <b> Bidang Laporan </b> </label>
+                        <p id="report_sector"></p>
+                    </div> 
+
                     <div class="mb-3">
                         <label for="report_about"> <b> Perihal Laporan </b> </label>
                         <p id="report_about"></p>
@@ -160,6 +165,7 @@
             $('#formViewReport').trigger('reset');
 
             $('#report_subordinate').text(data.data[0].subordinate.name); 
+            $('#report_sector').text(data.data[0].sector.sector_name); 
             $('#report_about').text(data.data[0].report_about); 
             $('#report_source_information').text(data.data[0].report_source_information); 
             $('#report_place').text(data.data[0].report_source_information);  

routes/web.php

@@ -25,6 +25,7 @@
 Route::get('getAllJobtask', [App\Http\Controllers\Admin\JobtaskController::class, 'getAllJobtask'])->name('getAllJobtask');
 Route::get('getAllNews', [App\Http\Controllers\Admin\NewsController::class, 'getAllNews'])->name('getAllNews');
 Route::get('getAllReport', [App\Http\Controllers\Admin\ReportController::class, 'getAllReport'])->name('getAllReport');
+Route::get('getAllSector', [App\Http\Controllers\Admin\SectorController::class, 'getAllSector'])->name('getAllSector');