Skip to content
Snippets Groups Projects

Resolve "Frontend for Models"

Merged Julian requested to merge 1-frontend-for-models into master
Compare and Show latest version
1 file
+ 0
60
Compare changes
  • Side-by-side
  • Inline
@@ -753,48 +753,6 @@ export default defineComponent({
.map((slot) => slot.weekday),
}));
},
<<<<<<< HEAD
getOutermostItems(arr) {
const result = [];
// Convert the input array into an array of numbers
const numbers = arr.map((item) => parseInt(item.slice(2), 10));
let startIndex = 0;
for (let i = 1; i < numbers.length; i++) {
if (numbers[i] !== numbers[i - 1] + 1) {
result.push(arr.slice(startIndex, i));
startIndex = i;
}
}
// Push the last subarray
result.push(arr.slice(startIndex));
return result.map((array) =>
array.length < 3 ? array : [array[0], array[array.length - 1]]
);
},
getTimeRangesByWeekdaysString(timeRange) {
return (
(timeRange.weekdays.length === this.weekdays.length
? ""
: this.getOutermostItems(timeRange.weekdays)
.map(
(weekdays) =>
weekdays
.map((weekday) => this.$t("weekdays_short." + weekday))
.join("") // Non-breaking hyphen (U+02011)
)
.join(", ") + ": ") +
this.$d(new Date("1970-01-01T" + timeRange.timeStart), "shortTime") +
" " +
this.$d(new Date("1970-01-01T" + timeRange.timeEnd), "shortTime")
);
},
=======
>>>>>>> fcf0d1f61bc823dbd6a1e58764b87dbf3892e341
},
});
</script>
@@ -864,23 +822,6 @@ export default defineComponent({
<period-card
v-for="(period, index) in periods"
:key="period"
<<<<<<< HEAD
class="d-flex justify-center align-center"
>
<v-card-title>{{ period }}</v-card-title>
<v-card-subtitle class="ma-0 pa-4">
<div
v-for="timeRange in timeRangesByWeekdays(
slotsByPeriods.find(
(periodWithSlots) => periodWithSlots.period === period
)
)"
>
{{ getTimeRangesByWeekdaysString(timeRange) }}
</div>
</v-card-subtitle>
</v-card>
=======
:period="period"
:weekdays="weekdays"
:time-ranges="
@@ -891,7 +832,6 @@ export default defineComponent({
)
"
/>
>>>>>>> fcf0d1f61bc823dbd6a1e58764b87dbf3892e341
</div>
<drag-grid
:cols="weekdays.length"
Loading