From 309492e3c57c2d1bef6c5967ee8bc00497026c7e Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Tue, 16 Feb 2021 14:36:13 +0100
Subject: [PATCH 1/4] TimeOffset Widget: adjust default size

---
 src/widget/widget-factory.js      | 8 ++++----
 src/widget/widgets/time-offset.js | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/widget/widget-factory.js b/src/widget/widget-factory.js
index ed04630..e3f4c2c 100644
--- a/src/widget/widget-factory.js
+++ b/src/widget/widget-factory.js
@@ -200,10 +200,10 @@ class WidgetFactory {
                 break;
 
             case 'TimeOffset':
-                widget.minWidth = 20;
-                widget.minHeight = 20;
-                widget.width = 100;
-                widget.height = 40;
+                widget.minWidth = 200;
+                widget.minHeight = 80;
+                widget.width = 200;
+                widget.height = 80;
                 widget.customProperties.threshold_yellow = 1;
                 widget.customProperties.threshold_red = 2;
                 widget.customProperties.icID = -1;
diff --git a/src/widget/widgets/time-offset.js b/src/widget/widgets/time-offset.js
index 3682da8..ee429e8 100644
--- a/src/widget/widgets/time-offset.js
+++ b/src/widget/widgets/time-offset.js
@@ -66,7 +66,6 @@ class WidgetTimeOffset extends Component {
     } else if (this.props.widget.customProperties.showOffset){
       icSelected = this.state.timeOffset + 's';
     }
-    
     return (
       <div className="time-offset">
       {this.props.widget.customProperties.icID !== -1 ? 
@@ -81,7 +80,7 @@ class WidgetTimeOffset extends Component {
       : 
       (<span>Please select Infrastructure Component</span>)}
       </Tooltip>}>      
-        <TrafficLight Horizontal={this.props.widget.customProperties.horizontal} width={this.props.widget.width} height={this.props.widget.height}
+        <TrafficLight Horizontal={this.props.widget.customProperties.horizontal} width={this.props.widget.width - 40} height={this.props.widget.height - 40}
         RedOn={(this.props.widget.customProperties.threshold_red <= this.state.timeOffset) || !this.state.websocketOpen}
         YellowOn={(this.props.widget.customProperties.threshold_yellow <= this.state.timeOffset) && (this.state.timeOffset < this.props.widget.customProperties.threshold_red) && this.state.websocketOpen}
         GreenOn={(this.state.timeOffset < this.props.widget.customProperties.threshold_yellow) && this.state.websocketOpen}

From 1ed62b0534be8f8419947bc5689caad4d7be1f2d Mon Sep 17 00:00:00 2001
From: irismarie <Ikoester@eonerc.rwth-aachen.de>
Date: Tue, 16 Feb 2021 18:39:19 +0100
Subject: [PATCH 2/4] show filesnames in tooltip, resulttable (#271)

---
 src/common/table.js      | 15 ++++++++++-----
 src/scenario/scenario.js |  1 +
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/common/table.js b/src/common/table.js
index 1a1dd90..400bffe 100644
--- a/src/common/table.js
+++ b/src/common/table.js
@@ -52,6 +52,13 @@ class CustomTable extends Component {
           break;
         }
       }
+    } else if ('data' in child.props && 'dataKey' in child.props) {
+      content = new Map();
+      let keys = _.get(data, child.props.dataKey);
+      let filteredData = child.props.data.filter(data => keys.includes(data.id))
+      filteredData.forEach(file => {
+        content.set(_.get(file, 'id'), _.get(file, 'name'));
+      })
     } else if ('dataKey' in child.props) {
       content = _.get(data, child.props.dataKey);
     }
@@ -63,8 +70,6 @@ class CustomTable extends Component {
 
     let cell = [];
     if (content != null) {
-      //content = content.toString();
-
       // check if cell should be a link
       const linkKey = child.props.linkKey;
       if (linkKey && data[linkKey] != null) {
@@ -72,9 +77,9 @@ class CustomTable extends Component {
       } else if (child.props.clickable) {
         cell.push(<Button variant="link" onClick={() => child.props.onClick(index)}>{content}</Button>);
       } else if (linkKey === 'filebuttons') {
-        content.forEach(element => {
-          cell.push(<OverlayTrigger key={element} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"export"}`}>Download {element}</Tooltip>} >
-          <Button variant='table-control-button' onClick={() => child.props.onDownload(element)} disabled={child.props.onDownload == null}>{element + ' ' }
+        content.forEach((contentvalue, contentkey) => {
+          cell.push(<OverlayTrigger key={contentkey} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"export"}`}>Download {contentvalue}</Tooltip>} >
+          <Button variant='table-control-button' onClick={() => child.props.onDownload(contentkey)} disabled={child.props.onDownload == null}>{contentkey + ' ' }
             <Icon icon='file-download' /></Button></OverlayTrigger>);
         });
       } else {
diff --git a/src/scenario/scenario.js b/src/scenario/scenario.js
index 7bf2de9..f33875c 100644
--- a/src/scenario/scenario.js
+++ b/src/scenario/scenario.js
@@ -749,6 +749,7 @@ class Scenario extends React.Component {
               title='Files/Data'
               dataKey='resultFileIDs'
               linkKey='filebuttons'
+              data={this.state.files}
               width='300'
               onDownload={(index) => this.downloadResultData(index)}
             />

From 48ee4825d5bf7ceb34a483ceaef06200bc823a05 Mon Sep 17 00:00:00 2001
From: irismarie <Ikoester@eonerc.rwth-aachen.de>
Date: Tue, 16 Feb 2021 18:42:53 +0100
Subject: [PATCH 3/4] make result edit dialog a bit prettier (#271)

---
 src/result/edit-result.js | 43 ++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/result/edit-result.js b/src/result/edit-result.js
index e1992c1..024a410 100644
--- a/src/result/edit-result.js
+++ b/src/result/edit-result.js
@@ -53,7 +53,7 @@ class EditResultDialog extends React.Component {
 
   isEmpty(val) {
     return (val === undefined || val == null || val.length <= 0);
-  }; 
+  };
 
   componentDidUpdate(prevProps, prevState) {
     if (this.props.resultId != prevProps.resultId || this.props.results != prevProps.results) {
@@ -75,7 +75,7 @@ class EditResultDialog extends React.Component {
           })
         }
       }
-    } 
+    }
   };
 
   selectUploadFile(event) {
@@ -118,7 +118,7 @@ class EditResultDialog extends React.Component {
 
   }
 
-  submitDescription() {  
+  submitDescription() {
     let result = this.props.results[this.props.resultId];
     if (!this.isEmpty(result)) {
       result.description = this.state.description;
@@ -143,16 +143,15 @@ class EditResultDialog extends React.Component {
 
       <div>
         <FormGroup as={Col} controlId='description'>
-
           <Row style={{ float: 'center' }} >
-            <Col xs="auto">
+            <Col xs lg="2">
               <FormLabel>Description</FormLabel>
             </Col>
-            <Col xs="auto">
+            <Col xs lg="4">
               <FormControl type='text' placeholder={this.state.description} value={this.state.description} onChange={this.handleChange} />
               <FormControl.Feedback />
             </Col>
-            <Col xs="auto">
+            <Col xs lg="2">
               <Button
                 type="submit"
                 onClick={() => this.submitDescription()}>
@@ -160,8 +159,6 @@ class EditResultDialog extends React.Component {
             </Button>
             </Col>
           </Row>
-
-
         </FormGroup>
 
         <Table data={this.state.files}>
@@ -176,19 +173,23 @@ class EditResultDialog extends React.Component {
           />
         </Table>
 
-
-        <FormGroup controlId='resultfile'>
-          <FormLabel>Add Result File</FormLabel>
-          <FormControl type='file' onChange={(event) => this.selectUploadFile(event)} />
-        </FormGroup>
-
-        <FormGroup as={Col} >
-          <Button
-            disabled={this.state.uploadFile === null}
-            onClick={() => this.startFileUpload()}>
-            Upload
+        <div style={{ float: 'center' }}>
+          <h5>Add result file</h5>
+          <Row>
+            <Col xs lg="4">
+              <FormControl type='file' onChange={(event) => this.selectUploadFile(event)} />
+            </Col>
+            <Col xs lg="2">
+              <Button
+                disabled={this.state.uploadFile === null}
+                onClick={() => this.startFileUpload()}>
+                Upload
             </Button>
-        </FormGroup>
+            </Col>
+          </Row>
+        </div>
+
+        <br></br>
 
         <FormGroup as={Col} >
           <ProgressBar

From 8d7635553d2d60bd984208d083f89e7d38dd8537 Mon Sep 17 00:00:00 2001
From: irismarie <Ikoester@eonerc.rwth-aachen.de>
Date: Tue, 16 Feb 2021 18:58:59 +0100
Subject: [PATCH 4/4] nicer timestamp for result zipfile

---
 src/scenario/scenario.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scenario/scenario.js b/src/scenario/scenario.js
index f33875c..698f1d6 100644
--- a/src/scenario/scenario.js
+++ b/src/scenario/scenario.js
@@ -177,7 +177,7 @@ class Scenario extends React.Component {
             filesToDownload.forEach(file => {
               zip.file(file.name, file.data);
             });
-            let zipname = "result_" + this.state.resultNodl + "_" + Date.now();
+            let zipname = "result_" + this.state.resultNodl + "_" + (new Date()).toISOString();
             zip.generateAsync({type: "blob"}).then(function(content) {
               saveAs(content, zipname);
             });