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

Timestamp:

05/22/11 21:01:58 (14 years ago)

Author:

dhohl

Message:

#1499 The filter form does not lost any inputs after reloading the page; date filter is possible

Location:

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Filter

Files:

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

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

@@ -9 +9 @@
 <p>
     <%
-        CombinedFilter currentFilter = ((FilterModel)Model).Content;
+        CombinedFilter topFilter = ((FilterModel)Model).Content;
     %>
-    <% using (Html.BeginForm("AddFilterAnd", "Filter", FormMethod.Post, new { id = currentFilter.Id, name = currentFilter.Id })) %>
-    <% {     %>
-    <%
-  
-        string comboboxName = FilterModel.ComboboxName + "." + currentFilter.Id;
-        string hiddenName = FilterModel.ParentIdName + "." + currentFilter.Id;
+    <% using (Html.BeginForm("AddFilterAnd", "Filter", FormMethod.Post, new { id = topFilter.Id, name = topFilter.Id })) %>
+    <% {    
+           
+            foreach (Filter fNode in topFilter.Filters)
+            {
+
+                CombinedFilter currentFilter = (CombinedFilter)fNode;
+                string comboboxName = FilterModel.ComboboxName + "." + currentFilter.Id;
+                string hiddenName = FilterModel.ParentIdName + "." + currentFilter.Id;
     %>
- 
     <%: Html.Hidden(hiddenName,currentFilter.Id.ToString()) %>
     <%: Html.DropDownList( comboboxName, new SelectList(((FilterModel)Model).AvailableFilterForCombobox, "FilterTypeName", "Label"))%>
-    <input type="submit" value="+" />
+    <input type="submit" name="submitButton" value="+.<%:currentFilter.Id%>" />
 </p>
 <!-- Build the selected filters. The filtesr will be stored in the session and the
@@ -106 +108 @@
     <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.OrdinalComparisons, "Value", "Text", (int)filter.Comparison))%>
     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
+    <% }
+else if ("OrdinalComparisonDateTimeFilter".Equals(f.GetType().Name))
+{ %>
+    <% OrdinalComparisonDateTimeFilter filter = ((OrdinalComparisonDateTimeFilter)f);   %>
+    <%: Html.Label(filter.Label)%>
+    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.OrdinalComparisons, "Value", "Text", (int)filter.Comparison))%>
+    <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
     <% }                 
                   
     %>
-    <%: Html.ActionLink("remove", "DeleteFilter", new { f.Id })%>
 
+    <input type="submit" name="submitButton" value="-.<%:f.Id%>"    />
+   
 <% }%>
     </td></tr></table>
     <% } %>
  <%  }%>
+   <% }%>
+ <input type="submit" name="submitButton"  value="or" />
+ </br>
+ <input type="submit" name="submitButton" value="runs" />
+
+  
+
 <% }
       

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

@@ -26 +26 @@
         if (model != null && model.Content != null)
         {
-            foreach (Filter f in model.Content.Filters)
-            {
+            
+                FilterModel fm = new FilterModel((CombinedFilter)model.Content);
     %>
- 
-    <% FilterModel fm = new FilterModel((CombinedFilter)f);
-             
+                 <% Html.RenderPartial("Filters", fm); %>
+    <%    
+        }
     %>
-    <% 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>