Skip to content

Commit

Permalink
Merge pull request #260 from FrontMen/fix/admin-hide
Browse files Browse the repository at this point in the history
fix: hide empty standby and travel allowances in admin view
  • Loading branch information
DunkVader authored Aug 17, 2021
2 parents 8dbb588 + f398532 commit b27eceb
Showing 1 changed file with 20 additions and 6 deletions.
26 changes: 20 additions & 6 deletions pages/records/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@
</template>
</weekly-timesheet>

<template
v-if="employee && employee.standBy && timesheet.standByProject"
>
<template v-if="showStandby">
<weekly-timesheet
:selected-week="recordsState.selectedWeek"
:active="!!employee.standBy"
Expand All @@ -100,9 +98,7 @@
</weekly-timesheet>
</template>

<template
v-if="employee && employee.travelAllowance && timesheet.travelProject"
>
<template v-if="showTravel">
<weekly-timesheet
:selected-week="recordsState.selectedWeek"
:active="!!employee.travelAllowance"
Expand Down Expand Up @@ -316,6 +312,22 @@ export default defineComponent({
selectedEmployee.value?.bridgeUid
);
const showTravel = computed(() => {
if (isAdminView) {
return timesheet.timesheet.value.travelProject?.values.some((value: number) => value > 0);
} else {
return (selectedEmployee && selectedEmployee.value?.travelAllowance && timesheet.timesheet.value.travelProject);
}
});
const showStandby = computed(() => {
if (isAdminView) {
return timesheet.timesheet.value.standByProject?.values.some((value: number) => value > 0);
} else {
return (selectedEmployee && selectedEmployee.value?.standBy && timesheet.timesheet.value.standByProject);
}
});
const reasonOfDenial = ref("");
const handleDeny = () => {
Expand Down Expand Up @@ -406,6 +418,8 @@ export default defineComponent({
isAdminView,
showBridgeError,
reasonOfDenial,
showTravel,
showStandby,
handleBlur,
handleDeny,
handleReminder,
Expand Down

1 comment on commit b27eceb

@vercel
Copy link

@vercel vercel bot commented on b27eceb Aug 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.