From 7ed4d557b47d9ede994a2b5122ab14331e869284 Mon Sep 17 00:00:00 2001 From: Martijn van de Rijdt Date: Wed, 19 Jul 2023 16:19:32 -0400 Subject: [PATCH] changed: copied enketo/enketo-express offline submission UI changes in last merge to custom OC controller --- public/js/src/module/controller-webform-oc.js | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/public/js/src/module/controller-webform-oc.js b/public/js/src/module/controller-webform-oc.js index 05a39bf5..47c66f72 100644 --- a/public/js/src/module/controller-webform-oc.js +++ b/public/js/src/module/controller-webform-oc.js @@ -1020,18 +1020,10 @@ function _saveRecord(survey, draft, recordName, confirmed) { 'info', 5 ); - } else { - gui.alert( - `${t('record-list.msg2')}`, - t('alert.recordsavesuccess.finalmsg'), - 'info', - 10 - ); - // The timeout simply avoids showing two messages at the same time: - // 1. "added to queue" - // 2. "successfully submitted" - setTimeout(records.uploadQueue, 10 * 1000); + return true; } + + return records.uploadQueue({ isUserTriggered: !draft }); }) .catch((error) => { console.error('save error', error); @@ -1566,7 +1558,7 @@ function _setButtonEventHandlers(survey) { } $('.record-list__button-bar__button.upload').on('click', () => { - records.uploadQueue(true); + records.uploadQueue({ isUserTriggered: true }); }); $('.record-list__button-bar__button.export').on('click', () => {