From 6faaa5fa04c3ae86b67205d37a7f65ca3ae34c6b Mon Sep 17 00:00:00 2001 From: Matthew White Date: Wed, 13 Jan 2021 15:00:43 -0500 Subject: [PATCH 1/2] Add autosend to managed QR codes --- src/components/field-key/qr-panel.vue | 9 ++++++--- test/components/field-key/qr-panel.spec.js | 3 ++- transifex/strings_en.json | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/components/field-key/qr-panel.vue b/src/components/field-key/qr-panel.vue index 33fdc6a5f..770c52f07 100644 --- a/src/components/field-key/qr-panel.vue +++ b/src/components/field-key/qr-panel.vue @@ -87,7 +87,10 @@ export default { const settings = { server_url: apiPaths.serverUrlForFieldKey(token, projectId) }; - if (this.managed) settings.form_update_mode = 'match_exactly'; + if (this.managed) { + settings.form_update_mode = 'match_exactly'; + settings.autosend = 'wifi_and_cellular'; + } return settings; } } @@ -167,8 +170,8 @@ export default { }, // "Get Blank Form" is the text of a button in ODK Collect. { - "managed": "Collect will exactly match the Forms available to “{displayName}” including automatically applying updates. Users will not need to manually Get Blank Forms.", - "legacy": "Users will have to manually Get Blank Forms on the device and determine which Forms to update.", + "managed": "Collect will exactly match the Forms available to “{displayName}” including automatically applying updates. Users will not need to manually Get Blank Forms. Additionally, finalized Forms will be sent automatically as soon as a connection is found.", + "legacy": "Users will have to manually Get Blank Forms on the device and determine which Forms to update." }, { "managed": { diff --git a/test/components/field-key/qr-panel.spec.js b/test/components/field-key/qr-panel.spec.js index 224e5378b..85cce7c3d 100644 --- a/test/components/field-key/qr-panel.spec.js +++ b/test/components/field-key/qr-panel.spec.js @@ -23,7 +23,8 @@ describe('FieldKeyQrPanel', () => { const { token } = testData.extendedFieldKeys.last(); panel.first(CollectQr).getProp('settings').should.eql({ server_url: `/v1/key/${token}/projects/1`, - form_update_mode: 'match_exactly' + form_update_mode: 'match_exactly', + autosend: 'wifi_and_cellular' }); }); diff --git a/transifex/strings_en.json b/transifex/strings_en.json index 567f3fadb..3a65af658 100644 --- a/transifex/strings_en.json +++ b/transifex/strings_en.json @@ -911,7 +911,7 @@ }, "1": { "managed": { - "string": "Collect will exactly match the Forms available to “{displayName}” including automatically applying updates. Users will not need to manually Get Blank Forms.", + "string": "Collect will exactly match the Forms available to “{displayName}” including automatically applying updates. Users will not need to manually Get Blank Forms. Additionally, finalized Forms will be sent automatically as soon as a connection is found.", "developer_comment": "\"Get Blank Form\" is the text of a button in ODK Collect." }, "legacy": { From 99558b1fef3360b582853bf3213466fab85b97f8 Mon Sep 17 00:00:00 2001 From: Matthew White Date: Thu, 14 Jan 2021 15:07:16 -0500 Subject: [PATCH 2/2] Mention autosend in text for legacy QR code --- src/components/field-key/qr-panel.vue | 5 +++-- transifex/strings_en.json | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/field-key/qr-panel.vue b/src/components/field-key/qr-panel.vue index 770c52f07..7cf886f03 100644 --- a/src/components/field-key/qr-panel.vue +++ b/src/components/field-key/qr-panel.vue @@ -168,10 +168,11 @@ export default { "legacyCode": "Legacy QR Code" } }, - // "Get Blank Form" is the text of a button in ODK Collect. { + // "Get Blank Form" is the text of a button in ODK Collect. "managed": "Collect will exactly match the Forms available to “{displayName}” including automatically applying updates. Users will not need to manually Get Blank Forms. Additionally, finalized Forms will be sent automatically as soon as a connection is found.", - "legacy": "Users will have to manually Get Blank Forms on the device and determine which Forms to update." + // "Get Blank Form" and "Send Finalized Form" are the text of buttons in ODK Collect. + "legacy": "Users will have to manually Get Blank Forms on the device and determine which Forms to update. They will also need to manually Send Finalized Forms." }, { "managed": { diff --git a/transifex/strings_en.json b/transifex/strings_en.json index 3a65af658..d621556b9 100644 --- a/transifex/strings_en.json +++ b/transifex/strings_en.json @@ -915,8 +915,8 @@ "developer_comment": "\"Get Blank Form\" is the text of a button in ODK Collect." }, "legacy": { - "string": "Users will have to manually Get Blank Forms on the device and determine which Forms to update.", - "developer_comment": "\"Get Blank Form\" is the text of a button in ODK Collect." + "string": "Users will have to manually Get Blank Forms on the device and determine which Forms to update. They will also need to manually Send Finalized Forms.", + "developer_comment": "\"Get Blank Form\" and \"Send Finalized Form\" are the text of buttons in ODK Collect." } }, "2": {