Mirrors/VILLASweb
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-09 00:00:01 +01:00
Code Issues Releases Wiki Activity

some fixes to make simulator add and edit work

Browse source
This commit is contained in:
Sonja Happ 2019-07-24 16:42:04 +02:00
parent 9dc65a640b
commit 3f926d1e94
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/dialogs/edit-simulator.js
View file

@ -41,7 +41,7 @@ class EditSimulatorDialog extends React.Component {
onClose(canceled) {
if (canceled === false) {
if (this.valid) {
let data = {};
let data = this.props.simulator.properties;
if (this.state.name != null && this.state.name !== "" && this.state.name !== _.get(this.props.simulator, 'rawProperties.name')) {
data.name = this.state.name;
@ -85,7 +85,7 @@ class EditSimulatorDialog extends React.Component {
</FormGroup>
<FormGroup controlId='properties'>
<FormLabel column={false}>Properties</FormLabel>
<ParametersEditor content={_.merge({}, this.props.simulator.rawProperties, this.props.simulator.properties)} disabled={true} />
<ParametersEditor content={_.merge({}, _.get(this.props.simulator, 'rawProperties'), _.get(this.props.simulator, 'properties'))} disabled={true} />
</FormGroup>
</form>
</Dialog>

2
src/containers/simulators.js
View file

@ -96,7 +96,7 @@ class Simulators extends Component {
});
// Start timer for periodic refresh
this.timer = window.setInterval(() => this.refresh(), 5000);
this.timer = window.setInterval(() => this.refresh(), 10000);
}
componentWillUnmount() {