Changeset 6245 for branches/WebApplication/MVC2/HLWebOKBQueryPlugin/ViewModels/ComparisonsHelper.cs

Timestamp:

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

Author:

dhohl

Message:

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

File:

• branches/WebApplication/MVC2/HLWebOKBQueryPlugin/ViewModels/ComparisonsHelper.cs (modified) (3 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 
+            }
+
+           
+        }
     }
 }