From 376fef7f9faaa4731947f139d8314654b70163a8 Mon Sep 17 00:00:00 2001 From: jhflorey Date: Tue, 30 Apr 2024 10:56:56 -0400 Subject: [PATCH 1/9] Fix: Formatting does not work in gmail from browser --- newsletter/anniversary.html | 310 +++++++++++++++--------------------- 1 file changed, 125 insertions(+), 185 deletions(-) diff --git a/newsletter/anniversary.html b/newsletter/anniversary.html index 280e3415..cabbbd01 100644 --- a/newsletter/anniversary.html +++ b/newsletter/anniversary.html @@ -1,198 +1,138 @@ - + - - - - - - - HTML Email Template - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - -
- - - -
- -
-
- - - - -
-

-
-
-

- It’s your Connect anniversary!

-
- - -
-

Over the past year, your contributions to Connect have helped us start to build a resource for cancer prevention research. - Your continued participation will help us grow and use this resource to explore the causes of cancer and learn how to better prevent it.

We appreciate your commitment to partnering with us for the future of cancer prevention and encourage you to - spread the word to others. We look forward to having you as part of the Connect community for years to come! -

-
-

-
- - - - -
-

-
-
- - - + + + + + + + + + - +

Connect for Cancer Prevention Study

+ National Cancer Institute | National Institutes of Health | + U.S. Department of Health and + Human Services | USA.gov + + +
+ +

+ Over the past year, your contributions to Connect have helped us start to build a resource for cancer + prevention research. + Your continued participation will help us grow and use this resource to explore the causes of cancer and learn + how to better prevent it.

We appreciate your commitment to partnering with us for the future of + cancer prevention and encourage you to + spread the word to + others. We look forward to having you as part of the Connect community for years to come! +
+

+
+

+
+ + + + +
+

+
+
+ + + - -
-

Connect for Cancer Prevention Study

- National Cancer Institute | National Institutes of Health | - U.S. Department of Health and Human Services | USA.gov -
- - - - -
-

Connect for Cancer Prevention Study, the Connect for Cancer Prevention Study logo, and “Connect today. Prevent cancer tomorrow.” - are trademarks of the U.S. Department of Health and Human Services (HHS).®

-
-
+ + + + +
+

Connect for Cancer Prevention Study, the Connect for Cancer Prevention Study logo, + and “Connect today. Prevent cancer tomorrow.” + are trademarks of the U.S. Department of Health and Human Services (HHS).®

+
+
- - + + + + \ No newline at end of file From 890e1f9545b958cd3bbc6900fc2cc6452bb1b0f6 Mon Sep 17 00:00:00 2001 From: Warren Lu Date: Wed, 1 May 2024 10:44:41 -0400 Subject: [PATCH 2/9] fix string type and cleanup --- siteManagerDashboard/participantDetails.js | 18 ++++++++--------- .../participantDetailsHelpers.js | 20 +++++++------------ 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/siteManagerDashboard/participantDetails.js b/siteManagerDashboard/participantDetails.js index 49d77ccd..ee3d61fa 100644 --- a/siteManagerDashboard/participantDetails.js +++ b/siteManagerDashboard/participantDetails.js @@ -395,7 +395,7 @@ const renderMonthSelector = (participantValue, conceptId) => { const renderTextVoicemailPermissionSelector = (participantValue, conceptId) => { return ` @@ -431,14 +431,14 @@ const renderPhoneInputBox = (participantValue, conceptId) => { const renderSuffixSelector = (participant, participantValue, conceptId) => { return ` ` }; diff --git a/siteManagerDashboard/participantDetailsHelpers.js b/siteManagerDashboard/participantDetailsHelpers.js index 0c872369..dea2edaa 100644 --- a/siteManagerDashboard/participantDetailsHelpers.js +++ b/siteManagerDashboard/participantDetailsHelpers.js @@ -83,8 +83,10 @@ const fieldValues = { } export const getFieldValues = (variableValue, conceptId) => { - const formattedPhoneValue = variableValue ? formatPhoneNumber(variableValue.toString()) : ''; + if (!variableValue || (conceptId === "Change Login Email" && variableValue.startsWith("noreply"))) return ""; + if (variableValue in fieldValues) return fieldValues[variableValue]; + const formattedPhoneValue = variableValue ? formatPhoneNumber(variableValue.toString()) : ""; const phoneFieldValues = { [fieldMapping.cellPhone]: formattedPhoneValue, [fieldMapping.homePhone]: formattedPhoneValue, @@ -92,11 +94,9 @@ export const getFieldValues = (variableValue, conceptId) => { 'Change Login Phone': formattedPhoneValue } - if (!variableValue) return ''; - else if (conceptId === 'Change Login Email' && variableValue.startsWith('noreply')) return ''; - else if (variableValue in fieldValues) return fieldValues[variableValue]; - else if (conceptId in phoneFieldValues) return phoneFieldValues[conceptId]; - else return variableValue; + if (conceptId in phoneFieldValues) return phoneFieldValues[conceptId]; + + return variableValue; } export const formatPhoneNumber = (phoneNumber) => { @@ -868,13 +868,7 @@ const getUITextForUpdatedValue = (newValue, conceptIdArray) => { if (conceptIdArray.toString().includes(fieldMapping.suffix.toString())) { return suffixToTextMap.get(parseInt(newValue)); } else if (conceptIdArray.some(id => [fieldMapping.canWeText.toString(), fieldMapping.voicemailMobile.toString(), fieldMapping.voicemailHome.toString(), fieldMapping.voicemailOther.toString()].includes(id.toString()))) { - if (newValue == fieldMapping.yes) { - return 'Yes'; - } else if (newValue == fieldMapping.no) { - return 'No'; - } else { - return ''; - } + return newValue === fieldMapping.yes.toString() ? "Yes" : "No"; } else { return newValue; } From 270d1ff9acc1997f4ad72c3fe082c4a809d1a04a Mon Sep 17 00:00:00 2001 From: Warren Lu Date: Wed, 1 May 2024 11:04:55 -0400 Subject: [PATCH 3/9] simpify --- siteManagerDashboard/participantDetailsHelpers.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/siteManagerDashboard/participantDetailsHelpers.js b/siteManagerDashboard/participantDetailsHelpers.js index dea2edaa..f53d8629 100644 --- a/siteManagerDashboard/participantDetailsHelpers.js +++ b/siteManagerDashboard/participantDetailsHelpers.js @@ -94,9 +94,7 @@ export const getFieldValues = (variableValue, conceptId) => { 'Change Login Phone': formattedPhoneValue } - if (conceptId in phoneFieldValues) return phoneFieldValues[conceptId]; - - return variableValue; + return phoneFieldValues[conceptId] ?? variableValue; } export const formatPhoneNumber = (phoneNumber) => { From ce2d26ce30f60559f9c74122849e9d396862090c Mon Sep 17 00:00:00 2001 From: jhflorey Date: Fri, 3 May 2024 10:14:35 -0400 Subject: [PATCH 4/9] Set value for dataHasBeenDestroyed flag when request data destruction --- siteManagerDashboard/participantWithdrawalForm.js | 1 + 1 file changed, 1 insertion(+) diff --git a/siteManagerDashboard/participantWithdrawalForm.js b/siteManagerDashboard/participantWithdrawalForm.js index d34edfe3..15c3b675 100644 --- a/siteManagerDashboard/participantWithdrawalForm.js +++ b/siteManagerDashboard/participantWithdrawalForm.js @@ -546,6 +546,7 @@ const sendResponses = async (finalOptions, retainOptions, requestedHolder, sourc if (statusConceptId === fieldMapping.destroyDataStatus) { sendRefusalData[fieldMapping.dateDataDestroyRequested] = new Date().toISOString(); sendRefusalData[fieldMapping.dataDestroyCategorical] = fieldMapping.requestedDataDestroyNotSigned; + sendRefusalData[fieldMapping.dataHasBeenDestroyed] = fieldMapping.no; updateWhoRequested(sendRefusalData, fieldMapping.whoRequestedDataDestruction, fieldMapping.whoRequestedDataDestructionOther) } if (statusConceptId === fieldMapping.revokeHIPAAOnly) { From 20626f2944cdffcb5c1fa21da71bf848c92da844 Mon Sep 17 00:00:00 2001 From: Gene Barra Date: Tue, 7 May 2024 11:07:16 -0400 Subject: [PATCH 5/9] add bswh dev SSO Config --- siteManagerDashboard/dev/identityProvider.js | 22 ++++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/siteManagerDashboard/dev/identityProvider.js b/siteManagerDashboard/dev/identityProvider.js index d8b4312b..e9d5120a 100644 --- a/siteManagerDashboard/dev/identityProvider.js +++ b/siteManagerDashboard/dev/identityProvider.js @@ -1,37 +1,41 @@ export const SSOConfig = (inputValue) => { let tenantID = ''; let provider = ''; - if(/nih.gov/i.test(inputValue)) { + if (/nih.gov/i.test(inputValue)) { tenantID = 'NIH-SSO-qfszp'; provider = 'saml.nih-sso'; }; - if(/healthpartners.com/i.test(inputValue)) { + if (/healthpartners.com/i.test(inputValue)) { tenantID = 'HP-SSO-wb1zb'; provider = 'saml.healthpartner'; }; - if(/hfhs.org/i.test(inputValue)) { + if (/hfhs.org/i.test(inputValue)) { tenantID = 'HFHS-SSO-ay0iz'; provider = 'saml.connect-hfhs'; }; - if(/sanfordhealth.org/i.test(inputValue)) { + if (/sanfordhealth.org/i.test(inputValue)) { tenantID = 'SFH-SSO-cgzpj'; provider = 'saml.connect-sanford'; }; - if(/uchicago.edu/i.test(inputValue)) { + if (/uchicago.edu/i.test(inputValue)) { tenantID = 'UCM-SSO-tovai'; provider = 'saml.connect-uchicago'; }; - if(/norc.org/i.test(inputValue)) { + if (/norc.org/i.test(inputValue)) { tenantID = 'NORC-SSO-dilvf'; provider = 'saml.connect-norc'; }; - if(/kp.org/i.test(inputValue)) { + if (/kp.org/i.test(inputValue)) { tenantID = 'KP-SSO-wulix'; provider = 'saml.connect-kp'; }; - if(/marshfieldresearch.org/i.test(inputValue) || /marshfieldclinic.org/i.test(inputValue)) { + if (/marshfieldresearch.org/i.test(inputValue) || /marshfieldclinic.org/i.test(inputValue)) { tenantID = 'MFC-SSO-fljvd'; provider = 'saml.connect-mfc' } - return {tenantID, provider} + if (/bswhealth.org/i.test(inputValue)) { + tenantID = 'BSWH-SSO-y2jj3'; + provider = 'saml.connect-bswh'; + }; + return { tenantID, provider } } \ No newline at end of file From 2bd15bd2b67d77371999fe1c3fbd5c69578b2a2f Mon Sep 17 00:00:00 2001 From: Gene Barra Date: Tue, 7 May 2024 12:12:43 -0400 Subject: [PATCH 6/9] remove semicolons and indent return --- siteManagerDashboard/dev/identityProvider.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/siteManagerDashboard/dev/identityProvider.js b/siteManagerDashboard/dev/identityProvider.js index e9d5120a..7d3a5b38 100644 --- a/siteManagerDashboard/dev/identityProvider.js +++ b/siteManagerDashboard/dev/identityProvider.js @@ -4,31 +4,31 @@ export const SSOConfig = (inputValue) => { if (/nih.gov/i.test(inputValue)) { tenantID = 'NIH-SSO-qfszp'; provider = 'saml.nih-sso'; - }; + } if (/healthpartners.com/i.test(inputValue)) { tenantID = 'HP-SSO-wb1zb'; provider = 'saml.healthpartner'; - }; + } if (/hfhs.org/i.test(inputValue)) { tenantID = 'HFHS-SSO-ay0iz'; provider = 'saml.connect-hfhs'; - }; + } if (/sanfordhealth.org/i.test(inputValue)) { tenantID = 'SFH-SSO-cgzpj'; provider = 'saml.connect-sanford'; - }; + } if (/uchicago.edu/i.test(inputValue)) { tenantID = 'UCM-SSO-tovai'; provider = 'saml.connect-uchicago'; - }; + } if (/norc.org/i.test(inputValue)) { tenantID = 'NORC-SSO-dilvf'; provider = 'saml.connect-norc'; - }; + } if (/kp.org/i.test(inputValue)) { tenantID = 'KP-SSO-wulix'; provider = 'saml.connect-kp'; - }; + } if (/marshfieldresearch.org/i.test(inputValue) || /marshfieldclinic.org/i.test(inputValue)) { tenantID = 'MFC-SSO-fljvd'; provider = 'saml.connect-mfc' @@ -36,6 +36,7 @@ export const SSOConfig = (inputValue) => { if (/bswhealth.org/i.test(inputValue)) { tenantID = 'BSWH-SSO-y2jj3'; provider = 'saml.connect-bswh'; - }; + } + return { tenantID, provider } } \ No newline at end of file From 77094c4af53499ec86f75b4874cb8a085ebd08a9 Mon Sep 17 00:00:00 2001 From: Brian Bransteitter Date: Fri, 10 May 2024 11:51:46 -0400 Subject: [PATCH 7/9] Expanded Suffix to 8th and depricated seperate 2nd and 3rd --- .../fieldToConceptIdMapping.js | 6 +++++ siteManagerDashboard/participantDetails.js | 13 ++++++---- .../participantDetailsHelpers.js | 24 +++++++++++++++---- 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/siteManagerDashboard/fieldToConceptIdMapping.js b/siteManagerDashboard/fieldToConceptIdMapping.js index 050bedb7..74eeb684 100644 --- a/siteManagerDashboard/fieldToConceptIdMapping.js +++ b/siteManagerDashboard/fieldToConceptIdMapping.js @@ -60,11 +60,17 @@ export default "userProfileUpdateTimestamp": 371303487, "noneOfTheseApply": 398561594, + // suffix 'jr': 612166858, 'sr': 255907182, 'one': 226924545, 'two': 270793412, 'three': 959021713, + 'four': 611945488, + 'five': 773963342, + 'six': 911299066, + 'seven': 528373182, + 'eight': 233284019, 'second': 643664527, 'third': 537892528, diff --git a/siteManagerDashboard/participantDetails.js b/siteManagerDashboard/participantDetails.js index ee3d61fa..4bf8e0bb 100644 --- a/siteManagerDashboard/participantDetails.js +++ b/siteManagerDashboard/participantDetails.js @@ -434,11 +434,14 @@ const renderSuffixSelector = (participant, participantValue, conceptId) => { - - - - - + + + + + + + + ` }; diff --git a/siteManagerDashboard/participantDetailsHelpers.js b/siteManagerDashboard/participantDetailsHelpers.js index f53d8629..9c86ede2 100644 --- a/siteManagerDashboard/participantDetailsHelpers.js +++ b/siteManagerDashboard/participantDetailsHelpers.js @@ -928,15 +928,31 @@ export const showAlreadyExistsNoteInModal = () => { document.getElementById('showNote').innerHTML = `This value already exists. Please enter a different value or choose 'cancel'.
`; }; -export const suffixList = { 612166858: 0, 255907182: 1, 226924545: 2, 270793412: 3, 959021713: 4, 643664527: 5, 537892528: 6 }; +export const suffixList = { 612166858: 0, + 255907182: 1, + 226924545: 2, + 270793412: 3, + 959021713: 4, + 611945488: 5, + 773963342: 6, + 911299066: 7, + 528373182: 8, + 233284019: 9, + 643664527: 10, + 537892528: 11 }; export const suffixToTextMap = new Map([ [398561594, ''], [612166858, 'Jr.'], [255907182, 'Sr.'], - [226924545, 'I'], - [270793412, 'II'], - [959021713, 'III'], + [226924545, 'I, 1st'], + [270793412, 'II, 2nd'], + [959021713, 'III, 3rd'], + [611945488, 'IV, 4th'], + [773963342, 'V, 5th'], + [911299066, 'VI, 6th'], + [528373182, 'VII, 7th'], + [233284019, 'VIII, 8th'], [643664527, '2nd'], [537892528, '3rd'], ]); From 90e7994bf6797492d6aac71814e6cc9390190285 Mon Sep 17 00:00:00 2001 From: Brian Bransteitter Date: Fri, 10 May 2024 12:16:46 -0400 Subject: [PATCH 8/9] Added field mapping for additional suffix strings --- siteManagerDashboard/fieldToConceptIdMapping.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/siteManagerDashboard/fieldToConceptIdMapping.js b/siteManagerDashboard/fieldToConceptIdMapping.js index 74eeb684..1c57f069 100644 --- a/siteManagerDashboard/fieldToConceptIdMapping.js +++ b/siteManagerDashboard/fieldToConceptIdMapping.js @@ -79,6 +79,11 @@ export default 226924545 : 'I', 270793412 : 'II', 959021713: 'III', + 611945488: 'IV', + 773963342: 'V', + 911299066: 'VI', + 528373182: 'VII', + 233284019: 'VIII', 643664527: '2nd', 537892528: '3rd', From 574633cd74f3454017a0dc61a57291afd60ccd58 Mon Sep 17 00:00:00 2001 From: Brian Bransteitter Date: Tue, 14 May 2024 10:24:44 -0400 Subject: [PATCH 9/9] Added additional suffix to the field values map --- siteManagerDashboard/participantDetailsHelpers.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/siteManagerDashboard/participantDetailsHelpers.js b/siteManagerDashboard/participantDetailsHelpers.js index 9c86ede2..0239cf8b 100644 --- a/siteManagerDashboard/participantDetailsHelpers.js +++ b/siteManagerDashboard/participantDetailsHelpers.js @@ -73,9 +73,14 @@ const fieldValues = { [fieldMapping.noneOfTheseApply]: '', [fieldMapping.jr]: 'Jr.', [fieldMapping.sr]: 'Sr.', - [fieldMapping.one]: 'I', - [fieldMapping.two]: 'II', - [fieldMapping.three]: 'III', + [fieldMapping.one]: 'I, 1st', + [fieldMapping.two]: 'II, 2nd', + [fieldMapping.three]: 'III, 3rd', + [fieldMapping.four]: 'IV, 4th', + [fieldMapping.five]: 'V, 5th', + [fieldMapping.six]: 'VI, 6th', + [fieldMapping.seven]: 'VII, 7th', + [fieldMapping.eight]: 'VIII, 8th', [fieldMapping.second]: '2nd', [fieldMapping.third]: '3rd', [fieldMapping.prefPhone]: 'Phone',