From 33dcadfc7cdd16343e16285a74377431ab597dba Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 3 Dec 2018 23:32:15 +0000
Subject: [PATCH]

---
 server/AyaNova/biz/FilterSqlCriteriaBuilder.cs       | 12 ++++++------
 .../DataFilter/DataFilterFilteringLists.cs           |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs
index 89c1ca9b..3f10a8b2 100644
--- a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs
+++ b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs
@@ -120,7 +120,7 @@ namespace AyaNova.Biz
                     // case "Like":
                     //     //No change on like
                     //     break;
-                    case "NotEquals":
+                    case FilterComparisonOperator.NotEqual:
                         //This is the big one:
                         sb.Append("Is Null OR ");
                         sb.Append(sColumn);
@@ -186,7 +186,7 @@ namespace AyaNova.Biz
                                 sb.Append("%'");
                                 break;
 
-                            case "NotEquals":
+                            case FilterComparisonOperator.NotEqual:
                                 sb.Append("<>'");
                                 sb.Append(sValue);
                                 sb.Append("'");
@@ -252,7 +252,7 @@ namespace AyaNova.Biz
                                         sb.Append("0");
                                     break;
 
-                                case "NotEquals":
+                                case FilterComparisonOperator.NotEqual:
                                     sb.Append("<> ");
                                     if (sValue == "True")
                                         sb.Append("1");
@@ -711,12 +711,12 @@ namespace AyaNova.Biz
                                         sb.Append("'");
                                         break;
 
-                                    //case "NotEquals":
+                                    //case FilterComparisonOperator.NotEqual:
                                     //    sb.Append("<>'");
                                     //    sb.Append(sValue);
                                     //    sb.Append("'");
                                     //    break;
-                                    case "NotEquals":
+                                    case FilterComparisonOperator.NotEqual:
                                         sb.Append("<'");
                                         sb.Append(sLowEnd);
                                         sb.Append("') OR (");
@@ -804,7 +804,7 @@ namespace AyaNova.Biz
                                 //								sb.Append(sValue);
                                 //								sb.Append("%'");
                                 //								break;
-                                case "NotEquals":
+                                case FilterComparisonOperator.NotEqual:
                                     sb.Append("<>");
                                     sb.Append(sValue);
                                     break;
diff --git a/test/raven-integration/DataFilter/DataFilterFilteringLists.cs b/test/raven-integration/DataFilter/DataFilterFilteringLists.cs
index dee2414f..d5a7f35f 100644
--- a/test/raven-integration/DataFilter/DataFilterFilteringLists.cs
+++ b/test/raven-integration/DataFilter/DataFilterFilteringLists.cs
@@ -49,7 +49,8 @@ namespace raven_integration
         //TEXT
         //
 
-        //TODO: Specifically test a string with an apostrophe in it
+        //TODO: Specifically test a string with an apostrophe in it (for inclusive, finding ti)
+        //TODO: specifically test a string with an ampersand character in it for inclusive (finding it)
 
         ///////////////////////
         //INT