Changeset 13841 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views

Timestamp:

05/10/16 16:55:18 (9 years ago)

Author:

jlodewyc

Message:

#2582 More parameter datatypes, splitting fileopening service, approving users, reopen last file, change name tasks and repetitions

Location:

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views

Files:

• Job/OpenFile.cshtml (modified) (4 diffs)
• Job/OpenFilePartials/DataPartials/BoolArray.cshtml (added)
• Job/OpenFilePartials/DataPartials/BoolMatrix.cshtml (added)
• Job/OpenFilePartials/DataPartials/DataMaster.cshtml (modified) (3 diffs)
• Job/OpenFilePartials/DataPartials/DoubleMatrix.cshtml (modified) (1 diff)
• Job/OpenFilePartials/DataPartials/IntMatrix.cshtml (added)
• Job/OpenFilePartials/DataPartials/OthersClean.cshtml (added)
• Job/OpenFilePartials/DataPartials/PercentArray.cshtml (added)
• Job/OpenFilePartials/DataPartials/PercentMatrix.cshtml (added)
• Job/OpenFilePartials/DataPartials/StringArray.cshtml (added)
• Job/OpenFilePartials/DataPartials/StringMatrix.cshtml (added)
• Job/OpenFilePartials/_Algorithm.cshtml (modified) (1 diff)
• Job/OpenFilePartials/_AlgorithmSmall.cshtml (modified) (2 diffs)
• Job/OpenFilePartials/_BatchRun.cshtml (modified) (2 diffs)
• Job/OpenFilePartials/_BatchRunSmall.cshtml (modified) (2 diffs)
• Job/OpenFilePartials/_Experiment.cshtml (modified) (1 diff)
• Job/OpenFilePartials/_ExperimentSmall.cshtml (modified) (2 diffs)
• Job/OpenFilePartials/_Help.cshtml (added)
• Job/Uploads.cshtml (modified) (1 diff)
• User/Index.cshtml (modified) (5 diffs)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFile.cshtml

@@ -42 +42 @@
         </a>
     </div>
+    @Html.Partial("OpenFilePartials/_Help", Model);
     <!-- Check model to select right partial, partial handles all subloading -->
     <div class="col-md-9">
@@ -164 +165 @@
             </div>
             <div class="col-sm-4">
-                <h4>Save to file</h4>
+                <h3 style="text-align:center">Save to file</h3>
+                <p style="text-align:center;font-style:italic">Changed parameters get saved but child distribution and task priority get lost in the process.</p>
                 <form asp-controller="Job"
                    asp-action="saveToFile"
@@ -200 +202 @@
     </div>
     <!-- Side scrolling menu-->
-    <nav style="margin-top:50px; "
+    <nav 
          class="col-md-2" id="scrolly">
         <ul class="nav nav-pills nav-stacked"
@@ -238 +240 @@
                         $('html, body').animate({
                             scrollTop: target.offset().top
-                        }, 1000);
+                        }, 700);
                         return false;
                     }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFilePartials/DataPartials/DataMaster.cshtml

@@ -12 +12 @@
                 @Html.Partial("OpenFilePartials/DataPartials/Bool", Model);
             }
+            else if (Model.Data.ActualValue is BoolArray)
+            {
+                @Html.Partial("OpenFilePartials/DataPartials/BoolArray", Model);
+            }
+            else if (Model.Data.ActualValue is BoolMatrix)
+            {
+                @Html.Partial("OpenFilePartials/DataPartials/BoolMatrix", Model);
+            }
             else if (Model.Data.ActualValue is StringValue)
             {
                 @Html.Partial("OpenFilePartials/DataPartials/String", Model);
+            }
+            else if (Model.Data.ActualValue is StringArray)
+            {
+                @Html.Partial("OpenFilePartials/DataPartials/StringArray", Model);
+            }
+            else if (Model.Data.ActualValue is StringMatrix)
+            {
+                @Html.Partial("OpenFilePartials/DataPartials/StringMatrix", Model);
             }
             else if (Model.Data.ActualValue is IntValue)
@@ -20 +36 @@
                 @Html.Partial("OpenFilePartials/DataPartials/Int", Model);
             }
+            else if (Model.Data.ActualValue is IntArray && !(Model.Data.ActualValue is HeuristicLab.Encodings.PermutationEncoding.Permutation))
+            {
+                @Html.Partial("OpenFilePartials/DataPartials/IntArray", Model);
+            }
+            else if (Model.Data.ActualValue is IntMatrix)
+            {
+                @Html.Partial("OpenFilePartials/DataPartials/IntMatrix", Model);
+            }
             else if (Model.Data.ActualValue is PercentValue)
             {
                 @Html.Partial("OpenFilePartials/DataPartials/Percent", Model);
             }
+            else if (Model.Data.ActualValue is PercentArray)
+            {
+                @Html.Partial("OpenFilePartials/DataPartials/PercentArray", Model);
+            }
+            else if (Model.Data.ActualValue is PercentMatrix)
+            {
+                @Html.Partial("OpenFilePartials/DataPartials/PercentMatrix", Model);
+            }
             else if (Model.Data.ActualValue is DoubleValue)
             {
                 @Html.Partial("OpenFilePartials/DataPartials/Double", Model);
-            }
-            else if (Model.Data.ActualValue is IntArray)
-            {
-                @Html.Partial("OpenFilePartials/DataPartials/IntArray", Model);
             }
             else if (Model.Data.ActualValue is DoubleArray)
@@ -42 +70 @@
             else if (Model.Data.ActualValue is IItem)
             {
-                @Html.Partial("OpenFilePartials/DataPartials/Others", Model);
+                @Html.Partial("OpenFilePartials/DataPartials/OthersClean", Model);//just Others to print the datatype too 
                 }
         }
         catch(NotSupportedException e)
         {
-            @Html.Partial("OpenFilePartials/DataPartials/Others", Model)
+            @Html.Partial("OpenFilePartials/DataPartials/OthersClean", Model)
 
         }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFilePartials/DataPartials/DoubleMatrix.cshtml

@@ -10 +10 @@
         {
             s += "[ ";
-            s += dat[d,0] + "; " + dat[d,1];
+            for (var i = 0; i < dat.Columns; i++)
+            {
+                s += dat[d, i];
+                if (i < dat.Columns - 1)
+                {
+                    s += "; ";
+                }
+
+            }
             s += " ] " + Environment.NewLine;
 

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFilePartials/_Algorithm.cshtml

@@ -13 +13 @@
     <div class="row" style="text-align:center">
         <h1>
-            <span class="label label-primary">Algorithm: @Model.SelectedTask.ItemTask.Name</span>
+            <span class="label label-primary">Algorithm:<span id="nameCarrier@(randy)">@Model.SelectedTask.ItemTask.Name</span></span>
         </h1>
-
+        <p>
+            <input type="text"
+                   style="width:50%;display:initial; background-color:transparent;text-align:center"
+                   onchange="changeName([],this.value,@randy)"
+                   value="@Model.SelectedTask.ItemTask.Name" />
+        </p>
     </div>
 

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFilePartials/_AlgorithmSmall.cshtml

@@ -12 +12 @@
 <p class="text-center">
     <a class="btn btn-primary"
+       id="nameCarrier@(randomal)"
        data-toggle="collapse"
        href="#collapseExample@(randomal)"
@@ -33 +34 @@
         text-shadow:none">
         <div class="panel-heading panel-primary text-center">
+            <p>
+                <input type="text"
+                       class="form-control"
+                       style="width:50%;display:initial; background-color:transparent; color:white;text-align:center"
+                       onchange="changeName(@builder,this.value,@randomal)"
+                       value="@Model.algo.Name" />
+            </p>
             <p>@Model.algo.Description</p>
 

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFilePartials/_BatchRun.cshtml

@@ -11 +11 @@
     <div class="row"
          style="text-align:center">
-        <h1 
-            >
+        <h1>
             <span class="label label-warning "
                   style="text-shadow:2px 2px black;">
-                Batch: @Model.SelectedBatchRun.Name
+                Batch: <span id="nameCarrier@(randy)">@Model.SelectedBatchRun.Name</span>
             </span>
+
         </h1>
+        <input type="text"
+               class="form-control"
+               style="width:50%;display:initial; background-color:transparent;text-align:center"
+               onchange="changeName([],this.value,@randy)"
+               value="@Model.SelectedTask.ItemTask.Name" />
     </div>
     <h4 id="tasks">
-        Repeats: @Model.SelectedBatchRun.Repetitions x
+        Repeats:
+        <input type="number" 
+               class="form-control"
+               style="width:80px;display:initial"
+               min="1" 
+               value="@Model.SelectedBatchRun.Repetitions"
+               onchange="changeRepit([],this.value,@randy)" />
+          x
 
     </h4>
@@ -30 +42 @@
                data-onstyle="warning"
                onchange="toggleChild([], @randy)" />
-        
+
     </p>
     <div id="childs@(randy)">

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFilePartials/_BatchRunSmall.cshtml

@@ -13 +13 @@
 <p class="text-center">
     <a class="btn btn-warning"
+       id="nameCarrier@(randombr)"
        data-toggle="collapse"
        href="#collapseExample@(randombr)"
@@ -36 +37 @@
             text-shadow:2px 2px black">
         <div class="panel-heading  text-center">
+            <p>
+                <input type="text"
+                       class="form-control"
+                       style="width:50%;display:initial; background-color:transparent;text-align:center;color:white"
+                       onchange="changeName(@builder,this.value,@randombr)"
+                       value="@Model.batch.Name" />
+            </p>
             <p class="panel-title">
-                Repeats @Model.batch.Repetitions X
+                Repeats:
+                <input type="number"
+                       class="form-control"
+                       style="width:80px;display:initial; margin-bottom:5px"
+                       min="1"
+                       value="@Model.batch.Repetitions"
+                       onchange="changeRepit(@builder,this.value,@randombr)" />
+                x
             </p>
             <p>

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFilePartials/_Experiment.cshtml

@@ -12 +12 @@
             >
             <span class="label label-danger"
-                  style="text-shadow:2px 2px black;">
-                Experiment: @Model.SelectedTask.ItemTask.Name
+                  style="text-shadow:2px 2px black;">Experiment:
+                <span id="nameCarrier@(randy)">
+                     @Model.SelectedTask.ItemTask.Name
+                </span>
             </span>
         </h1>
-
+        <p>
+            <input type="text"
+                   style="width:50%;display:initial; background-color:transparent;text-align:center"
+                   onchange="changeName([],this.value,@randy)"
+                   value="@Model.SelectedTask.ItemTask.Name" />
+        </p>
     </div>
     <h4 id="tasks">

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFilePartials/_ExperimentSmall.cshtml

@@ -14 +14 @@
        href="#collapseExample@(randomex)"
        aria-expanded="false"
+       id="nameCarrier@(randomex)"
        aria-controls="collapseExample@(randomex)"
        style="margin:10px; margin-bottom:0; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
@@ -34 +35 @@
 
         <div class="panel-heading panel-danger text-center">
+            <p>
+                <input type="text"
+                       class="form-control"
+                       style="width:50%;display:initial; background-color:transparent; color:white;text-align:center"
+                       onchange="changeName(@builder,this.value,@randomex)"
+                       value="@Model.exp.Name" />
+            </p>
             <p class="panel-title">
                 Children: @Model.exp.Optimizers.Count

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/Uploads.cshtml

@@ -80 +80 @@
                     }
                 </div>
+                @if (ViewBag.active != null && ViewBag.active == true)
+                {
+                    <div>
+                        <a class="btn btn-warning btn-block"
+                           asp-controller="Job"
+                           asp-action="OpenRecent"
+                           style="box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+                            text-shadow:2px 2px black;margin-top:10px">
+                            <i class="fa fa-undo"></i> Reopen last file
+                        </a>
+                    </div>
+
+                }
+               
             </div>
             <p style="display:none"

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Index.cshtml

@@ -68 +68 @@
                 </div>
                 <div class="btn-group-vertical btn-block">
-                    
-                    
+
+
                     @foreach (var user in Model.users)
                     {
@@ -111 +111 @@
                         box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);">
                     <div class="row">
-                        <h2 style="padding-left:20px">
+                        @if (Model.SelectedUser.Id != Guid.Empty && Model.SelectedUser.IsApproved)
+                        {<div class="row" style="margin-right:20px">
+                            <a class="btn btn-success pull-right disabled"><i class="fa fa-check-square-o "></i> Approved</a>
+                        </div>
+                        }
+                        else if (Model.SelectedUser.Id != Guid.Empty && !Model.SelectedUser.IsApproved)
+                        {<div class="row" style="margin-right:20px">
+                            <a class="btn btn-warning pull-right"
+                               asp-action="approveUser"
+                               asp-controller="User"
+                               asp-route-id="@Model.SelectedUser.Id">
+                                <i class="fa fa-square-o" ></i> Not approved
+                            </a>
+                            
+                        </div>
+                        }
+                        <h2 style="padding-left:20px; margin-top:0">
                             @if (Model.SelectedUser.Id != Guid.Empty)
                             {
-                                <i class="fa fa-user "></i> @Model.SelectedUser.UserName;
+                                <i class="fa fa-user "></i> @Model.SelectedUser.UserName
+
                             }
                             else
@@ -122 +139 @@
                             }
                         </h2>
+                        
                         <form class="form-horizontal"
                               method="post"
@@ -189 +207 @@
 
                                 </div>
-                                <div class="form-group">
-                                    <label class="col-sm-3 control-label">
-                                        User created
-                                    </label>
-                                    <label class="col-sm-8 control-label" style="text-align:left">
-                                        @Model.SelectedUser.CreationDate.AddHours(2).ToString();
-                                    </label>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-3 control-label">
-                                        Last activity
-                                    </label>
-                                    <label class="col-sm-8 control-label" style="text-align:left">
-                                        @Model.SelectedUser.LastActivityDate.AddHours(2).ToString()
-                                    </label>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-3 control-label">
-                                        Password
-                                    </label>
-                                    <div id="inppassreset" class="col-sm-8">
-                                        Last change: @Model.SelectedUser.LastPasswordChangedDate.ToShortDateString()
-                                        <button type="button"
-                                                onclick="resetPass('@(Model.SelectedUser.Id)')"
-                                                class="btn btn-default">
-                                            <i class="fa fa-unlock"></i> Reset password
-                                        </button>
-                                    </div>
-                                </div>
-
-                                <div class="form-group">
-                                    <label class="col-sm-3 control-label">
-                                        Member of @Model.SelectedUserSubscriptions.Count groups
-                                    </label>
-                                    <div class="col-sm-8 control-label" style="text-align:left">
-                                        @if (Model.SelectedUserSubscriptions.Count > 0)
-                                        {
-                                            @foreach (var g in Model.SelectedUserSubscriptions)
+                                    <div class="form-group">
+                                        <label class="col-sm-3 control-label">
+                                            User created
+                                        </label>
+                                        <label class="col-sm-8 control-label" style="text-align:left">
+                                            @Model.SelectedUser.CreationDate.AddHours(2).ToString();
+                                        </label>
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="col-sm-3 control-label">
+                                            Last activity
+                                        </label>
+                                        <label class="col-sm-8 control-label" style="text-align:left">
+                                            @Model.SelectedUser.LastActivityDate.AddHours(2).ToString()
+                                        </label>
+                                    </div>
+                                    <div class="form-group">
+                                        <label class="col-sm-3 control-label">
+                                            Password
+                                        </label>
+                                        <div id="inppassreset" class="col-sm-8">
+                                            Last change: @Model.SelectedUser.LastPasswordChangedDate.ToShortDateString()
+                                            <button type="button"
+                                                    onclick="resetPass('@(Model.SelectedUser.Id)')"
+                                                    class="btn btn-default">
+                                                <i class="fa fa-unlock"></i> Reset password
+                                            </button>
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label class="col-sm-3 control-label">
+                                            Member of @Model.SelectedUserSubscriptions.Count groups
+                                        </label>
+                                        <div class="col-sm-8 control-label" style="text-align:left">
+                                            @if (Model.SelectedUserSubscriptions.Count > 0)
                                             {
-                                                <div class="row">
-                                                    <p class="col-sm-10"><i class="fa fa-group"></i> @g.Name</p>
-                                                    <p class="col-sm-2">
-                                                        <a class="btn btn-danger pull-right"
-                                                           asp-controller="User"
-                                                           asp-action="deleteUserGroup"
-                                                           asp-route-id="@Model.SelectedUser.Id"
-                                                           asp-route-group="@g.Id"
-                                                           onclick="showDeleter()">
-                                                            <i class="fa fa-trash-o"></i>
-                                                        </a>
-                                                    </p>
-                                                </div>
+                                                @foreach (var g in Model.SelectedUserSubscriptions)
+                                                {
+                                                    <div class="row">
+                                                        <p class="col-sm-10"><i class="fa fa-group"></i> @g.Name</p>
+                                                        <p class="col-sm-2">
+                                                            <a class="btn btn-danger pull-right"
+                                                               asp-controller="User"
+                                                               asp-action="deleteUserGroup"
+                                                               asp-route-id="@Model.SelectedUser.Id"
+                                                               asp-route-group="@g.Id"
+                                                               onclick="showDeleter()">
+                                                                <i class="fa fa-trash-o"></i>
+                                                            </a>
+                                                        </p>
+                                                    </div>
+                                                }
                                             }
-                                        }
-                                        else
-                                        {
-                                            <p>Not a member of any groups</p>
-                                        }
-                                    </div>
-                                </div>
+                                            else
+                                            {
+                                                <p>Not a member of any groups</p>
+                                            }
+                                        </div>
+                                    </div>
                             }
 
@@ -293 +311 @@
                                 <div class="form-group">
                                     <label class="col-sm-3 control-label">
-                                       @Model.SelectedUserRoles.Count Roles
+                                        @Model.SelectedUserRoles.Count Roles
                                     </label>
                                     <div class="col-sm-8 control-label" style="text-align:left">