Fixed Err: DSP update to check if data is complete

episphere · Aug 30, 2024 · d9ace2e · d9ace2e
1 parent 60c229c
commit d9ace2e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/pages/uploaddata.js b/src/pages/uploaddata.js
@@ -228,7 +228,15 @@ export const approvedFormSelect = async (csvData) => { //Is there a DSMP functio
     document.getElementById("nextBtn").style.display = "none";
     // const dsmpdata = csvData.data;
     // const dsmpdataHeaders = csvData.headers;
-    const dsmpdataPDR = dsmpdata.filter((df) => ((df['repositories'] || []).includes('PDR')) && (df['dmsPlanType']).includes('Publication/Presentation'));
+    function filterForPDRPub(data) {
+      if (data.repositories && data.repositories.includes("PDR") && data.dmsPlanType && data.dmsPlanType.includes("Publication/Presentation")) {
+        return true;
+      } else {
+        return false;
+      }
+    }
+    const dsmpdataPDR = dsmpdata.filter(filterForPDRPub);
+    //const dsmpdataPDR = dsmpdata.filter((df) => ((df['repositories'] || []).includes('PDR')) && (df['dmsPlanType']).includes('Publication/Presentation'));
     let dsmpdataPDR2 = [];
     for(let item of dsmpdataPDR){
       if (item.cas) {
@@ -249,7 +257,17 @@ export const approvedFormSelect = async (csvData) => { //Is there a DSMP functio
     //   console.log(value);
     // }
     // const dsmpdataHeaders = csvData.headers;
-    const dsmpdataPDR = dsmpdata.filter((df) => ((df['repositories'] || []).includes('DCEG')) && (df['dmsPlanType']).includes('Study'));
+    function filterForPDRStudy(data) {
+      if (data.repositories && data.repositories.includes("PDR") && data.dmsPlanType && data.dmsPlanType.includes("Study")) {
+        return true;
+      } else {
+        return false;
+      }
+    }
+
+    const dsmpdataPDR = dsmpdata.filter(filterForPDRStudy);
+    //console.log(dsmpdataPDRTest);
+    //const dsmpdataPDR = dsmpdata.filter((df) => ((df["repositories"] || []).includes("DCEG")) && (df["dmsPlanType"]).includes("Study"));
     createFilter(dsmpdataPDR, dsmpdataHeaders);
     await populateApprovedSelect(dsmpdataPDR, dsmpdataHeaders);
   }

diff --git a/src/shared.js b/src/shared.js
@@ -49,7 +49,7 @@ export const submitterFolder = 162222418449;
 
 export const dataPlatformFolder = 196554876811;
 
-export const dataPlatformDataFolder = 239899508915
+export const dataPlatformDataFolder = 156698557621;//239899508915
 
 export const publicDataFolder = 259664212144;