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

Fix simulation model simulator name

Browse source
This commit is contained in:
Markus Grigull 2018-04-20 10:35:04 +02:00
parent bc71cf1ff2
commit 74e75f4674
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/dialog/edit-simulation-model.js
View file

@ -21,6 +21,7 @@
import React from 'react';
import { FormGroup, FormControl, ControlLabel, HelpBlock } from 'react-bootstrap';
import _ from 'lodash';
import Table from '../table';
import TableColumn from '../table-column';
@ -140,7 +141,7 @@ class EditSimulationModelDialog extends React.Component {
<ControlLabel>Simulator</ControlLabel>
<FormControl componentClass="select" placeholder="Select simulator" value={this.state.simulator} onChange={(e) => this.handleChange(e)}>
{this.props.simulators.map(simulator => (
<option key={simulator._id} value={simulator._id}>{simulator.rawProperties.name}</option>
<option key={simulator._id} value={simulator._id}>{_.get(simulator, 'properties.name') || _.get(simulator, 'rawProperties.name')}</option>
))}
</FormControl>
</FormGroup>

3
src/components/dialog/import-simulation-model.js
View file

@ -21,6 +21,7 @@
import React from 'react';
import { FormGroup, FormControl, ControlLabel, HelpBlock } from 'react-bootstrap';
import _ from 'lodash';
import Table from '../table';
import TableColumn from '../table-column';
@ -175,7 +176,7 @@ class ImportSimulationModelDialog extends React.Component {
<ControlLabel>Simulator</ControlLabel>
<FormControl readOnly={!this.imported} componentClass="select" placeholder="Select simulator" value={this.state.simulator} onChange={(e) => this.handleChange(e)}>
{this.props.simulators.map(simulator => (
<option key={simulator._id} value={simulator}>{simulator.rawProperties.name}</option>
<option key={simulator._id} value={simulator}>{_.get(simulator, 'properties.name') || _.get(simulator, 'rawProperties.name')}</option>
))}
</FormControl>
</FormGroup>

3
src/components/dialog/new-simulation-model.js
View file

@ -21,6 +21,7 @@
import React from 'react';
import { FormGroup, FormControl, ControlLabel, HelpBlock } from 'react-bootstrap';
import _ from 'lodash';
import Table from '../table';
import TableColumn from '../table-column';
@ -146,7 +147,7 @@ class NewSimulationModelDialog extends React.Component {
<ControlLabel>Simulator</ControlLabel>
<FormControl componentClass="select" placeholder="Select simulator" value={this.state.simulator} onChange={(e) => this.handleChange(e)}>
{this.props.simulators.map(simulator => (
<option key={simulator._id} value={simulator._id}>{simulator.rawProperties.name}</option>
<option key={simulator._id} value={simulator._id}>{_.get(simulator, 'properties.name') || _.get(simulator, 'rawProperties.name')}</option>
))}
</FormControl>
</FormGroup>

3
src/containers/simulation.js
View file

@ -23,6 +23,7 @@ import React from 'react';
import { Container } from 'flux/utils';
import { Button, Glyphicon } from 'react-bootstrap';
import FileSaver from 'file-saver';
import _ from 'lodash';
import SimulationStore from '../stores/simulation-store';
import SimulatorStore from '../stores/simulator-store';
@ -159,7 +160,7 @@ class Simulation extends React.Component {
for (let simulator of this.state.simulators) {
if (simulator._id === simulatorId) {
if ('name' in simulator.rawProperties) {
return simulator.rawProperties.name;
return _.get(simulator, 'properties.name') || _.get(simulator, 'rawProperties.name');
} else {
return simulator.uuid;
}