From 1d2acc900a695bee5c1d83d7631725e4d8b18df0 Mon Sep 17 00:00:00 2001
From: chenjiankun <chenjiankun1@huawei.com>
Date: Thu, 8 Mar 2018 12:18:27 +0000
Subject: Supporting user config task parameters in GUI

JIRA: YARDSTICK-981

We need to add function to enable user to config task parameters in GUI.
The way to config must be more friendly.

Change-Id: I8746149084f1d554b48ed392f2fef4748e279dfb
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
---
 gui/app/views/modal/taskCreate.html | 19 +++++++++++++------
 gui/app/views/taskmodify.html       | 23 +++++++++++++++--------
 2 files changed, 28 insertions(+), 14 deletions(-)

(limited to 'gui/app/views')

diff --git a/gui/app/views/modal/taskCreate.html b/gui/app/views/modal/taskCreate.html
index 2d7f1dc3b..ab6ff0ca1 100644
--- a/gui/app/views/modal/taskCreate.html
+++ b/gui/app/views/modal/taskCreate.html
@@ -80,13 +80,20 @@
             </div>
         </div>
 
-        <div ng-show="displayTable==false">
-            <textarea ng-model="contentInfo" spellcheck="false">
-
-
-            </textarea>
-
 
+        <div ng-show="displayTable==false" style="display:flex;flex-direction:row;justify-content:space-between;margin-top:10px;">
+            <textarea class="col-md-8" ng-model="contentInfo" style="margin-top:5px;" spellcheck="false"></textarea>
+            <div class="col-md-4" style="border:1px solid #e8e8e8;margin-top:5px;margin-left:10px;padding-top:30px;">
+                <h4>Optional Paramters:</h4>
+                <form class="form-horizontal col-md-offset-2" style="margin-top:20px">
+                    <div ng-repeat="(name, value) in optionalParams" class="form-group">
+                        <label for="param{{$index}}" class="col-md-5" style="font-weight:normal;">{{ name }}:</label>
+                        <div class="col-md-5">
+                            <input type="text" ng-model="value.value" class="form-control" id="param{{$index}}">
+                        </div>
+                    </div>
+                </form>
+            </div>
         </div>
 
 
diff --git a/gui/app/views/taskmodify.html b/gui/app/views/taskmodify.html
index d12df4ba2..24b3d945f 100644
--- a/gui/app/views/taskmodify.html
+++ b/gui/app/views/taskmodify.html
@@ -42,11 +42,20 @@
                 <button class="btn btn-default" style="float:right" ng-disabled="sourceShow==null" ng-click="confirmToServer(contentInfo,taskDetailData.content)">Confirm</button>
             </div>
 
-
-            <textarea ng-model="taskDetailData.content" ng-show="sourceShow==false" style="margin-top:5px;" spellcheck="false">
-
-
-            </textarea>
+            <div ng-show="sourceShow==false" style="display:flex;flex-direction:row;justify-content:space-between;margin-top:10px;">
+                <textarea class="col-md-8" ng-model="taskDetailData.content" style="margin-top:5px;" spellcheck="false"></textarea>
+                <div class="col-md-4" style="border:1px solid #e8e8e8;margin-top:5px;margin-left:10px;padding-top:30px;">
+                    <h4>Optional Paramters:</h4>
+                    <form class="form-horizontal col-md-offset-2" style="margin-top:20px">
+                        <div ng-repeat="(name, value) in optionalParams" class="form-group">
+                            <label for="param{{$index}}" class="col-md-5" style="font-weight:normal;">{{ name }}:</label>
+                            <div class="col-md-5">
+                                <input type="text" ng-model="value.value" class="form-control" id="param{{$index}}">
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
 
             <div ng-show="sourceShow==true">
                 <div style="display:flex;flex-direction:row">
@@ -102,9 +111,7 @@
 
                 <div ng-show="displayTable==false">
                     <textarea ng-model="contentInfo" spellcheck="false">
-            </textarea>
-
-
+                    </textarea>
                 </div>
             </div>
 
-- 
cgit 1.2.3-korg