From 71469f9c2b367bf534a1ecd743525e6ce933e664 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 21 Jul 2020 14:07:47 +0000 Subject: [PATCH] --- ayanova/src/api/notifypoll.js | 4 ++-- ayanova/src/views/home-notifications.vue | 29 ++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/ayanova/src/api/notifypoll.js b/ayanova/src/api/notifypoll.js index 2a628a10..125b2beb 100644 --- a/ayanova/src/api/notifypoll.js +++ b/ayanova/src/api/notifypoll.js @@ -7,7 +7,7 @@ const MAX_POLLING_INTERVAL = 15 * 60 * 1000; //15 minutes maximum wait time export default { async startPolling() { keepPolling = true; - let pollingInterval = DEFAULT_POLLING_INTERVAL; + let pollingInterval = window.$gz.dev ? 20000 : DEFAULT_POLLING_INTERVAL; try { while (keepPolling == true) { let status = await window.$gz.api.get("notify/new-count"); @@ -16,7 +16,7 @@ export default { } window.$gz.store.commit("setNewNotificationCount", status.data); //success so go to default in case it was changed by an error - pollingInterval = DEFAULT_POLLING_INTERVAL; + pollingInterval = window.$gz.dev ? 20000 : DEFAULT_POLLING_INTERVAL; await window.$gz.util.sleepAsync(pollingInterval); } } catch (error) { diff --git a/ayanova/src/views/home-notifications.vue b/ayanova/src/views/home-notifications.vue index c84d4849..c913345e 100644 --- a/ayanova/src/views/home-notifications.vue +++ b/ayanova/src/views/home-notifications.vue @@ -89,7 +89,31 @@ export default { id: item.notifySubscriptionId }); }, - deleteItem(item) {}, + async deleteItem(item) { + //prompt + //delete + + let vm = this; + try { + let dialogResult = await window.$gz.dialog.confirmDelete(); + if (dialogResult != true) { + return; + } + + window.$gz.form.deleteAllErrorBoxErrors(vm); + let res = await window.$gz.api.upsert( + `notify/${item.id}`, + this.selectedItems + ); + if (res.error) { + vm.formState.serverError = res.error; + window.$gz.form.setErrorBoxErrors(vm); + } + this.reload = !this.reload; + } catch (ex) { + window.$gz.errorHandler.handleFormError(ex, vm); + } + }, async getDataFromApi() { let vm = this; @@ -267,7 +291,8 @@ async function initForm(vm) { async function fetchTranslatedText(vm) { await window.$gz.translation.cacheTranslations([ "NotifySubscription", - "Server" + "Server", + "Notifications" ]); }