daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update pemilihan team hanya surveyor atau penilai dan update form foto menggunakan camera

Browse Source
This commit is contained in:
majid
2024-10-29 14:22:25 +07:00
parent 13d7b1c4fd
commit 4b08225403
33 changed files with 1477 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/Http/Controllers/TeamsController.php
View File

@@ -31,20 +31,26 @@ class TeamsController extends Controller
* Show the form for creating a new resource.
*/
public function create()
{
{
// cek region apakah sudah ada di tabel teams
$regionTeam = Teams::pluck('regions_id')->toArray();
$region = Regions::whereNotIn('id', $regionTeam)->get();
$regionTeam = Teams::pluck('regions_id')->toArray();
$regions = 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)
->with('roles')
->get();
$userTeam = TeamsUsers::pluck('user_id')->toArray();
$usersWithRole = User::whereNotIn('id', $userTeam)
->with('roles') // Eager load roles
->get();
return view('lpj::teams.form', compact('region', 'user'));
}
$user = $usersWithRole->filter(function ($user) {
return $user->roles->contains(function ($role) {
return $role->name === 'surveyor' || $role->name === 'surveyor-penilai';
});
});
return view('lpj::teams.form', compact('regions', 'user'));
}
/**
* Store a newly created resource in storage.
@@ -97,12 +103,19 @@ class TeamsController extends Controller
{
$teams = Teams::find($id);
$region = Regions::all();
$usedUsers = TeamsUsers::where('teams_id', '!=', $id)->pluck('user_id')->toArray();
$user = User::whereNotIn('id', $usedUsers)
$usersWithRole = User::whereNotIn('id', $usedUsers)
->with('roles')
->get();
$user = $usersWithRole->filter(function ($user) {
return $user->roles->contains(function ($role) {
return $role->name === 'surveyor' || $role->name === 'surveyor-penilai';
});
});
// Ambil user yang sudah ada di tim ini
$selectedUsers = $teams->teamsUsers->pluck('user_id')->toArray();