Merge pull request #588 from episphere/addnewcollectionloca

Biospecimen Dashboard: Add new collections location
episphere · Sep 26, 2023 · f4dc35d · f4dc35d
2 parents d71c0ca + d48c4a8
commit f4dc35d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/src/fieldToConceptIdMapping.js b/src/fieldToConceptIdMapping.js
@@ -254,6 +254,9 @@ export default {
         'merr': 665277300,
         'nci': 111111111,
         'other': 807835037,
+        "ucmPopUp": 319518299,
+        "orPark": 940329442,
+        "mfPopUp": 567969985,
         'all': 1000
 
     }

diff --git a/src/pages/dailyReport.js b/src/pages/dailyReport.js
@@ -66,7 +66,8 @@ const renderCollectionLocationList = () => {
                         <li><a class="dropdown-item" data-siteKey="wisRapids" id="wisRapids">Wisconsin Rapids</a></li>
                         <li><a class="dropdown-item" data-siteKey="colAbb" id="colAbb">Colby Abbotsford</a></li>
                         <li><a class="dropdown-item" data-siteKey="mino" id="mino">Minocqua</a></li>
-                        <li><a class="dropdown-item" data-siteKey="merr" id="merr">Merrill</a></li>`:
+                        <li><a class="dropdown-item" data-siteKey="merr" id="merr">Merrill</a></li>
+                        <li><a class="dropdown-item" data-siteKey="mfPopUp" id="mfPopUp">MF Pop-Up</a></li>`:
                         appState.getState().siteAcronym === 'HP' ? `
                         <li><a class="dropdown-item" data-siteKey="hpRC" id="hpRC">HP Research Clinic</a></li>`:
                         appState.getState().siteAcronym === 'HFHS' ? `
@@ -79,9 +80,12 @@ const renderCollectionLocationList = () => {
                         <li><a class="dropdown-item" data-siteKey="ucDcam" id="ucDcam">UC-DCAM</a></li>
                         <li><a class="dropdown-item" data-siteKey="ingHar" id="ingHar">Ingalls Harvey</a></li>
                         <li><a class="dropdown-item" data-siteKey="rivEas" id="rivEas">River East</a></li>
-                        <li><a class="dropdown-item" data-siteKey="soLo" id="soLo">South Loop</a></li>` :
+                        <li><a class="dropdown-item" data-siteKey="soLo" id="soLo">South Loop</a></li>
+                        <li><a class="dropdown-item" data-siteKey="ucmPopUp" id="ucmPopUp">UCM Pop-Up</a></li>
+                        <li><a class="dropdown-item" data-siteKey="orPark" id="orPark">Orland Park</a></li>`  :
                         appState.getState().siteAcronym === 'NIH' ? 
-                        `<li><a class="dropdown-item" data-siteKey="nci" id="nci">NIH/NCI</a></li>`:
+                        `<li><a class="dropdown-item" data-siteKey="nci" id="nci">NIH/NCI</a></li>
+                        `:
                         `<li><a class="dropdown-item" data-siteKey="other" id="other">Other</a></li>`}
                 </ul>
             </div>

diff --git a/src/shared.js b/src/shared.js
@@ -1665,6 +1665,7 @@ export const keyToLocationObj =
 {
     777644826: "UC-DCAM",
     692275326: "Marshfield",
+    567969985: "MF Pop-Up",
     698283667: "Lake Hallie",
     834825425: "HP Research Clinic",
     736183094: "HFH K-13 Research Clinic",
@@ -1674,6 +1675,8 @@ export const keyToLocationObj =
     145191545: "Ingalls Harvey",
     489380324: "River East",
     120264574: "South Loop",
+    319518299: "UCM Pop-Up",
+    940329442: "Orland Park",
     691714762: "Rice Lake",
     487512085: "Wisconsin Rapids",
     983848564: "Colby Abbotsford",
@@ -1875,8 +1878,13 @@ export const disableInput = (id, disable) => {
 
 export const siteLocations = {
     'research': {
-        'UCM': [{location: 'UC-DCAM', concept: 777644826}, {location: 'Ingalls Harvey', concept: 145191545}, {location: 'River East', concept: 489380324}, {location: 'South Loop', concept: 120264574}],
-        'MFC': [{location: 'Marshfield', concept: 692275326}, {location: 'Lake Hallie', concept: 698283667}, {location: 'Weston', concept: 813701399}, {location: 'Rice Lake', concept: 691714762}, {location: 'Wisconsin Rapids', concept: 487512085}, {location: 'Colby Abbotsford', concept: 983848564}, {location: 'Minocqua', concept: 261931804}, {location: 'Merrill', concept: 665277300}],
+        'UCM': [{location: 'UC-DCAM', concept: 777644826}, {location: 'Ingalls Harvey', concept: 145191545}, {location: 'River East', concept: 489380324}, {location: 'South Loop', concept: 120264574},
+                {location: 'UCM Pop-Up', concept: 319518299}, {location: 'Orland Park', concept: 940329442}          
+              ],
+        'MFC': [{location: 'Marshfield', concept: 692275326}, {location: 'Lake Hallie', concept: 698283667}, {location: 'Weston', concept: 813701399}, {location: 'Rice Lake', concept: 691714762}, 
+                {location: 'Wisconsin Rapids', concept: 487512085}, {location: 'Colby Abbotsford', concept: 983848564}, {location: 'Minocqua', concept: 261931804}, {location: 'Merrill', concept: 665277300},
+                {location: 'MF Pop-Up', concept: 567969985}
+              ],
         'HP': [{location: 'HP Research Clinic', concept: 834825425}],
         'HFHS': [{location: 'HFH K-13 Research Clinic', concept: 736183094}, {location: 'HFH Cancer Pavilion Research Clinic', concept: 886364332},
                 {location: 'HFH Livonia Research Clinic', concept: 706927479}],