prerbaikan export dan penambahan role di team penilai

This commit is contained in:
majid
2024-09-13 17:02:04 +07:00
parent 0ae0374e5e
commit 53ccf7de11
15 changed files with 1107 additions and 388 deletions

View File

@@ -57,9 +57,10 @@
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">Region</label>
<div class="flex flex-wrap items-baseline w-full">
<select class="input tomselect w-full border-danger bg-danger-light" name="regions_id">
<select
class="input tomselect w-full @error('regions_id') border-danger bg-danger-light @enderror"
name="regions_id">
<option value="">Select Region</option>
@if (isset($region))
@foreach ($region as $regions)
@if (isset($teams))
@@ -71,31 +72,45 @@
@endif
@endforeach
@endif
</select>
@error('regions_id')
<em class="alert text-danger text-sm">{{ $message }}</em>
@enderror
</div>
</div>
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label class="form-label max-w-56">Users</label>
<div class="flex flex-wrap items-baseline w-full">
<select class="input tomselect w-full border-danger bg-danger-light select2" name="user[]"
multiple="multiple">
<select
class="input tomselect w-full @error('regions_id') border-danger bg-danger-light @enderror select2"
name="user[]" multiple="multiple">
<option value="">Select Team Group</option>
@if (isset($user))
@foreach ($user as $users)
@if (isset($teams))
<option value="{{ $users->id }}"
{{ in_array($users->id, $selectedUsers) ? 'selected' : '' }}>
{{ $users->name }}</option>
{{ $users->name . ' | ' }}
@foreach ($users->roles as $role)
{{ $role->name }}
@endforeach
</option>
@else
<option value="{{ $users->id }}">{{ $users->name }}</option>
<option value="{{ $users->id }}">{{ $users->name . ' | ' }}
@foreach ($users->roles as $role)
{{ $role->name }}
@endforeach
</option>
@endif
@endforeach
@endif
</select>
@error('user')
<em class="alert text-danger text-sm">{{ $message }}</em>
@enderror
</div>
</div>

View File

@@ -141,7 +141,9 @@
title: 'User Team',
render: (item, data) => {
if (data.user_team && data.user_team.length) {
return `<ul>${data.user_team.map(user => `<li>${user.nama}</li>`).join('')}</ul>`;
return `<ul>${data.user_team.map(user =>
`<li>${user.nama} | ${user.roles.join(', ')}</li>`
).join('')}</ul>`;
} else {
return '<ul><li>N/A</li></ul>';
}