diff --git a/src/common/editable-header.js b/src/common/editable-header.js
index 54411d2..47aba96 100644
--- a/src/common/editable-header.js
+++ b/src/common/editable-header.js
@@ -68,7 +68,7 @@ class EditableHeader extends React.Component {
};
const iconStyle = {
- float: 'left',
+ float: 'right',
marginLeft: '10px',
marginTop: '25px',
@@ -84,7 +84,7 @@ class EditableHeader extends React.Component {
return
diff --git a/src/file/select-file.js b/src/file/select-file.js
index 74403f1..fbb9965 100644
--- a/src/file/select-file.js
+++ b/src/file/select-file.js
@@ -43,12 +43,12 @@ class SelectFile extends React.Component {
};
}
- componentDidMount() {
+ /*componentDidMount() {
AppDispatcher.dispatch({
type: 'files/start-load',
token: this.state.sessionToken
});
- }
+ }*/
static getDerivedStateFromProps(props, state){
if (props.value === state.selectedSimulator) {
@@ -107,10 +107,19 @@ class SelectFile extends React.Component {
};
render() {
- const fileOptions = this.state.files.map(f =>
-
- );
+ console.log("Files: ", this.state.files);
+
+ let fileOptions;
+ if (this.state.files.length > 0){
+ fileOptions = this.state.files.map(f =>
+
+ );
+ } else {
+ fileOptions =
+ }
+
+ console.log("FileOptions: ", fileOptions);
const progressBarStyle = {
marginLeft: '100px',
marginTop: '-25px'
@@ -122,27 +131,24 @@ class SelectFile extends React.Component {
{this.props.name}
-
-
+
+ this.handleChange(e)}>
{fileOptions}
-
+
-
-
+
-
-
-
+
-
+
+
-
;
}
diff --git a/src/simulationmodel/signal-mapping.js b/src/simulationmodel/signal-mapping.js
index f2d8126..900360c 100644
--- a/src/simulationmodel/signal-mapping.js
+++ b/src/simulationmodel/signal-mapping.js
@@ -112,7 +112,7 @@ class SignalMapping extends React.Component {
;
diff --git a/src/simulationmodel/simulation-model.js b/src/simulationmodel/simulation-model.js
index 1ef00aa..3cfd522 100644
--- a/src/simulationmodel/simulation-model.js
+++ b/src/simulationmodel/simulation-model.js
@@ -21,7 +21,7 @@
import React from 'react';
import { Container } from 'flux/utils';
-import { Button, Col, Form, FormLabel } from 'react-bootstrap';
+import { Button, Col, Form, FormLabel, FormGroup } from 'react-bootstrap';
import SimulationModelStore from './simulation-model-store';
import LoginStore from '../user/login-store';
@@ -57,15 +57,22 @@ class SimulationModel extends React.Component {
}
// signals and files of simulation model
- let signals = SignalStore.getState().find(sig => sig.simulationModelID === parseInt(props.match.params.simulationModel, 10));
+ // TODO add direction of signals to find operation
+ let inputSignals = SignalStore.getState().find(sig => sig.simulationModelID === parseInt(props.match.params.simulationModel, 10));
+ let outputSignals = SignalStore.getState().find(sig => sig.simulationModelID === parseInt(props.match.params.simulationModel, 10));
+
+
let files = FileStore.getState().find(f => f.simulationModelID === parseInt(props.match.params.simulationModel, 10));
+
return {
simulationModel,
- signals,
+ inputSignals,
+ outputSignals,
files,
sessionToken,
- simulators: SimulatorStore.getState()
+ simulators: SimulatorStore.getState(),
+ selectedFile: null,
};
}
@@ -78,18 +85,25 @@ class SimulationModel extends React.Component {
token: this.state.sessionToken
});
- // load signals for selected simulation model
+ // load input signals for selected simulation model
AppDispatcher.dispatch({
type: 'signals/start-load',
token: this.state.sessionToken,
- param: 'TODO',
+ param: '?direction=in&modelID=' + this.state.simulationModel.id,
+ });
+
+ // load output signals for selected simulation model
+ AppDispatcher.dispatch({
+ type: 'signals/start-load',
+ token: this.state.sessionToken,
+ param: '?direction=out&modelID=' + this.state.simulationModel.id,
});
// load files for selected simulation model
AppDispatcher.dispatch({
type: 'files/start-load',
token: this.state.sessionToken,
- param: 'TODO',
+ param: '?objectType=model&objectID=' + this.state.simulationModel.id,
});
// load simulators
@@ -171,17 +185,30 @@ class SimulationModel extends React.Component {
const buttonStyle = {
marginRight: '10px'
};
+ console.log("OutputSignals: ", this.state.outputSignals);
+ let outputSignals = null;
+ if (this.state.outputSignals != null){
+ outputSignals = Object.keys(this.state.outputSignals).map(key => {return this.state.outputSignals[key]});
+ console.log("OutputSignals Array", outputSignals);
+ }
+ let inputSignals = null;
+ console.log("InputSignals: ", this.state.inputSignals);
+ if (this.state.inputSignals != null){
+ inputSignals = Object.keys(this.state.inputSignals).map(key => {return this.state.inputSignals[key]});
+ console.log("InputSignals Array", inputSignals);
+ }
+
return