Merge pull request #58 from MichaelPesce/add-workshop-input-link

Add workshop input link
project-pareto · Jan 24, 2024 · 6719d37 · 6719d37
2 parents 752b40a + 2a091ff
commit 6719d37
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -126,4 +126,4 @@ jobs:
   #       with:
   #           name: windows-pareto-dist
   #           path: |
-  #             electron/dist/ParetoUI-24.01.11-win64.exe
+  #             electron/dist/ParetoUI-24.01.11-win64.exe
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -39,9 +39,13 @@ jobs:
           miniforge-version: latest
           activate-environment: pareto-ui-env
 
-      - name: Install correct branch of pareto
+      # - name: Install correct branch of pareto
+      #   working-directory: ../
+      #   run: git clone https://github.com/project-pareto/project-pareto.git && cd project-pareto && pip install --progress-bar off .
+
+      - name: Install Pareto (0.9.0) locally
         working-directory: ../
-        run: git clone https://github.com/project-pareto/project-pareto.git && cd project-pareto && pip install --progress-bar off .
+        run: git clone https://github.com/project-pareto/project-pareto.git && cd project-pareto && git fetch --all --tags && git checkout 0.9.0 && pip install --progress-bar off .
 
       - name: Install electron JS dependencies
         run: |

diff --git a/backend/app/internal/get_data.py b/backend/app/internal/get_data.py
@@ -637,7 +637,7 @@ def get_input_lists():
         "SCA",
         "SNA",
         "ROA",
-        "RKA",
+        # "RKA",
         "SOA",
         "NOA",
         "PCT",
@@ -649,12 +649,12 @@ def get_input_lists():
         "RST",
         "ROT",
         "SOT",
-        "RKT",
+        # "RKT",
         "Elevation",
         "CompletionsPadOutsideSystem",
         "DesalinationTechnologies",
         "DesalinationSites",
-        "BeneficialReuseCost",
+        # "BeneficialReuseCost",
         "BeneficialReuseCredit",
         "TruckingTime",
         "CompletionsDemand",

diff --git a/electron/ui/cypress/e2e/ScenarioTests.cy.js b/electron/ui/cypress/e2e/ScenarioTests.cy.js
@@ -4,7 +4,8 @@ describe('scenario testing', () => {
         start with 10 because starting with 0 would stop working when it hits 10
     */
     // let strategic_small_case_study_url = "https://github.com/project-pareto/project-pareto/raw/main/pareto/case_studies/strategic_small_case_study.xlsx"
-    let strategic_toy_case_study_url = "https://github.com/project-pareto/project-pareto/raw/main/pareto/case_studies/strategic_toy_case_study.xlsx"
+    // let strategic_toy_case_study_url = "https://github.com/project-pareto/project-pareto/raw/main/pareto/case_studies/strategic_toy_case_study.xlsx"
+    let strategic_toy_case_study_url = "https://github.com/project-pareto/project-pareto/raw/0.9_rel/pareto/case_studies/strategic_toy_case_study.xlsx"
     let sc_count = 10
     it('test that scenario list loads properly', () => {
         //load webpage

diff --git a/electron/ui/src/components/FileUploadModal/FileUploadModal.js b/electron/ui/src/components/FileUploadModal/FileUploadModal.js
@@ -19,6 +19,7 @@ export default function FileUploadModal(props) {
     const fileTypes = ["xlsx", "kmz", "kml"];
     // const sampleFileUrl = "https://github.com/project-pareto/project-pareto/raw/0.6_rel/pareto/case_studies/strategic_small_case_study.xlsx"
     const sampleFileUrl = "https://github.com/project-pareto/project-pareto/raw/main/pareto/case_studies/strategic_permian_demo.xlsx"
+    const workshopFileUrl = "https://github.com/project-pareto/project-pareto/raw/main/pareto/case_studies/workshop_baseline_all_data.xlsx"
 
 
   useEffect(()=>{
@@ -179,10 +180,15 @@ export default function FileUploadModal(props) {
         </Grid>
         <Grid item xs={6}>
             <p ><a data-cy="excel-download" style={styles.sampleFile} href={sampleFileUrl} download>Download an Example Input File</a></p>
+            <p ><a data-cy="excel-download2" style={styles.sampleFile} href={workshopFileUrl} download>Download Workshop Input File</a></p>
         </Grid>
         <Grid item xs={6}>
-            {showWarning && <p style={{color:'red'}}>{warningMessage}</p>}
+            {showWarning && <p style={{color:'red', }}>{warningMessage}</p>}
         </Grid>
+        {/* <Grid item xs={6}>
+            <p ><a data-cy="excel-download" style={styles.sampleFile} href={workshopFileUrl} download>Download Workshop Input File</a></p>
+        </Grid>
+        <Grid item xs={6}></Grid> */}
         <Grid item xs={12}>
             <Button id="create-scenario-button" style={styles.button} onClick={handleCreateScenario}>Create Scenario</Button>
         </Grid>