This commit is contained in:
2021-10-06 15:20:01 +00:00
parent c59e6de8ae
commit dd3199aafb

View File

@@ -402,7 +402,7 @@ export default {
hour12: window.$gz.locale.getHour12(), hour12: window.$gz.locale.getHour12(),
formUserOptions: {}, formUserOptions: {},
tempFirstTime: null, tempFirstTime: null,
availableUsers: [], // availableUsers: [],
lastMouseDownMS: null, lastMouseDownMS: null,
tags: [] tags: []
}; };
@@ -792,7 +792,7 @@ export default {
window.$gz.form.setErrorBoxErrors(this); window.$gz.form.setErrorBoxErrors(this);
} else { } else {
this.categories = res.data.users; this.categories = res.data.users;
this.availableUsers = res.data.users; // this.availableUsers = res.data.users;
this.events.splice(0); this.events.splice(0);
const timeZoneName = this.timeZoneName; const timeZoneName = this.timeZoneName;
@@ -822,7 +822,7 @@ export default {
id: x.id, id: x.id,
editable: x.editable, editable: x.editable,
userId: x.userId, userId: x.userId,
category: this.availableUsers.find(a => a.id == x.userId).name category: this.categories.find(a => a.id == x.userId).name
}); });
} }
} }
@@ -1042,15 +1042,15 @@ async function getFormUserOptions(vm) {
firstTime: "00:00", firstTime: "00:00",
excludeDaysOfWeek: 0, excludeDaysOfWeek: 0,
wisuColorSource: "2", wisuColorSource: "2",
wisu: true, wisu: true
users: [...vm.availableUsers.map(x => x.id)] //default to all users //, users: [...vm.availableUsers.map(x => x.id)] //default to all users
}; };
} else { } else {
vm.formUserOptions = JSON.parse(res.data.options); vm.formUserOptions = JSON.parse(res.data.options);
} }
vm.categories = vm.formUserOptions.users.map(x => { // vm.categories = vm.formUserOptions.users.map(x => {
return vm.availableUsers.find(a => a.id == x); // return vm.availableUsers.find(a => a.id == x);
}); // });
//takes local time in "HH:MM" format and converts to ISO UTC format for picker consumption //takes local time in "HH:MM" format and converts to ISO UTC format for picker consumption
const d = new Date(); const d = new Date();
const temp = new Date( const temp = new Date(