exclude days added to home-schedule now to port to svc-schedule
This commit is contained in:
@@ -911,6 +911,60 @@ export default {
|
||||
`gzutil->calendarViewtoAyaNovaEnum - Unknown view type '${view}'`
|
||||
);
|
||||
}
|
||||
},
|
||||
///////////////////////////////////////////////
|
||||
// GZDaysOfWeek to VCalendar weekdays
|
||||
//
|
||||
//
|
||||
DaysOfWeekToWeekdays: function(dow) {
|
||||
/*
|
||||
AyaDaysOfWeek
|
||||
Monday = 1,
|
||||
Tuesday = 2,
|
||||
Wednesday = 4,
|
||||
Thursday = 8,
|
||||
Friday = 16,
|
||||
Saturday = 32,
|
||||
Sunday = 64
|
||||
|
||||
vCalendar [
|
||||
0,//sunday
|
||||
1,
|
||||
2,
|
||||
3,
|
||||
4,
|
||||
5,
|
||||
6//saturday
|
||||
]
|
||||
*/
|
||||
if (dow == null || dow == 0) {
|
||||
return [0, 1, 2, 3, 4, 5, 6]; //all the days
|
||||
}
|
||||
const ret = [];
|
||||
|
||||
//turn EXCLUDE selected gzDaysOfWeek into INCLUDE selected days for vCalendar
|
||||
if (!!!(dow & 64)) {
|
||||
ret.push(0);
|
||||
}
|
||||
if (!!!(dow & 1)) {
|
||||
ret.push(1);
|
||||
}
|
||||
if (!!!(dow & 2)) {
|
||||
ret.push(2);
|
||||
}
|
||||
if (!!!(dow & 4)) {
|
||||
ret.push(3);
|
||||
}
|
||||
if (!!!(dow & 8)) {
|
||||
ret.push(4);
|
||||
}
|
||||
if (!!!(dow & 16)) {
|
||||
ret.push(5);
|
||||
}
|
||||
if (!!!(dow & 32)) {
|
||||
ret.push(6);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -67,6 +67,7 @@
|
||||
:locale="languageName"
|
||||
:event-more-text="$ay.t('More')"
|
||||
:first-time="formUserOptions.firstTime"
|
||||
:weekdays="weekdays"
|
||||
@click:more="viewDay"
|
||||
@click:date="viewDay"
|
||||
@change="fetchEvents"
|
||||
@@ -333,6 +334,7 @@
|
||||
</template>
|
||||
</v-sheet>
|
||||
<template>
|
||||
<!-- SETTINGS DIALOG -->
|
||||
<v-row justify="center">
|
||||
<v-dialog max-width="600px" v-model="settingsDialog">
|
||||
<v-card>
|
||||
@@ -345,6 +347,14 @@
|
||||
v-model="tempFirstTime"
|
||||
></gz-time-picker>
|
||||
</v-col>
|
||||
<v-col cols="12">
|
||||
<GZDaysOfWeek
|
||||
:label="$ay.t('ExcludeDaysOfWeek')"
|
||||
v-model="formUserOptions.excludeDaysOfWeek"
|
||||
ref="daysofweek"
|
||||
></GZDaysOfWeek>
|
||||
</v-col>
|
||||
|
||||
<span class="text-h6 mt-3">{{
|
||||
$ay.t("ScheduleShowTypes")
|
||||
}}</span>
|
||||
@@ -411,7 +421,11 @@
|
||||
</template>
|
||||
<script>
|
||||
const FORM_KEY = "home-schedule";
|
||||
import GZDaysOfWeek from "../components/days-of-week-control.vue";
|
||||
export default {
|
||||
components: {
|
||||
GZDaysOfWeek
|
||||
},
|
||||
async created() {
|
||||
const vm = this;
|
||||
try {
|
||||
@@ -851,6 +865,13 @@ export default {
|
||||
window.location.reload();
|
||||
}
|
||||
//eom
|
||||
},
|
||||
computed: {
|
||||
weekdays() {
|
||||
return window.$gz.util.DaysOfWeekToWeekdays(
|
||||
this.formUserOptions.excludeDaysOfWeek
|
||||
);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1029,6 +1050,7 @@ async function getFormUserOptions(vm) {
|
||||
//make a default
|
||||
vm.formUserOptions = {
|
||||
firstTime: "00:00",
|
||||
excludeDaysOfWeek: 0,
|
||||
wisuColorSource: "2",
|
||||
wisu: true,
|
||||
reviews: true,
|
||||
@@ -1079,6 +1101,7 @@ async function saveFormUserOptions(vm) {
|
||||
async function fetchTranslatedText(vm) {
|
||||
await window.$gz.translation.cacheTranslations([
|
||||
"DateRangeToday",
|
||||
"ExcludeDaysOfWeek",
|
||||
"ScheduleMonth",
|
||||
"ScheduleDay",
|
||||
"ScheduleWeek",
|
||||
|
||||
Reference in New Issue
Block a user