diff --git a/app/Http/Controllers/TeamsController.php b/app/Http/Controllers/TeamsController.php index bf0a39b..e360132 100644 --- a/app/Http/Controllers/TeamsController.php +++ b/app/Http/Controllers/TeamsController.php @@ -2,18 +2,19 @@ namespace Modules\Lpj\Http\Controllers; -use App\Http\Controllers\Controller; -use Illuminate\Http\RedirectResponse; +use Exception; use Illuminate\Http\Request; use Illuminate\Http\Response; -use Modules\Lpj\Models\Regions; -use Modules\Usermanagement\Models\User; use Modules\Lpj\Models\Teams; -use Modules\Lpj\Models\TeamsUsers; -use Modules\Lpj\Http\Requests\TeamsRequest; +use Modules\Lpj\Models\Regions; use Illuminate\Support\Facades\DB; -use Modules\Lpj\Exports\TeamPenilaianExport; +use Modules\Lpj\Models\TeamsUsers; +use App\Http\Controllers\Controller; use Maatwebsite\Excel\Facades\Excel; +use Illuminate\Http\RedirectResponse; +use Modules\Usermanagement\Models\User; +use Modules\Lpj\Http\Requests\TeamsRequest; +use Modules\Lpj\Exports\TeamPenilaianExport; class TeamsController extends Controller { @@ -39,8 +40,8 @@ class TeamsController extends Controller // cek user apakah sudah ada di tabel teams_users $userTeam = TeamsUsers::pluck('user_id')->toArray(); $user = User::whereNotIn('id', $userTeam) - ->with('roles') - ->get(); + ->with('roles') + ->get(); return view('lpj::teams.form', compact('region', 'user')); } @@ -69,15 +70,15 @@ class TeamsController extends Controller DB::commit(); return redirect() - ->route('basicdata.teams.index') - ->with('success', 'Data saved successfully. '); + ->route('basicdata.teams.index') + ->with('success', 'Data saved successfully. '); } catch (Exception $e) { DB::rollBack(); return redirect() - ->route('basicdata.teams.create') - ->with('error', 'Failed to save data. '); + ->route('basicdata.teams.create') + ->with('error', 'Failed to save data. '); } } @@ -100,8 +101,8 @@ class TeamsController extends Controller $region = Regions::all(); $usedUsers = TeamsUsers::where('teams_id', '!=', $id)->pluck('user_id')->toArray(); $user = User::whereNotIn('id', $usedUsers) - ->with('roles') - ->get(); + ->with('roles') + ->get(); // Ambil user yang sudah ada di tim ini $selectedUsers = $teams->teamsUsers->pluck('user_id')->toArray(); @@ -136,15 +137,15 @@ class TeamsController extends Controller DB::commit(); return redirect() - ->route('basicdata.teams.index') - ->with('success', 'Data updated successfully. '); + ->route('basicdata.teams.index') + ->with('success', 'Data updated successfully. '); } catch (Exception $e) { DB::rollBack(); return redirect() - ->route('basicdata.teams.create') - ->with('error', 'Failed to update data. '); + ->route('basicdata.teams.create') + ->with('error', 'Failed to update data. '); } } @@ -165,7 +166,6 @@ class TeamsController extends Controller DB::commit(); echo json_encode(['success' => true, 'message' => 'Team has been deleted successfully']); - } catch (Exception $e) { DB::rollBack(); echo json_encode(['success' => false, 'message' => 'Failed to delete Team']); @@ -190,8 +190,8 @@ class TeamsController extends Controller $search = $request->get('search'); $query->where(function ($q) use ($search) { $q->where('teams.name', 'LIKE', "%$search%") - ->orWhere('regions.name', 'LIKE', "%$search%") - ->orWhere('users.name', 'LIKE', "%$search%"); + ->orWhere('regions.name', 'LIKE', "%$search%") + ->orWhere('users.name', 'LIKE', "%$search%"); }); } @@ -255,6 +255,4 @@ class TeamsController extends Controller { return Excel::download(new TeamPenilaianExport(), 'team-penilai.xlsx'); } - - }