Changeset 6141 for branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views

Timestamp:

05/07/11 10:41:02 (14 years ago)

Author:

mjesner

Message:

#1499 new (non-recursive) view/architecture

Location:

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Filter

Files:

• Filters.ascx (modified) (1 diff)
• Index.aspx (modified) (1 diff)

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Filter/Filters.ascx

@@ -3 +3 @@
 <%@ Import Namespace="HLWebOKBQueryPlugin.OKBQueryService" %>
 <!-- Put all into a form that calls the "AddFilter" Action-->
-<% using (Html.BeginForm ("AddFilter", "Filter")) %>
-<% { %>
 <p>
+    <%
+        CombinedFilter currentFilter = ((FilterModel)Model).Content;
+    %>
+    <% using (Html.BeginForm("AddFilterAnd", "Filter", FormMethod.Post, new { id = currentFilter.Id, name = currentFilter.Id })) %>
+    <% {     %>
+    <%
+  
+        string comboboxName = "filtersCombobox." + currentFilter.Id;
+        string hiddenName = "parentId." + currentFilter.Id;
+    %>
+ 
     Select Filter:
-    <%: Html.DropDownList("filtersCombobox", new SelectList(((FilterModel)Model).Filters, "FilterTypeName", "Label"))%>
-    <input type="submit" value="add" />
-    
+    <%: Html.Hidden(hiddenName,currentFilter.Id.ToString()) %>
+    <%: Html.DropDownList(comboboxName, new SelectList(((FilterModel)Model).Filters, "FilterTypeName", "Label"))%>
+    <input type="submit" value="+" />
 </p>
-<ul>
-    <!-- Build the selected filters. The filtesr will be stored in the session and the
+<!-- Build the selected filters. The filtesr will be stored in the session and the
 Controller puts the current filters from the session into the model. Selected Filters
 will be iterated. -->
-    <% if (((FilterModel)Model).SelectedFilters != null)
+<% if (currentFilter.Filters != null)
+   {
+
+       foreach (Filter f in currentFilter.Filters)
        {
-
-           foreach (Filter f in ((FilterModel)Model).SelectedFilters)
-           { %>
-    <li>
-        <%
-                // If type is StringComparisonFilter build thes controls
-                if ("StringComparisonFilter".Equals(f.GetType().Name))
-                {  %>
-                    <%: Html.TextBox("valueTextbox." + f.GetType().Name, ((StringComparisonFilter)f).Value)%>
-                    <%: Html.LabelFor(x => f.Label)%>
-                   
-             <% }
-               // If type is NameStringComparisonFilter build thes controls
-               else if ("NameStringComparisonFilter".Equals(f.GetType().Name))
-               { %>
-                    <%: Html.TextBox("valueTextbox." + f.GetType().Name, ((NameStringComparisonFilter)f).Value) %>
-                   
-             <% } 
-               else if ("CombinedFilter".Equals(f.GetType().Name))
-               { %>
-                <% CombinedFilter combiFilter = ((CombinedFilter)f);  %>
-                 <% List<Filter> comtbiFtilterLis = combiFilter.Filters.ToList<Filter>();
-                    FilterModel m = new FilterModel();
-                    m.Filters = ((FilterModel)Model).Filters;
-                    m.SelectedFilters = comtbiFtilterLis;
-                    %>
-                    <%   Html.RenderPartial("Filters", m); %>
-                   
-             <% } 
+           if (f != null)
+           {  %>
+<div>
+    <%
+           
+// If type is StringComparisonFilter build thes controls
+if ("StringComparisonFilter".Equals(f.GetType().Name))
+{  %>
+    <%: Html.TextBox(f.Id + ".valueTextbox", ((StringComparisonFilter)f).Value)%>
+    <%: Html.Label(f.GetType().Name)%>
+    <% }
+// If type is NameStringComparisonFilter build thes controls
+else if ("NameStringComparisonFilter".Equals(f.GetType().Name))
+{ %>
+    <%: Html.TextBox(f.Id + ".valueTextbox" + f.Id, new{((NameStringComparisonFilter)f).Value})%>
+    <%: Html.Label(f.GetType().Name)%>
+    <% }
 
 
-              else 
-                { %>
-                     <!-- type not supported ... -->
-                     FilerTypeName =
-                    <%: Html.Label(f.GetType().Name)%>
-               <% }
-               %>
-    </li>
+else
+{ %>
+    <!-- other types ... must be implemented -->
+    <%: Html.Label(f.GetType().Name)%>
     <% }
-
+    %>
+</div>
+<% }
        }
    }%>
-</ul>
+<% }
+       
+%>

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Filter/Index.aspx

@@ -1 +1 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %>
 
+<%@ Import Namespace="HLWebOKBQueryPlugin.Models" %>
+<%@ Import Namespace="HLWebOKBQueryPlugin.OKBQueryService" %>
 <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
     Index
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-    <h2>Filter</h2>
+    <h2>
+        Filter</h2>
     <!--
      This is the "user control" for the filters. This will call the action "AddFilter"
      in the controller, after the Action "Index" is called (for rendering the page).
+
+
+     ch130 TSP (imported from TSPLIB)
+
+
      -->
-    <% Html.RenderPartial("Filters"); %>
+    <%
+         
+        FilterModel model = (FilterModel)Model;
+
+        if (model != null && model.Content != null)
+        {
+            foreach (Filter f in model.Content.Filters)
+            {
+    %>
+ 
+    <% FilterModel fm = new FilterModel((CombinedFilter)f);
+             
+    %>
+    <% Html.RenderPartial("Filters", fm); %>
+    <%}
+         }%>
+
+         
+     
+  <% using (Html.BeginForm("AddFilterOr", "Filter")) %>
+  <% {     %>
+ Or filter <input type="submit" value="+" />
+  <% }     %>
+
+
+  
+  <% using (Html.BeginForm("GetRuns", "Filter")) %>
+  <% {     %>
+ <input type="submit" value="get runs" />
+  <% }     %>
+
 </asp:Content>