From 21af44e1f818d8bcc812d8717590727be8629883 Mon Sep 17 00:00:00 2001 From: hilpitome Date: Wed, 19 May 2021 11:14:07 +0300 Subject: [PATCH 1/3] added test in ListPresenterTest --- .../org/smartregister/presenter/ListPresenterTest.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/opensrp-app/src/test/java/org/smartregister/presenter/ListPresenterTest.java b/opensrp-app/src/test/java/org/smartregister/presenter/ListPresenterTest.java index 9e1685495..b069ec1db 100644 --- a/opensrp-app/src/test/java/org/smartregister/presenter/ListPresenterTest.java +++ b/opensrp-app/src/test/java/org/smartregister/presenter/ListPresenterTest.java @@ -54,6 +54,15 @@ public void testOnFetchRequestError() { Mockito.verify(view).setLoadingState(false); } + @Test + public void testOnFetchRequestErrorWithException() { + listPresenter.with(view); + Exception e = new Exception(); + listPresenter.onFetchRequestError(e); + Mockito.verify(view).setLoadingState(false); + Mockito.verify(view).onFetchError(e); + } + @Test public void testWithAttachesView() { listPresenter.with(view); From 4a0961d88864155cef3a199da950cec70336569b Mon Sep 17 00:00:00 2001 From: beatN97 Date: Mon, 28 Jun 2021 09:21:16 +0300 Subject: [PATCH 2/3] update version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d8f6877d9..63a29e838 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -VERSION_NAME=4.3.10-SNAPSHOT +VERSION_NAME=4.3.11-SNAPSHOT VERSION_CODE=1 GROUP=org.smartregister POM_SETTING_DESCRIPTION=OpenSRP Client Core Application From 93ccd21c82ace6147702ea007a1177bc5491f12f Mon Sep 17 00:00:00 2001 From: hilpitome Date: Mon, 4 Oct 2021 17:43:39 +0300 Subject: [PATCH 3/3] get count from cached tables --- .../java/org/smartregister/AllConstants.java | 4 ++ .../interactor/StatsFragmentInteractor.java | 43 ++++++++++++++++++- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/opensrp-app/src/main/java/org/smartregister/AllConstants.java b/opensrp-app/src/main/java/org/smartregister/AllConstants.java index e1a7a6f78..6270166c3 100644 --- a/opensrp-app/src/main/java/org/smartregister/AllConstants.java +++ b/opensrp-app/src/main/java/org/smartregister/AllConstants.java @@ -596,5 +596,9 @@ public interface SyncInfo { String INVALID_CLIENTS = "INValidClients"; String TASK_UNPROCESSED_EVENTS = "taskUnprocessedEvents"; String NULL_EVENT_SYNC_STATUS = "nullEventSyncStatus"; + String CACHED_VACCINES = "cachedVaccines"; + String CACHED_RECURRING_SERVICE_RECORDS = "cachedRecurringServiceRecords"; + String CACHED_HEIGHTS = "cachedHeights"; + String CACHED_WEIGHTS = "cachedWeights"; } } diff --git a/opensrp-app/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java b/opensrp-app/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java index 59ab35bd4..031143764 100644 --- a/opensrp-app/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java +++ b/opensrp-app/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java @@ -15,6 +15,10 @@ import static org.smartregister.AllConstants.DatabaseKeys.SYNC_STATUS; import static org.smartregister.AllConstants.DatabaseKeys.VALIDATION_STATUS; +import static org.smartregister.AllConstants.SyncInfo.CACHED_HEIGHTS; +import static org.smartregister.AllConstants.SyncInfo.CACHED_RECURRING_SERVICE_RECORDS; +import static org.smartregister.AllConstants.SyncInfo.CACHED_VACCINES; +import static org.smartregister.AllConstants.SyncInfo.CACHED_WEIGHTS; import static org.smartregister.AllConstants.SyncInfo.INVALID_CLIENTS; import static org.smartregister.AllConstants.SyncInfo.INVALID_EVENTS; import static org.smartregister.AllConstants.SyncInfo.NULL_EVENT_SYNC_STATUS; @@ -54,7 +58,10 @@ public void fetchECSyncInfo() { syncInfoMap.put(VALID_CLIENTS, 0); syncInfoMap.put(INVALID_CLIENTS, 0); syncInfoMap.put(TASK_UNPROCESSED_EVENTS, 0); - syncInfoMap.put(NULL_EVENT_SYNC_STATUS, 0); + syncInfoMap.put(CACHED_VACCINES, 0); + syncInfoMap.put(CACHED_RECURRING_SERVICE_RECORDS, 0); + syncInfoMap.put(CACHED_HEIGHTS, 0); + syncInfoMap.put(CACHED_WEIGHTS, 0); String eventSyncSql = "select count(*), syncStatus from event group by syncStatus"; String clientSyncSql = "select count(*), syncStatus from client group by syncStatus"; @@ -62,6 +69,11 @@ public void fetchECSyncInfo() { String validatedEventsSql = "select count(*), validationStatus from event group by validationStatus"; String validatedClientsSql = "select count(*), validationStatus from client group by validationStatus"; + String cachedVaccinesSql = "select count(*) vaccines WHERE sync_status != 'Synced'"; + String cachedRecurringServiceRecordsSql = "select count(*) from recurring_service_records where WHERE sync_status != 'Synced'"; + String cachedHeightsSql = "select count(*) from heights WHERE sync_status != 'Synced'"; + String cachedWeightsSql = "select count(*) from weights WHERE sync_status != 'Synced'"; + Cursor cursor = null; try { @@ -90,6 +102,34 @@ public void fetchECSyncInfo() { cursor.close(); + + cursor = database.rawQuery(cachedVaccinesSql, new String[]{}); + while (cursor.moveToNext()) { + + } + cursor.close(); + + + cursor = database.rawQuery(cachedRecurringServiceRecordsSql, new String[]{}); + while (cursor.moveToNext()) { + + } + cursor.close(); + + + cursor = database.rawQuery(cachedHeightsSql, new String[]{}); + while (cursor.moveToNext()) { + + } + cursor.close(); + + + cursor = database.rawQuery(cachedWeightsSql, new String[]{}); + while (cursor.moveToNext()) { + + } + cursor.close(); + appExecutors.mainThread().execute(new Runnable() { @Override public void run() { @@ -144,4 +184,5 @@ private void populateValidatedClientsInfo(Cursor cursor) { syncInfoMap.put(INVALID_CLIENTS, cursor.getInt(0)); } } + }