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

Timestamp:

05/21/11 16:13:05 (14 years ago)

Author:

dhohl

Message:

#1499 Filter controls save the correct Comparison. Filter Label is correct.

Location:

branches/WebApplication/MVC2/HLWebOKBQueryPlugin/ViewModels

Files:

• ComparisonsHelper.cs (modified) (3 diffs)
• FilterModel.cs (modified) (4 diffs)

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

@@ -22 +22 @@
         private static String STRING_COMPARISONS_NOT_LIKE = "not like";
 
+        private static String BOOL_COMPARISONS_EQUAL = "=";
+        private static String BOOL_COMPARISONS_NOT_EQUAL = "<>";
+
+        public static List<ComparisonItem> boolComparisons = new List<ComparisonItem>() 
+        { new ComparisonItem((int)OKBQueryService.EqualityComparison.Equal, BOOL_COMPARISONS_EQUAL),
+          new ComparisonItem((int)OKBQueryService.EqualityComparison.NotEqual, BOOL_COMPARISONS_NOT_EQUAL)
+        };
         public static List<ComparisonItem> ordinalComparisons = new List<ComparisonItem>() 
         { new ComparisonItem((int)OKBQueryService.OrdinalComparison.Less, ORDINAL_COMPARISONS_LESS),
@@ -40 +47 @@
 
 
-        public static String GetValueForStringComparision(OKBQueryService.StringComparison comparisionValue)
-        {
-            switch (comparisionValue)
-            {
-                case OKBQueryService.StringComparison.Equal:
-                    return STRING_COMPARISONS_EQUAL;
-                case OKBQueryService.StringComparison.Contains:
-                    return STRING_COMPARISONS_CONTAINS;
-                case OKBQueryService.StringComparison.Like:
-                    return STRING_COMPARISONS_LIKE;
-                case OKBQueryService.StringComparison.NotContains:
-                    return STRING_COMPARISONS_NOT_CONTAINS;
-                case OKBQueryService.StringComparison.NotEqual:
-                    return STRING_COMPARISONS_NOT_EQUAL;
-                case OKBQueryService.StringComparison.NotLike:
-                    return STRING_COMPARISONS_NOT_LIKE;
-                default:
-                    return STRING_COMPARISONS_EQUAL; //TODO 
-            }
-        }
+        //public static String GetValueForStringComparision(OKBQueryService.StringComparison comparisionValue)
+        //{
+        //    switch (comparisionValue)
+        //    {
+        //        case OKBQueryService.StringComparison.Equal:
+        //            return STRING_COMPARISONS_EQUAL;
+        //        case OKBQueryService.StringComparison.Contains:
+        //            return STRING_COMPARISONS_CONTAINS;
+        //        case OKBQueryService.StringComparison.Like:
+        //            return STRING_COMPARISONS_LIKE;
+        //        case OKBQueryService.StringComparison.NotContains:
+        //            return STRING_COMPARISONS_NOT_CONTAINS;
+        //        case OKBQueryService.StringComparison.NotEqual:
+        //            return STRING_COMPARISONS_NOT_EQUAL;
+        //        case OKBQueryService.StringComparison.NotLike:
+        //            return STRING_COMPARISONS_NOT_LIKE;
+        //        default:
+        //            return STRING_COMPARISONS_EQUAL; //TODO 
+        //    }
+        //}
+
+       
 
 
@@ -85 +94 @@
             }
         }
+
+        public static OKBQueryService.EqualityComparison GetEqualityComparisonForValue(string comparisonValue)
+        {
+             int v = Int32.Parse(comparisonValue);
+
+             switch (v)
+             {
+                 case (int)OKBQueryService.EqualityComparison.Equal:
+                     return OKBQueryService.EqualityComparison.Equal;
+                 case (int)OKBQueryService.EqualityComparison.NotEqual:
+                     return OKBQueryService.EqualityComparison.NotEqual;
+                 default:
+                     return OKBQueryService.EqualityComparison.Equal; //TODO 
+             }
+        }
+
+        public static OKBQueryService.OrdinalComparison GetOrdinalComparisonForValue(string comparisonValue)
+        {
+            int v = Int32.Parse(comparisonValue);
+
+         
+
+            switch (v)
+            {
+                case (int)OKBQueryService.OrdinalComparison.Equal:
+                    return OKBQueryService.OrdinalComparison.Equal;
+                case (int)OKBQueryService.OrdinalComparison.Greater:                    
+                    return OKBQueryService.OrdinalComparison.Greater;
+                case (int)OKBQueryService.OrdinalComparison.GreaterOrEqual:
+                    return OKBQueryService.OrdinalComparison.GreaterOrEqual;
+                case (int)OKBQueryService.OrdinalComparison.Less:
+                    return OKBQueryService.OrdinalComparison.Less;
+                case (int)OKBQueryService.OrdinalComparison.NotEqual:
+                    return OKBQueryService.OrdinalComparison.NotEqual;
+                case (int)OKBQueryService.OrdinalComparison.LessOrEqual:
+                    return OKBQueryService.OrdinalComparison.LessOrEqual;
+                default:                   
+                    return OKBQueryService.OrdinalComparison.Equal; //TODO 
+            }
+
+           
+        }
     }
 }

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

@@ -56 +56 @@
 
 
+        public static List<ComparisonItem> BoolComparisons
+        {
+            get { return ComparisonsHelper.boolComparisons; }
+        }
+
         public static List<ComparisonItem> OrdinalComparisons 
         {
@@ -67 +72 @@
         
 
-        //"<";
-        //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>
@@ -205 +196 @@
                         {
                             if ("StringComparisonFilter".Equals(f.GetType().Name))
-                            {
-
-                                ((StringComparisonFilter)f).Value = kvp.Value;
-
-                                if (kvp.Key.Equals(FilterModel.ValueTextbox))
-                                {
-                                    ((StringComparisonFilter)f).Value = kvp.Value; // +"111";
-
-                                    //((StringComparisonFilter)f).Value = ((StringComparisonFilter)f).Value;
-                                  //  ((StringComparisonFilter)f).Comparison = ((StringComparisonFilter)f).Comparison;
-
-
-                                }
-                                else if (kvp.Key.Equals(FilterModel.ComparisonDropDownList))
-                                {
-                                  //  ((StringComparisonFilter)f).Value = ((StringComparisonFilter)f).Value;
-                                    ((StringComparisonFilter)f).Comparison = ComparisonsHelper.GetStringComparisonForValue(kvp.Value);
-                                  
-                                }
-                                // To this for alle keys
-
-                            }
+                            { 
+                                if (kvp.Key.Equals(FilterModel.ValueTextbox))
+                                {
+                                    ((StringComparisonFilter)f).Value = kvp.Value;
+                                }
+                                else if (kvp.Key.Equals(FilterModel.ComparisonDropDownList))
+                                {                                  
+                                    ((StringComparisonFilter)f).Comparison = ComparisonsHelper.GetStringComparisonForValue(kvp.Value);                                  
+                                } 
+                            }
+                            else if ("NameStringComparisonFilter".Equals(f.GetType().Name))
+                            {
+                                if (kvp.Key.Equals(FilterModel.ValueTextbox))
+                                {
+                                    ((NameStringComparisonFilter)f).Value = kvp.Value;
+                                }
+                                else if (kvp.Key.Equals(FilterModel.ComparisonDropDownList))
+                                {
+                                    ((NameStringComparisonFilter)f).Comparison = ComparisonsHelper.GetStringComparisonForValue(kvp.Value);
+                                }
+                            }
+                            else if ("StringComparisonAvailableValuesFilter".Equals(f.GetType().Name))
+                            {
+                                if (kvp.Key.Equals(FilterModel.ValueTextbox))
+                                {
+                                    ((StringComparisonAvailableValuesFilter)f).Value = kvp.Value;
+                                }
+                                else if (kvp.Key.Equals(FilterModel.ComparisonDropDownList))
+                                {
+                                    ((StringComparisonAvailableValuesFilter)f).Comparison = ComparisonsHelper.GetStringComparisonForValue(kvp.Value);
+                                }
+                            }
+                            else if ("NameStringComparisonAvailableValuesFilter".Equals(f.GetType().Name))
+                            {
+                                if (kvp.Key.Equals(FilterModel.ValueTextbox))
+                                {
+                                    ((NameStringComparisonAvailableValuesFilter)f).Value = kvp.Value;
+                                }
+                                else if (kvp.Key.Equals(FilterModel.ComparisonDropDownList))
+                                {
+                                    ((NameStringComparisonAvailableValuesFilter)f).Comparison = ComparisonsHelper.GetStringComparisonForValue(kvp.Value);
+                                }
+                            }  
+                             else if ("NameEqualityComparisonByteArrayFilter".Equals(f.GetType().Name))
+                            {
+                               //TODO not supported
+                            }
+                              else if ("NameEqualityComparisonBoolFilter".Equals(f.GetType().Name))
+                            {
+                                if (kvp.Key.Equals(FilterModel.ValueDropDownList))
+                                {
+                                    ((NameEqualityComparisonBoolFilter)f).Value = Boolean.Parse( kvp.Value);                                  
+                                }
+                                else if (kvp.Key.Equals(FilterModel.ComparisonDropDownList))
+                                {
+                                    ((NameEqualityComparisonBoolFilter)f).Comparison = ComparisonsHelper.GetEqualityComparisonForValue(kvp.Value);
+                                }
+                            }
+                            else if ("NameOrdinalComparisonIntFilter".Equals(f.GetType().Name))
+                            {
+                                if (kvp.Key.Equals(FilterModel.ValueTextbox))
+                                {
+                                    try
+                                    {
+                                        ((NameOrdinalComparisonIntFilter)f).Value = Int32.Parse(kvp.Value);
+                                    }
+                                    catch (Exception)
+                                    {
+                                        //TOOD Fehler ausgeben
+                                    }
+                                }
+                                else if (kvp.Key.Equals(FilterModel.ComparisonDropDownList))
+                                {                                    
+                                    ((NameOrdinalComparisonIntFilter)f).Comparison = ComparisonsHelper.GetOrdinalComparisonForValue(kvp.Value);                                  
+                                }
+                            }
+                            else if ("NameOrdinalComparisonLongFilter".Equals(f.GetType().Name))
+                            {
+                                if (kvp.Key.Equals(FilterModel.ValueTextbox))
+                                {
+                                    try
+                                    {
+                                        ((NameOrdinalComparisonLongFilter)f).Value = Int64.Parse(kvp.Value);
+                                    }
+                                    catch (Exception)
+                                    {
+                                        //TOOD Fehler ausgeben
+                                    }
+                                }
+                                else if (kvp.Key.Equals(FilterModel.ComparisonDropDownList))
+                                {                                   
+                                    ((NameOrdinalComparisonLongFilter)f).Comparison = ComparisonsHelper.GetOrdinalComparisonForValue(kvp.Value);                                  
+                                }                            
+                            }
+
+                            else if ("NameOrdinalComparisonFloatFilter".Equals(f.GetType().Name))
+                            {
+                                if (kvp.Key.Equals(FilterModel.ValueTextbox))
+                                {
+                                    try
+                                    {
+                                        ((NameOrdinalComparisonFloatFilter)f).Value = float.Parse(kvp.Value);
+                                    }
+                                    catch (Exception)
+                                    {
+                                        //TOOD Fehler ausgeben
+                                    }
+                                }
+                                else if (kvp.Key.Equals(FilterModel.ComparisonDropDownList))
+                                {                                   
+                                    ((NameOrdinalComparisonFloatFilter)f).Comparison = ComparisonsHelper.GetOrdinalComparisonForValue(kvp.Value);
+                                }
+                            }
+                            else if ("NameOrdinalComparisonDoubleFilter".Equals(f.GetType().Name))
+                            {
+                                if (kvp.Key.Equals(FilterModel.ValueTextbox))
+                                {
+                                    try
+                                    {
+                                        ((NameOrdinalComparisonDoubleFilter)f).Value = Double.Parse(kvp.Value);
+                                    }
+                                    catch (Exception)
+                                    {
+                                        //TOOD Fehler ausgeben
+                                    }
+                                }
+                                else if (kvp.Key.Equals(FilterModel.ComparisonDropDownList))
+                                {                                    
+                                    ((NameOrdinalComparisonDoubleFilter)f).Comparison = ComparisonsHelper.GetOrdinalComparisonForValue(kvp.Value);
+                                }
+                            }
+                                
+
                             else
                             {
@@ -234 +336 @@
                             
                         }
-                        StringComparisonFilter scf = (StringComparisonFilter)f;
-                        //throw new Exception("Huhu ich bin doof");
+                       
                         
                     }