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

Timestamp:

05/02/11 21:40:26 (13 years ago)

Author:

dhohl

Message:

#1499 query filter
recursive layout of the filters

Location:

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views

Files:

• AlgorithmClass (added)
• Filter/Filters.ascx (modified) (2 diffs)
• Query/Controls (added)
• Query/Menu.ascx (modified) (1 diff)
• ServiceTest (added)

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")) %>
+<% using (Html.BeginForm ("AddFilter", "Filter")) %>
 <% { %>
 <p>
@@ -21 +21 @@
     <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 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)%>
-        <!-- other filter >
-          <% } // If type is StringComparisonFilter build thes controls
-       else 
-       { %>
-       <!-- type not supported ... -->
-        FilerTypeName =
-        <%: Html.Label(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); %>
+                   
+             <% } 
+
+
+              else 
+                { %>
+                     <!-- type not supported ... -->
+                     FilerTypeName =
+                    <%: Html.Label(f.GetType().Name)%>
+               <% }
+               %>
     </li>
     <% }

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Query/Menu.ascx

@@ -3 +3 @@
 <ul>
 <li <% if(Session["SelectedSubMenu"] == "Filter") {%> class="selected" <%}%>>
-    <%: Html.ActionLink("Filter", "Index", "Filter") %>
+    <%: Html.ActionLink( "Filter", "Index", "Filter") %>
 </li>
 <li <% if(Session["SelectedSubMenu"] == "Results") {%> class="selected" <%}%>>