Changeset 9166 for branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Optimization/JobDetails.cshtml

Timestamp:

01/15/13 15:50:53 (11 years ago)

Author:

fschoepp

Message:

#1888:

• Model: OptimizationScenario may be a tree of algorithms (and problems)
• Model: Renamed InputParameters to ProblemParameters (as they are the parameters of a problem)
• Model: Added JobExecutionDetails which contain Repetitions + Group (resource to use)
• ScenarioParser parses the new XML scenario files
• Website + Model: You are now able to add/remove rows from a table (no JavaScript involved yet)
• Website + Controller: Added repetitions (enables batch jobs) and group (resource to use) to OaaS which will be used by the controller to schedule the job
• Website: Updated templates to use new model structure
• Website + Scenarios: Added the new algorithm Benchmark Algorithm
• Controller: Added a singleton to make the (Azure/Mockup)-DAL exchangeable
• Controller: Added mockup classes for DAL + IScenarioManager
• Website/Result Page: Line Diagrams will be added via JavaScript, crawling their data using AJAX
• Website: Most configuration parameters can be set in the ServiceDefinition directly
• Added a mockup for the Membership classes: These can be used if no network connection is available or if other parts of the app shall be tested
• Scenarios: Updated TSP mappings to new xsd

File:

• branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Optimization/JobDetails.cshtml (modified) (4 diffs)

branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Optimization/JobDetails.cshtml

@@ -28 +28 @@
 
 <h3>Run details:</h3>
-@for (int j=0; j < Model.Runs.Count; j++) {
+<div class="collapsible">
+@if (Model.Runs.Count > 1) {
+    <h3>Analyze runs</h3>
+    <div>
+        <div class="resizable ui-widget-content" style="width: 800px; height: 600px;">
+            <div id="dataTableView" style="width: 96%; height: 96%;">    
+              <form action="#">
+                <label for="dataTable">DataTable:</label>
+                <select name="dataTable" id="dataTable"></select>
+                <label for="dataRow">DataRow:</label>
+                <select name="dataRow" id="dataRow"></select>
+                <div id="dataTableGraph" style="width: 100%; height: 100%;"></div>
+              </form>
+            </div>
+        </div>
+    </div>
+}
+@for (int j = 0; j < Model.Runs.Count; j++) {
     var run = Model.Runs[j];
-    <p>@run.Name:</p>
+    <h3>@run.Name</h3>
+    <div>
     <table>
       <thead>
@@ -40 +58 @@
       <tbody>
       @for (var i = 0; i < run.Results.Count; i++) {
-        var result = run.Results[i];      
+          var result = run.Results[i];      
         <tr>
-          <td>@result.Value.Name</td> 
+          <td>@Html.Label(result.Value.Name, result.Value.Name)</td> 
           @if (result.Value is HeuristicLab.Services.Optimization.ControllerService.Model.DecimalMatrix) {
               var matrix = (result.Value as HeuristicLab.Services.Optimization.ControllerService.Model.DecimalMatrix);              
@@ -65 +83 @@
                   </div>                
               </td>
-          }
+          }          
           else {
-              <td>@((result.Value as HeuristicLab.Services.Optimization.ControllerService.Model.StringValue).Value)</td>
+              <td>
+                @Html.DisplayFor(m => result.Value)               
+              </td>
+              <!-- Html.Partial(string.Format("~/Views/Shared/DisplayTemplates/{0}.cshtml", result.Value.GetType().Name), result.Value) -->                
+              <!--td>((result.Value as HeuristicLab.Services.Optimization.ControllerService.Model.StringValue).Value)</td-->
           }
        </tr>
@@ -73 +95 @@
       </tbody>
     </table>
+    </div>
 }
+</div>