Merge pull request #70 from tarnold17/dashboard_total_disposal

Change "Annual Disposal" to "Total Disposal" on dashboard
project-pareto · Jul 12, 2024 · e7617bb · e7617bb
2 parents 6b90349 + a58fa37
commit e7617bb
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 36 deletions.
diff --git a/electron/ui/cypress/e2e/ScenarioTests.cy.js b/electron/ui/cypress/e2e/ScenarioTests.cy.js
@@ -144,39 +144,38 @@ describe('scenario testing', () => {
         })
     })
 
-    // it('runs an optimization and validates model results', () => {
-    //     //load webpage
-    //     cy.visit('/#/scenarios')
-    //     cy.wait(2000)
-    //     cy.screenshot(`loaded homepage`)
-
-    //     //load scnenario
-    //     cy.contains(/cypress test/i).click()
-    //     cy.wait(2000)
-    //     cy.screenshot(`clicked on scenario`)
-
-
-    //     //run optimization with default settings
-    //     cy.findByRole('button', {name: /continue to optimization/i}).click()
-    //     cy.screenshot(`optimization settings`)
-
-    //     // cy.findByRole('button', {name: /optimize/i}).click()
-    //     cy.findAllByRole('button', {name: /optimize/i}).eq(0).click()
-
-    //     /*
-    //         wait for optimization to finish. times out after 4 minutes
-    //     */
-    //     cy.wait(2000)
-    //     cy.findByRole('heading', {name: /running optimization/i}).should('exist')
-    //     cy.findByRole('heading', {name: /running optimization/i, timeout: 1200000}).should('not.exist')
-    //     cy.screenshot(`finished optimizing`)
-
-
-    //     //validate results
-    //     cy.contains(/recycling rate/i).should('be.visible')
-    //     cy.contains(/annual disposal/i).should('be.visible')
-    //     cy.contains(/groundwater source/i).should('be.visible')
-    //     cy.contains(/capex/i).should('be.visible')
-    //     cy.contains(/opex/i).should('be.visible')
-    // })
+    it('runs an optimization and validates model results', () => {
+        //load webpage
+        cy.visit('/#/scenarios')
+        cy.wait(2000)
+        cy.screenshot(`loaded homepage`)
+
+        //load scnenario
+        cy.contains(/cypress test/i).click()
+        cy.wait(2000)
+        cy.screenshot(`clicked on scenario`)
+
+
+        //run optimization with default settings
+        cy.findByRole('button', {name: /continue to optimization/i}).click()
+        cy.screenshot(`optimization settings`)
+
+        // cy.findByRole('button', {name: /optimize/i}).click()
+        cy.findAllByRole('button', {name: /optimize/i}).eq(0).click()
+
+        /*
+            wait for optimization to finish. times out after 4 minutes
+        */
+        cy.wait(2000)
+        cy.findByRole('heading', {name: /running optimization/i}).should('exist')
+        cy.findByRole('heading', {name: /running optimization/i, timeout: 1200000}).should('not.exist')
+        cy.screenshot(`finished optimizing`)
+
+        //validate results
+        cy.contains(/recycling rate/i).should('be.visible')
+        cy.contains(/total disposal/i).should('be.visible')
+        cy.contains(/groundwater source/i).should('be.visible')
+        cy.contains(/capex/i).should('be.visible')
+        cy.contains(/opex/i).should('be.visible')
+    })
 })
diff --git a/electron/ui/src/views/ModelResults/KPIDashboard.js b/electron/ui/src/views/ModelResults/KPIDashboard.js
@@ -180,7 +180,7 @@ export default function KPIDashboard(props) {
             <Grid item xs={12}>
                 <Box sx={{display: 'flex', justifyContent: 'center'}}>
                 <IconButton disabled><RemoveCircleOutlineIcon sx={{ color: "#fc2414" }}/></IconButton>
-                <p style={styles.kpiTitle}>Annual Disposal</p>
+                <p style={styles.kpiTitle}>Total Disposal</p>
                 </Box>
             </Grid>
             <Grid item xs={12}>