diff --git a/README.md b/README.md index 9483ee3..b471dc0 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ The DSI will be extending a data pipeline to format data from new experiments in ## Pipeline The data pipeline for this project does the following standardizes data from multiple facilities for display on a dashboard displaying decomposition rates of different compostable plastics as well as operating conditions of the associated facilities. -Note: The pipeline was set up to handle multiple disparate files with varied input formats. Future data will come in a standardized format. The pipline is left as one script for ease of iteration and refactoring later when the new data format is known. +Note: The pipeline was set up to handle multiple disparate files with varied input formats. Future data will come in a standardized format. The pipeline is left as one script for ease of iteration and refactoring later when the new data format is known. ### Docker The pipeline runs in Docker. If you use VS Code, this is set up to run in a [dev container](https://code.visualstudio.com/docs/devcontainers/containers), so build the container the way you normally would. Otherwise, just build the Docker image from the ```Dockerfile``` in the root of the directory. @@ -37,7 +37,7 @@ To run the pipeline: python scripts/pipeline-template.py ``` -Cleaned data files will be output in ```data/```. To update the files displayed on the dashboard, follow the instuctions in [Updating the Dashboard Data](#updating-the-dashboard-data) +Cleaned data files will be output in ```data/```. To update the files displayed on the dashboard, follow the instructions in [Updating the Dashboard Data](#updating-the-dashboard-data) ## Dashboard This is a [Next.js](https://nextjs.org/) project. @@ -71,7 +71,7 @@ npm run dev Open [http://localhost:3000](http://localhost:3000) with your browser to see the result. -### Deplying the Dashboard +### Deploying the Dashboard The dashboard is deployed via Vercel and is hosted on CFTP's site in an iframe. Any update to the ```main``` branch of this repo will update the production deployment of the dashboard. diff --git a/dashboard/app/api/data/route.js b/dashboard/app/api/data/route.js index 756ac9e..30cf4c7 100644 --- a/dashboard/app/api/data/route.js +++ b/dashboard/app/api/data/route.js @@ -98,7 +98,6 @@ const getIntersectingTrialIDs = (...sets) => { }; const prepareData = async (searchParams) => { - // console.log("searchParams", searchParams); // Display params const aggCol = searchParams.get("aggcol") || "Material Class I"; const displayCol = searchParams.get("displaycol") || "% Residuals (Mass)"; @@ -177,8 +176,6 @@ const prepareData = async (searchParams) => { filteredData = filterData(filteredData, "Technology", technologies); // Return empty object to preserve privacy if not enough trials (Except for Bulk Dose) const technologyTrialIDs = new Set(filteredData.map((d) => d["Trial ID"])); - // console.log("technologyTrialIDs", technologyTrialIDs); - // console.log(technologies); const trialThreshold = testMethod === "Bulk Dose" ? 1 : 3; if (technologyTrialIDs.size < trialThreshold && testMethod !== "Bulk Dose") { return { @@ -242,8 +239,6 @@ const prepareData = async (searchParams) => { trialDurationTrialIDs ); - console.log("combinedTrialIDs", combinedTrialIDs); - if (combinedTrialIDs.size === 0) { filteredData = []; } else { @@ -252,8 +247,6 @@ const prepareData = async (searchParams) => { ); } - console.log("filteredData.length", filteredData.length); - // Not enough data - return empty object const dataThreshold = 1; if (filteredData.length < dataThreshold) { diff --git a/dashboard/components/DashboardDisplayControls.js b/dashboard/components/DashboardDisplayControls.js index 65c1f5e..af5c37c 100644 --- a/dashboard/components/DashboardDisplayControls.js +++ b/dashboard/components/DashboardDisplayControls.js @@ -23,7 +23,7 @@ export default function DashboardDisplayControls() { options={display2col} title="Show Results by Mass or by Surface Area" filterKey="displayCol" - infoText="Disintegration data can be based on the change in weight of a product, or the surface area before and after testing." + infoText="Field testing results can be based on the change in weight of a product, or the surface area before and after testing. The results by mass provided here are a combination of wet and dry weights. Future versions of the dashboard will further divide these data sets." /> 75 Days": [75, Infinity, false], + "40-59 Days": [40, 59, true], + "59-89 Days": [59, 89, true], + ">89 Days": [89, Infinity, false], }; export const material2col = {