diff --git a/js/event.js b/js/event.js
index c1ac08eb..4d44fd35 100644
--- a/js/event.js
+++ b/js/event.js
@@ -1,5 +1,5 @@
import { allCountries, dataSavingBtn, storeResponse, validatePin, generateNewToken, showAnimation, hideAnimation, sites, errorMessage, BirthMonths, getAge, getMyData,
- hasUserData, retrieveNotifications, removeActiveClass, toggleNavbarMobileView, appState, logDDRumError, translateHTML, translateText, firebaseSignInRender } from "./shared.js";
+ hasUserData, retrieveNotifications, toggleNavbarMobileView, appState, logDDRumError, translateHTML, translateText, firebaseSignInRender } from "./shared.js";
import { consentTemplate } from "./pages/consent.js";
import { heardAboutStudy, healthCareProvider, duplicateAccountReminderRender } from "./pages/healthCareProvider.js";
import { myToDoList } from "./pages/myToDoList.js";
@@ -385,74 +385,56 @@ export const addEventUPSubmit = () => {
const radios = document.getElementsByName('UPRadio');
let hasError = false;
let focus = true;
- // Array.from(validations).forEach(element => {
- // if(element.value){
- // const validationPattern = element.dataset.validationPattern;
- // if(validationPattern && validationPattern === 'alphabets') {
- // if(!/^[A-Za-z ]+$/.test(element.value)) {
- // errorMessage(element.id, element.dataset.errorValidation, focus)
- // focus = false;
- // hasError = true;
- // }
- // }
- // if(validationPattern && validationPattern === 'year') {
- // if(!/^(19|20)[0-9]{2}$/.test(element.value)) {
- // errorMessage(element.id, element.dataset.errorValidation, focus)
- // focus = false;
- // hasError = true;
- // }
- // else {
- // if(element.value.length > 4) {
- // errorMessage(element.id, element.dataset.errorValidation, focus)
- // focus = false;
- // hasError = true;
- // }
- // else if (parseInt(element.value) > new Date().getFullYear()) {
- // errorMessage(element.id, element.dataset.errorValidation, focus)
- // focus = false;
- // hasError = true;
- // }
- // }
- // }
- // if(validationPattern && validationPattern === 'numbers') {
- // if(!/^[0-9]*$/.test(element.value)) {
- // errorMessage(element.id, element.dataset.errorValidation, focus)
- // focus = false;
- // hasError = true;
- // }
- // }
- // }
- // });
- // Array.from(requiredFields).forEach(element => {
- // if(!element.value){
- // errorMessage(element.id, `${element.dataset.errorRequired}`, focus);
- // focus = false;
- // hasError = true;
- // }
- // if(element.type === 'checkbox' && element.checked === false && element.hidden === false){
- // errorMessage(element.id, `${element.dataset.errorRequired}`, focus);
- // focus = false;
- // hasError = true;
- // }
- // });
- // Array.from(confirmationFields).forEach(element => {
- // const target = element.getAttribute('target')
- // const targetElement= document.getElementById(target)
-
- // if(element.value !== targetElement.value){
- // errorMessage(element.id, `${element.dataset.errorConfirmation}`, focus);
- // focus = false;
- // hasError = true;
- // }
- // });
- /*Array.from(numberValidations).forEach(element => {
- const pattern = element.dataset.valPattern
- if(element.value && !element.value.match(new RegExp(pattern))){
- errorMessageNumbers(element.id, `${element.dataset.errorValidation}`, focus);
+ Array.from(validations).forEach(element => {
+ if(element.value){
+ const validationPattern = element.dataset.validationPattern;
+ if(validationPattern && validationPattern === 'alphabets') {
+ if(!/^[A-Za-z ]+$/.test(element.value)) {
+ errorMessage(element.id, element.dataset.errorValidation, focus)
+ focus = false;
+ hasError = true;
+ }
+ }
+ if(validationPattern && validationPattern === 'year') {
+ if(!/^(19|20)[0-9]{2}$/.test(element.value)) {
+ errorMessage(element.id, element.dataset.errorValidation, focus)
+ focus = false;
+ hasError = true;
+ }
+ else {
+ if(element.value.length > 4) {
+ errorMessage(element.id, element.dataset.errorValidation, focus)
+ focus = false;
+ hasError = true;
+ }
+ else if (parseInt(element.value) > new Date().getFullYear()) {
+ errorMessage(element.id, element.dataset.errorValidation, focus)
+ focus = false;
+ hasError = true;
+ }
+ }
+ }
+ if(validationPattern && validationPattern === 'numbers') {
+ if(!/^[0-9]*$/.test(element.value)) {
+ errorMessage(element.id, element.dataset.errorValidation, focus)
+ focus = false;
+ hasError = true;
+ }
+ }
+ }
+ });
+ Array.from(requiredFields).forEach(element => {
+ if(!element.value){
+ errorMessage(element.id, `${element.dataset.errorRequired}`, focus);
+ focus = false;
+ hasError = true;
+ }
+ if(element.type === 'checkbox' && element.checked === false && element.hidden === false){
+ errorMessage(element.id, `${element.dataset.errorRequired}`, focus);
focus = false;
hasError = true;
}
- });*/
+ });
if(!(document.getElementById('UPCancer1').checked|| document.getElementById('UPCancer2').checked)){
errorMessage('UPCancerBtnGroup', '
'+translateText('event.provideResponse')+' ', focus);
focus = false;
@@ -553,13 +535,6 @@ export const addEventUPSubmit = () => {
focus = false;
hasError = true;
}
-
- /*if(city && !/^[a-zA-Z]+$/.test(city) ){
- errorMessage('UPAddress1City', 'City name may only contain letters.');
- if(focus) document.getElementById('UPAddress1City').focus();
- focus = false;
- hasError = true;
- }*/
if(email && /\S+@\S+\.\S+/.test(email) === false) {
errorMessage('UPEmail', '
'+translateText('settingsHelpers.emailFormat')+' ', focus);
if(focus) document.getElementById('UPPhoneNumber11').focus();
@@ -741,39 +716,17 @@ export const addEventUPSubmit = () => {
const ageToday = getAge(`${formData['544150384']}-${formData['564964481']}-${formData['795827569']}`);
- /*if(!(ageToday < 66 && ageToday > 39)){
- // Age is out of qualified range.
- openModal();
- document.getElementById('connectModalHeader').innerHTML = `
-
Review your date of birth
-
- ×
-
- `;
- document.getElementById('connectModalBody').innerHTML = `The date of birth that you entered does not make you eligible for the study. Please check that you entered your correct date of birth.`;
- document.getElementById('connectModalFooter').innerHTML = `
-
Back
-
Continue anyway
- `
- document.getElementById('continueAnyways').addEventListener('click', () => {
- verifyUserDetails(formData);
- });
- }else {*/
- formData['117249500'] = ageToday;
- verifyUserDetails(formData);
- //}
+
+ formData['117249500'] = ageToday;
+ verifyUserDetails(formData);
});
}
const openModal = () => {
- const tmpBtn = document.createElement('button');
- tmpBtn.dataset.target = "#connectMainModal";
- tmpBtn.dataset.toggle = "modal";
- tmpBtn.hidden = true;
- document.body.appendChild(tmpBtn);
- tmpBtn.click();
- document.body.removeChild(tmpBtn);
-}
+ const modalElement = document.getElementById('connectMainModal');
+ const modal = new bootstrap.Modal(modalElement);
+ modal.show();
+};
export const downtimeWarning = () => {
document.getElementById('connectWarningModalHeader').style.display = 'block';
@@ -828,19 +781,15 @@ export const environmentWarningModal = () => {
-
+
Enter staff access code
`;
- const tmpBtn = document.createElement('button');
- tmpBtn.dataset.target = "#connectWarningModal";
- tmpBtn.dataset.toggle = "modal";
- tmpBtn.hidden = true;
- document.body.appendChild(tmpBtn);
- tmpBtn.click();
- document.body.removeChild(tmpBtn);
+ const modalElement = document.getElementById('connectWarningModal');
+ const modal = new bootstrap.Modal(modalElement);
+ modal.show();
const testingAccessCode = document.getElementById('testingAccessCode');
const warningCloseBtn = document.getElementById('warningCloseBtn');
@@ -848,7 +797,13 @@ export const environmentWarningModal = () => {
if(testingAccessCode) {
testingAccessCode.addEventListener('keyup', () => {
if(warningCloseBtn) warningCloseBtn.disabled = !(testingAccessCode.value == 'agree')
- })
+ });
+ // allow enter key if warningCloseBtn is enabled
+ testingAccessCode.addEventListener('keydown', (e) => {
+ if(e.key === 'Enter' && !warningCloseBtn.disabled) {
+ warningCloseBtn.click();
+ }
+ });
}
}
@@ -869,9 +824,7 @@ const verifyUserDetails = (formData) => {
if(!document.getElementById('connectMainModal').classList.contains('show')) openModal();
document.getElementById('connectModalHeader').innerHTML = translateHTML(`
Review your profile details
-
- ×
-
+
`);
let bodyHtml = `
@@ -1107,8 +1060,10 @@ const verifyUserDetails = (formData) => {
document.getElementById('connectModalBody').innerHTML = translateHTML(bodyHtml);
document.getElementById('connectModalFooter').innerHTML = translateHTML(`
-
Go Back
-
Submit
+
+ Go Back
+ Submit
+
`);
document.getElementById('connectModalFooter').style.display = 'block';
@@ -1132,6 +1087,7 @@ const verifyUserDetails = (formData) => {
}
+// TODO: this doesn't appear to be used anywhere
export const addEventPreferredContactType = () => {
const p1 = document.getElementById('textPermissionYes');
const p2 = document.getElementById('textPermissionNo');
@@ -1152,12 +1108,6 @@ export const addEventPreferredContactType = () => {
+
@@ -1386,10 +1336,12 @@ export const toggleCurrentPage = async (route) => {
const IDs = ['userDashboard', 'Notifications', 'userAgreements', 'userSettings', 'connectSamples', 'connectSupport', 'connectPayment'];
IDs.forEach(id => {
const element = document.getElementById(id);
- if(element) {
- element.addEventListener('click', () => {
- removeActiveClass('navbar-nav', 'current-page');
- element.parentNode.parentNode.classList.add('current-page');
+ if (element) {
+ const clonedElement = element.cloneNode(true);
+ element.parentNode.replaceChild(clonedElement, element);
+
+ clonedElement.addEventListener('click', () => {
+ updateActiveNavItem(clonedElement);
toggleNavbarMobileView();
});
}
@@ -1404,21 +1356,28 @@ export const toggleCurrentPage = async (route) => {
if(route === '#payment') document.getElementById('connectPayment').click();
}
-export const toggleCurrentPageNoUser = async (route) => {
+export const toggleCurrentPageNoUser = async () => {
const IDs = ['home', 'about', 'expectations', 'privacy'];
IDs.forEach(id => {
const element = document.getElementById(id);
- element.addEventListener('click', () => {
- removeActiveClass('navbar-nav', 'current-page');
- element.parentNode.parentNode.classList.add('current-page');
- toggleNavbarMobileView();
- })
+ if (element) {
+ const clonedElement = element.cloneNode(true);
+ element.parentNode.replaceChild(clonedElement, element);
+
+ clonedElement.addEventListener('click', () => {
+ updateActiveNavItem(clonedElement);
+ toggleNavbarMobileView();
+ });
+ }
+ });
+}
+
+export const updateActiveNavItem = (clonedElement) => {
+ document.querySelectorAll('.nav-item').forEach(item => {
+ item.classList.remove('current-page');
});
- // if(route === '#') document.getElementById('home').click();
- // else if(route === '#about') document.getElementById('about').click();
- // else if(route === '#expectations') document.getElementById('expectations').click();
- // else if(route === '#privacy') document.getElementById('privacy').click();
+ clonedElement.closest('.nav-item').classList.add('current-page');
}
export const addEventCheckCanText = () => {
diff --git a/js/fieldToConceptIdMapping.js b/js/fieldToConceptIdMapping.js
index 7d77a235..915e4e04 100644
--- a/js/fieldToConceptIdMapping.js
+++ b/js/fieldToConceptIdMapping.js
@@ -248,17 +248,28 @@ export default
"version": "905236593"
},
- // external variables passed into Quest that require extra async/await handling.
+ // @deprecated. Retain until migration to Quest2 is complete. External variables passed into Quest that require extra async/await handling.
delayedParameterArray: [
- "D_627122657",
- "D_796828094",
- "D_118061122",
- "D_518387017",
"D_761310265",
"D_279637054",
- "D_951357171",
],
+ // External question IDs (Quest) mapped to their function names. // TODO: make this module-specific
+ questAsyncQuestionsMap: {
+ "Module1": {
+ asyncQuestions: {
+ "[D_761310265?]": {
+ func: "soccer",
+ args: ["D_627122657", "D_796828094"],
+ },
+ "[D_279637054?]": {
+ func: "soccer",
+ args: ["D_118061122", "D_518387017"],
+ }
+ },
+ },
+ },
+
collectionDetails: 173836415,
baseline: 266600170,
bioKitMouthwash: 319972665,
diff --git a/js/pages/agreements.js b/js/pages/agreements.js
index 0bfbde62..84d94ae8 100644
--- a/js/pages/agreements.js
+++ b/js/pages/agreements.js
@@ -210,9 +210,7 @@ export const renderAgreements = async () => {
let template = '';
if(hasUserData(myData) && myData.data['919254129'] !== undefined && myData.data['919254129'] === 353358909){
template += translateHTML(`
-
-
-
+
@@ -222,7 +220,7 @@ export const renderAgreements = async () => {
${((((myData.data.hasOwnProperty('773707518') && myData.data['773707518'] == 353358909) || (myData.data['747006172'] && myData.data['747006172'] == 353358909)) && (!myData.data['153713899'] || myData.data['153713899'] == 104430631) || (myData.data.hasOwnProperty('831041022') && myData.data['831041022'] == 353358909 && (!myData.data['359404406'] || myData.data['359404406'] == 104430631)))) ?`
-
+
${(myData.data.hasOwnProperty('831041022') && myData.data['831041022'] == 353358909 && (!myData.data['359404406'] || myData.data['359404406'] == 104430631)) ?`
-
+
@@ -256,7 +254,7 @@ export const renderAgreements = async () => {
`:''}
${(((myData.data.hasOwnProperty('773707518') && myData.data['773707518'] == 353358909) || (myData.data['747006172'] && myData.data['747006172'] == 353358909)) && (!myData.data['153713899'] || myData.data['153713899'] == 104430631)) ?`
-
+
`:''
}
-
+
${myData.data['119449326'] ?`
-
+
@@ -320,7 +318,7 @@ export const renderAgreements = async () => {
${myData.data['613641698'] ?`
-
+
@@ -348,7 +346,7 @@ export const renderAgreements = async () => {
${myData.data['454445267'] ?`
-
+
@@ -375,7 +373,7 @@ export const renderAgreements = async () => {
${myData.data['262613359'] ? `
-
+
-
-
-
`);
}
@@ -432,7 +427,7 @@ const addEventAgreementOptions = (myData) => {
});
// Handle touch events in iPhone/iPad
- anchorElement.addEventListener('touchend', (e) => {
+ anchorElement.addEventListener('touchend', () => {
anchorElement.click();
});
}
@@ -503,18 +498,14 @@ const renderDownloadDestroy = async (data) => {
const renderSignDataDestroy = async () =>{
document.getElementById('root').innerHTML = translateHTML(`
-
-
-
+
` + consentSignTemplate() +
`
-
-
`);
@@ -552,18 +543,14 @@ const renderSignDataDestroy = async () =>{
const renderSignHIPAARevoke = async () =>{
document.getElementById('root').innerHTML = translateHTML(`
-
-
-
+
` + consentSignTemplate() +
`
-
-
`);
@@ -639,35 +626,43 @@ const renderDownload = async (participant, timeStamp, fileLocation, nameCoordina
const consentSignTemplate = () => {
return translateHTML(`
-