Changeset 13844 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job

Timestamp:

05/11/16 16:50:29 (9 years ago)

Author:

jlodewyc

Message:

#2582 Optimizing open file view by cutting down batches to 1. Logging system in navbar. Start authenticationCheck

Location:

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

Files:

• OpenFile.cshtml (modified) (6 diffs)
• OpenFilePartials/_BatchRun.cshtml (modified) (4 diffs)
• OpenFilePartials/_BatchRunSmall.cshtml (modified) (5 diffs)

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

@@ -153 +153 @@
 
                 <!-- Progress-->
-                
+
                 <h4 id="result" style="display:none">Start uploading experiment...</h4>
                 <div class="progress" id="progdiv" style="display:none">
@@ -168 +168 @@
                 <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"
+                      asp-action="saveToFile"
                       method="post">
                     <div class="col-sm-6"
@@ -191 +191 @@
                         <h5>Directory: /HiveChanged</h5>
                     </div>
-                    <button class="btn btn-success btn-block" type="submit" 
+                    <button class="btn btn-success btn-block" type="submit"
                             style="margin:10px; 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;">
-                    Save to file</button>
+                        Save to file
+                    </button>
                 </form>
             </div>
@@ -202 +203 @@
     </div>
     <!-- Side scrolling menu-->
-    <nav 
-         class="col-md-2" id="scrolly">
+    <nav class="col-md-2" id="scrolly">
         <ul class="nav nav-pills nav-stacked"
             data-spy="affix"
@@ -219 +219 @@
                 <li><a onclick="shower()" href="#tasks"><i class="fa fa-eye"></i> Show all tasks</a></li>
                 <li><a onclick="collapser()" href="#tasks"><i class="fa fa-eye-slash"></i> Hide all tasks</a></li>
-                
+
             }
             <li><a href="#finish"><i class="fa fa-flag-checkered"></i> Add to Hive or save to file</a></li>
+            <li>
+                <div class="alert alert-success" id="success-alert">
+                    <span id="succText"></span>
+                </div>
+                <p id="logs">
+                    
+                </p>
+            </li>
         </ul>
+
     </nav>
 
     <script src="~/js/hubs/progresshubber.js"></script>
-    
+
     <script>
         showScrolly = function () {
@@ -246 +255 @@
             });
             $('body').click(function () {
-                if ($("#ctasks").length > 0) 
+                if ($("#ctasks").length > 0)
                     $("#ctasks").html("<i class='fa fa-sitemap'></i> Tasks (" + $('a[href^="#collapseExample"]').length + ")");
             });
             $('body').click();
-            
+
         });
         collapser = function () {

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

@@ -26 +26 @@
     <h4 id="tasks">
         Repeats:
-        <input type="number" 
+        <input type="number"
                class="form-control"
                style="width:80px;display:initial"
-               min="1" 
+               min="1"
                value="@Model.SelectedBatchRun.Repetitions"
                onchange="changeRepit([],this.value,@randy)" />
-          x
+        x
 
     </h4>
@@ -45 +45 @@
     </p>
     <div id="childs@(randy)">
-        @for (var k = 0; k < Model.SelectedBatchRun.Repetitions; k++)
-        {
-            @if (Model.SelectedBatchRun.Optimizer is HeuristicLab.Optimization.IAlgorithm)
+
+        @if (Model.SelectedBatchRun.Optimizer is HeuristicLab.Optimization.IAlgorithm)
             {
-                @Html.Partial("OpenFilePartials/_AlgorithmSmall",
+            @Html.Partial("OpenFilePartials/_AlgorithmSmall",
                 new HeuristicLab.Clients.Hive.WebJobManager.Models.AlgorithmContainer(
                     ((HeuristicLab.Optimization.IAlgorithm)Model.SelectedBatchRun.Optimizer),
                     new List<int[]>(),
-                    new int[] { 0, k },
+                    new int[] { 0, 0 },
                     randomizer));
 
@@ -59 +58 @@
             else if (Model.SelectedBatchRun.Optimizer is HeuristicLab.Optimization.BatchRun)
             {
-                @Html.Partial("OpenFilePartials/_BatchRunSmall",
+            @Html.Partial("OpenFilePartials/_BatchRunSmall",
                 new HeuristicLab.Clients.Hive.WebJobManager.Models.BatchRunContainer(
                     ((HeuristicLab.Optimization.BatchRun)Model.SelectedBatchRun.Optimizer),
                     new List<int[]>(),
-                    new int[] { 0, k },
+                    new int[] { 0, 0 },
                     randomizer));
 
@@ -69 +68 @@
             else if (Model.SelectedBatchRun.Optimizer is HeuristicLab.Optimization.Experiment)
             {
-                @Html.Partial("OpenFilePartials/_ExperimentSmall",
+            @Html.Partial("OpenFilePartials/_ExperimentSmall",
                 new HeuristicLab.Clients.Hive.WebJobManager.Models.ExperimentContainer(
                     ((HeuristicLab.Optimization.Experiment)Model.SelectedBatchRun.Optimizer),
                     new List<int[]>(),
-                    new int[] { 0, k },
+                    new int[] { 0, 0 },
                     randomizer));
 
             }
-        }
+
     </div>
 </div>

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

@@ -18 +18 @@
        aria-expanded="false"
        aria-controls="collapseExample@(randombr)"
-        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);
+       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);
                             text-shadow:2px 2px black;">
         @Model.batch.Name
@@ -24 +24 @@
 
 </p>
-<div class="collapse" 
-     id="collapseExample@(randombr)" 
-     style="margin-left:10px;margin-right:10px;margin-top:-10px "
-     
-     >
-    <img src="~/img/accoladebatch.png" 
+<div class="collapse"
+     id="collapseExample@(randombr)"
+     style="margin-left:10px;margin-right:10px;margin-top:-10px ">
+    <img src="~/img/accoladebatch.png"
          style="width:100%" />
 
-    <div class="panel panel-warning" 
+    <div class="panel panel-warning"
          style="border-color:#f6cd94!important; border-width:2px!important;
             box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
@@ -57 +55 @@
 
                 Distribute child tasks
-                <input type="checkbox" 
-                       checked 
-                       data-toggle="toggle" 
+                <input type="checkbox"
+                       checked
+                       data-toggle="toggle"
                        data-onstyle="warning"
                        onchange="toggleChild(@builder, @randombr)" />
-                
+
 
             </p>
-            <div class="btn-group" 
+            <div class="btn-group"
                  style="text-shadow:none">
 
@@ -72 +70 @@
                         class="btn btn-info dropdown-toggle"
                         data-toggle="dropdown"
-                        aria-haspopup="true" 
+                        aria-haspopup="true"
                         aria-expanded="false">
                     Normal <span class="caret"></span>
@@ -85 +83 @@
         </div>
         <div id="childs@(randombr)">
-            @for (var k = 0; k < Model.batch.Repetitions; k++)
+            @if (Model.batch.Optimizer is HeuristicLab.Optimization.IAlgorithm)
             {
-                @if (Model.batch.Optimizer is HeuristicLab.Optimization.IAlgorithm)
-                {
-                    @Html.Partial("OpenFilePartials/_AlgorithmSmall",
+                @Html.Partial("OpenFilePartials/_AlgorithmSmall",
                     new HeuristicLab.Clients.Hive.WebJobManager.Models.AlgorithmContainer(
                         ((HeuristicLab.Optimization.IAlgorithm)Model.batch.Optimizer),
                         Model.depth.ToList(),
-                        new int[] { 0, k },
+                        new int[] { 0, 0 },
                         Model.randy))
 
-                }
-                else if (Model.batch.Optimizer is HeuristicLab.Optimization.BatchRun)
-                {
-                    @Html.Partial("OpenFilePartials/_BatchRunSmall",
+            }
+            else if (Model.batch.Optimizer is HeuristicLab.Optimization.BatchRun)
+            {
+                @Html.Partial("OpenFilePartials/_BatchRunSmall",
                     new HeuristicLab.Clients.Hive.WebJobManager.Models.BatchRunContainer(
                         ((HeuristicLab.Optimization.BatchRun)Model.batch.Optimizer),
                         Model.depth.ToList(),
-                        new int[] { 0, k },
+                        new int[] { 0, 0 },
                         Model.randy)) ;
 
-                }
-                else if (Model.batch.Optimizer is HeuristicLab.Optimization.Experiment)
-                {
-                    @Html.Partial("OpenFilePartials/_ExperimentSmall",
+            }
+            else if (Model.batch.Optimizer is HeuristicLab.Optimization.Experiment)
+            {
+                @Html.Partial("OpenFilePartials/_ExperimentSmall",
                     new HeuristicLab.Clients.Hive.WebJobManager.Models.ExperimentContainer(
                         ((HeuristicLab.Optimization.Experiment)Model.batch.Optimizer),
                         Model.depth.ToList(),
-                        new int[] { 0, k },
+                        new int[] { 0, 0 },
                         Model.randy)) ;
 
-                }
             }
+
         </div>
     </div>