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

Timestamp:

01/15/13 15:50:53 (12 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

Location:

branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Shared

Files:

• DisplayTemplates/DecimalMatrix.cshtml (modified) (1 diff)
• DisplayTemplates/ProblemParameters.cshtml (added)
• DisplayTemplates/StringValue.cshtml (added)
• EditorTemplates/DecimalMatrix.cshtml (modified) (1 diff)
• EditorTemplates/ProblemParameters.cshtml (added)
• _Layout.cshtml (modified) (1 diff)

branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Shared/DisplayTemplates/DecimalMatrix.cshtml

@@ -10 +10 @@
       @for (int i = 0; i < Model.Value.Length; i++) {
       <tr>
-        @if (Model.RowNames.Length > i) {
+        @if (Model.RowNames != null && Model.RowNames.Length > i) {
         <th scope="row">@Model.RowNames[i]</th>
         }

branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Shared/EditorTemplates/DecimalMatrix.cshtml

@@ -19 +19 @@
     </td>
     }
-    <td><a class="delete-row" href="#">Delete</a></td>
-    <td><input type="submit" name="AddRow" value="Add Row"/></td>
+    <!-- TODO: Add unique identifier for algorithm / input parameters -->
+    <td>@Html.ActionLink("-", "DeleteRow", new { paramName = @Model.Name, id = @i }) </td>
+    <td>@Html.ActionLink("+", "AddRow", new { paramName = @Model.Name, id = @i }) </td>
   </tr>  
   }

branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Shared/_Layout.cshtml

@@ -19 +19 @@
     <script src="@Url.Content("~/Content/jqplot/src/plugins/jqplot.canvasTextRenderer.js")" type="text/javascript"></script>
     <script src="@Url.Content("~/Content/jqplot/src/plugins/jqplot.canvasAxisLabelRenderer.js")" type="text/javascript"></script>
+    <script type="text/javascript" src="@Url.Content("~/Content/jqplot/src/plugins/jqplot.highlighter.js")"></script>
     <script type="text/javascript" src="@Url.Content("~/Content/jqplot/src/plugins/jqplot.barRenderer.js")"></script>
     <script type="text/javascript" src="@Url.Content("~/Content/jqplot/src/plugins/jqplot.categoryAxisRenderer.js")"></script>