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

update assingment

Browse Source
This commit is contained in:
majid
2024-11-08 16:14:46 +07:00
parent 7e425d10e6
commit df68c70127
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/PenilaianController.php
View File

@@ -215,7 +215,7 @@ class PenilaianController extends Controller
$teamPenilai = $userTeam->flatMap(function ($team) { $teamPenilai = $userTeam->flatMap(function ($team) {
return $team->teamsUsers->filter(function ($teamUser) { return $team->teamsUsers->filter(function ($teamUser) {
return $teamUser->user->roles->contains(function ($role) { return $teamUser->user->roles->contains(function ($role) {
return $role->name === 'surveyor' || $role->name === 'surveyor-penilai'; return $role->name === 'surveyor' || $role->name === 'surveyor-penilai' || $role->name === 'administrator';
}); });
})->map(function ($teamUser) { })->map(function ($teamUser) {
return $teamUser->user; return $teamUser->user;

1
app/Http/Requests/PenilaianRequest.php
View File

@@ -33,7 +33,6 @@ class PenilaianRequest extends FormRequest
'tanggal_kunjungan' => 'required|max:255', 'tanggal_kunjungan' => 'required|max:255',
'status' => 'required|string', 'status' => 'required|string',
'nomor_registrasi' => 'required|string', 'nomor_registrasi' => 'required|string',
'surveyor_id' => 'nullable|required_without_all:penilai_surveyor_id,surveyor_region_id,penilai_region_id,penilai_id', 'surveyor_id' => 'nullable|required_without_all:penilai_surveyor_id,surveyor_region_id,penilai_region_id,penilai_id',
'penilai_id' => 'nullable|required_without_all:penilai_surveyor_id,surveyor_region_id,penilai_region_id,surveyor_id', 'penilai_id' => 'nullable|required_without_all:penilai_surveyor_id,surveyor_region_id,penilai_region_id,surveyor_id',
'penilai_surveyor_id' => 'nullable', 'penilai_surveyor_id' => 'nullable',

1
resources/views/penilaian/form.blade.php
View File

@@ -451,6 +451,7 @@
<button type="button" data-modal-toggle="#modal_revisi" class="btn btn-warning ml-3"> <button type="button" data-modal-toggle="#modal_revisi" class="btn btn-warning ml-3">
Revisi Revisi
</button> </button>
</div> </div>
</form> </form>
</div> </div>