+ Updated the testing of workflow action filters to correctly compare…

… numerical values (Fixes #1205)
SparkDevNetwork · Aug 27, 2015 · 1f876ef · 1f876ef
1 parent 540f3cb
commit 1f876ef
Showing 1 changed file with 43 additions and 15 deletions.
diff --git a/Rock/Utility/ExtensionMethods/ReportingExtensions.cs b/Rock/Utility/ExtensionMethods/ReportingExtensions.cs
@@ -43,56 +43,84 @@ public static bool CompareTo( this string value, string compareValue, Comparison
                 return !value.Contains( compareValue );
             }
 
+            if ( compareType == ComparisonType.StartsWith )
+            {
+                return value.StartsWith( compareValue, StringComparison.OrdinalIgnoreCase );
+            }
+
             if ( compareType == ComparisonType.EndsWith )
             {
                 return value.EndsWith( compareValue, StringComparison.OrdinalIgnoreCase );
             }
 
-            if ( compareType == ComparisonType.EqualTo )
+            if ( compareType == ComparisonType.IsBlank )
             {
-                return value.Equals( compareValue, StringComparison.OrdinalIgnoreCase );
+                return string.IsNullOrWhiteSpace( value );
             }
 
-            if ( compareType == ComparisonType.GreaterThan )
+            if ( compareType == ComparisonType.IsNotBlank )
             {
-                return value.CompareTo( compareValue ) > 0;
+                return !string.IsNullOrWhiteSpace( value );
             }
 
-            if ( compareType == ComparisonType.GreaterThanOrEqualTo )
+            // Following compares could be numeric
+            decimal? decimalValue = value.AsDecimalOrNull();
+            decimal? decimalCompareValue = compareValue.AsDecimalOrNull();
+
+            if ( compareType == ComparisonType.EqualTo )
             {
-                return value.CompareTo( compareValue ) >= 0;
+                if ( decimalValue.HasValue && decimalCompareValue.HasValue )
+                {
+                    return decimalValue.Value == decimalCompareValue.Value;
+                }
+                return value.Equals( compareValue, StringComparison.OrdinalIgnoreCase );
             }
 
-            if ( compareType == ComparisonType.IsBlank )
+            if ( compareType == ComparisonType.GreaterThan )
             {
-                return string.IsNullOrWhiteSpace( value );
+                if ( decimalValue.HasValue && decimalCompareValue.HasValue )
+                {
+                    return decimalValue.Value > decimalCompareValue.Value;
+                }
+                return value.CompareTo( compareValue ) > 0;
             }
 
-            if ( compareType == ComparisonType.IsNotBlank )
+            if ( compareType == ComparisonType.GreaterThanOrEqualTo )
             {
-                return !string.IsNullOrWhiteSpace( value );
+                if ( decimalValue.HasValue && decimalCompareValue.HasValue )
+                {
+                    return decimalValue.Value >= decimalCompareValue.Value;
+                }
+                return value.CompareTo( compareValue ) >= 0;
             }
 
             if ( compareType == ComparisonType.LessThan )
             {
+                if ( decimalValue.HasValue && decimalCompareValue.HasValue )
+                {
+                    return decimalValue.Value < decimalCompareValue.Value;
+                }
                 return value.CompareTo( compareValue ) < 0;
             }
 
             if ( compareType == ComparisonType.LessThanOrEqualTo )
             {
+                if ( decimalValue.HasValue && decimalCompareValue.HasValue )
+                {
+                    return decimalValue.Value >= decimalCompareValue.Value;
+                }
                 return value.CompareTo( compareValue ) <= 0;
             }
 
             if ( compareType == ComparisonType.NotEqualTo )
             {
+                if ( decimalValue.HasValue && decimalCompareValue.HasValue )
+                {
+                    return decimalValue.Value != decimalCompareValue.Value;
+                }
                 return !value.Equals( compareValue, StringComparison.OrdinalIgnoreCase );
             }
 
-            if ( compareType == ComparisonType.StartsWith )
-            {
-                return value.StartsWith( compareValue, StringComparison.OrdinalIgnoreCase );
-            }
-
             return false;
         }
     }