Skip to content

Commit 3d0d09d

Browse files
committed
filter out closed hut dates in availability display
1 parent 5d58225 commit 3d0d09d

File tree

1 file changed

+19
-4
lines changed

1 file changed

+19
-4
lines changed

website/src/components/HutDetailPage.vue

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,12 @@ export default {
666666
});
667667
},
668668
groupByMonth(availabilities) {
669-
const filteredAvailabilities = this.filterByWeekdays(availabilities);
669+
// First filter out weekdays if selected
670+
const weekdayFilteredAvailabilities = this.filterByWeekdays(availabilities);
671+
672+
// Then filter out closed hut dates
673+
const filteredAvailabilities = weekdayFilteredAvailabilities.filter(av => !av.hutClosed);
674+
670675
const months = {};
671676
672677
// Store current collapse states
@@ -682,9 +687,9 @@ export default {
682687
if (!months[month]) {
683688
// Use previous collapse state if available, otherwise use default
684689
const wasCollapsed = currentCollapseStates[month] !== undefined ?
685-
currentCollapseStates[month] :
686-
!(new Date(av.date).getMonth() === new Date().getMonth() &&
687-
new Date(av.date).getFullYear() === new Date().getFullYear());
690+
currentCollapseStates[month] :
691+
!(new Date(av.date).getMonth() === new Date().getMonth() &&
692+
new Date(av.date).getFullYear() === new Date().getFullYear());
688693
689694
months[month] = {
690695
month,
@@ -705,6 +710,16 @@ export default {
705710
}];
706711
}
707712
713+
// If no months after filtering due to all dates being closed
714+
if (Object.keys(months).length === 0 && this.selectedWeekdays.length === 0) {
715+
return [{
716+
month: this.$t('message.allDatesClosedTitle'),
717+
availabilities: [],
718+
collapsed: false,
719+
isEmptyFilterResult: true
720+
}];
721+
}
722+
708723
return Object.values(months);
709724
},
710725
getAvailabilityClass(freeBeds, totalBeds) {

0 commit comments

Comments
 (0)