diff --git a/ayanova/src/views/svc-schedule.vue b/ayanova/src/views/svc-schedule.vue index 10394dcd..daa99240 100644 --- a/ayanova/src/views/svc-schedule.vue +++ b/ayanova/src/views/svc-schedule.vue @@ -763,6 +763,10 @@ export default { } }, async fetchEvents({ start, end }) { + /* + + { items = r, users = Users } + */ try { window.$gz.form.deleteAllErrorBoxErrors(this); const res = await window.$gz.api.post("schedule/svc", { @@ -787,11 +791,12 @@ export default { this.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(this); } else { + this.availableUsers = res.data.users; this.events.splice(0); const timeZoneName = this.timeZoneName; - let i = res.data.length; + let i = res.data.items.length; while (i--) { - const x = res.data[i]; + const x = res.data.items[i]; this.events.push({ start: new Date( new Date(x.start) @@ -982,23 +987,23 @@ function generateMenu(vm) { // async function initForm(vm) { await fetchTranslatedText(vm); - await fetchAvailableUsers(vm); + //await fetchAvailableUsers(vm); getFormSettings(vm); await getFormUserOptions(vm); } -////////////////////// -// -// -async function fetchAvailableUsers(vm) { - const res = await window.$gz.api.get("schedule/scheduleable-user-list"); - if (res.error) { - vm.formState.serverError = res.error; - window.$gz.form.setErrorBoxErrors(vm); - } else { - vm.availableUsers = res.data; - } -} +// ////////////////////// +// // +// // +// async function fetchAvailableUsers(vm) { +// const res = await window.$gz.api.get("schedule/scheduleable-user-list"); +// if (res.error) { +// vm.formState.serverError = res.error; +// window.$gz.form.setErrorBoxErrors(vm); +// } else { +// vm.availableUsers = res.data; +// } +// } function getFormSettings(vm) { let formSettings = window.$gz.form.getFormSettings(FORM_KEY);