mirror of
https://git.rwth-aachen.de/acs/public/villas/web/
synced 2025-03-09 00:00:01 +01:00
Merge branch 'master' of git.rwth-aachen.de:acs/public/villas/web
This commit is contained in:
commit
f8df647196
1 changed files with 5 additions and 5 deletions
|
@ -85,7 +85,7 @@ class Scenario extends React.Component {
|
|||
modalConfigIndex = index;
|
||||
}
|
||||
|
||||
let results = ResultStore.getState().filter(result => result.scenarioID === parseInt(props.match.params.scenario, 10));
|
||||
let results = ResultStore.getState().filter(result => result.scenarioID === parseInt(props.match.params.scenario, 10));
|
||||
|
||||
return {
|
||||
scenario,
|
||||
|
@ -359,7 +359,7 @@ class Scenario extends React.Component {
|
|||
}
|
||||
|
||||
// Unix time stamp + delay
|
||||
action.data.when = Date.now() / 1000.0 + delay
|
||||
action.data.when = Math.round(Date.now() / 1000.0 + delay)
|
||||
|
||||
console.log("Sending action: ", action.data)
|
||||
|
||||
|
@ -641,7 +641,7 @@ class Scenario extends React.Component {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* ##############################################
|
||||
* Render method
|
||||
############################################## */
|
||||
|
@ -672,7 +672,7 @@ class Scenario extends React.Component {
|
|||
|
||||
let resulttable;
|
||||
if (this.state.results && this.state.results.length > 0) {
|
||||
resulttable = <div>
|
||||
resulttable = <div>
|
||||
<Table data={this.state.results}>
|
||||
<TableColumn title='Result No.' dataKey='id' />
|
||||
<TableColumn title='Description' dataKey='description' />
|
||||
|
@ -859,7 +859,7 @@ class Scenario extends React.Component {
|
|||
<h2 style={tableHeadingStyle}>Results
|
||||
<Button onClick={() => this.setState({ newResultModal: true })} style={buttonStyle}><Icon icon="plus" /></Button>
|
||||
</h2>
|
||||
|
||||
|
||||
</div>
|
||||
{resulttable}
|
||||
{/*
|
||||
|
|
Loading…
Add table
Reference in a new issue