Update export di module senior officer

app/Http/Controllers/JenisPenilaianController.php

@@ -6,15 +6,12 @@ use Exception;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 use Modules\Lpj\Models\JenisPenilaian;
-
 use Modules\Lpj\Http\Requests\JenisPenilaianRequest;
-
-
+use Modules\Lpj\Exports\JenisPenilaianExport;
+use Maatwebsite\Excel\Facades\Excel;
 class JenisPenilaianController extends Controller
 {
-
     public $user;
     /**
      * Display a listing of the resource.
@@ -62,7 +59,6 @@ class JenisPenilaianController extends Controller
     public function update(JenisPenilaianRequest $request, $id)
     {
 
-
         $validate = $request->validate();
 
         // dump($validate);
@@ -96,8 +92,6 @@ class JenisPenilaianController extends Controller
 
     public function dataForDatatables(Request $request)
     {
-
-
         if (is_null($this->user) || !$this->user->can('jenis_penilaian.view')) {
             //abort(403, 'Sorry! You are not allowed to view users.');
         }
@@ -112,7 +106,7 @@ class JenisPenilaianController extends Controller
             });
         }
 
-        if($request->has('sortOrder') && !empty($request->get('sortOrder'))){
+        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
             $order  = $request->get('sortOrder');
             $column = $request->get('sortField');
             $query->orderBy($column, $order);
@@ -153,4 +147,10 @@ class JenisPenilaianController extends Controller
             'data'            => $data
         ]);
     }
+
+
+    public function export()
+    {
+        return Excel::download(new JenisPenilaianExport(), 'jenis-penilaian.xlsx');
+    }
 }

app/Http/Controllers/PenilaianController.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace Modules\Lpj\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+class PenilaianController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        return view('lpj::penilaian.index');
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create()
+    {
+        return view('lpj::create');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(Request $request): RedirectResponse
+    {
+        //
+    }
+
+    /**
+     * Show the specified resource.
+     */
+    public function show($id)
+    {
+        return view('lpj::show');
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit($id)
+    {
+        return view('lpj::edit');
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(Request $request, $id): RedirectResponse
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy($id)
+    {
+        //
+    }
+}

app/Http/Controllers/TeamsController.php

@@ -12,6 +12,8 @@ use Modules\Lpj\Models\Teams;
 use Modules\Lpj\Models\TeamsUsers;
 use Modules\Lpj\Http\Requests\TeamsRequest;
 use Illuminate\Support\Facades\DB;
+use Modules\Lpj\Exports\TeamPenilaianExport;
+use Maatwebsite\Excel\Facades\Excel;
 
 class TeamsController extends Controller
 {
@@ -30,8 +32,13 @@ class TeamsController extends Controller
     public function create()
     {
 
-        $region = Regions::all();
-        $user = User::all();
+        // cek region apakah sudah ada di tabel teams
+        $regionTeam = Teams::pluck('regions_id')->toArray();
+        $region = Regions::whereNotIn('id', $regionTeam)->get();
+
+        // cek user apakah sudah ada di tabel teams_users
+        $userTeam = TeamsUsers::pluck('user_id')->toArray();
+        $user = User::whereNotIn('id', $userTeam)->get();
 
         return view('lpj::teams.form', compact('region', 'user'));
     }
@@ -86,8 +93,13 @@ class TeamsController extends Controller
     public function edit($id)
     {
         $teams = Teams::find($id);
+
+
         $region = Regions::all();
-        $user = User::all();
+        $usedUsers = TeamsUsers::where('teams_id', '!=', $id)->pluck('user_id')->toArray();
+
+        $user = User::whereNotIn('id', $usedUsers)->get();
+        // Ambil user yang sudah ada di tim ini
         $selectedUsers = $teams->teamsUsers->pluck('user_id')->toArray();
 
         return view('lpj::teams.form', compact('teams', 'region', 'user', 'selectedUsers'));
@@ -149,15 +161,11 @@ class TeamsController extends Controller
 
             DB::commit();
 
-            return redirect()
-                    ->route('basicdata.teams.index')
-                    ->with('success', 'Team has been deleted successfully.');
+            echo json_encode(['success' => true, 'message' => 'Team has been deleted successfully']);
+
         } catch (Exception $e) {
             DB::rollBack();
-
-            return redirect()
-                    ->route('basicdata.teams.index')
-                    ->with('error', 'Failed to delete team. ');
+            echo json_encode(['success' => false, 'message' => 'Failed to delete Team']);
         }
     }
 
@@ -236,6 +244,10 @@ class TeamsController extends Controller
     }
 
 
+    public function export()
+    {
+        return Excel::download(new TeamPenilaianExport, 'team-penilai.xlsx');
+    }
 
 
 }