Skip to content
This repository was archived by the owner on Jul 13, 2023. It is now read-only.

pendingRemovalDaysOffSlots #49

Open
SemProvoost wants to merge 1 commit into
base: master
Choose a base branch
from
Open

pendingRemovalDaysOffSlots #49

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/components/daysoff/CalendarTooltipContent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,13 @@
<calendar-tooltip-item v-for="item in pendingDaysOffSlots" :key="item.id" :item="item" />
</div>
</div>

<div v-if="pendingRemovalDaysOffSlots.length > 0" class="calendar-tooltip-row">
<div class="calendar-tooltip-title">{{ $t('DAYS_OFF_PENDING_REMOVAL') }}</div>
<div class="calendar-tooltip-content">
<calendar-tooltip-item v-for="item in pendingRemovalDaysOffSlots" :key="item.id" :item="item" />
</div>
</div>
</div>
</template>

Expand Down Expand Up @@ -77,26 +84,32 @@ export default {
pendingDaysOffSlots () {
return this.slots.filter(x => x.classBools.pending)
},
pendingRemovalDaysOffSlots () {
return this.slots.filter(x => x.classBools.pending_deletion)
},
activitySlots () {
const { slots, pendingDaysOffSlots } = this
const { slots, pendingDaysOffSlots, pendingRemovalDaysOffSlots } = this
return slots.filter(x => {
if (pendingDaysOffSlots.indexOf(x) > -1) return false
if (pendingRemovalDaysOffSlots.indexOf(x) > -1) return false
if (x.interpretation === 'activity') return true
})
},
daysOffSlots () {
const { slots, activitySlots, companyDaysoffSlots, pendingDaysOffSlots } = this
const { slots, activitySlots, companyDaysoffSlots, pendingDaysOffSlots, pendingRemovalDaysOffSlots } = this
return slots.filter(x => {
if (activitySlots.indexOf(x) > -1) return false
if (companyDaysoffSlots.indexOf(x) > -1) return false
if (pendingDaysOffSlots.indexOf(x) > -1) return false
if (pendingRemovalDaysOffSlots.indexOf(x) > -1) return false
return true
})
},
workTime () {
const timeOffTotal = this.daysOffSlots.reduce((timeOffMinutes, slot) => timeOffMinutes + slot.duration_minutes, 0)
const pendingRemovalTimeOffTotal = this.pendingRemovalDaysOffSlots.reduce((timeOffMinutes, slot) => timeOffMinutes + slot.duration_minutes, 0)
const workTimeSchedule = this.weeklySchedule[this.dateStr] || 0
const workTime = workTimeSchedule - timeOffTotal
const workTime = workTimeSchedule - timeOffTotal - pendingRemovalTimeOffTotal
Copy link
Contributor

@willem-delbare willem-delbare Apr 14, 2020

Choose a reason for hiding this comment

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

this correct?

Copy link
Author

@SemProvoost SemProvoost Apr 14, 2020

Choose a reason for hiding this comment

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

yep. timeOffTotal excludes pendingRemovalTimeOffTotal. They should both be subtracted

return Math.max(0, workTime)
},
emptyDay () {
Expand Down