Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/20/13 16:56:28 (12 years ago)
Author:
fschoepp
Message:

#1888:

  • DAL: Added a Delete method which deletes by experiment id.
  • HL DataTables will now be transposed and mapped as double[ROWS][COLUMNS] (transposed)
  • JS: Moved all classes into "modules" to prevent namespace pollution (using OAAS_MODEL for model classes, OAAS_VIEW for views and OAAS_CONTROLLER for controllers)
  • JS: Moved DatatypeMapper classes into Backbone views
  • JS: Models now correctly send DELETE requests
  • Added a new job overview page (which also renders run details) using AJAX
  • Using moment.min.js to format DateTime as string
  • Controllers now inherit from BaseController which provides a RedirectToLoginIfNecessary-method
  • Added loading animations to several AJAX bound places (loading experiments / scenarios)
  • Added a section to _Layout.cshtml which allows page-specific JavaScript includes (<script> only for a certain page)
  • Fixed Build/Edit of experiment menu redirecting to the wrong page
  • The Experiment Variation Dialog disables input fields, if the property has not been activated before
Location:
branches/OaaS/HeuristicLab.Services.Optimization.Web/Views
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed

  • branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Experiment/New.cshtml

    r9305 r9324  
    7070<script type="text/template" id="checkbox_template">
    7171<div>
    72     <input type="checkbox" name="<%=name%>"/><%=text%><br/>
    73 </div>
    74 </script>       
     72    <input type="checkbox" name="<%=name%>"
     73        <% if (checked) { %>
     74            checked
     75        <% } %>
     76    />
     77    <% if (!hideText) { %>
     78         <%=text%><br/>
     79    <% } %>
     80</div>
     81</script>   
    7582
    7683<script type="text/template" id="variation_generator_template">
    … …  
    93100
    94101<script type="text/javascript">
    95     var controller = new ExperimentPageController();
     102    var controller = new OAAS_CONTROLLER.ExperimentPageController();
    96103    $(document).ready(function () {
    97104        controller.create();
    … …  
    141148    <div id="container" class="treeStyle"></div>   
    142149    <p>Choose an algorithm:</p>
    143     <div id="algorithms"></div>
     150    <div id="algorithms">
     151        <span>Loading ... <img src="@Url.Content("~/Content/ajax-loader.gif")" alt="Loading animation" />  </span>       
     152    </div>
    144153    <div class="clearer"></div>
    145154    <p>Choose from your stored experiments:</p>
    146     <div id="experiments"></div>
     155    <div id="experiments">
     156        <span>Loading ... <img src="@Url.Content("~/Content/ajax-loader.gif")" alt="Loading animation" />  </span>       
     157    </div>
    147158  </fieldset>
    148159  </div>
    … …  
    196207@section submenu {
    197208    <ul>
    198         <li class="selected">@Html.ActionLink("Build", "New")</li>   
    199         <li>@Html.ActionLink("Edit", "NewEdit")</li>
     209        <li class="selected">@Html.ActionLink("Build", "New", "Experiment")</li>   
     210        <li>@Html.ActionLink("Edit", "NewEdit", "Experiment")</li>
    200211        <li>@Html.ActionLink("Status", "Index", "Status")</li>
    201212    </ul>

  • branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Experiment/NewEdit.cshtml

    r9305 r9324  
    7070<script type="text/template" id="checkbox_template">
    7171<div>
    72     <input type="checkbox" name="<%=name%>"/><%=text%><br/>
     72    <input type="checkbox" name="<%=name%>"
     73        <% if (checked) { %>
     74            checked
     75        <% } %>
     76    />
     77    <% if (!hideText) { %>
     78         <%=text%><br/>
     79    <% } %>
    7380</div>
    7481</script>       
    … …  
    93100
    94101<script type="text/javascript">
    95     var controller = new ExperimentEditPageController();
     102    var controller = new OAAS_CONTROLLER.ExperimentEditPageController();
    96103    $(document).ready(function () {
    97104        controller.create();
    … …  
    145152  <div id="step1">
    146153  <fieldset>       
    147     <div id="experiments"></div>
     154    <div id="experiments">
     155        <span>Loading ... <img src="@Url.Content("~/Content/ajax-loader.gif")" alt="Loading animation" />  </span>       
     156    </div>
     157    <div class="experimentMenu">
     158        <button type="button" disabled="disabled" id="deleteExperimentButton">Delete</button>
     159    </div>
    148160  </fieldset>
    149161  </div>
    … …  
    210222@section submenu {
    211223    <ul>
    212         <li>@Html.ActionLink("Build", "New")</li>   
    213         <li class="selected">@Html.ActionLink("Edit", "NewEdit")</li>
     224        <li>@Html.ActionLink("Build", "New", "Experiment")</li>   
     225        <li class="selected">@Html.ActionLink("Edit", "NewEdit", "Experiment")</li>
    214226        <li>@Html.ActionLink("Status", "Index", "Status")</li>
    215227    </ul>

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

    r9305 r9324  
    3232
    3333    <!-- Experiment Additions -->
    34     <script src="@Url.Content("~/Content/Datatypemapping.js")" type="text/javascript"></script>
     34   
    3535    <link href="@Url.Content("~/Content/smartwizard2.0/styles/smart_wizard.css")" rel="stylesheet" type="text/css" />
    3636    <script type="text/javascript" src="@Url.Content("~/Content/smartwizard2.0/js/jquery.smartWizard-2.0.min.js")"></script>
    … …  
    4040    <script type='text/javascript' src='@Url.Content("~/Content/backbone/backbone-relational.js")'></script>
    4141
     42    <script src="@Url.Content("~/Content/Datatypemapping.js")" type="text/javascript"></script>
    4243    <script type='text/javascript' src='@Url.Content("~/Content/experiment.model.js")'></script>
    4344    <script type='text/javascript' src='@Url.Content("~/Content/experiment.view.js")'></script>
    4445    <script type='text/javascript' src='@Url.Content("~/Content/experiment.controller.js")'></script>
     46
     47    @RenderSection("customHeader", required: false)
    4548</head>
    4649<body>

  • branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Status/Index.cshtml

    r9215 r9324  
    103103@section submenu {
    104104    <ul>
    105         <li>@Html.ActionLink("Build", "Index")</li>   
    106         <li>@Html.ActionLink("Edit", "Edit")</li>
     105        <li>@Html.ActionLink("Build", "New", "Experiment")</li>   
     106        <li>@Html.ActionLink("Edit", "NewEdit", "Experiment")</li>
    107107        <li class="selected">@Html.ActionLink("Status", "Index", "Status")</li>
    108108    </ul>
Note: See TracChangeset for help on using the changeset viewer.