dont change optimization status when selecting different override values

MichaelPesce · Aug 3, 2023 · 5239424 · 5239424
1 parent d018b21
commit 5239424
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/electron/ui/src/App.js b/electron/ui/src/App.js
@@ -217,9 +217,9 @@ useEffect(()=> {
     navigate('/scenario', {replace: true})   
   }
 
-  const handleScenarioUpdate = (updatedScenario) => {
+  const handleScenarioUpdate = (updatedScenario, keepOptimized) => {
     // console.log('inside handle scenario update')
-    if (updatedScenario.results.status==='Optimized') {
+    if (updatedScenario.results.status==='Optimized' && !keepOptimized) {
       // console.log('changing status to not optimized')
       updatedScenario.results.status = "Not Optimized"
     }

diff --git a/electron/ui/src/components/Bottombar/Bottombar.js b/electron/ui/src/components/Bottombar/Bottombar.js
@@ -36,10 +36,10 @@ export default function Bottombar(props) {
       // check if override values are present
       try {
         let tempHasOverride = false
-        if(props.scenario.results.status === "Not Optimized"){
+        // if(props.scenario.results.status === "Not Optimized"){
           for (let key of Object.keys(props.scenario.override_values)) {
             if(Object.keys(props.scenario.override_values[key]).length>0) tempHasOverride = true
-          }    
+          // }    
         }
 
         setHasOverride(tempHasOverride)

diff --git a/electron/ui/src/components/OverrideTable/OverrideTable.js b/electron/ui/src/components/OverrideTable/OverrideTable.js
@@ -97,7 +97,7 @@ export default function OverrideTable(props) {
         }
         const tempScenario = {...scenario}
         tempScenario.override_values = tempOverrideValues
-        updateScenario(tempScenario)
+        updateScenario(tempScenario, true)
     } 
 
     const handleInputOverrideValue = (event, number_value) => {
@@ -134,20 +134,20 @@ export default function OverrideTable(props) {
           // else tempOverrideValues[category][idx].isZero = false
           const tempScenario = {...scenario}
           tempScenario.override_values = tempOverrideValues
-          updateScenario(tempScenario)
+          updateScenario(tempScenario, true)
         }
         else if(inputType === "technology") {
           tempOverrideValues[category][idx].indexes[1] = val
           const tempScenario = {...scenario}
           tempScenario.override_values = tempOverrideValues
-          updateScenario(tempScenario)
+          updateScenario(tempScenario, true)
         }
         else if(!isNaN(val)) {
             if (val === "") tempOverrideValues[category][idx].value = val
             else tempOverrideValues[category][idx].value = parseInt(val)
             const tempScenario = {...scenario}
             tempScenario.override_values = tempOverrideValues
-            updateScenario(tempScenario)
+            updateScenario(tempScenario, true)
         }
     }
 
@@ -166,7 +166,7 @@ export default function OverrideTable(props) {
       let tempScenario = {...scenario}
       tempScenario.override_values = tempOverrideValues
       tempScenario.results.data.vb_y_overview_dict=tempInfrastructureTable
-      updateScenario(tempScenario)
+      updateScenario(tempScenario, true)
     }