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

update data pembading surveyor

Browse Source
This commit is contained in:
majid
2024-12-03 15:00:18 +07:00
parent 9502329fef
commit 280ed97a50
15 changed files with 1185 additions and 1034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
resources/views/activity/progres_activity/index.blade.php
View File

@@ -51,13 +51,12 @@
@php
$sortedTeamsActivity = $teamsActivity->sortBy(function ($item) {
return $item->team->penilaianTeam
->filter(function ($penilaianTeam) use ($item) {
return $penilaianTeam->user_id == $item->user->id;
return $item->team->regions->penilaiTeam
->filter(function ($penilaiTeam) use ($item) {
return $penilaiTeam->user_id == $item->user->id;
})
->count();
});
@endphp
@foreach ($sortedTeamsActivity as $index => $item)
@@ -75,9 +74,9 @@
<th class="min-w-[150px]">
<span class="text-base text-gray-900 font-normal">
@php
$totalTasks = $item->team->penilaianTeam
->filter(function ($penilaianTeam) use ($item) {
return $penilaianTeam->user_id == $item->user->id;
$totalTasks = $item->team->regions->penilaiTeam
->filter(function ($penilaiTeam) use ($item) {
return $penilaiTeam->user_id == $item->user->id;
})
->count();
@endphp
@@ -208,7 +207,7 @@
tanggal_kunjungan: {
title: 'Tgl Kunjungan',
render: (item, data) =>
`${formatDateFromISO(data.tanggal_kunjungan) || ''}`,
`${formatDateFromISO(data.waktu_penilaian) || ''}`,
},
progress: {
title: 'Progress',
@@ -222,6 +221,7 @@
return `${mulai.getDate()}-${mulai.getMonth() + 1}-${mulai.getFullYear()} - ${selesai.getDate()}-${selesai.getMonth() + 1}-${selesai.getFullYear()}`
},
},
paparan: {
title: 'Paparan',
render: (item, data) => `${data.paparan || ''}`,