diff --git a/app/static/app/css/main.scss b/app/static/app/css/main.scss index 39922792..2fcc3a7f 100644 --- a/app/static/app/css/main.scss +++ b/app/static/app/css/main.scss @@ -266,6 +266,6 @@ footer{ padding-bottom: 12px; } -.clearfix{ +.floatfix{ clear: both; } \ No newline at end of file diff --git a/app/static/app/js/Console.jsx b/app/static/app/js/Console.jsx index e21939c9..4ce7f59b 100644 --- a/app/static/app/js/Console.jsx +++ b/app/static/app/js/Console.jsx @@ -158,8 +158,7 @@ class Console extends React.Component { onMouseOver={this.handleMouseOver} onMouseOut={this.handleMouseOut} ref={this.setRef} - > - {lines.map(line => { + >{lines.map(line => { if (this.props.lang) return (
); else return line + "\n"; })} diff --git a/app/static/app/js/components/BasicTaskView.jsx b/app/static/app/js/components/BasicTaskView.jsx index 242d3316..bccaf157 100644 --- a/app/static/app/js/components/BasicTaskView.jsx +++ b/app/static/app/js/components/BasicTaskView.jsx @@ -24,7 +24,8 @@ class BasicTaskView extends React.Component { this.state = { lines: [], currentRf: 0, - rf: PipelineSteps.get() + rf: PipelineSteps.get(), + loaded: false }; this.imageUpload = { @@ -74,6 +75,7 @@ class BasicTaskView extends React.Component { if (textStatus !== "abort" && this.props.refreshInterval !== undefined){ this.sourceTimeout = setTimeout(updateFromSource, this.props.refreshInterval); } + if (!this.state.loaded) this.setState({loaded: true}); }); }; @@ -110,7 +112,7 @@ class BasicTaskView extends React.Component { } this.tearDownDynamicSource(); - this.setState({lines: [], currentRf: 0}); + this.setState({lines: [], currentRf: 0, loaded: false}); this.setupDynamicSource(); } @@ -195,18 +197,20 @@ class BasicTaskView extends React.Component { } render() { - const { rf } = this.state; + const { rf, loaded } = this.state; const imageUploadState = this.props.taskStatus === null ? 'running' : 'completed'; - return (
+ return (
{this.imageUpload.label} {this.suffixFor(imageUploadState)}
{rf.map(p => { - return (
- {p.label} {this.suffixFor(p.state)} + const state = loaded ? p.state : 'queued'; + + return (
+ {p.label} {this.suffixFor(state)}
); })}
); diff --git a/app/static/app/js/components/TaskListItem.jsx b/app/static/app/js/components/TaskListItem.jsx index 4f54e98d..1770f966 100644 --- a/app/static/app/js/components/TaskListItem.jsx +++ b/app/static/app/js/components/TaskListItem.jsx @@ -457,7 +457,7 @@ class TaskListItem extends React.Component { expanded = (
-
+
Created on: {(new Date(task.created_at)).toLocaleString()}
@@ -479,7 +479,7 @@ class TaskListItem extends React.Component {
An orthophoto could not be generated. To generate one, make sure GPS information is embedded in the EXIF tags of your images, or use a Ground Control Points (GCP) file.
: ""}
-
+
Basic @@ -490,7 +490,7 @@ class TaskListItem extends React.Component { {this.state.view === 'console' ?