Changeset 6190 for branches/WebApplication/MVC2

Timestamp:

05/12/11 20:08:00 (14 years ago)

Author:

dhohl

Message:

#1499 refactor, first part of the comparison combobox for the different filters, Controls for the Filters

Location:

branches/WebApplication/MVC2/HLWebOKBQueryPlugin

Files:

• Controllers/FilterController.cs (modified) (5 diffs)
• HLWebOKBQueryPlugin.csproj (modified) (1 diff)
• ViewModels/ComparisonItem.cs (added)
• ViewModels/ComparisonsHelper.cs (added)
• ViewModels/FilterModel.cs (modified) (7 diffs)
• Views/Filter/Filters.ascx (modified) (8 diffs)

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Controllers/FilterController.cs

@@ -26 +26 @@
 
             QueryServiceClient client = Query.GetClientFactory("okbtester", "okbtester");
-            
-
-           long[] ids =  client.GetRunIds(qm.Content);
+
+
+            long[] ids = client.GetRunIds(qm.Content);
 
             Response.Write("Found <" + ids.Count() + "> Runs.");
@@ -52 +52 @@
         /// <returns></returns>
         public ActionResult AddFilterAnd(FormCollection collection)
-        {       
+        {
             FilterModel fm = new FilterModel((CombinedFilter)Session["Content"]);
 
 
             // Add Filter
-            
+
             String idKey = null;
             String parentIdKey = null;
@@ -135 +135 @@
         {
             // Get Content from Session
-            FilterModel fm = new FilterModel((CombinedFilter)Session["Content"]);  
-            
+            FilterModel fm = new FilterModel((CombinedFilter)Session["Content"]);
+
             // Remove Filter
-           bool filterRemoved =  fm.RemoveFilter(id);
-        
+            bool filterRemoved = fm.RemoveFilter(id);
+
             // Set Content
             Session["Content"] = fm.Content;
-           
+
             return View("Index", fm);
         }
@@ -181 +181 @@
         public ActionResult Index()
         {
-           
+
             // Set submenu
             Session["SelectedSubMenu"] = "Filter";
@@ -201 +201 @@
             CombinedFilter f = (CombinedFilter)Session["Content"];
             fm.Content = f;
-            
-           
+
+
             return View(fm);
         }

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/HLWebOKBQueryPlugin.csproj

@@ -103 +103 @@
     <Compile Include="Models\ChartModel.cs" />
     <Compile Include="Models\Filter.cs" />
+    <Compile Include="ViewModels\ComparisonItem.cs" />
+    <Compile Include="ViewModels\ComparisonsHelper.cs" />
     <Compile Include="ViewModels\FilterModel.cs" />
     <Compile Include="Models\QueryModel.cs" />

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/ViewModels/FilterModel.cs

@@ -5 +5 @@
 using HLWebOKBQueryPlugin.OKBQueryService;
 using HLWebOKBQueryPlugin.Helpers;
+using HLWebOKBQueryPlugin.ViewModels;
 
 namespace HLWebOKBQueryPlugin.Models
@@ -15 +16 @@
     public class FilterModel
     {
+        
+
 
         public static string ComboboxName { get { return "filtersCombobox"; } }
@@ -20 +23 @@
         public static string ValueTextbox { get { return "valueTextbox"; } }
         public static string ValueDropDownList { get { return "valueDropDownList"; } }
-
+        public static string ComparisonDropDownList { get { return "comparisonDropDownList"; } }
 
         /// <summary>
@@ -53 +56 @@
 
 
+        public static List<ComparisonItem> OrdinalComparisons 
+        {
+            get { return ComparisonsHelper.ordinalComparisons; }
+        }
+
+        public static List<ComparisonItem> StringComparisons
+        {
+            get { return ComparisonsHelper.stringComparisons; }
+        }
+        
+
+        //"<";
+        //else if (Content.Comparison == OrdinalComparison.LessOrEqual)
+        //  comparisonComboBox.SelectedItem = "<=";
+        //else if (Content.Comparison == OrdinalComparison.Equal)
+        //  comparisonComboBox.SelectedItem = "=";
+        //else if (Content.Comparison == OrdinalComparison.GreaterOrEqual)
+        //  comparisonComboBox.SelectedItem = ">=";
+        //else if (Content.Comparison == OrdinalComparison.Greater)
+        //  comparisonComboBox.SelectedItem = ">";
+        //else if (Content.Comparison == OrdinalComparison.NotEqual)
+        //  comparisonComboBox.SelectedItem = "<>"
+
+
+
+
+
         /// <summary>
         /// Available Filters
@@ -61 +91 @@
             {
                 QueryServiceClient client = Query.GetClientFactory("okbtester", "okbtester");
-                return client.GetFilters().ToList<Filter>();
+                Filter[] filters = client.GetFilters();
+
+                if (filters == null)
+                {
+                    return new List<Filter>();
+                }
+                return filters.ToList<Filter>();
             }
         }
@@ -87 +123 @@
         public CombinedFilter Content { get; set; }
 
-      
+
 
         /// <summary>
@@ -171 +207 @@
                                 if (kvp.Key.Equals(FilterModel.ValueTextbox))
                                 {
-                                    ((StringComparisonFilter)f).Value = kvp.Value;
+                                    ((StringComparisonFilter)f).Value = kvp.Value + "111";
+                                }
+                                else if (kvp.Key.Equals(FilterModel.ComparisonDropDownList))
+                                {
+                                    ((StringComparisonFilter)f).Value = ((StringComparisonFilter)f).Value + "222";
+                                    ((StringComparisonFilter)f).Comparison = ComparisonsHelper.GetStringComparisonForValue(kvp.Value);
                                 }
                                 // To this for alle keys

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

@@ -40 +40 @@
     <% StringComparisonFilter filter = ((StringComparisonFilter)f); %>
     <%: Html.Label(filter.Label)%>
-    <%: Html.Label("=")%>
+    <%: Html.DropDownList(f.Id + "." + FilterModel.ComparisonDropDownList, new SelectList(FilterModel.StringComparisons,"Value","Text", filter.Comparison))%>   
     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, (filter.Value))%>
     <% }
@@ -47 +47 @@
     <% NameStringComparisonFilter filter = ((NameStringComparisonFilter)f); %>
     <%: Html.Label(filter.Label)%>
-    <%: Html.Label("=" + f.Id)%>
+    <%: Html.Label("=")%>
     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
     <% }
@@ -61 +61 @@
     <% NameEqualityComparisonByteArrayFilter filter = ((NameEqualityComparisonByteArrayFilter)f); %>
     <%: Html.Label(filter.Label)%>
+      <%: Html.Label("teby")%>
     <% }
 else if ("NameEqualityComparisonBoolFilter".Equals(f.GetType().Name))
@@ -67 +68 @@
     %>
     <%: Html.Label(filter.Label)%>
-    <%: Html.Label("is")%>
+    <%: Html.Label("is") %>
     <%: Html.DropDownList(f.Id + "." + FilterModel.ValueDropDownList, new SelectList(((FilterModel)Model).BoolStates, filter.Value))%>
     <% }
@@ -74 +75 @@
     <% NameOrdinalComparisonIntFilter filter = ((NameOrdinalComparisonIntFilter)f);   %>
     <%: Html.Label(filter.Label)%>
-    <%: Html.Label("is")%>
+    <%: Html.DropDownList(f.Id + "." + FilterModel.ValueDropDownList, new SelectList(FilterModel.OrdinalComparisons,"Value","Text", filter.Comparison))%>
+    <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
     <% }
 else if ("NameStringComparisonAvailableValuesFilter".Equals(f.GetType().Name))
@@ -87 +89 @@
     <% NameOrdinalComparisonDoubleFilter filter = ((NameOrdinalComparisonDoubleFilter)f);   %>
     <%: Html.Label(filter.Label)%>
-    <%: Html.Label("=")%>
+    <%: Html.Label("<")%>
     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
     <% }
@@ -94 +96 @@
     <% NameOrdinalComparisonFloatFilter filter = ((NameOrdinalComparisonFloatFilter)f);   %>
     <%: Html.Label(filter.Label)%>
-    <%: Html.Label("=")%>
+    <%: Html.Label("<")%>
     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
     <% }
@@ -101 +103 @@
     <% NameOrdinalComparisonLongFilter filter = ((NameOrdinalComparisonLongFilter)f);   %>
     <%: Html.Label(filter.Label)%>
-    <%: Html.Label("=")%>
+    <%: Html.Label("<")%>
     <%: Html.TextBox(f.Id + "." + FilterModel.ValueTextbox, filter.Value)%>
     <% }