From af3bdf823ebb3f58ff4080ae862d315841d3706e Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Tue, 8 Nov 2022 17:55:38 +0500
Subject: [PATCH 01/13] Extend Sync stats view for v5

---
 gradle.properties                             |   2 +-
 opensrp-core/res/layout/fragment_stats.xml    | 517 ++++++++++++++++--
 opensrp-core/res/values/strings.xml           |  20 +
 .../java/org/smartregister/AllConstants.java  |  17 +
 .../org/smartregister/util/StatsUtils.java    | 210 +++++++
 .../view/contract/StatsFragmentContract.java  |   4 +-
 .../view/fragment/StatsFragment.java          |  89 ++-
 .../interactor/StatsFragmentInteractor.java   | 125 +----
 .../presenter/StatsFragmentPresenter.java     |   3 +-
 opensrp-core/src/test/assets/app.properties   |   1 +
 .../presenter/StatsFragmentPresenterTest.java |   2 +-
 .../smartregister/util/StatsUtilsTest.java    | 141 +++++
 .../org/smartregister/util/UtilsTest.java     |   1 +
 .../view/fragment/StatsFragmentTest.java      |  38 +-
 14 files changed, 974 insertions(+), 196 deletions(-)
 create mode 100644 opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java
 create mode 100644 opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java

diff --git a/gradle.properties b/gradle.properties
index 662d7758f..5cba84a33 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=5.0.8-SNAPSHOT
+VERSION_NAME=5.0.9-DEV-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Core Application
diff --git a/opensrp-core/res/layout/fragment_stats.xml b/opensrp-core/res/layout/fragment_stats.xml
index f268f118e..3572d6b7e 100644
--- a/opensrp-core/res/layout/fragment_stats.xml
+++ b/opensrp-core/res/layout/fragment_stats.xml
@@ -1,22 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fillViewport="true">
 
     <LinearLayout
         android:id="@+id/summary_forms_group"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:layout_marginTop="50dp"
+        android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
+        android:layout_marginTop="50dp"
         android:layout_marginEnd="20dp"
+        android:orientation="vertical"
         android:visibility="visible">
 
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="start"
+            android:paddingEnd="56dp"
+            android:text="@string/sync_statistics"
+            android:textColor="@color/text_black"
+            android:textSize="24sp"
+            android:textStyle="bold" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
             android:orientation="horizontal"
             android:weightSum="2">
 
@@ -25,17 +36,18 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="15sp"
-                android:textStyle="bold"
-                android:text="@string/synced_events"/>
+                android:text="@string/synced_events"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
             <TextView
                 android:id="@+id/synced_events"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="15sp"
-                android:text=""/>
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
         </LinearLayout>
 
@@ -46,21 +58,22 @@
             android:weightSum="2">
 
             <TextView
+                android:id="@+id/unsynced_events_label"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:id="@+id/unsynced_events_label"
                 android:layout_weight="1"
-                android:textSize="15sp"
-                android:textStyle="bold"
-                android:text="@string/unsynced_events"/>
+                android:text="@string/unsynced_events"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
             <TextView
                 android:id="@+id/unsynced_events"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="15sp"
-                android:text=""/>
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
         </LinearLayout>
 
@@ -71,47 +84,49 @@
             android:weightSum="2">
 
             <TextView
+                android:id="@+id/task_unprocessed_events_label"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:id="@+id/task_unprocessed_events_label"
-                android:textSize="15sp"
-                android:textStyle="bold"
-                android:text="@string/task_unprocessed_events"/>
+                android:text="@string/task_unprocessed_events"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
             <TextView
                 android:id="@+id/task_unprocessed_events"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="15sp"
-                android:text=""/>
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="30dp"
+            android:layout_marginTop="8dp"
             android:orientation="horizontal"
             android:weightSum="2">
 
             <TextView
+                android:id="@+id/synced_clients_label"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:id="@+id/synced_clients_label"
-                android:textSize="15sp"
-                android:textStyle="bold"
-                android:text="@string/synced_clients"/>
+                android:text="@string/synced_clients"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
             <TextView
                 android:id="@+id/synced_clients"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="15sp"
-                android:text=""/>
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
         </LinearLayout>
 
@@ -122,47 +137,49 @@
             android:weightSum="2">
 
             <TextView
+                android:id="@+id/unsynced_clients_label"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="15sp"
-                android:id="@+id/unsynced_clients_label"
-                android:textStyle="bold"
-                android:text="@string/unsynced_clients"/>
+                android:text="@string/unsynced_clients"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
             <TextView
                 android:id="@+id/unsynced_clients"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="15sp"
-                android:text=""/>
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
             android:orientation="horizontal"
-            android:layout_marginTop="30dp"
             android:weightSum="2">
 
             <TextView
+                android:id="@+id/validated_events_label"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:id="@+id/validated_events_label"
-                android:textSize="15sp"
-                android:textStyle="bold"
-                android:text="@string/validated_events"/>
+                android:text="@string/validated_events"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
             <TextView
                 android:id="@+id/validated_events"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="15sp"
-                android:text=""/>
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
         </LinearLayout>
 
@@ -173,34 +190,428 @@
             android:weightSum="2">
 
             <TextView
+                android:id="@+id/validated_clients_label"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="15sp"
-                android:id="@+id/validated_clients_label"
-                android:textStyle="bold"
-                android:text="@string/validated_clients"/>
+                android:text="@string/validated_clients"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
             <TextView
                 android:id="@+id/validated_clients"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:textSize="15sp"
-                android:text=""/>
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/synced_vaccine_events"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/synced_vaccine_events"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/unsynced_weight_events"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/synced_weight_events"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/height_stats"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/unsynced_height_events"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/synced_height_events"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:text="@string/user_info"
+            android:textColor="@color/text_black"
+            android:textSize="24sp"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:id="@+id/user_name"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/user"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/user_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:id="@+id/team_name"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/team"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/team_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:id="@+id/locality"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/locality"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/locality_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:text="@string/app_info"
+            android:textColor="@color/text_black"
+            android:textSize="24sp"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="16dp"
+            android:weightSum="2">
+
+            <TextView
+                android:id="@+id/app_version"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/app_version_name"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/app_version_name_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:id="@+id/app_version_code"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/app_version_code"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/app_version_code_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:id="@+id/db_version"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="@string/database_version"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/db_version_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
 
         </LinearLayout>
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/build_date"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/build_date_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:text="@string/device_info"
+            android:textColor="@color/text_black"
+            android:textSize="24sp"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:id="@+id/manufacturer_name"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/manufacturer"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/manufacturer_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:id="@+id/device_name"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/device"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/device_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/os_version"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/os_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/date"
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/date_value"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text=""
+                android:textColor="@color/text_black"
+                android:textSize="18sp" />
+
+        </LinearLayout>
+
+
         <Button
             android:id="@+id/refresh_button"
             android:layout_width="300dp"
             android:layout_height="wrap_content"
-            android:background="@color/white"
-            android:gravity="center_horizontal|center_vertical"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="30dp"
             android:layout_marginStart="20dp"
+            android:layout_marginTop="30dp"
             android:layout_marginEnd="20dp"
+            android:background="@color/white"
+            android:gravity="center_horizontal|center_vertical"
             android:text="@string/refresh"
             android:textAllCaps="false"
             android:textColor="@color/text_black"
@@ -208,4 +619,4 @@
 
     </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/opensrp-core/res/values/strings.xml b/opensrp-core/res/values/strings.xml
index 8b587d131..68376462e 100644
--- a/opensrp-core/res/values/strings.xml
+++ b/opensrp-core/res/values/strings.xml
@@ -457,4 +457,24 @@
     <string name="return_to_register">Return</string>
     <string name="summary_forms">Other Forms</string>
     <string name="permission_write_external_storage_rationale">Write access to the device internal storage is required for database download.</string>
+
+    <string name="app_version_name">App Version Name:</string>
+    <string name="app_version_code">App Version Code:</string>
+    <string name="database_version">Database Version:</string>
+    <string name="team">Team:</string>
+    <string name="locality">Locality:</string>
+    <string name="sync">Sync</string>
+    <string name="app_info">App Info</string>
+    <string name="device_info">Device Info</string>
+    <string name="manufacturer">Manufacturer:</string>
+    <string name="device">Device:</string>
+    <string name="os_version">OS Version:</string>
+    <string name="sync_statistics">Sync Statistics</string>
+    <string name="user_info">User Info</string>
+    <string name="build_date">Build Date:</string>
+    <string name="date">Date:</string>
+    <string name="user">User:</string>
+    <string name="synced_vaccine_events">Unynced vaccine events:</string>
+    <string name="unsynced_weight_events">Unsynced weight events:</string>
+    <string name="unsynced_height_events">Unsynced height events:</string>
 </resources>
diff --git a/opensrp-core/src/main/java/org/smartregister/AllConstants.java b/opensrp-core/src/main/java/org/smartregister/AllConstants.java
index d7ca3bc34..25b8949a2 100644
--- a/opensrp-core/src/main/java/org/smartregister/AllConstants.java
+++ b/opensrp-core/src/main/java/org/smartregister/AllConstants.java
@@ -473,6 +473,7 @@ public static class PROPERTY {
         public static final String ALLOW_OFFLINE_LOGIN_WITH_INVALID_TOKEN = "allow.offline.login.with.invalid.token";
         public static final String IGNORE_LOCATION_DELETION = "ignore.location.deletion";
         public static final String ENABLE_SEARCH_BUTTON ="enable.search.button";
+        public static final String MONITOR_HEIGHT = "monitor.height";
     }
 
     public interface FORCED_LOGOUT {
@@ -575,6 +576,7 @@ public interface ClientProcessing {
     public interface DatabaseKeys {
         String SYNC_STATUS = "syncStatus";
         String VALIDATION_STATUS = "validationStatus";
+        String DB_VERSION = "db_version";
     }
 
     public interface SyncInfo {
@@ -588,6 +590,21 @@ public interface SyncInfo {
         String INVALID_CLIENTS = "INValidClients";
         String TASK_UNPROCESSED_EVENTS = "taskUnprocessedEvents";
         String NULL_EVENT_SYNC_STATUS = "nullEventSyncStatus";
+        String USER_NAME = "user";
+        String USER_TEAM = "user_team";
+        String USER_LOCALITY = "user_locality";
+        String APP_VERSION_NAME = "app_ver_name";
+        String APP_VERSION_CODE = "app_ver_code";
+        String APP_BUILD_DATE = "app_build_date";
+        String UNSYNCED_VACCINE_EVENTS = "unsuncyed_vaccine_events";
+        String UNSYNCED_WEIGHT_EVENTS = "unsuncyed_weight_events";
+        String UNSYNCED_HEIGHT_EVENTS = "unsuncyed_height_events";
+    }
+
+    public interface DeviceInfo {
+        String MANUFACTURER = "manufacturer";
+        String MODEL = "model";
+        String OS_VERSION = "os_version";
     }
 
     public static class EventType {
diff --git a/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java b/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java
new file mode 100644
index 000000000..c82c5357a
--- /dev/null
+++ b/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java
@@ -0,0 +1,210 @@
+package org.smartregister.util;
+
+import static org.smartregister.AllConstants.DatabaseKeys.DB_VERSION;
+import static org.smartregister.AllConstants.DatabaseKeys.SYNC_STATUS;
+import static org.smartregister.AllConstants.DatabaseKeys.VALIDATION_STATUS;
+import static org.smartregister.AllConstants.DeviceInfo.MANUFACTURER;
+import static org.smartregister.AllConstants.DeviceInfo.MODEL;
+import static org.smartregister.AllConstants.DeviceInfo.OS_VERSION;
+import static org.smartregister.AllConstants.SyncInfo.APP_BUILD_DATE;
+import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_CODE;
+import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_NAME;
+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;
+import static org.smartregister.AllConstants.SyncInfo.SYNCED_CLIENTS;
+import static org.smartregister.AllConstants.SyncInfo.SYNCED_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.TASK_UNPROCESSED_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_CLIENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_HEIGHT_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_VACCINE_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_WEIGHT_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.USER_LOCALITY;
+import static org.smartregister.AllConstants.SyncInfo.USER_NAME;
+import static org.smartregister.AllConstants.SyncInfo.USER_TEAM;
+import static org.smartregister.AllConstants.SyncInfo.VALID_CLIENTS;
+import static org.smartregister.AllConstants.SyncInfo.VALID_EVENTS;
+
+import android.content.Context;
+import android.os.Build;
+
+import net.sqlcipher.Cursor;
+import net.sqlcipher.database.SQLiteDatabase;
+
+import org.smartregister.AllConstants;
+import org.smartregister.CoreLibrary;
+import org.smartregister.repository.AllSharedPreferences;
+import org.smartregister.repository.BaseRepository;
+import org.smartregister.view.activity.DrishtiApplication;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+import timber.log.Timber;
+
+public class StatsUtils {
+
+    private final Map<String, String> syncInfoMap = new HashMap<>();
+    private final SQLiteDatabase database;
+
+    public StatsUtils() {
+        database = DrishtiApplication.getInstance().getRepository().getReadableDatabase();
+    }
+
+    public Map<String, String> fetchStatsInfo() {
+        syncInfoMap.put(SYNCED_EVENTS, "0");
+        syncInfoMap.put(SYNCED_CLIENTS, "0");
+        syncInfoMap.put(UNSYNCED_EVENTS, "0");
+        syncInfoMap.put(UNSYNCED_CLIENTS, "0");
+        syncInfoMap.put(VALID_EVENTS, "0");
+        syncInfoMap.put(INVALID_EVENTS, "0");
+        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(UNSYNCED_VACCINE_EVENTS, "0");
+        syncInfoMap.put(UNSYNCED_WEIGHT_EVENTS, "0");
+        syncInfoMap.put(UNSYNCED_HEIGHT_EVENTS, "0");
+
+        String eventSyncSql = "select count(*), syncStatus from event group by syncStatus";
+        String clientSyncSql = "select count(*), syncStatus from client group by syncStatus";
+
+        String validatedEventsSql = "select count(*), validationStatus from event group by validationStatus";
+        String validatedClientsSql = "select count(*), validationStatus from client group by validationStatus";
+
+        String unsyncedVaccineEventsSQL = "SELECT COUNT(*) FROM vaccines WHERE sync_status = 'Unsynced'";
+        String unsyncedWeightEventsSQL = "SELECT COUNT(*) FROM weights WHERE sync_status = 'Unsynced'";
+        String unsyncedHeightEventsSQL = "SELECT COUNT(*) FROM heights WHERE sync_status = 'Unsynced'";
+
+        Cursor cursor;
+
+        cursor = database.rawQuery(eventSyncSql, new String[]{});
+        while (cursor.moveToNext()) {
+            populateEventSyncInfo(cursor);
+        }
+        cursor.close();
+
+        cursor = database.rawQuery(clientSyncSql, new String[]{});
+        while (cursor.moveToNext()) {
+            populateClientSyncInfo(cursor);
+        }
+        cursor.close();
+
+        cursor = database.rawQuery(validatedEventsSql, new String[]{});
+        while (cursor.moveToNext()) {
+            populateValidatedEventsInfo(cursor);
+        }
+        cursor.close();
+
+        cursor = database.rawQuery(validatedClientsSql, new String[]{});
+        while (cursor.moveToNext()) {
+            populateValidatedClientsInfo(cursor);
+        }
+
+        cursor = database.rawQuery(unsyncedVaccineEventsSQL, new String[]{});
+        while (cursor.moveToNext()) {
+            syncInfoMap.put(UNSYNCED_VACCINE_EVENTS, String.valueOf(cursor.getInt(0)));
+        }
+
+        cursor = database.rawQuery(unsyncedWeightEventsSQL, new String[]{});
+        while (cursor.moveToNext()) {
+            syncInfoMap.put(UNSYNCED_WEIGHT_EVENTS, String.valueOf(cursor.getInt(0)));
+        }
+        if (CoreLibrary.getInstance().context().getAppProperties().isTrue(AllConstants.PROPERTY.MONITOR_HEIGHT)) {
+            cursor = database.rawQuery(unsyncedHeightEventsSQL, new String[]{});
+            while (cursor.moveToNext()) {
+                syncInfoMap.put(UNSYNCED_HEIGHT_EVENTS, String.valueOf(cursor.getInt(0)));
+            }
+        }
+
+        cursor.close();
+
+        populateUserInfo();
+        populateBuildInfo();
+        populateDeviceInfo();
+        return syncInfoMap;
+    }
+
+    private void populateEventSyncInfo(Cursor cursor) {
+        String syncStatus = cursor.getString(cursor.getColumnIndex(SYNC_STATUS));
+        if (BaseRepository.TYPE_Synced.equals(syncStatus)) {
+            syncInfoMap.put(SYNCED_EVENTS, String.valueOf(cursor.getInt(0)));
+        } else if (BaseRepository.TYPE_Unsynced.equals(syncStatus)) {
+            syncInfoMap.put(UNSYNCED_EVENTS, String.valueOf(cursor.getInt(0)));
+        } else if (BaseRepository.TYPE_Task_Unprocessed.equals(syncStatus)) {
+            syncInfoMap.put(TASK_UNPROCESSED_EVENTS, String.valueOf(cursor.getInt(0)));
+        } else if (syncStatus == null) {
+            syncInfoMap.put(NULL_EVENT_SYNC_STATUS, String.valueOf(cursor.getInt(0)));
+        }
+    }
+
+    private void populateClientSyncInfo(Cursor cursor) {
+        String syncStatus = cursor.getString(cursor.getColumnIndex(SYNC_STATUS));
+        if (BaseRepository.TYPE_Synced.equals(syncStatus)) {
+            syncInfoMap.put(SYNCED_CLIENTS, String.valueOf(cursor.getInt(0)));
+        } else if (BaseRepository.TYPE_Unsynced.equals(syncStatus)) {
+            syncInfoMap.put(UNSYNCED_CLIENTS, String.valueOf(cursor.getInt(0)));
+        }
+    }
+
+    private void populateValidatedEventsInfo(Cursor cursor) {
+        String syncStatus = cursor.getString(cursor.getColumnIndex(VALIDATION_STATUS));
+        if (BaseRepository.TYPE_Valid.equals(syncStatus)) {
+            syncInfoMap.put(VALID_EVENTS, String.valueOf(cursor.getInt(0)));
+        } else if (BaseRepository.TYPE_InValid.equals(syncStatus)) {
+            syncInfoMap.put(INVALID_EVENTS, String.valueOf(cursor.getInt(0)));
+        }
+    }
+
+    private void populateValidatedClientsInfo(Cursor cursor) {
+        String validationStatus = cursor.getString(cursor.getColumnIndex(VALIDATION_STATUS));
+        if (BaseRepository.TYPE_Valid.equals(validationStatus)) {
+            syncInfoMap.put(VALID_CLIENTS, String.valueOf(cursor.getInt(0)));
+        } else if (BaseRepository.TYPE_InValid.equals(validationStatus)) {
+            syncInfoMap.put(INVALID_CLIENTS, String.valueOf(cursor.getInt(0)));
+        }
+    }
+
+    public void populateUserInfo() {
+        AllSharedPreferences sharedPreferences = CoreLibrary.getInstance().context().userService().getAllSharedPreferences();
+        syncInfoMap.put(USER_NAME, sharedPreferences.fetchRegisteredANM());
+        syncInfoMap.put(USER_TEAM, sharedPreferences.fetchDefaultTeam(sharedPreferences.fetchRegisteredANM()));
+        syncInfoMap.put(USER_LOCALITY, sharedPreferences.fetchCurrentLocality());
+    }
+
+
+    private void populateBuildInfo() {
+        syncInfoMap.put(APP_VERSION_NAME, getBuildConfigValue("VERSION_NAME"));
+        syncInfoMap.put(APP_VERSION_CODE, getBuildConfigValue("VERSION_CODE"));
+        syncInfoMap.put(DB_VERSION, getBuildConfigValue("DATABASE_VERSION"));
+    }
+
+    private void populateDeviceInfo() {
+        try {
+            syncInfoMap.put(MANUFACTURER, Build.MANUFACTURER);
+            syncInfoMap.put(MODEL, Build.MODEL);
+            syncInfoMap.put(APP_BUILD_DATE, Utils.getBuildDate(true));
+
+            String osName = Build.VERSION_CODES.class.getFields()[android.os.Build.VERSION.SDK_INT].getName();
+            syncInfoMap.put(OS_VERSION, osName);
+        } catch (Exception e) {
+            Timber.e(e);
+        }
+
+    }
+
+    public String getBuildConfigValue(String fieldName) {
+        try {
+            Context context = CoreLibrary.getInstance().context().applicationContext();
+            Class<?> clazz = Class.forName(context.getPackageName() + ".BuildConfig");
+            Field field = clazz.getField(fieldName);
+            return String.valueOf(field.get(null));
+        } catch (Exception e) {
+            Timber.e(e);
+            return "0";
+        }
+    }
+
+}
diff --git a/opensrp-core/src/main/java/org/smartregister/view/contract/StatsFragmentContract.java b/opensrp-core/src/main/java/org/smartregister/view/contract/StatsFragmentContract.java
index 8c51df68c..4353c7d4a 100644
--- a/opensrp-core/src/main/java/org/smartregister/view/contract/StatsFragmentContract.java
+++ b/opensrp-core/src/main/java/org/smartregister/view/contract/StatsFragmentContract.java
@@ -7,7 +7,7 @@
 public interface StatsFragmentContract {
     interface Presenter {
 
-        void onECSyncInfoFetched(Map<String, Integer> syncInfoMap);
+        void onECSyncInfoFetched(Map<String, String> syncInfoMap);
 
         void fetchSyncInfo();
 
@@ -16,7 +16,7 @@ interface Presenter {
     interface View {
         Context getContext();
 
-        void refreshECSyncInfo(Map<String, Integer> syncInfoMap);
+        void refreshECSyncInfo(Map<String, String> syncInfoMap);
     }
 
     interface Interactor {
diff --git a/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java b/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java
index 04d46464c..f3e3dae61 100644
--- a/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java
+++ b/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java
@@ -1,5 +1,26 @@
 package org.smartregister.view.fragment;
 
+import static org.smartregister.AllConstants.DatabaseKeys.DB_VERSION;
+import static org.smartregister.AllConstants.DeviceInfo.MANUFACTURER;
+import static org.smartregister.AllConstants.DeviceInfo.MODEL;
+import static org.smartregister.AllConstants.DeviceInfo.OS_VERSION;
+import static org.smartregister.AllConstants.SyncInfo.APP_BUILD_DATE;
+import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_CODE;
+import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_NAME;
+import static org.smartregister.AllConstants.SyncInfo.SYNCED_CLIENTS;
+import static org.smartregister.AllConstants.SyncInfo.SYNCED_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.TASK_UNPROCESSED_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_CLIENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_HEIGHT_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_VACCINE_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_WEIGHT_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.USER_LOCALITY;
+import static org.smartregister.AllConstants.SyncInfo.USER_NAME;
+import static org.smartregister.AllConstants.SyncInfo.USER_TEAM;
+import static org.smartregister.AllConstants.SyncInfo.VALID_CLIENTS;
+import static org.smartregister.AllConstants.SyncInfo.VALID_EVENTS;
+
 import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -12,20 +33,16 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
+import org.smartregister.AllConstants;
+import org.smartregister.CoreLibrary;
 import org.smartregister.R;
 import org.smartregister.view.contract.StatsFragmentContract;
 import org.smartregister.view.presenter.StatsFragmentPresenter;
 
+import java.text.DateFormat;
+import java.util.Date;
 import java.util.Map;
 
-import static org.smartregister.AllConstants.SyncInfo.SYNCED_CLIENTS;
-import static org.smartregister.AllConstants.SyncInfo.SYNCED_EVENTS;
-import static org.smartregister.AllConstants.SyncInfo.TASK_UNPROCESSED_EVENTS;
-import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_CLIENTS;
-import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_EVENTS;
-import static org.smartregister.AllConstants.SyncInfo.VALID_CLIENTS;
-import static org.smartregister.AllConstants.SyncInfo.VALID_EVENTS;
-
 public class StatsFragment extends Fragment implements StatsFragmentContract.View {
 
     private StatsFragmentPresenter presenter;
@@ -37,6 +54,20 @@ public class StatsFragment extends Fragment implements StatsFragmentContract.Vie
     private TextView tvValidatedEvents;
     private TextView tvValidatedClients;
     private TextView tvTaskUnprocessedEvents;
+    private TextView tvUserName;
+    private TextView tvAppVersionName;
+    private TextView tvAppVersionCode;
+    private TextView tvDBVersion;
+    private TextView tvTeam;
+    private TextView tvLocality;
+    private TextView tvManufacturer;
+    private TextView tvDevice;
+    private TextView tvOS;
+    private TextView tvBuildDate;
+    private TextView tvCurrentDate;
+    private TextView tvUnsyncedVaccineEvents;
+    private TextView tvUnsyncedWeightEvents;
+    private TextView tvUnsyncedHeightEvents;
 
     public static StatsFragment newInstance(Bundle bundle) {
         StatsFragment fragment = new StatsFragment();
@@ -70,6 +101,20 @@ private void initializeViews(View view) {
         tvValidatedEvents = view.findViewById(R.id.validated_events);
         tvValidatedClients = view.findViewById(R.id.validated_clients);
         tvTaskUnprocessedEvents = view.findViewById(R.id.task_unprocessed_events);
+        tvUserName = view.findViewById(R.id.user_value);
+        tvAppVersionName = view.findViewById(R.id.app_version_name_value);
+        tvAppVersionCode = view.findViewById(R.id.app_version_code_value);
+        tvDBVersion = view.findViewById(R.id.db_version_value);
+        tvTeam = view.findViewById(R.id.team_value);
+        tvLocality = view.findViewById(R.id.locality_value);
+        tvManufacturer = view.findViewById(R.id.manufacturer_value);
+        tvDevice = view.findViewById(R.id.device_value);
+        tvOS = view.findViewById(R.id.os_value);
+        tvBuildDate = view.findViewById(R.id.build_date_value);
+        tvCurrentDate = view.findViewById(R.id.date_value);
+        tvUnsyncedVaccineEvents = view.findViewById(R.id.synced_vaccine_events);
+        tvUnsyncedHeightEvents = view.findViewById(R.id.synced_height_events);
+        tvUnsyncedWeightEvents = view.findViewById(R.id.synced_weight_events);
 
         Button btnRefreshStats = view.findViewById(R.id.refresh_button);
         btnRefreshStats.setOnClickListener(v -> presenter.fetchSyncInfo());
@@ -79,7 +124,7 @@ private void initializeViews(View view) {
 
     @SuppressLint("SetTextI18n")
     @Override
-    public void refreshECSyncInfo(Map<String, Integer> syncInfoMap) {
+    public void refreshECSyncInfo(Map<String, String> syncInfoMap) {
 
         tvSyncedEvents.setText(syncInfoMap.get(SYNCED_EVENTS) + "");
         tvUnSyncedEvents.setText(syncInfoMap.get(UNSYNCED_EVENTS) + "");
@@ -88,8 +133,32 @@ public void refreshECSyncInfo(Map<String, Integer> syncInfoMap) {
         tvSyncedClient.setText(syncInfoMap.get(SYNCED_CLIENTS) + "");
         tvUnSyncedClients.setText(syncInfoMap.get(UNSYNCED_CLIENTS) + "");
 
-        tvValidatedEvents.setText(syncInfoMap.get(VALID_EVENTS) + "");
+        tvValidatedEvents.setText(syncInfoMap.get(VALID_EVENTS));
         tvValidatedClients.setText(syncInfoMap.get(VALID_CLIENTS) + "");
+
+        tvUnsyncedVaccineEvents.setText(syncInfoMap.get(UNSYNCED_VACCINE_EVENTS) + "");
+        tvUnsyncedWeightEvents.setText(syncInfoMap.get(UNSYNCED_WEIGHT_EVENTS) + "");
+        // Only show height stats if they are record height is enabled
+        if (CoreLibrary.getInstance().context().getAppProperties().isTrue(AllConstants.PROPERTY.MONITOR_HEIGHT))
+            tvUnsyncedHeightEvents.setText(syncInfoMap.get(UNSYNCED_HEIGHT_EVENTS) + "");
+        else {
+            if (getView() != null) {
+                getView().findViewById(R.id.height_stats).setVisibility(View.GONE);
+            }
+        }
+        tvUserName.setText(syncInfoMap.get(USER_NAME));
+        tvAppVersionName.setText(syncInfoMap.get(APP_VERSION_NAME));
+        tvAppVersionCode.setText(syncInfoMap.get(APP_VERSION_CODE));
+        tvDBVersion.setText(syncInfoMap.get(DB_VERSION));
+        tvBuildDate.setText(syncInfoMap.get(APP_BUILD_DATE));
+
+        tvTeam.setText(syncInfoMap.get(USER_TEAM));
+        tvLocality.setText(syncInfoMap.get(USER_LOCALITY));
+
+        tvManufacturer.setText(syncInfoMap.get(MANUFACTURER));
+        tvDevice.setText(syncInfoMap.get(MODEL));
+        tvOS.setText(syncInfoMap.get(OS_VERSION));
+        tvCurrentDate.setText(DateFormat.getDateTimeInstance().format(new Date()));
     }
 
 }
diff --git a/opensrp-core/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java b/opensrp-core/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java
index 59ab35bd4..5a0e16e62 100644
--- a/opensrp-core/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java
+++ b/opensrp-core/src/main/java/org/smartregister/view/interactor/StatsFragmentInteractor.java
@@ -1,147 +1,32 @@
 package org.smartregister.view.interactor;
 
-import net.sqlcipher.Cursor;
-import net.sqlcipher.database.SQLiteDatabase;
-
-import org.smartregister.repository.BaseRepository;
 import org.smartregister.util.AppExecutors;
-import org.smartregister.view.activity.DrishtiApplication;
+import org.smartregister.util.StatsUtils;
 import org.smartregister.view.contract.StatsFragmentContract;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import timber.log.Timber;
 
-import static org.smartregister.AllConstants.DatabaseKeys.SYNC_STATUS;
-import static org.smartregister.AllConstants.DatabaseKeys.VALIDATION_STATUS;
-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;
-import static org.smartregister.AllConstants.SyncInfo.SYNCED_CLIENTS;
-import static org.smartregister.AllConstants.SyncInfo.SYNCED_EVENTS;
-import static org.smartregister.AllConstants.SyncInfo.TASK_UNPROCESSED_EVENTS;
-import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_CLIENTS;
-import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_EVENTS;
-import static org.smartregister.AllConstants.SyncInfo.VALID_CLIENTS;
-import static org.smartregister.AllConstants.SyncInfo.VALID_EVENTS;
-
 public class StatsFragmentInteractor implements StatsFragmentContract.Interactor {
 
-    private AppExecutors appExecutors;
-
-    private SQLiteDatabase database;
+    private final AppExecutors appExecutors;
 
-    private StatsFragmentContract.Presenter presenter;
-
-    private Map<String, Integer> syncInfoMap = new HashMap<>();
+    private final StatsFragmentContract.Presenter presenter;
 
     public StatsFragmentInteractor(StatsFragmentContract.Presenter presenter) {
         this.presenter = presenter;
         appExecutors = new AppExecutors();
-        database = DrishtiApplication.getInstance().getRepository().getReadableDatabase();
     }
 
     @Override
     public void fetchECSyncInfo() {
-        syncInfoMap = new HashMap<>();
-        syncInfoMap.put(SYNCED_EVENTS, 0);
-        syncInfoMap.put(SYNCED_CLIENTS, 0);
-        syncInfoMap.put(UNSYNCED_EVENTS, 0);
-        syncInfoMap.put(UNSYNCED_CLIENTS, 0);
-        syncInfoMap.put(VALID_EVENTS, 0);
-        syncInfoMap.put(INVALID_EVENTS, 0);
-        syncInfoMap.put(VALID_CLIENTS, 0);
-        syncInfoMap.put(INVALID_CLIENTS, 0);
-        syncInfoMap.put(TASK_UNPROCESSED_EVENTS, 0);
-        syncInfoMap.put(NULL_EVENT_SYNC_STATUS, 0);
-
-        String eventSyncSql = "select count(*), syncStatus from event group by syncStatus";
-        String clientSyncSql = "select count(*), syncStatus from client group by syncStatus";
-
-        String validatedEventsSql = "select count(*), validationStatus from event group by validationStatus";
-        String validatedClientsSql = "select count(*), validationStatus from client group by validationStatus";
-
-        Cursor cursor = null;
-
         try {
-            cursor = database.rawQuery(eventSyncSql, new String[]{});
-            while (cursor.moveToNext()) {
-                populateEventSyncInfo(cursor);
-            }
-            cursor.close();
-
-            cursor = database.rawQuery(clientSyncSql, new String[]{});
-            while (cursor.moveToNext()) {
-                populateClientSyncInfo(cursor);
-            }
-            cursor.close();
-
-            cursor = database.rawQuery(validatedEventsSql, new String[]{});
-            while (cursor.moveToNext()) {
-                populateValidatedEventsInfo(cursor);
-            }
-            cursor.close();
-
-            cursor = database.rawQuery(validatedClientsSql, new String[]{});
-            while (cursor.moveToNext()) {
-                populateValidatedClientsInfo(cursor);
-            }
-
-            cursor.close();
-
-            appExecutors.mainThread().execute(new Runnable() {
-                @Override
-                public void run() {
-                    presenter.onECSyncInfoFetched(syncInfoMap);
-                }
-            });
+            Map<String, String> syncInfoMap = new StatsUtils().fetchStatsInfo();
+            appExecutors.mainThread().execute(() -> presenter.onECSyncInfoFetched(syncInfoMap));
         } catch (Exception e) {
             Timber.e(e);
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
-        }
-    }
-
-    private void populateEventSyncInfo(Cursor cursor) {
-        String syncStatus = cursor.getString(cursor.getColumnIndex(SYNC_STATUS));
-        if (BaseRepository.TYPE_Synced.equals(syncStatus)) {
-            syncInfoMap.put(SYNCED_EVENTS, cursor.getInt(0));
-        } else if (BaseRepository.TYPE_Unsynced.equals(syncStatus)) {
-            syncInfoMap.put(UNSYNCED_EVENTS, cursor.getInt(0));
-        } else if (BaseRepository.TYPE_Task_Unprocessed.equals(syncStatus)) {
-            syncInfoMap.put(TASK_UNPROCESSED_EVENTS, cursor.getInt(0));
-        } else if (syncStatus == null) {
-            syncInfoMap.put(NULL_EVENT_SYNC_STATUS, cursor.getInt(0));
-        }
-    }
-
-    private void populateClientSyncInfo(Cursor cursor) {
-        String syncStatus = cursor.getString(cursor.getColumnIndex(SYNC_STATUS));
-        if (BaseRepository.TYPE_Synced.equals(syncStatus)) {
-            syncInfoMap.put(SYNCED_CLIENTS, cursor.getInt(0));
-        } else if (BaseRepository.TYPE_Unsynced.equals(syncStatus)) {
-            syncInfoMap.put(UNSYNCED_CLIENTS, cursor.getInt(0));
-        }
-    }
-
-    private void populateValidatedEventsInfo(Cursor cursor) {
-        String syncStatus = cursor.getString(cursor.getColumnIndex(VALIDATION_STATUS));
-        if (BaseRepository.TYPE_Valid.equals(syncStatus)) {
-            syncInfoMap.put(VALID_EVENTS, cursor.getInt(0));
-        } else if (BaseRepository.TYPE_InValid.equals(syncStatus)) {
-            syncInfoMap.put(INVALID_EVENTS, cursor.getInt(0));
         }
     }
 
-    private void populateValidatedClientsInfo(Cursor cursor) {
-        String validationStatus = cursor.getString(cursor.getColumnIndex(VALIDATION_STATUS));
-        if (BaseRepository.TYPE_Valid.equals(validationStatus)) {
-            syncInfoMap.put(VALID_CLIENTS, cursor.getInt(0));
-        } else if (BaseRepository.TYPE_InValid.equals(validationStatus)) {
-            syncInfoMap.put(INVALID_CLIENTS, cursor.getInt(0));
-        }
-    }
 }
diff --git a/opensrp-core/src/main/java/org/smartregister/view/presenter/StatsFragmentPresenter.java b/opensrp-core/src/main/java/org/smartregister/view/presenter/StatsFragmentPresenter.java
index 018e94134..6003c5a23 100644
--- a/opensrp-core/src/main/java/org/smartregister/view/presenter/StatsFragmentPresenter.java
+++ b/opensrp-core/src/main/java/org/smartregister/view/presenter/StatsFragmentPresenter.java
@@ -1,5 +1,6 @@
 package org.smartregister.view.presenter;
 
+
 import org.smartregister.view.contract.StatsFragmentContract;
 import org.smartregister.view.interactor.StatsFragmentInteractor;
 
@@ -16,7 +17,7 @@ public StatsFragmentPresenter(StatsFragmentContract.View view) {
     }
 
     @Override
-    public void onECSyncInfoFetched(Map<String, Integer> syncInfoMap) {
+    public void onECSyncInfoFetched(Map<String, String> syncInfoMap) {
         view.refreshECSyncInfo(syncInfoMap);
     }
 
diff --git a/opensrp-core/src/test/assets/app.properties b/opensrp-core/src/test/assets/app.properties
index 809917585..8b3bee365 100644
--- a/opensrp-core/src/test/assets/app.properties
+++ b/opensrp-core/src/test/assets/app.properties
@@ -4,3 +4,4 @@ SHOULD_VERIFY_CERTIFICATE=false
 SYNC_DOWNLOAD_BATCH_SIZE=10
 system.toaster.centered=false
 allow.offline.login.with.invalid.token=false
+monitor.height=true
diff --git a/opensrp-core/src/test/java/org/smartregister/presenter/StatsFragmentPresenterTest.java b/opensrp-core/src/test/java/org/smartregister/presenter/StatsFragmentPresenterTest.java
index f1a09d3e1..58e44979c 100644
--- a/opensrp-core/src/test/java/org/smartregister/presenter/StatsFragmentPresenterTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/presenter/StatsFragmentPresenterTest.java
@@ -37,7 +37,7 @@ public void setUp() {
 
     @Test
     public void onECSyncInfoFetchedRefreshesECSyncInfo() {
-        Map<String, Integer> syncInfoMap = new HashMap<>();
+        Map<String, String> syncInfoMap = new HashMap<>();
         presenter.onECSyncInfoFetched(syncInfoMap);
         Mockito.verify(view).refreshECSyncInfo(ArgumentMatchers.eq(syncInfoMap));
     }
diff --git a/opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java b/opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java
new file mode 100644
index 000000000..b0294634f
--- /dev/null
+++ b/opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java
@@ -0,0 +1,141 @@
+package org.smartregister.util;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.smartregister.AllConstants.DatabaseKeys.DB_VERSION;
+import static org.smartregister.AllConstants.DatabaseKeys.VALIDATION_STATUS;
+import static org.smartregister.AllConstants.DeviceInfo.MANUFACTURER;
+import static org.smartregister.AllConstants.DeviceInfo.MODEL;
+import static org.smartregister.AllConstants.DeviceInfo.OS_VERSION;
+import static org.smartregister.AllConstants.SyncInfo.APP_BUILD_DATE;
+import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_CODE;
+import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_NAME;
+import static org.smartregister.AllConstants.SyncInfo.INVALID_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.USER_LOCALITY;
+import static org.smartregister.AllConstants.SyncInfo.USER_NAME;
+import static org.smartregister.AllConstants.SyncInfo.USER_TEAM;
+import static org.smartregister.AllConstants.SyncInfo.VALID_EVENTS;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import net.sqlcipher.Cursor;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.robolectric.util.ReflectionHelpers;
+import org.smartregister.BaseUnitTest;
+import org.smartregister.BuildConfig;
+import org.smartregister.Context;
+import org.smartregister.CoreLibrary;
+import org.smartregister.repository.AllSharedPreferences;
+import org.smartregister.repository.BaseRepository;
+import org.smartregister.service.UserService;
+
+import java.util.Map;
+
+public class StatsUtilsTest extends BaseUnitTest {
+
+    private StatsUtils statsUtils;
+
+    @Before
+    public void setUp() {
+        statsUtils = new StatsUtils();
+    }
+
+    @Test
+    public void testPopulateUserInfoPopulatesCorrectValues() {
+        CoreLibrary coreLibrary = Mockito.mock(CoreLibrary.class);
+        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", coreLibrary);
+
+        Context context = Mockito.mock(Context.class);
+        UserService userService = Mockito.mock(UserService.class);
+        AllSharedPreferences sharedPreferences = Mockito.mock(AllSharedPreferences.class);
+
+        Mockito.doReturn(context).when(coreLibrary).context();
+        Mockito.doReturn(userService).when(context).userService();
+        Mockito.doReturn(sharedPreferences).when(userService).getAllSharedPreferences();
+        Mockito.doReturn("user").when(sharedPreferences).fetchRegisteredANM();
+        Mockito.doReturn("team").when(sharedPreferences).fetchDefaultTeam(Mockito.anyString());
+        Mockito.doReturn("locality").when(sharedPreferences).fetchCurrentLocality();
+
+        ReflectionHelpers.callInstanceMethod(statsUtils, "populateUserInfo");
+
+        Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsUtils, "syncInfoMap");
+
+        Assert.assertEquals("user", syncInfoMap.get(USER_NAME));
+        Assert.assertEquals("team", syncInfoMap.get(USER_TEAM));
+        Assert.assertEquals("locality", syncInfoMap.get(USER_LOCALITY));
+    }
+
+    @Test
+    public void testPopulateBuildInfoPopulatesCorrectValues() {
+        CoreLibrary coreLibrary = Mockito.mock(CoreLibrary.class);
+        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", coreLibrary);
+
+        Context context = Mockito.mock(Context.class);
+        android.content.Context appContext = Mockito.spy(ApplicationProvider.getApplicationContext());
+
+        Mockito.doReturn(context).when(coreLibrary).context();
+        Mockito.doReturn(appContext).when(context).applicationContext();
+        Mockito.doReturn("org.smartregister").when(appContext).getPackageName();
+
+        ReflectionHelpers.callInstanceMethod(statsUtils, "populateBuildInfo");
+
+        Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsUtils, "syncInfoMap");
+
+        Assert.assertEquals(BuildConfig.VERSION_NAME, syncInfoMap.get(APP_VERSION_NAME));
+        Assert.assertEquals("1", syncInfoMap.get(APP_VERSION_CODE));
+        Assert.assertEquals("0", syncInfoMap.get(DB_VERSION));
+    }
+
+    @Test
+    public void testPopulateDeviceInfoPopulatesCorrectValues() {
+        ReflectionHelpers.callInstanceMethod(statsUtils, "populateDeviceInfo");
+
+        Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsUtils, "syncInfoMap");
+
+        Assert.assertEquals("robolectric", syncInfoMap.get(MANUFACTURER));
+        Assert.assertEquals("robolectric", syncInfoMap.get(MODEL));
+        Assert.assertEquals("28 Apr 2020", syncInfoMap.get(APP_BUILD_DATE));
+        Assert.assertEquals("Q", syncInfoMap.get(OS_VERSION));
+    }
+
+    @Test
+    public void testPopulateValidatedEventsInfoAddValidEventsCountWhenStatusIsValid() {
+        Cursor cursor = Mockito.mock(Cursor.class);
+
+        Mockito.doReturn(1).when(cursor).getColumnIndex(eq(VALIDATION_STATUS));
+        Mockito.doReturn(BaseRepository.TYPE_Valid).when(cursor).getString(eq(1));
+        Mockito.doReturn(10).when(cursor).getInt(eq(0));
+
+        ReflectionHelpers.callInstanceMethod(statsUtils, "populateValidatedEventsInfo",
+                ReflectionHelpers.ClassParameter.from(Cursor.class, cursor));
+
+        Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsUtils, "syncInfoMap");
+        Assert.assertEquals("10", syncInfoMap.get(VALID_EVENTS));
+
+    }
+
+    @Test
+    public void testPopulateValidatedEventsInfoAddInvalidEventsCountWhenStatusIsInvalid() {
+        Cursor cursor = Mockito.mock(Cursor.class);
+
+        Mockito.doReturn(1).when(cursor).getColumnIndex(eq(VALIDATION_STATUS));
+        Mockito.doReturn(BaseRepository.TYPE_InValid).when(cursor).getString(eq(1));
+        Mockito.doReturn(10).when(cursor).getInt(eq(0));
+
+        ReflectionHelpers.callInstanceMethod(statsUtils, "populateValidatedEventsInfo",
+                ReflectionHelpers.ClassParameter.from(Cursor.class, cursor));
+
+        Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsUtils, "syncInfoMap");
+        Assert.assertEquals("10", syncInfoMap.get(INVALID_EVENTS));
+
+    }
+
+    @After
+    public void destroy() {
+        ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", null);
+    }
+}
diff --git a/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java b/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java
index 1a2edab45..b0f7bd5f5 100644
--- a/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java
@@ -694,6 +694,7 @@ public void getPropertiesShouldLoadPropertiesInPropertiesFile() {
         assertEquals("false", appProperties.getProperty("SHOULD_VERIFY_CERTIFICATE"));
         assertEquals("false", appProperties.getProperty("system.toaster.centered"));
         assertEquals("10", appProperties.getProperty("SYNC_DOWNLOAD_BATCH_SIZE"));
+        assertEquals("true", appProperties.getProperty("monitor.height"));
     }
 
     @Test
diff --git a/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java b/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java
index ac7646e4b..edca6c064 100644
--- a/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java
@@ -6,6 +6,9 @@
 import static org.smartregister.AllConstants.SyncInfo.TASK_UNPROCESSED_EVENTS;
 import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_CLIENTS;
 import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_HEIGHT_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_VACCINE_EVENTS;
+import static org.smartregister.AllConstants.SyncInfo.UNSYNCED_WEIGHT_EVENTS;
 import static org.smartregister.AllConstants.SyncInfo.VALID_CLIENTS;
 import static org.smartregister.AllConstants.SyncInfo.VALID_EVENTS;
 
@@ -92,19 +95,23 @@ public void onCreateViewInitsViewsAndReturnsCorrectView() {
 
     @Test
     public void refreshECSyncInfoUpdatesViews() {
-        Map<String, Integer> syncInfoMap = new HashMap<>();
-        syncInfoMap.put(SYNCED_EVENTS, 2);
-        syncInfoMap.put(UNSYNCED_EVENTS, 3);
-        syncInfoMap.put(TASK_UNPROCESSED_EVENTS, 4);
-        syncInfoMap.put(SYNCED_CLIENTS, 5);
-        syncInfoMap.put(UNSYNCED_CLIENTS, 6);
-        syncInfoMap.put(VALID_EVENTS, 7);
-        syncInfoMap.put(VALID_CLIENTS, 8);
+        Map<String, String> syncInfoMap = new HashMap<>();
+        syncInfoMap.put(SYNCED_EVENTS, "2");
+        syncInfoMap.put(UNSYNCED_EVENTS, "3");
+        syncInfoMap.put(TASK_UNPROCESSED_EVENTS, "4");
+        syncInfoMap.put(SYNCED_CLIENTS, "5");
+        syncInfoMap.put(UNSYNCED_CLIENTS, "6");
+        syncInfoMap.put(VALID_EVENTS, "7");
+        syncInfoMap.put(VALID_CLIENTS, "8");
+        syncInfoMap.put(UNSYNCED_VACCINE_EVENTS, "1");
+        syncInfoMap.put(UNSYNCED_WEIGHT_EVENTS, "1");
+        syncInfoMap.put(UNSYNCED_HEIGHT_EVENTS, "1");
 
         View rootView = LayoutInflater.from(RuntimeEnvironment.application).inflate(R.layout.fragment_stats, null);
 
         TextView tvSyncedEvents = rootView.findViewById(R.id.synced_events);
         TextView tvUnSyncedEvents = rootView.findViewById(R.id.unsynced_events);
+        TextView tvUnsyncedHeightEvents = rootView.findViewById(R.id.synced_height_events);
 
         ReflectionHelpers.setField(statsFragment, "tvSyncedEvents", tvSyncedEvents);
         ReflectionHelpers.setField(statsFragment, "tvUnSyncedEvents", tvUnSyncedEvents);
@@ -113,10 +120,25 @@ public void refreshECSyncInfoUpdatesViews() {
         ReflectionHelpers.setField(statsFragment, "tvUnSyncedClients", rootView.findViewById(R.id.unsynced_clients));
         ReflectionHelpers.setField(statsFragment, "tvValidatedEvents", rootView.findViewById(R.id.validated_events));
         ReflectionHelpers.setField(statsFragment, "tvValidatedClients", rootView.findViewById(R.id.validated_clients));
+        ReflectionHelpers.setField(statsFragment, "tvUserName", rootView.findViewById(R.id.user_value));
+        ReflectionHelpers.setField(statsFragment, "tvAppVersionName", rootView.findViewById(R.id.app_version_name_value));
+        ReflectionHelpers.setField(statsFragment, "tvAppVersionCode", rootView.findViewById(R.id.app_version_code_value));
+        ReflectionHelpers.setField(statsFragment, "tvDBVersion", rootView.findViewById(R.id.db_version_value));
+        ReflectionHelpers.setField(statsFragment, "tvTeam", rootView.findViewById(R.id.team_value));
+        ReflectionHelpers.setField(statsFragment, "tvLocality", rootView.findViewById(R.id.locality_value));
+        ReflectionHelpers.setField(statsFragment, "tvManufacturer", rootView.findViewById(R.id.manufacturer_value));
+        ReflectionHelpers.setField(statsFragment, "tvDevice", rootView.findViewById(R.id.device_value));
+        ReflectionHelpers.setField(statsFragment, "tvOS", rootView.findViewById(R.id.os_value));
+        ReflectionHelpers.setField(statsFragment, "tvBuildDate", rootView.findViewById(R.id.build_date_value));
+        ReflectionHelpers.setField(statsFragment, "tvCurrentDate", rootView.findViewById(R.id.date_value));
+        ReflectionHelpers.setField(statsFragment, "tvUnsyncedVaccineEvents", rootView.findViewById(R.id.synced_vaccine_events));
+        ReflectionHelpers.setField(statsFragment, "tvUnsyncedWeightEvents", rootView.findViewById(R.id.synced_weight_events));
+        ReflectionHelpers.setField(statsFragment, "tvUnsyncedHeightEvents", tvUnsyncedHeightEvents);
 
         statsFragment.refreshECSyncInfo(syncInfoMap);
         Assert.assertEquals("2", tvSyncedEvents.getText());
         Assert.assertEquals("3", tvUnSyncedEvents.getText());
+        Assert.assertEquals("1", tvUnsyncedHeightEvents.getText());
     }
 
     @Test

From d362250f607b5b6bb5af2cbed4c4ae5394d2902e Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Wed, 23 Nov 2022 15:49:53 +0500
Subject: [PATCH 02/13] Fix failing test

---
 .../src/test/java/org/smartregister/util/UtilsTest.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java b/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java
index b0f7bd5f5..435c62ebf 100644
--- a/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java
@@ -689,7 +689,7 @@ public void dobStringToDateTimeShouldHandleInvalidDateTimeStrings() {
     public void getPropertiesShouldLoadPropertiesInPropertiesFile() {
         AppProperties appProperties = Utils.getProperties(RuntimeEnvironment.application);
 
-        assertEquals(6, appProperties.size());
+        assertEquals(7, appProperties.size());
         assertEquals("", appProperties.getProperty("DRISHTI_BASE_URL"));
         assertEquals("false", appProperties.getProperty("SHOULD_VERIFY_CERTIFICATE"));
         assertEquals("false", appProperties.getProperty("system.toaster.centered"));

From 9c39fb3436436e84bcaed506a40c0684fdd1316a Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Wed, 14 Dec 2022 16:05:59 +0500
Subject: [PATCH 03/13] Refactored getConfigValue logic

---
 .../org/smartregister/util/StatsUtils.java    | 36 ++++++++++---------
 .../java/org/smartregister/util/Utils.java    |  5 +++
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java b/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java
index c82c5357a..3695184cd 100644
--- a/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java
+++ b/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java
@@ -26,7 +26,7 @@
 import static org.smartregister.AllConstants.SyncInfo.VALID_CLIENTS;
 import static org.smartregister.AllConstants.SyncInfo.VALID_EVENTS;
 
-import android.content.Context;
+import android.content.pm.PackageManager;
 import android.os.Build;
 
 import net.sqlcipher.Cursor;
@@ -176,9 +176,24 @@ public void populateUserInfo() {
 
 
     private void populateBuildInfo() {
-        syncInfoMap.put(APP_VERSION_NAME, getBuildConfigValue("VERSION_NAME"));
-        syncInfoMap.put(APP_VERSION_CODE, getBuildConfigValue("VERSION_CODE"));
-        syncInfoMap.put(DB_VERSION, getBuildConfigValue("DATABASE_VERSION"));
+        try {
+            syncInfoMap.put(APP_VERSION_NAME, Utils.getVersion(CoreLibrary.getInstance().context().applicationContext()));
+        } catch (PackageManager.NameNotFoundException e) {
+            syncInfoMap.put(APP_VERSION_NAME, "0");
+            Timber.e(e);
+        }
+        try {
+            syncInfoMap.put(APP_VERSION_CODE, String.valueOf(Utils.getVersionCode(CoreLibrary.getInstance().context().applicationContext())));
+        } catch (PackageManager.NameNotFoundException e) {
+            syncInfoMap.put(APP_VERSION_CODE, "0");
+            Timber.e(e);
+        }
+        try {
+            syncInfoMap.put(DB_VERSION, String.valueOf(Utils.getDatabaseVersion()));
+        } catch (Exception e) {
+            syncInfoMap.put(DB_VERSION, "0");
+            Timber.e(e);
+        }
     }
 
     private void populateDeviceInfo() {
@@ -194,17 +209,4 @@ private void populateDeviceInfo() {
         }
 
     }
-
-    public String getBuildConfigValue(String fieldName) {
-        try {
-            Context context = CoreLibrary.getInstance().context().applicationContext();
-            Class<?> clazz = Class.forName(context.getPackageName() + ".BuildConfig");
-            Field field = clazz.getField(fieldName);
-            return String.valueOf(field.get(null));
-        } catch (Exception e) {
-            Timber.e(e);
-            return "0";
-        }
-    }
-
 }
diff --git a/opensrp-core/src/main/java/org/smartregister/util/Utils.java b/opensrp-core/src/main/java/org/smartregister/util/Utils.java
index 43980a361..4f3248872 100644
--- a/opensrp-core/src/main/java/org/smartregister/util/Utils.java
+++ b/opensrp-core/src/main/java/org/smartregister/util/Utils.java
@@ -77,6 +77,7 @@
 import org.smartregister.domain.jsonmapping.util.TreeNode;
 import org.smartregister.receiver.SyncStatusBroadcastReceiver;
 import org.smartregister.repository.AllSharedPreferences;
+import org.smartregister.view.activity.DrishtiApplication;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -575,6 +576,10 @@ public static long getVersionCode(Context context) throws PackageManager.NameNot
         return packageInfo.versionCode;
     }
 
+    public static int getDatabaseVersion() {
+        return DrishtiApplication.getInstance().getRepository().getReadableDatabase().getVersion();
+    }
+
     public static String getBuildDate(Boolean isShortMonth) {
         String simpleDateFormat;
         if (isShortMonth) {

From 1aa59b2b2828ea51d6d794e741435d894884a686 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Wed, 14 Dec 2022 18:48:37 +0500
Subject: [PATCH 04/13] Fix failing tests

---
 .../org/smartregister/TestApplication.java    | 12 ++++++++++--
 .../smartregister/util/StatsUtilsTest.java    | 19 ++++++++++++++-----
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/opensrp-core/src/test/java/org/smartregister/TestApplication.java b/opensrp-core/src/test/java/org/smartregister/TestApplication.java
index 5c006c2d4..11176eaad 100644
--- a/opensrp-core/src/test/java/org/smartregister/TestApplication.java
+++ b/opensrp-core/src/test/java/org/smartregister/TestApplication.java
@@ -14,8 +14,11 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 
+import net.sqlcipher.database.SQLiteDatabase;
+
 /**
  * Created by samuelgithengi on 12/30/19.
  */
@@ -45,8 +48,13 @@ public void logoutCurrentUser() {
 
     @Override
     public Repository getRepository() {
-        if (repository == null)
-            repository = mock(Repository.class);
+        if (repository == null) {
+            Repository mockRepository = mock(Repository.class);
+            SQLiteDatabase mockSqLiteDatabase = mock(SQLiteDatabase.class);
+            doReturn(mockSqLiteDatabase).when(mockRepository).getReadableDatabase();
+            doReturn(1).when(mockSqLiteDatabase).getVersion();
+            repository = mockRepository;
+        }
         return repository;
     }
 
diff --git a/opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java b/opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java
index b0294634f..81695b7d6 100644
--- a/opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java
@@ -15,6 +15,9 @@
 import static org.smartregister.AllConstants.SyncInfo.USER_TEAM;
 import static org.smartregister.AllConstants.SyncInfo.VALID_EVENTS;
 
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+
 import androidx.test.core.app.ApplicationProvider;
 
 import net.sqlcipher.Cursor;
@@ -70,7 +73,7 @@ public void testPopulateUserInfoPopulatesCorrectValues() {
     }
 
     @Test
-    public void testPopulateBuildInfoPopulatesCorrectValues() {
+    public void testPopulateBuildInfoPopulatesCorrectValues() throws PackageManager.NameNotFoundException {
         CoreLibrary coreLibrary = Mockito.mock(CoreLibrary.class);
         ReflectionHelpers.setStaticField(CoreLibrary.class, "instance", coreLibrary);
 
@@ -79,15 +82,22 @@ public void testPopulateBuildInfoPopulatesCorrectValues() {
 
         Mockito.doReturn(context).when(coreLibrary).context();
         Mockito.doReturn(appContext).when(context).applicationContext();
+
+        PackageManager packageManager = Mockito.mock(PackageManager.class);
+        PackageInfo packageInfo = Mockito.mock(PackageInfo.class);
+        packageInfo.versionName = "v1.0.0";
+        packageInfo.versionCode = 1;
+        Mockito.doReturn(packageManager).when(appContext).getPackageManager();
         Mockito.doReturn("org.smartregister").when(appContext).getPackageName();
+        Mockito.doReturn(packageInfo).when(packageManager).getPackageInfo(eq("org.smartregister"), eq(0));
 
         ReflectionHelpers.callInstanceMethod(statsUtils, "populateBuildInfo");
 
         Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsUtils, "syncInfoMap");
 
-        Assert.assertEquals(BuildConfig.VERSION_NAME, syncInfoMap.get(APP_VERSION_NAME));
+        Assert.assertEquals("v1.0.0", syncInfoMap.get(APP_VERSION_NAME));
         Assert.assertEquals("1", syncInfoMap.get(APP_VERSION_CODE));
-        Assert.assertEquals("0", syncInfoMap.get(DB_VERSION));
+        Assert.assertEquals("1", syncInfoMap.get(DB_VERSION));
     }
 
     @Test
@@ -96,10 +106,9 @@ public void testPopulateDeviceInfoPopulatesCorrectValues() {
 
         Map<String, String> syncInfoMap = ReflectionHelpers.getField(statsUtils, "syncInfoMap");
 
-        Assert.assertEquals("robolectric", syncInfoMap.get(MANUFACTURER));
+        Assert.assertEquals("unknown", syncInfoMap.get(MANUFACTURER));
         Assert.assertEquals("robolectric", syncInfoMap.get(MODEL));
         Assert.assertEquals("28 Apr 2020", syncInfoMap.get(APP_BUILD_DATE));
-        Assert.assertEquals("Q", syncInfoMap.get(OS_VERSION));
     }
 
     @Test

From b980ee8bc1b39c2f3e8f5a68c21144f8b9b2cef8 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Thu, 12 Jan 2023 11:10:25 +0500
Subject: [PATCH 05/13] Fix codacy errors

---
 .../src/main/java/org/smartregister/util/StatsUtils.java        | 1 -
 .../src/test/java/org/smartregister/util/StatsUtilsTest.java    | 2 --
 2 files changed, 3 deletions(-)

diff --git a/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java b/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java
index 3695184cd..f35146e5b 100644
--- a/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java
+++ b/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java
@@ -38,7 +38,6 @@
 import org.smartregister.repository.BaseRepository;
 import org.smartregister.view.activity.DrishtiApplication;
 
-import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java b/opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java
index 81695b7d6..97691ef8a 100644
--- a/opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/util/StatsUtilsTest.java
@@ -5,7 +5,6 @@
 import static org.smartregister.AllConstants.DatabaseKeys.VALIDATION_STATUS;
 import static org.smartregister.AllConstants.DeviceInfo.MANUFACTURER;
 import static org.smartregister.AllConstants.DeviceInfo.MODEL;
-import static org.smartregister.AllConstants.DeviceInfo.OS_VERSION;
 import static org.smartregister.AllConstants.SyncInfo.APP_BUILD_DATE;
 import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_CODE;
 import static org.smartregister.AllConstants.SyncInfo.APP_VERSION_NAME;
@@ -29,7 +28,6 @@
 import org.mockito.Mockito;
 import org.robolectric.util.ReflectionHelpers;
 import org.smartregister.BaseUnitTest;
-import org.smartregister.BuildConfig;
 import org.smartregister.Context;
 import org.smartregister.CoreLibrary;
 import org.smartregister.repository.AllSharedPreferences;

From 3d120a444298fff0cc35c90e704119268ec76147 Mon Sep 17 00:00:00 2001
From: Simon Njoroge <snjoroge@ona.io>
Date: Fri, 13 Jan 2023 15:45:00 +0300
Subject: [PATCH 06/13] Bump up version to 5.0.10-SNAPSHOT

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 5f0308c43..ade16f7ef 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=5.0.9-SNAPSHOT
+VERSION_NAME=5.0.10-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Core Application

From 7e9bd524e5804d2dc0cc6d8db5e38983a6c2792b Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Wed, 25 Jan 2023 19:06:21 +0500
Subject: [PATCH 07/13] Fix text alignment for Arabic

---
 opensrp-core/res/layout/fragment_stats.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/opensrp-core/res/layout/fragment_stats.xml b/opensrp-core/res/layout/fragment_stats.xml
index 3572d6b7e..70b1f63bb 100644
--- a/opensrp-core/res/layout/fragment_stats.xml
+++ b/opensrp-core/res/layout/fragment_stats.xml
@@ -317,6 +317,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text=""
+                android:textAlignment="viewStart"
                 android:textColor="@color/text_black"
                 android:textSize="18sp" />
 
@@ -343,6 +344,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text=""
+                android:textAlignment="viewStart"
                 android:textColor="@color/text_black"
                 android:textSize="18sp" />
 
@@ -369,6 +371,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text=""
+                android:textAlignment="viewStart"
                 android:textColor="@color/text_black"
                 android:textSize="18sp" />
 
@@ -406,6 +409,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text=""
+                android:textAlignment="viewStart"
                 android:textColor="@color/text_black"
                 android:textSize="18sp" />
 
@@ -432,6 +436,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text=""
+                android:textAlignment="viewStart"
                 android:textColor="@color/text_black"
                 android:textSize="18sp" />
 
@@ -458,6 +463,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text=""
+                android:textAlignment="viewStart"
                 android:textColor="@color/text_black"
                 android:textSize="18sp" />
 
@@ -483,6 +489,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text=""
+                android:textAlignment="viewStart"
                 android:textColor="@color/text_black"
                 android:textSize="18sp" />
 
@@ -520,6 +527,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text=""
+                android:textAlignment="viewStart"
                 android:textColor="@color/text_black"
                 android:textSize="18sp" />
 
@@ -546,6 +554,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text=""
+                android:textAlignment="viewStart"
                 android:textColor="@color/text_black"
                 android:textSize="18sp" />
 
@@ -571,6 +580,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text=""
+                android:textAlignment="viewStart"
                 android:textColor="@color/text_black"
                 android:textSize="18sp" />
 
@@ -596,6 +606,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text=""
+                android:textAlignment="viewStart"
                 android:textColor="@color/text_black"
                 android:textSize="18sp" />
 

From 611a631ad5e4757eb9cd207ca3e1ffa4126662c8 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Wed, 25 Jan 2023 19:33:04 +0500
Subject: [PATCH 08/13] Bump up version to 5.1.0

---
 gradle.properties                              |  2 +-
 .../view/fragment/StatsFragment.java           | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index ade16f7ef..039164e41 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=5.0.10-SNAPSHOT
+VERSION_NAME=5.1.0-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Core Application
diff --git a/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java b/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java
index f3e3dae61..a0581500c 100644
--- a/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java
+++ b/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java
@@ -126,21 +126,21 @@ private void initializeViews(View view) {
     @Override
     public void refreshECSyncInfo(Map<String, String> syncInfoMap) {
 
-        tvSyncedEvents.setText(syncInfoMap.get(SYNCED_EVENTS) + "");
-        tvUnSyncedEvents.setText(syncInfoMap.get(UNSYNCED_EVENTS) + "");
-        tvTaskUnprocessedEvents.setText(syncInfoMap.get(TASK_UNPROCESSED_EVENTS) + "");
+        tvSyncedEvents.setText(syncInfoMap.get(SYNCED_EVENTS));
+        tvUnSyncedEvents.setText(syncInfoMap.get(UNSYNCED_EVENTS));
+        tvTaskUnprocessedEvents.setText(syncInfoMap.get(TASK_UNPROCESSED_EVENTS));
 
-        tvSyncedClient.setText(syncInfoMap.get(SYNCED_CLIENTS) + "");
-        tvUnSyncedClients.setText(syncInfoMap.get(UNSYNCED_CLIENTS) + "");
+        tvSyncedClient.setText(syncInfoMap.get(SYNCED_CLIENTS));
+        tvUnSyncedClients.setText(syncInfoMap.get(UNSYNCED_CLIENTS));
 
         tvValidatedEvents.setText(syncInfoMap.get(VALID_EVENTS));
-        tvValidatedClients.setText(syncInfoMap.get(VALID_CLIENTS) + "");
+        tvValidatedClients.setText(syncInfoMap.get(VALID_CLIENTS));
 
-        tvUnsyncedVaccineEvents.setText(syncInfoMap.get(UNSYNCED_VACCINE_EVENTS) + "");
-        tvUnsyncedWeightEvents.setText(syncInfoMap.get(UNSYNCED_WEIGHT_EVENTS) + "");
+        tvUnsyncedVaccineEvents.setText(syncInfoMap.get(UNSYNCED_VACCINE_EVENTS));
+        tvUnsyncedWeightEvents.setText(syncInfoMap.get(UNSYNCED_WEIGHT_EVENTS));
         // Only show height stats if they are record height is enabled
         if (CoreLibrary.getInstance().context().getAppProperties().isTrue(AllConstants.PROPERTY.MONITOR_HEIGHT))
-            tvUnsyncedHeightEvents.setText(syncInfoMap.get(UNSYNCED_HEIGHT_EVENTS) + "");
+            tvUnsyncedHeightEvents.setText(syncInfoMap.get(UNSYNCED_HEIGHT_EVENTS));
         else {
             if (getView() != null) {
                 getView().findViewById(R.id.height_stats).setVisibility(View.GONE);

From a16a308dd92c2c256ece565590e4dc1c53aa1976 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Thu, 26 Jan 2023 18:13:34 +0500
Subject: [PATCH 09/13] Fix typo in constants

---
 .../src/main/java/org/smartregister/AllConstants.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/opensrp-core/src/main/java/org/smartregister/AllConstants.java b/opensrp-core/src/main/java/org/smartregister/AllConstants.java
index c5fe741c6..4c631f489 100644
--- a/opensrp-core/src/main/java/org/smartregister/AllConstants.java
+++ b/opensrp-core/src/main/java/org/smartregister/AllConstants.java
@@ -596,9 +596,9 @@ public interface SyncInfo {
         String APP_VERSION_NAME = "app_ver_name";
         String APP_VERSION_CODE = "app_ver_code";
         String APP_BUILD_DATE = "app_build_date";
-        String UNSYNCED_VACCINE_EVENTS = "unsuncyed_vaccine_events";
-        String UNSYNCED_WEIGHT_EVENTS = "unsuncyed_weight_events";
-        String UNSYNCED_HEIGHT_EVENTS = "unsuncyed_height_events";
+        String UNSYNCED_VACCINE_EVENTS = "unsynced_vaccine_events";
+        String UNSYNCED_WEIGHT_EVENTS = "unsynced_weight_events";
+        String UNSYNCED_HEIGHT_EVENTS = "unsynced_height_events";
     }
 
     public interface DeviceInfo {

From d8c4c0f54bfc2b0f6bcfc9d7d461be117a074cd9 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Fri, 27 Jan 2023 11:17:28 +0500
Subject: [PATCH 10/13] PR feedback changes

---
 .../java/org/smartregister/AllConstants.java  |  1 -
 .../org/smartregister/util/StatsUtils.java    | 35 +++++++++----------
 .../view/fragment/StatsFragment.java          |  3 +-
 opensrp-core/src/test/assets/app.properties   |  3 +-
 .../org/smartregister/util/UtilsTest.java     |  3 +-
 .../view/fragment/StatsFragmentTest.java      |  1 -
 6 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/opensrp-core/src/main/java/org/smartregister/AllConstants.java b/opensrp-core/src/main/java/org/smartregister/AllConstants.java
index 4c631f489..cf8f1e0ee 100644
--- a/opensrp-core/src/main/java/org/smartregister/AllConstants.java
+++ b/opensrp-core/src/main/java/org/smartregister/AllConstants.java
@@ -473,7 +473,6 @@ public static class PROPERTY {
         public static final String ALLOW_OFFLINE_LOGIN_WITH_INVALID_TOKEN = "allow.offline.login.with.invalid.token";
         public static final String IGNORE_LOCATION_DELETION = "ignore.location.deletion";
         public static final String ENABLE_SEARCH_BUTTON ="enable.search.button";
-        public static final String MONITOR_HEIGHT = "monitor.height";
     }
 
     public interface FORCED_LOGOUT {
diff --git a/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java b/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java
index f35146e5b..752c604ee 100644
--- a/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java
+++ b/opensrp-core/src/main/java/org/smartregister/util/StatsUtils.java
@@ -32,7 +32,6 @@
 import net.sqlcipher.Cursor;
 import net.sqlcipher.database.SQLiteDatabase;
 
-import org.smartregister.AllConstants;
 import org.smartregister.CoreLibrary;
 import org.smartregister.repository.AllSharedPreferences;
 import org.smartregister.repository.BaseRepository;
@@ -53,19 +52,19 @@ public StatsUtils() {
     }
 
     public Map<String, String> fetchStatsInfo() {
-        syncInfoMap.put(SYNCED_EVENTS, "0");
-        syncInfoMap.put(SYNCED_CLIENTS, "0");
-        syncInfoMap.put(UNSYNCED_EVENTS, "0");
-        syncInfoMap.put(UNSYNCED_CLIENTS, "0");
-        syncInfoMap.put(VALID_EVENTS, "0");
-        syncInfoMap.put(INVALID_EVENTS, "0");
-        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(UNSYNCED_VACCINE_EVENTS, "0");
-        syncInfoMap.put(UNSYNCED_WEIGHT_EVENTS, "0");
-        syncInfoMap.put(UNSYNCED_HEIGHT_EVENTS, "0");
+        syncInfoMap.put(SYNCED_EVENTS, "-");
+        syncInfoMap.put(SYNCED_CLIENTS, "-");
+        syncInfoMap.put(UNSYNCED_EVENTS, "-");
+        syncInfoMap.put(UNSYNCED_CLIENTS, "-");
+        syncInfoMap.put(VALID_EVENTS, "-");
+        syncInfoMap.put(INVALID_EVENTS, "-");
+        syncInfoMap.put(VALID_CLIENTS, "-");
+        syncInfoMap.put(INVALID_CLIENTS, "-");
+        syncInfoMap.put(TASK_UNPROCESSED_EVENTS, "-");
+        syncInfoMap.put(NULL_EVENT_SYNC_STATUS, "-");
+        syncInfoMap.put(UNSYNCED_VACCINE_EVENTS, "-");
+        syncInfoMap.put(UNSYNCED_WEIGHT_EVENTS, "-");
+        syncInfoMap.put(UNSYNCED_HEIGHT_EVENTS, "-");
 
         String eventSyncSql = "select count(*), syncStatus from event group by syncStatus";
         String clientSyncSql = "select count(*), syncStatus from client group by syncStatus";
@@ -111,7 +110,7 @@ public Map<String, String> fetchStatsInfo() {
         while (cursor.moveToNext()) {
             syncInfoMap.put(UNSYNCED_WEIGHT_EVENTS, String.valueOf(cursor.getInt(0)));
         }
-        if (CoreLibrary.getInstance().context().getAppProperties().isTrue(AllConstants.PROPERTY.MONITOR_HEIGHT)) {
+        if (CoreLibrary.getInstance().context().getAppProperties().isTrue("monitor.height")) { // Constant is defined in growth-monitoring module
             cursor = database.rawQuery(unsyncedHeightEventsSQL, new String[]{});
             while (cursor.moveToNext()) {
                 syncInfoMap.put(UNSYNCED_HEIGHT_EVENTS, String.valueOf(cursor.getInt(0)));
@@ -178,19 +177,19 @@ private void populateBuildInfo() {
         try {
             syncInfoMap.put(APP_VERSION_NAME, Utils.getVersion(CoreLibrary.getInstance().context().applicationContext()));
         } catch (PackageManager.NameNotFoundException e) {
-            syncInfoMap.put(APP_VERSION_NAME, "0");
+            syncInfoMap.put(APP_VERSION_NAME, "-");
             Timber.e(e);
         }
         try {
             syncInfoMap.put(APP_VERSION_CODE, String.valueOf(Utils.getVersionCode(CoreLibrary.getInstance().context().applicationContext())));
         } catch (PackageManager.NameNotFoundException e) {
-            syncInfoMap.put(APP_VERSION_CODE, "0");
+            syncInfoMap.put(APP_VERSION_CODE, "-");
             Timber.e(e);
         }
         try {
             syncInfoMap.put(DB_VERSION, String.valueOf(Utils.getDatabaseVersion()));
         } catch (Exception e) {
-            syncInfoMap.put(DB_VERSION, "0");
+            syncInfoMap.put(DB_VERSION, "-");
             Timber.e(e);
         }
     }
diff --git a/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java b/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java
index a0581500c..b2c2ff011 100644
--- a/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java
+++ b/opensrp-core/src/main/java/org/smartregister/view/fragment/StatsFragment.java
@@ -33,7 +33,6 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import org.smartregister.AllConstants;
 import org.smartregister.CoreLibrary;
 import org.smartregister.R;
 import org.smartregister.view.contract.StatsFragmentContract;
@@ -139,7 +138,7 @@ public void refreshECSyncInfo(Map<String, String> syncInfoMap) {
         tvUnsyncedVaccineEvents.setText(syncInfoMap.get(UNSYNCED_VACCINE_EVENTS));
         tvUnsyncedWeightEvents.setText(syncInfoMap.get(UNSYNCED_WEIGHT_EVENTS));
         // Only show height stats if they are record height is enabled
-        if (CoreLibrary.getInstance().context().getAppProperties().isTrue(AllConstants.PROPERTY.MONITOR_HEIGHT))
+        if (CoreLibrary.getInstance().context().getAppProperties().isTrue("monitor.height")) // Constant is defined in growth-monitoring module
             tvUnsyncedHeightEvents.setText(syncInfoMap.get(UNSYNCED_HEIGHT_EVENTS));
         else {
             if (getView() != null) {
diff --git a/opensrp-core/src/test/assets/app.properties b/opensrp-core/src/test/assets/app.properties
index 8b3bee365..f9c111750 100644
--- a/opensrp-core/src/test/assets/app.properties
+++ b/opensrp-core/src/test/assets/app.properties
@@ -3,5 +3,4 @@ PORT=-1
 SHOULD_VERIFY_CERTIFICATE=false
 SYNC_DOWNLOAD_BATCH_SIZE=10
 system.toaster.centered=false
-allow.offline.login.with.invalid.token=false
-monitor.height=true
+allow.offline.login.with.invalid.token=false
\ No newline at end of file
diff --git a/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java b/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java
index 435c62ebf..1a2edab45 100644
--- a/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java
@@ -689,12 +689,11 @@ public void dobStringToDateTimeShouldHandleInvalidDateTimeStrings() {
     public void getPropertiesShouldLoadPropertiesInPropertiesFile() {
         AppProperties appProperties = Utils.getProperties(RuntimeEnvironment.application);
 
-        assertEquals(7, appProperties.size());
+        assertEquals(6, appProperties.size());
         assertEquals("", appProperties.getProperty("DRISHTI_BASE_URL"));
         assertEquals("false", appProperties.getProperty("SHOULD_VERIFY_CERTIFICATE"));
         assertEquals("false", appProperties.getProperty("system.toaster.centered"));
         assertEquals("10", appProperties.getProperty("SYNC_DOWNLOAD_BATCH_SIZE"));
-        assertEquals("true", appProperties.getProperty("monitor.height"));
     }
 
     @Test
diff --git a/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java b/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java
index edca6c064..95f0aec73 100644
--- a/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java
@@ -138,7 +138,6 @@ public void refreshECSyncInfoUpdatesViews() {
         statsFragment.refreshECSyncInfo(syncInfoMap);
         Assert.assertEquals("2", tvSyncedEvents.getText());
         Assert.assertEquals("3", tvUnSyncedEvents.getText());
-        Assert.assertEquals("1", tvUnsyncedHeightEvents.getText());
     }
 
     @Test

From 860483c0f0e9d8340d7676d4389b455b3e725442 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Fri, 27 Jan 2023 11:59:07 +0500
Subject: [PATCH 11/13] Increase test coverage

---
 .../org/smartregister/view/fragment/StatsFragmentTest.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java b/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java
index 95f0aec73..9910c2fc9 100644
--- a/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java
@@ -17,6 +17,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.fragment.app.FragmentManager;
@@ -108,10 +109,12 @@ public void refreshECSyncInfoUpdatesViews() {
         syncInfoMap.put(UNSYNCED_HEIGHT_EVENTS, "1");
 
         View rootView = LayoutInflater.from(RuntimeEnvironment.application).inflate(R.layout.fragment_stats, null);
+        Mockito.doReturn(rootView).when(statsFragment).getView();
 
         TextView tvSyncedEvents = rootView.findViewById(R.id.synced_events);
         TextView tvUnSyncedEvents = rootView.findViewById(R.id.unsynced_events);
         TextView tvUnsyncedHeightEvents = rootView.findViewById(R.id.synced_height_events);
+        LinearLayout layoutUnsyncedHeightEvents = rootView.findViewById(R.id.height_stats);
 
         ReflectionHelpers.setField(statsFragment, "tvSyncedEvents", tvSyncedEvents);
         ReflectionHelpers.setField(statsFragment, "tvUnSyncedEvents", tvUnSyncedEvents);
@@ -138,6 +141,7 @@ public void refreshECSyncInfoUpdatesViews() {
         statsFragment.refreshECSyncInfo(syncInfoMap);
         Assert.assertEquals("2", tvSyncedEvents.getText());
         Assert.assertEquals("3", tvUnSyncedEvents.getText());
+        Assert.assertEquals(View.GONE, layoutUnsyncedHeightEvents.getVisibility());
     }
 
     @Test

From 14e7f3d4e5a1b46d1f56fff8c693f7027cf86d02 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Fri, 27 Jan 2023 18:38:10 +0500
Subject: [PATCH 12/13] Fix codacy errors and typos

---
 opensrp-core/res/values/strings.xml                            | 2 +-
 .../org/smartregister/view/fragment/StatsFragmentTest.java     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/opensrp-core/res/values/strings.xml b/opensrp-core/res/values/strings.xml
index 68376462e..4a29333b7 100644
--- a/opensrp-core/res/values/strings.xml
+++ b/opensrp-core/res/values/strings.xml
@@ -474,7 +474,7 @@
     <string name="build_date">Build Date:</string>
     <string name="date">Date:</string>
     <string name="user">User:</string>
-    <string name="synced_vaccine_events">Unynced vaccine events:</string>
+    <string name="synced_vaccine_events">Unsynced vaccine events:</string>
     <string name="unsynced_weight_events">Unsynced weight events:</string>
     <string name="unsynced_height_events">Unsynced height events:</string>
 </resources>
diff --git a/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java b/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java
index 9910c2fc9..34d5afef1 100644
--- a/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/view/fragment/StatsFragmentTest.java
@@ -1,6 +1,5 @@
 package org.smartregister.view.fragment;
 
-import static org.mockito.Mockito.doReturn;
 import static org.smartregister.AllConstants.SyncInfo.SYNCED_CLIENTS;
 import static org.smartregister.AllConstants.SyncInfo.SYNCED_EVENTS;
 import static org.smartregister.AllConstants.SyncInfo.TASK_UNPROCESSED_EVENTS;
@@ -190,7 +189,7 @@ public void assertTestLabelsNotNull() {
     @Test
     public void testUpdatedLabels() {
         View parentLayout = LayoutInflater.from(RuntimeEnvironment.application.getApplicationContext()).inflate(R.layout.fragment_stats, null, false);
-        doReturn(parentLayout).when(layoutInflater).inflate(R.layout.fragment_base_register, container, false);
+        Mockito.doReturn(parentLayout).when(layoutInflater).inflate(R.layout.fragment_base_register, container, false);
 
         TextView tvSyncedEventsLabel = parentLayout.findViewById(R.id.synced_events_label);
         TextView tvUnsyncedEventsLabel = parentLayout.findViewById(R.id.unsynced_events_label);

From dba053d9e9f49dcd84fbd437c6ad3c3d7552b2b7 Mon Sep 17 00:00:00 2001
From: Hamza Ahmed Khan <hamza.khan@venturedive.com>
Date: Tue, 31 Jan 2023 14:46:25 +0500
Subject: [PATCH 13/13] Increase coverage

---
 .../populateform/ModelTest.java                 | 17 +++++++++++++++++
 .../java/org/smartregister/util/UtilsTest.java  | 10 ++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 opensrp-core/src/test/java/org/smartregister/clientandeventmodel/populateform/ModelTest.java

diff --git a/opensrp-core/src/test/java/org/smartregister/clientandeventmodel/populateform/ModelTest.java b/opensrp-core/src/test/java/org/smartregister/clientandeventmodel/populateform/ModelTest.java
new file mode 100644
index 000000000..a8e03affb
--- /dev/null
+++ b/opensrp-core/src/test/java/org/smartregister/clientandeventmodel/populateform/ModelTest.java
@@ -0,0 +1,17 @@
+package org.smartregister.clientandeventmodel.populateform;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.smartregister.BaseUnitTest;
+import org.smartregister.clientandeventmodel.populateform.Model;
+
+public class ModelTest extends BaseUnitTest {
+
+
+    @Test
+    public void testConstructorNotNull() {
+        Model model = new Model("","","","");
+        Assert.assertNotNull(model);
+    }
+
+}
diff --git a/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java b/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java
index 1a2edab45..ab2db8352 100644
--- a/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java
+++ b/opensrp-core/src/test/java/org/smartregister/util/UtilsTest.java
@@ -719,5 +719,15 @@ public void testComposeApiCallParamsStringWithMultipleParamValues() {
         apiParams.add(Pair.create("serverVersion", "21"));
         assertEquals("&identifier=global_configs&serverVersion=21", Utils.composeApiCallParamsString(apiParams));
     }
+
+    @Test
+    public void testTryParseLongShouldParseCorrectly() {
+        assertEquals(123L, (Long) Utils.tryParseLong("123", 0), 0);
+    }
+
+    @Test
+    public void testTryParseLongShouldParseShoouldReturnDefaultValueOnException() {
+        assertEquals(0L, (Long) Utils.tryParseLong("xyz", 0), 0);
+    }
 }