From a1d95b3685cffb6a9344d0d1e5505dd391193f16 Mon Sep 17 00:00:00 2001
From: Georgios Andreadis <g.andreadis@student.tudelft.nl>
Date: Fri, 15 Sep 2017 12:53:26 +0200
Subject: Implement experiment list and add

---
 src/components/modals/TextInputModal.js                |  2 +-
 .../custom-components/NewExperimentModalComponent.js   | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'src/components/modals')

diff --git a/src/components/modals/TextInputModal.js b/src/components/modals/TextInputModal.js
index e4a55372..132df9fe 100644
--- a/src/components/modals/TextInputModal.js
+++ b/src/components/modals/TextInputModal.js
@@ -38,7 +38,7 @@ class TextInputModal extends React.Component {
                     this.onSubmit();
                 }}>
                     <div className="form-group">
-                        <label className="form-control-label">{this.props.label}:</label>
+                        <label className="form-control-label">{this.props.label}</label>
                         <input type="text" className="form-control"
                                ref={textInput => this.textInput = textInput}/>
                     </div>
diff --git a/src/components/modals/custom-components/NewExperimentModalComponent.js b/src/components/modals/custom-components/NewExperimentModalComponent.js
index 9efccc8a..d56d2316 100644
--- a/src/components/modals/custom-components/NewExperimentModalComponent.js
+++ b/src/components/modals/custom-components/NewExperimentModalComponent.js
@@ -20,8 +20,12 @@ class NewExperimentModalComponent extends React.Component {
     }
 
     onSubmit() {
-        this.props.callback(this.textInput.value, this.pathSelect.value, this.traceSelect.value,
-            this.schedulerSelect.value);
+        this.props.callback(
+            this.textInput.value,
+            parseInt(this.pathSelect.value, 10),
+            parseInt(this.traceSelect.value, 10),
+            this.schedulerSelect.value
+        );
         this.reset();
     }
 
@@ -41,23 +45,23 @@ class NewExperimentModalComponent extends React.Component {
                     this.onSubmit();
                 }}>
                     <div className="form-group">
-                        <label className="form-control-label">Name:</label>
+                        <label className="form-control-label">Name</label>
                         <input type="text" className="form-control"
                                ref={textInput => this.textInput = textInput}/>
                     </div>
                     <div className="form-group">
-                        <label className="form-control-label">Path:</label>
+                        <label className="form-control-label">Path</label>
                         <select className="form-control"
                                 ref={pathSelect => this.pathSelect = pathSelect}>
                             {this.props.paths.map(path => (
                                 <option value={path.id} key={path.id}>
-                                    {path.name}
+                                    {path.name ? path.name : "Path " + path.id}
                                 </option>
                             ))}
                         </select>
                     </div>
                     <div className="form-group">
-                        <label className="form-control-label">Trace:</label>
+                        <label className="form-control-label">Trace</label>
                         <select className="form-control"
                                 ref={traceSelect => this.traceSelect = traceSelect}>
                             {this.props.traces.map(trace => (
@@ -68,7 +72,7 @@ class NewExperimentModalComponent extends React.Component {
                         </select>
                     </div>
                     <div className="form-group">
-                        <label className="form-control-label">Scheduler:</label>
+                        <label className="form-control-label">Scheduler</label>
                         <select className="form-control"
                                 ref={schedulerSelect => this.schedulerSelect = schedulerSelect}>
                             {this.props.schedulers.map(scheduler => (
-- 
cgit v1.2.3