Changeset 6190 for branches/WebApplication/MVC2/HLWebOKBQueryPlugin/ViewModels

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/ViewModels

Files:

• ComparisonItem.cs (added)
• ComparisonsHelper.cs (added)
• FilterModel.cs (modified) (7 diffs)

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