Skip to content

Commit 5239424

Browse files
committed
dont change optimization status when selecting different override values
1 parent d018b21 commit 5239424

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

electron/ui/src/App.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,9 @@ useEffect(()=> {
217217
navigate('/scenario', {replace: true})
218218
}
219219

220-
const handleScenarioUpdate = (updatedScenario) => {
220+
const handleScenarioUpdate = (updatedScenario, keepOptimized) => {
221221
// console.log('inside handle scenario update')
222-
if (updatedScenario.results.status==='Optimized') {
222+
if (updatedScenario.results.status==='Optimized' && !keepOptimized) {
223223
// console.log('changing status to not optimized')
224224
updatedScenario.results.status = "Not Optimized"
225225
}

electron/ui/src/components/Bottombar/Bottombar.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ export default function Bottombar(props) {
3636
// check if override values are present
3737
try {
3838
let tempHasOverride = false
39-
if(props.scenario.results.status === "Not Optimized"){
39+
// if(props.scenario.results.status === "Not Optimized"){
4040
for (let key of Object.keys(props.scenario.override_values)) {
4141
if(Object.keys(props.scenario.override_values[key]).length>0) tempHasOverride = true
42-
}
42+
// }
4343
}
4444

4545
setHasOverride(tempHasOverride)

electron/ui/src/components/OverrideTable/OverrideTable.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export default function OverrideTable(props) {
9797
}
9898
const tempScenario = {...scenario}
9999
tempScenario.override_values = tempOverrideValues
100-
updateScenario(tempScenario)
100+
updateScenario(tempScenario, true)
101101
}
102102

103103
const handleInputOverrideValue = (event, number_value) => {
@@ -134,20 +134,20 @@ export default function OverrideTable(props) {
134134
// else tempOverrideValues[category][idx].isZero = false
135135
const tempScenario = {...scenario}
136136
tempScenario.override_values = tempOverrideValues
137-
updateScenario(tempScenario)
137+
updateScenario(tempScenario, true)
138138
}
139139
else if(inputType === "technology") {
140140
tempOverrideValues[category][idx].indexes[1] = val
141141
const tempScenario = {...scenario}
142142
tempScenario.override_values = tempOverrideValues
143-
updateScenario(tempScenario)
143+
updateScenario(tempScenario, true)
144144
}
145145
else if(!isNaN(val)) {
146146
if (val === "") tempOverrideValues[category][idx].value = val
147147
else tempOverrideValues[category][idx].value = parseInt(val)
148148
const tempScenario = {...scenario}
149149
tempScenario.override_values = tempOverrideValues
150-
updateScenario(tempScenario)
150+
updateScenario(tempScenario, true)
151151
}
152152
}
153153

@@ -166,7 +166,7 @@ export default function OverrideTable(props) {
166166
let tempScenario = {...scenario}
167167
tempScenario.override_values = tempOverrideValues
168168
tempScenario.results.data.vb_y_overview_dict=tempInfrastructureTable
169-
updateScenario(tempScenario)
169+
updateScenario(tempScenario, true)
170170
}
171171

172172

0 commit comments

Comments
 (0)