Merge pull request opensrp#83 from SoftmedTanzania/fix/register-counter

Fix/register counter
Digital-Square-Tanzania · Jun 15, 2022 · 8ad55c7 · 8ad55c7
2 parents 588f2bb + 0d204db
commit 8ad55c7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=1.5.31.17-NACP-SNAPSHOT
+VERSION_NAME=1.5.31.18-NACP-SNAPSHOT
 VERSION_CODE=5
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Chw Core Library

diff --git a/...rp-chw-core/src/main/java/org/smartregister/chw/core/interactor/NavigationInteractor.java b/...rp-chw-core/src/main/java/org/smartregister/chw/core/interactor/NavigationInteractor.java
@@ -402,7 +402,7 @@ protected int getCount(String tableName) {
                                 "              inner join ec_family_member m on p.base_entity_id = m.base_entity_id COLLATE NOCASE " +
                                 "              inner join ec_family f on f.base_entity_id = m.relational_id COLLATE NOCASE " +
                                 "              where m.date_removed is null and " +
-                                "              p.test_results IS NULL and p.refer_to_chw = 'Yes' and p.how_to_notify_the_contact_client <> 'na' ";
+                                "              p.test_results IS NULL and p.refer_to_chw = 'Yes' COLLATE NOCASE and p.how_to_notify_the_contact_client <> 'na' ";
                 return NavigationDao.getQueryCount(sqlIndex);
 
             case org.smartregister.chw.hiv.util.Constants.Tables.HIV_INDEX_HF:
@@ -413,7 +413,7 @@ protected int getCount(String tableName) {
                                 "              inner join ec_family f on f.base_entity_id = m.relational_id COLLATE NOCASE " +
                                 "              where m.date_removed is null and " +
                                 "               p.ctc_number IS NULL AND " +
-                                "               (p.test_results IS NULL OR p.test_results <> 'Negative')  AND " +
+                                "               (p.test_results IS NULL OR p.test_results <> 'Negative' COLLATE NOCASE)  AND " +
                                 "               p.how_to_notify_the_contact_client <> 'na' ";
                 return NavigationDao.getQueryCount(sqlIndexHf);
             case org.smartregister.chw.pmtct.util.Constants.TABLES.PMTCT_REGISTRATION: