From f788b9eb0e77959f084d97d71398287e79f3a62d Mon Sep 17 00:00:00 2001
From: Ogollah <kogollah2011@gmail.com>
Date: Tue, 15 Jun 2021 13:09:02 +0300
Subject: [PATCH 01/12] :construction: Start on the MOH510 Report

---
 opensrp-kip/build.gradle                      |   2 +-
 opensrp-kip/src/main/AndroidManifest.xml      |   5 +
 .../kip/activity/Moh510ReportActivity.java    | 116 +++++++++++++++
 .../kip/view/NavigationMenu.java              |  20 +++
 .../res/layout/activity_moh510_report.xml     |  15 ++
 .../main/res/layout/location_spinner_view.xml |   2 +-
 .../main/res/layout/moh510_content_view.xml   | 132 ++++++++++++++++++
 .../src/main/res/layout/navigation_drawer.xml |  35 +++++
 .../layout/toolbar_mho510_report_content.xml  |  28 ++++
 opensrp-kip/src/main/res/values/strings.xml   |   1 +
 10 files changed, 354 insertions(+), 2 deletions(-)
 create mode 100644 opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java
 create mode 100644 opensrp-kip/src/main/res/layout/activity_moh510_report.xml
 create mode 100644 opensrp-kip/src/main/res/layout/moh510_content_view.xml
 create mode 100644 opensrp-kip/src/main/res/layout/toolbar_mho510_report_content.xml

diff --git a/opensrp-kip/build.gradle b/opensrp-kip/build.gradle
index cc43f67..88e9759 100755
--- a/opensrp-kip/build.gradle
+++ b/opensrp-kip/build.gradle
@@ -276,7 +276,7 @@ dependencies {
         transitive = true
     }
     implementation group: 'io.fabric.sdk.android', name: 'fabric', version: '1.4.8'
-
+    implementation 'org.apache.poi:poi:3.17'
 
     def robolectricVersion = '4.1'
     testImplementation("org.robolectric:robolectric:$robolectricVersion") {
diff --git a/opensrp-kip/src/main/AndroidManifest.xml b/opensrp-kip/src/main/AndroidManifest.xml
index 77dae7c..48caa95 100755
--- a/opensrp-kip/src/main/AndroidManifest.xml
+++ b/opensrp-kip/src/main/AndroidManifest.xml
@@ -117,6 +117,11 @@
             android:screenOrientation="fullSensor"
             android:theme="@style/ChildTheme.NoActionBar"
             android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
+        <activity
+            android:name="org.smartregister.kip.activity.Moh510ReportActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/ChildTheme.NoActionBar"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java b/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java
new file mode 100644
index 0000000..75ea745
--- /dev/null
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java
@@ -0,0 +1,116 @@
+package org.smartregister.kip.activity;
+
+import android.Manifest;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.Environment;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.util.CellReference;
+import org.smartregister.kip.R;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.List;
+
+public class Moh510ReportActivity extends AppCompatActivity {
+
+    private File filePath = new File(Environment.getExternalStorageState()+"moh510Report.xls");
+
+    private String[] columnsVariable = {"KIP ID", "CHILD'S NAME", "SEX", "DATE OF BIRTH (DD/MM/YYYY)",
+            "DATE FIRST SEEN", "FATHER'S FULL NAME", "MOTHER'S FULL NAME", "MOTHER'S PHONE NUMBER","VILLAGE/ESTATE/LANDMARK",
+            "TELEPHONE NUMBER", "BCG", "POLIO BIRTH DOSE", "OPV1", "OPV2", "OPV3","IPV", "DPT/HEP.B/HIB.1","DPT/HEP.B/HIB.2",
+            "DPT/HEP.B/HIB.3", "PCV 10 (PNEUMOCOCCAL) 1","PCV 10 (PNEUMOCOCCAL) 2","PCV 10 (PNEUMOCOCCAL) 3", "ROTA 1",
+            "ROTA 2", "VITAMIN A","MEASLES 1","YELLOW FEVER", "FULLY IMMUNIZED", "MEASLES 2 (MR 2)", "REMARKS"};
+
+    private List<String> mohIndicators = Arrays.asList(columnsVariable);
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_moh510_report);
+
+        ActivityCompat.requestPermissions(this, new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                Manifest.permission.WRITE_EXTERNAL_STORAGE}, PackageManager.PERMISSION_GRANTED);
+    }
+
+    public void buttonWriteToExcel(View view){
+
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+            DateTimeFormatter dtf = DateTimeFormatter.ofPattern("dd-MM-yyyy");
+            LocalDateTime now = LocalDateTime.now();
+
+            HSSFWorkbook hssfWorkbook = new HSSFWorkbook();
+            HSSFSheet sheets = hssfWorkbook.createSheet("moh 510 Report");
+            HSSFRow tittle = sheets.createRow(0);
+            HSSFRow facility = sheets.createRow(1);
+            HSSFRow year = sheets.createRow(2);
+            HSSFRow dateRange = sheets.createRow(3);
+            HSSFRow columnName = sheets.createRow(4);
+
+            HSSFCell tittleCell = tittle.createCell(0);
+            HSSFCell facilityCell = facility.createCell(0);
+            HSSFCell yearCell = year.createCell(0);
+            HSSFCell strStart = dateRange.createCell(0);
+            HSSFCell startDate = dateRange.createCell(1);
+            HSSFCell strEnd = dateRange.createCell(2);
+            HSSFCell enddate = dateRange.createCell(3);
+            tittleCell.setCellValue("Permanent Immunization Register(MOH 510)");
+            facilityCell.setCellValue("Health Facility: Asayi Dispensary");
+            yearCell.setCellValue("Year of Enrollment");
+
+            strStart.setCellValue("Start Date");
+            strEnd.setCellValue("End Date");
+            enddate.setCellValue(dtf.format(now));
+            startDate.setCellValue(dtf.format(now));
+
+//            Column names
+            for (int cell = 0; cell<mohIndicators.size(); cell ++){
+                HSSFCell cell1 = columnName.createCell(cell);
+                String value = mohIndicators.get(cell);
+                cell1.setCellValue(value);
+            }
+
+            int columnNumber = 10;
+
+//            row data
+            for (int dataRow = 5; dataRow < columnNumber; dataRow ++){
+
+                HSSFRow queryRow = sheets.createRow(dataRow);
+                for (int dataCell = 0; dataCell<mohIndicators.size(); dataCell ++){
+
+                    HSSFCell queryDataCell = queryRow.createCell(dataCell);
+
+                    String str = new CellReference(queryDataCell).formatAsString();
+                    queryDataCell.setCellValue(str);
+                }
+            }
+            try {
+
+                if (!filePath.exists()) {
+                    filePath.createNewFile();
+                }
+                FileOutputStream fileOutputStream = new FileOutputStream(filePath);
+                hssfWorkbook.write(fileOutputStream);
+
+                if (fileOutputStream != null) {
+                    fileOutputStream.flush();
+                    fileOutputStream.close();
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/view/NavigationMenu.java b/opensrp-kip/src/main/java/org/smartregister/kip/view/NavigationMenu.java
index fb8e8ce..9c884d4 100755
--- a/opensrp-kip/src/main/java/org/smartregister/kip/view/NavigationMenu.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/view/NavigationMenu.java
@@ -36,6 +36,7 @@
 import org.smartregister.domain.FetchStatus;
 import org.smartregister.kip.R;
 import org.smartregister.kip.activity.Covid19VaccineStockSettingsActivity;
+import org.smartregister.kip.activity.Moh510ReportActivity;
 import org.smartregister.kip.activity.ReportRegisterActivity;
 import org.smartregister.kip.activity.KipStockActivity;
 import org.smartregister.kip.adapter.NavigationAdapter;
@@ -79,6 +80,7 @@ public class NavigationMenu implements NavigationContract.View, SyncStatusBroadc
     private RelativeLayout covidStockUpdate;
     private LinearLayout outOfAreaMenu;
     private LinearLayout stockControl;
+    private LinearLayout moh510Report;
 
     private View parentView;
     private LinearLayout reportView;
@@ -181,6 +183,7 @@ public void prepareViews(Activity activity) {
         covidStockUpdate = rootView.findViewById(R.id.covid19_vaccine_stock_section);
         outOfAreaMenu = rootView.findViewById(R.id.out_of_area_menu);
         stockControl = rootView.findViewById(R.id.stock_control);
+        moh510Report = rootView.findViewById(R.id.moh510_report_activity_view);
 
         ImageView ivLogo = rootView.findViewById(R.id.ivLogo);
         LinearLayout locationLayout = rootView.findViewById(R.id.giz_location_layout);
@@ -224,11 +227,28 @@ public void onClick(View v) {
         registerCovid19UpdateActivity(activity);
         recordOutOfArea(activity);
         recordStockControl(activity);
+        downloadMoh510Report(activity);
 
         // update all actions
         mPresenter.refreshLastSync();
     }
 
+    private void downloadMoh510Report(final Activity parentActivity){
+        moh510Report.setOnClickListener(v -> startMoh510Report(parentActivity));
+    }
+
+    private void startMoh510Report(@Nullable Activity parentActivity){
+        if (parentActivity instanceof Moh510ReportActivity) {
+            drawer.closeDrawer(GravityCompat.START);
+            return;
+        }
+
+        if (parentActivity != null) {
+            Intent intent = new Intent(parentActivity, Moh510ReportActivity.class);
+            parentActivity.startActivity(intent);
+        }
+    }
+
     private void recordStockControl(final Activity parentActivity){
         stockControl.setOnClickListener(v -> startStockActivity(parentActivity));
     }
diff --git a/opensrp-kip/src/main/res/layout/activity_moh510_report.xml b/opensrp-kip/src/main/res/layout/activity_moh510_report.xml
new file mode 100644
index 0000000..1f701c7
--- /dev/null
+++ b/opensrp-kip/src/main/res/layout/activity_moh510_report.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".activity.Moh510ReportActivity">
+
+    <include layout="@layout/toolbar_mho510_report_content" />
+
+    <include layout="@layout/moh510_content_view"
+        android:id="@+id/moh510_report_view"
+        />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/opensrp-kip/src/main/res/layout/location_spinner_view.xml b/opensrp-kip/src/main/res/layout/location_spinner_view.xml
index babae37..1b66c7b 100755
--- a/opensrp-kip/src/main/res/layout/location_spinner_view.xml
+++ b/opensrp-kip/src/main/res/layout/location_spinner_view.xml
@@ -12,7 +12,7 @@
         android:layout_weight=".28"
         android:orientation="horizontal">
 
-        <android.support.v7.widget.AppCompatSpinner
+        <androidx.appcompat.widget.AppCompatSpinner
             android:id="@+id/location_spinner"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/opensrp-kip/src/main/res/layout/moh510_content_view.xml b/opensrp-kip/src/main/res/layout/moh510_content_view.xml
new file mode 100644
index 0000000..36052bd
--- /dev/null
+++ b/opensrp-kip/src/main/res/layout/moh510_content_view.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@android:color/white"
+    android:gravity="center_horizontal"
+    android:orientation="horizontal">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/dialog_shape">
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginTop="20dp"
+            android:orientation="vertical">
+
+            <org.smartregister.view.customcontrols.CustomFontTextView
+                android:id="@+id/child_name"
+                style="@style/CustomFontTextViewStyle.ClientList.Medium"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
+                android:layout_marginTop="10dp"
+                android:text="@string/set_custom_date_range"
+                android:textColor="@color/black"
+                android:textSize="22sp"
+                android:textStyle="bold" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginBottom="10dp"
+                android:layout_marginTop="10dp"
+                android:orientation="horizontal"
+                android:weightSum="1">
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/moh510_start_date_layout"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="10dp"
+                    android:layout_weight="0.5"
+                    android:hint="@string/set_start_date">
+
+                    <EditText
+                        android:id="@+id/start_date"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:focusable="false"
+                        android:hint="@string/set_start_date"
+                        android:inputType="date"
+                        android:textSize="26sp" />
+
+
+                </com.google.android.material.textfield.TextInputLayout>
+
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/end_date_layout"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:layout_weight="0.5"
+                    android:hint="@string/set_end_date">
+
+                    <EditText
+                        android:id="@+id/end_date"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:focusable="false"
+                        android:hint="@string/set_end_date"
+                        android:inputType="date"
+                        android:textSize="26sp" />
+                </com.google.android.material.textfield.TextInputLayout>
+
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:layout_marginBottom="10dp"
+                android:layout_marginTop="10dp"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+
+                <Button
+                    android:id="@+id/cancel"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="20dp"
+                    android:paddingBottom="10dp"
+                    android:paddingTop="10dp"
+                    android:text="@string/cancel"
+                    android:textAllCaps="false"
+                    android:textAppearance="?android:textAppearanceSmall"
+                    android:textColor="@color/opensrp_accent"
+                    android:textSize="22sp" />
+
+                <Button
+                    android:id="@+id/ok"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="20dp"
+                    android:paddingBottom="10dp"
+                    android:paddingTop="10dp"
+                    android:text="@string/ok"
+                    android:textAllCaps="false"
+                    android:textAppearance="?android:textAppearanceSmall"
+                    android:textColor="@color/opensrp_accent"
+                    android:textSize="22sp" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </FrameLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/opensrp-kip/src/main/res/layout/navigation_drawer.xml b/opensrp-kip/src/main/res/layout/navigation_drawer.xml
index 4c8ada8..502674c 100755
--- a/opensrp-kip/src/main/res/layout/navigation_drawer.xml
+++ b/opensrp-kip/src/main/res/layout/navigation_drawer.xml
@@ -338,6 +338,41 @@
                                 android:textSize="@dimen/table_contents_text_size" />
                         </LinearLayout>
 
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="2dp"
+                            android:background="#000000" />
+
+                        <LinearLayout
+                            android:id="@+id/moh510_report_activity_view"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="10dp"
+                            android:layout_marginBottom="10dp"
+                            android:orientation="horizontal"
+                            android:visibility="visible">
+
+                            <ImageView
+                                android:layout_width="@dimen/custom_navigation_icon_size"
+                                android:layout_height="@dimen/custom_navigation_icon_size"
+                                android:layout_marginStart="15dp"
+                                android:layout_marginTop="5dp"
+                                android:layout_marginEnd="5dp"
+                                android:layout_marginBottom="5dp"
+                                android:src="@drawable/ic_keyboard_arrow_down"
+                                tools:ignore="ContentDescription" />
+
+                            <org.smartregister.view.customcontrols.CustomFontTextView
+                                style="@style/CustomFontTextViewStyle.ClientList.Light.twoline"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                android:layout_weight="1"
+                                android:text="@string/side_nav_moh510_report"
+                                android:textColor="@color/white"
+                                android:textSize="@dimen/table_contents_text_size" />
+                        </LinearLayout>
+
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="2dp"
diff --git a/opensrp-kip/src/main/res/layout/toolbar_mho510_report_content.xml b/opensrp-kip/src/main/res/layout/toolbar_mho510_report_content.xml
new file mode 100644
index 0000000..a1557dc
--- /dev/null
+++ b/opensrp-kip/src/main/res/layout/toolbar_mho510_report_content.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="?android:attr/actionBarSize"
+    android:background="@color/customAppThemeBlue">
+
+    <ImageButton
+        android:id="@+id/close_moh_510_report"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="@dimen/characteristics_drawable_padding"
+        android:background="@android:color/transparent"
+        android:src="@drawable/ic_cross_white" />
+
+    <TextView
+        android:id="@+id/settings_toolbar_title"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_toEndOf="@+id/close_moh_510_report"
+        android:gravity="center_vertical"
+        android:text="DownLoad moh 510 report"
+        android:textAllCaps="true"
+        android:textColor="@color/white"
+        android:textSize="@dimen/characteristics_text_size" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/opensrp-kip/src/main/res/values/strings.xml b/opensrp-kip/src/main/res/values/strings.xml
index 6256c61..477ddd1 100755
--- a/opensrp-kip/src/main/res/values/strings.xml
+++ b/opensrp-kip/src/main/res/values/strings.xml
@@ -14,6 +14,7 @@
     <string name="side_nav_add">Add new child</string>
     <string name="scan_card">Card Scanner</string>
     <string name="side_nav_out_of_catchment">Record out of catchment vaccination</string>
+    <string name="side_nav_moh510_report">MOH 510 Report</string>
 
     <string name="out_of_catchment">Record out of catchment vaccination</string>
     <string name="nav_register">Register</string>

From 2abdcef56e00c9ec87a5da46e17e71d01ac17262 Mon Sep 17 00:00:00 2001
From: Ogollah <kogollah2011@gmail.com>
Date: Wed, 16 Jun 2021 11:10:08 +0300
Subject: [PATCH 02/12] Fix write to external file

---
 .../kip/activity/Moh510ReportActivity.java    | 21 ++++++++++++++++---
 .../kip/activity/SmsActivity.java             | 16 +++++++-------
 .../main/res/layout/moh510_content_view.xml   |  1 +
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java b/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java
index 75ea745..4c9bb44 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java
@@ -1,10 +1,12 @@
 package org.smartregister.kip.activity;
 
 import android.Manifest;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Environment;
 import android.view.View;
+import android.widget.ImageButton;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
@@ -15,6 +17,7 @@
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.util.CellReference;
+import org.smartregister.child.util.Utils;
 import org.smartregister.kip.R;
 
 import java.io.File;
@@ -26,7 +29,8 @@
 
 public class Moh510ReportActivity extends AppCompatActivity {
 
-    private File filePath = new File(Environment.getExternalStorageState()+"moh510Report.xls");
+    private File filePath = new File(Environment.getExternalStorageDirectory()+"/moh510Report.xls");
+    ImageButton closeReport;
 
     private String[] columnsVariable = {"KIP ID", "CHILD'S NAME", "SEX", "DATE OF BIRTH (DD/MM/YYYY)",
             "DATE FIRST SEEN", "FATHER'S FULL NAME", "MOTHER'S FULL NAME", "MOTHER'S PHONE NUMBER","VILLAGE/ESTATE/LANDMARK",
@@ -40,9 +44,19 @@ public class Moh510ReportActivity extends AppCompatActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_moh510_report);
+        closeReport = findViewById(R.id.close_moh_510_report);
 
         ActivityCompat.requestPermissions(this, new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE,
                 Manifest.permission.WRITE_EXTERNAL_STORAGE}, PackageManager.PERMISSION_GRANTED);
+
+        closeReport.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(v.getContext(), ChildRegisterActivity.class);
+                startActivityForResult(intent, 0);
+                finish();
+            }
+        });
     }
 
     public void buttonWriteToExcel(View view){
@@ -65,14 +79,14 @@ public void buttonWriteToExcel(View view){
             HSSFCell strStart = dateRange.createCell(0);
             HSSFCell startDate = dateRange.createCell(1);
             HSSFCell strEnd = dateRange.createCell(2);
-            HSSFCell enddate = dateRange.createCell(3);
+            HSSFCell endDate = dateRange.createCell(3);
             tittleCell.setCellValue("Permanent Immunization Register(MOH 510)");
             facilityCell.setCellValue("Health Facility: Asayi Dispensary");
             yearCell.setCellValue("Year of Enrollment");
 
             strStart.setCellValue("Start Date");
             strEnd.setCellValue("End Date");
-            enddate.setCellValue(dtf.format(now));
+            endDate.setCellValue(dtf.format(now));
             startDate.setCellValue(dtf.format(now));
 
 //            Column names
@@ -112,5 +126,6 @@ public void buttonWriteToExcel(View view){
                 e.printStackTrace();
             }
         }
+        Utils.showToast(this, "Report Downloaded Successfully");
     }
 }
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/activity/SmsActivity.java b/opensrp-kip/src/main/java/org/smartregister/kip/activity/SmsActivity.java
index 6fba8bf..4aad21a 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/activity/SmsActivity.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/activity/SmsActivity.java
@@ -157,11 +157,11 @@ private ArrayList<SmsEnrollementModel> getModel(boolean isSelected){
 
     private List<String> getFullName(){
         List<String> list = new ArrayList<>();
-        SmsEnrolledClientRepository smsErolledClient = KipApplication.getInstance().smsEnrolledClientRepository();
-        List<SmsErolledClient> enrolledClients = smsErolledClient.getEnrolledClients();
+        SmsEnrolledClientRepository smsEnrolledClient = KipApplication.getInstance().smsEnrolledClientRepository();
+        List<SmsErolledClient> enrolledClients = smsEnrolledClient.getEnrolledClients();
         if (enrolledClients !=null){
-            for (SmsErolledClient erolledClient : enrolledClients){
-                list.add(erolledClient.getFirstName() + " " + erolledClient.getLastName() );
+            for (SmsErolledClient enrolledClient : enrolledClients){
+                list.add(enrolledClient.getFirstName() + " " + enrolledClient.getLastName() );
             }
         }
         return list;
@@ -169,11 +169,11 @@ private List<String> getFullName(){
 
     public List<String> getPhoneNumber(){
         List<String> list = new ArrayList<>();
-        SmsEnrolledClientRepository smsErolledClient = KipApplication.getInstance().smsEnrolledClientRepository();
-        List<SmsErolledClient> enrolledClients = smsErolledClient.getEnrolledClients();
+        SmsEnrolledClientRepository smsEnrolledClient = KipApplication.getInstance().smsEnrolledClientRepository();
+        List<SmsErolledClient> enrolledClients = smsEnrolledClient.getEnrolledClients();
         if (enrolledClients !=null){
-            for (SmsErolledClient erolledClient : enrolledClients){
-                list.add(erolledClient.getPhoneNumber());
+            for (SmsErolledClient enrolledClient : enrolledClients){
+                list.add(enrolledClient.getPhoneNumber());
             }
         }
         return list;
diff --git a/opensrp-kip/src/main/res/layout/moh510_content_view.xml b/opensrp-kip/src/main/res/layout/moh510_content_view.xml
index 36052bd..17ac352 100644
--- a/opensrp-kip/src/main/res/layout/moh510_content_view.xml
+++ b/opensrp-kip/src/main/res/layout/moh510_content_view.xml
@@ -115,6 +115,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dp"
+                    android:onClick="buttonWriteToExcel"
                     android:paddingBottom="10dp"
                     android:paddingTop="10dp"
                     android:text="@string/ok"

From 385cbacc854841502982b005f7472235d008dab4 Mon Sep 17 00:00:00 2001
From: Ogollah <kogollah2011@gmail.com>
Date: Wed, 16 Jun 2021 15:10:55 +0300
Subject: [PATCH 03/12] Add date picker

---
 .../kip/activity/Moh510ReportActivity.java    | 72 ++++++++++++++++---
 .../CustomDateRangeDialogFragment.java        |  2 +-
 .../kip/listener/DatePicker.java              | 25 +++++++
 .../kip/listener/DateRangeActionListener.java |  0
 .../main/res/layout/moh510_content_view.xml   | 31 ++++++++
 5 files changed, 118 insertions(+), 12 deletions(-)
 create mode 100644 opensrp-kip/src/main/java/org/smartregister/kip/listener/DatePicker.java
 mode change 100755 => 100644 opensrp-kip/src/main/java/org/smartregister/kip/listener/DateRangeActionListener.java

diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java b/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java
index 4c9bb44..870856a 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java
@@ -1,16 +1,21 @@
 package org.smartregister.kip.activity;
 
 import android.Manifest;
+import android.app.DatePickerDialog;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Environment;
 import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ImageButton;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
+import android.view.View;
+import android.widget.TextView;
 
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
@@ -19,18 +24,29 @@
 import org.apache.poi.ss.util.CellReference;
 import org.smartregister.child.util.Utils;
 import org.smartregister.kip.R;
+import org.smartregister.kip.listener.DatePicker;
 
 import java.io.File;
 import java.io.FileOutputStream;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.List;
 
-public class Moh510ReportActivity extends AppCompatActivity {
+public class Moh510ReportActivity extends AppCompatActivity implements DatePickerDialog.OnDateSetListener, View.OnClickListener {
+
+    private static final SimpleDateFormat MMMYYYY = new SimpleDateFormat("MMMM yyyy");
 
     private File filePath = new File(Environment.getExternalStorageDirectory()+"/moh510Report.xls");
     ImageButton closeReport;
+    TextView tvDate;
+    EditText endDate;
+    EditText startDate;
+    Button btPickDate;
+    Button cancel;
 
     private String[] columnsVariable = {"KIP ID", "CHILD'S NAME", "SEX", "DATE OF BIRTH (DD/MM/YYYY)",
             "DATE FIRST SEEN", "FATHER'S FULL NAME", "MOTHER'S FULL NAME", "MOTHER'S PHONE NUMBER","VILLAGE/ESTATE/LANDMARK",
@@ -46,17 +62,38 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setContentView(R.layout.activity_moh510_report);
         closeReport = findViewById(R.id.close_moh_510_report);
 
+
+
         ActivityCompat.requestPermissions(this, new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE,
                 Manifest.permission.WRITE_EXTERNAL_STORAGE}, PackageManager.PERMISSION_GRANTED);
 
-        closeReport.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(v.getContext(), ChildRegisterActivity.class);
-                startActivityForResult(intent, 0);
-                finish();
-            }
-        });
+        tvDate = findViewById(R.id.tvDate);
+        endDate = findViewById(R.id.end_date);
+        startDate = findViewById(R.id.start_date);
+        btPickDate = findViewById(R.id.btPickDate);
+        cancel = findViewById(R.id.cancel);
+        cancel.setOnClickListener(this);
+        btPickDate.setOnClickListener(this);
+        closeReport.setOnClickListener(this);
+    }
+
+
+    @Override
+    public void onClick(View v) {
+
+        if (v == closeReport) {
+            Intent intent = new Intent(v.getContext(), ChildRegisterActivity.class);
+            startActivityForResult(intent, 0);
+            finish();
+        } else if (v == btPickDate ){
+            DatePicker mDatePickerDialogFragment;
+            mDatePickerDialogFragment = new DatePicker();
+            mDatePickerDialogFragment.show(getSupportFragmentManager(), "DATE PICK");
+        } else if(v==cancel){
+            startDate.setText("");
+            endDate.setText("");
+        }
+
     }
 
     public void buttonWriteToExcel(View view){
@@ -86,8 +123,8 @@ public void buttonWriteToExcel(View view){
 
             strStart.setCellValue("Start Date");
             strEnd.setCellValue("End Date");
-            endDate.setCellValue(dtf.format(now));
-            startDate.setCellValue(dtf.format(now));
+            endDate.setCellValue(tvDate.getText().toString());
+            startDate.setCellValue(tvDate.getText().toString());
 
 //            Column names
             for (int cell = 0; cell<mohIndicators.size(); cell ++){
@@ -128,4 +165,17 @@ public void buttonWriteToExcel(View view){
         }
         Utils.showToast(this, "Report Downloaded Successfully");
     }
+
+    @Override
+    public void onDateSet(android.widget.DatePicker view, int year, int month, int dayOfMonth) {
+        Calendar mCalender = Calendar.getInstance();
+        mCalender.set(Calendar.YEAR, year);
+        mCalender.set(Calendar.MONTH, month);
+        mCalender.set(Calendar.DAY_OF_MONTH, dayOfMonth);
+        String selectedDate = DateFormat.getDateInstance(DateFormat.FULL).format(mCalender.getTime());
+
+        tvDate.setText(selectedDate);
+        endDate.setText(selectedDate);
+        startDate.setText(selectedDate);
+    }
 }
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/fragment/CustomDateRangeDialogFragment.java b/opensrp-kip/src/main/java/org/smartregister/kip/fragment/CustomDateRangeDialogFragment.java
index 0c7c541..e48d6ec 100755
--- a/opensrp-kip/src/main/java/org/smartregister/kip/fragment/CustomDateRangeDialogFragment.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/fragment/CustomDateRangeDialogFragment.java
@@ -55,7 +55,7 @@ public void onCreate(Bundle savedInstanceState) {
     public View onCreateView(final LayoutInflater inflater, final ViewGroup container,
                              Bundle savedInstanceState) {
 
-        ViewGroup dialogView = (ViewGroup) inflater.inflate(R.layout.custom_date_range_dialog_view, container, false);
+        ViewGroup dialogView = (ViewGroup) inflater.inflate(R.layout.moh510_content_view, container, false);
 
         final EditText startDateView = (EditText) dialogView.findViewById(R.id.start_date);
         final EditText endDateView = (EditText) dialogView.findViewById(R.id.end_date);
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/listener/DatePicker.java b/opensrp-kip/src/main/java/org/smartregister/kip/listener/DatePicker.java
new file mode 100644
index 0000000..af1e540
--- /dev/null
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/listener/DatePicker.java
@@ -0,0 +1,25 @@
+package org.smartregister.kip.listener;
+
+import android.app.DatePickerDialog;
+import android.app.Dialog;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+
+import java.util.Calendar;
+
+public class DatePicker extends DialogFragment {
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        Calendar mCalender = Calendar.getInstance();
+        int year = mCalender.get(Calendar.YEAR);
+        int month = mCalender.get(Calendar.MONTH);
+        int dayOfMonth = mCalender.get(Calendar.DAY_OF_MONTH);
+        return new DatePickerDialog(getActivity(), (DatePickerDialog.OnDateSetListener)
+                getActivity(), year, month, dayOfMonth);
+    }
+}
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/listener/DateRangeActionListener.java b/opensrp-kip/src/main/java/org/smartregister/kip/listener/DateRangeActionListener.java
old mode 100755
new mode 100644
diff --git a/opensrp-kip/src/main/res/layout/moh510_content_view.xml b/opensrp-kip/src/main/res/layout/moh510_content_view.xml
index 17ac352..4677385 100644
--- a/opensrp-kip/src/main/res/layout/moh510_content_view.xml
+++ b/opensrp-kip/src/main/res/layout/moh510_content_view.xml
@@ -8,6 +8,7 @@
     android:orientation="horizontal">
 
     <FrameLayout
+        android:id="@+id/www"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@drawable/dialog_shape">
@@ -126,8 +127,38 @@
 
             </LinearLayout>
 
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:layout_marginBottom="10dp"
+                android:layout_marginTop="10dp"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+
+                <TextView
+                    android:id="@+id/tvDate"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:text="Date" />
+
+                <Button
+                    android:id="@+id/btPickDate"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tvDate"
+                    android:layout_centerInParent="true"
+                    android:text="Pick Date" />
+
+            </LinearLayout>
+
         </LinearLayout>
 
+
     </FrameLayout>
 
+
+
 </FrameLayout>
\ No newline at end of file

From 34a8555563db57dbcb7cf468d121aff224afec79 Mon Sep 17 00:00:00 2001
From: Ogollah <kogollah2011@gmail.com>
Date: Fri, 18 Jun 2021 19:22:37 +0300
Subject: [PATCH 04/12] :construction: add moh510 repository

---
 opensrp-kip/build.gradle                      |   2 +-
 .../src/main/assets/ec_client_fields.json     |  42 +++
 .../kip/activity/Moh510ReportActivity.java    | 175 ++++++---
 .../kip/activity/SmsActivity.java             |  10 +-
 .../kip/application/KipApplication.java       |   9 +
 .../kip/pojo/Moh510SummaryReport.java         | 351 ++++++++++++++++++
 ...lledClient.java => SmsEnrolledClient.java} |   2 +-
 .../Moh510SummaryReportRepository.java        | 124 +++++++
 .../SmsEnrolledClientRepository.java          |  30 +-
 .../main/res/layout/moh510_content_view.xml   | 130 ++++++-
 10 files changed, 788 insertions(+), 87 deletions(-)
 create mode 100644 opensrp-kip/src/main/java/org/smartregister/kip/pojo/Moh510SummaryReport.java
 rename opensrp-kip/src/main/java/org/smartregister/kip/pojo/{SmsErolledClient.java => SmsEnrolledClient.java} (96%)
 create mode 100644 opensrp-kip/src/main/java/org/smartregister/kip/repository/Moh510SummaryReportRepository.java

diff --git a/opensrp-kip/build.gradle b/opensrp-kip/build.gradle
index 88e9759..d4f4741 100755
--- a/opensrp-kip/build.gradle
+++ b/opensrp-kip/build.gradle
@@ -164,7 +164,7 @@ dependencies {
     }
 
 
-    api('org.smartregister:opensrp-client-core:1.12.0-SNAPSHOT@aar') {
+    api('org.smartregister:opensrp-client-core:1.12.01-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'id.zelory', module: 'compressor'
         exclude group: 'com.github.bmelnychuk', module: 'atv'
diff --git a/opensrp-kip/src/main/assets/ec_client_fields.json b/opensrp-kip/src/main/assets/ec_client_fields.json
index 53fe492..35751a5 100755
--- a/opensrp-kip/src/main/assets/ec_client_fields.json
+++ b/opensrp-kip/src/main/assets/ec_client_fields.json
@@ -429,6 +429,20 @@
             "field": "attributes.phone_number"
           }
         },
+        {
+          "column_name": "first_name",
+          "type": "Client",
+          "json_mapping": {
+            "field": "firstName"
+          }
+        },
+        {
+          "column_name": "last_name",
+          "type": "Client",
+          "json_mapping": {
+            "field": "lastName"
+          }
+        },
         {
           "column_name": "alt_name",
           "type": "Client",
@@ -614,6 +628,20 @@
             "field": "attributes.lost_to_follow_up"
           }
         },
+        {
+          "column_name": "first_name",
+          "type": "Client",
+          "json_mapping": {
+            "field": "firstName"
+          }
+        },
+        {
+          "column_name": "last_name",
+          "type": "Client",
+          "json_mapping": {
+            "field": "lastName"
+          }
+        },
         {
           "column_name": "dob",
           "type": "Client",
@@ -728,6 +756,20 @@
             "field": "baseEntityId"
           }
         },
+        {
+          "column_name": "first_name",
+          "type": "Client",
+          "json_mapping": {
+            "field": "firstName"
+          }
+        },
+        {
+          "column_name": "last_name",
+          "type": "Client",
+          "json_mapping": {
+            "field": "lastName"
+          }
+        },
         {
           "column_name": "father_phone",
           "type": "Client",
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java b/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java
index 870856a..cf0ed22 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java
@@ -9,50 +9,50 @@
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.FrameLayout;
 import android.widget.ImageButton;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
-import android.view.View;
-import android.widget.TextView;
 
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.util.CellReference;
 import org.smartregister.child.util.Utils;
 import org.smartregister.kip.R;
-import org.smartregister.kip.listener.DatePicker;
+import org.smartregister.kip.application.KipApplication;
+import org.smartregister.kip.pojo.Moh510SummaryReport;
+import org.smartregister.kip.repository.Moh510SummaryReportRepository;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
 
-public class Moh510ReportActivity extends AppCompatActivity implements DatePickerDialog.OnDateSetListener, View.OnClickListener {
 
-    private static final SimpleDateFormat MMMYYYY = new SimpleDateFormat("MMMM yyyy");
+public class Moh510ReportActivity extends AppCompatActivity implements DatePickerDialog.OnDateSetListener, View.OnClickListener {
 
     private File filePath = new File(Environment.getExternalStorageDirectory()+"/moh510Report.xls");
+    private int mYear, mMonth, mDay, mHour, mMinute;
     ImageButton closeReport;
-    TextView tvDate;
-    EditText endDate;
-    EditText startDate;
-    Button btPickDate;
-    Button cancel;
+    EditText endTextDate, startEditTextDate;
+    Button cancel, endDateBtn,startDateBtn, customDateRangeBtn;
+    FrameLayout frameLayout, download;
 
     private String[] columnsVariable = {"KIP ID", "CHILD'S NAME", "SEX", "DATE OF BIRTH (DD/MM/YYYY)",
             "DATE FIRST SEEN", "FATHER'S FULL NAME", "MOTHER'S FULL NAME", "MOTHER'S PHONE NUMBER","VILLAGE/ESTATE/LANDMARK",
             "TELEPHONE NUMBER", "BCG", "POLIO BIRTH DOSE", "OPV1", "OPV2", "OPV3","IPV", "DPT/HEP.B/HIB.1","DPT/HEP.B/HIB.2",
             "DPT/HEP.B/HIB.3", "PCV 10 (PNEUMOCOCCAL) 1","PCV 10 (PNEUMOCOCCAL) 2","PCV 10 (PNEUMOCOCCAL) 3", "ROTA 1",
-            "ROTA 2", "VITAMIN A","MEASLES 1","YELLOW FEVER", "FULLY IMMUNIZED", "MEASLES 2 (MR 2)", "REMARKS"};
+            "ROTA 2", "VITAMIN A","MEASLES 1","YELLOW FEVER","Malaria 1","Malaria 2", "Malaria 3", "FULLY IMMUNIZED", "MEASLES 2 (MR 2)", "Malaria 4", "REMARKS"};
 
     private List<String> mohIndicators = Arrays.asList(columnsVariable);
 
@@ -66,15 +66,21 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         ActivityCompat.requestPermissions(this, new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE,
                 Manifest.permission.WRITE_EXTERNAL_STORAGE}, PackageManager.PERMISSION_GRANTED);
+        endTextDate = findViewById(R.id.end_date);
+        startEditTextDate = findViewById(R.id.start_date);
+        startDateBtn = findViewById(R.id.start_date_button);
+        endDateBtn = findViewById(R.id.end_date_button);
+        customDateRangeBtn = findViewById(R.id.custom_date_button);
+        frameLayout = findViewById(R.id.custom_date);
+        download = findViewById(R.id.download);
 
-        tvDate = findViewById(R.id.tvDate);
-        endDate = findViewById(R.id.end_date);
-        startDate = findViewById(R.id.start_date);
-        btPickDate = findViewById(R.id.btPickDate);
         cancel = findViewById(R.id.cancel);
         cancel.setOnClickListener(this);
-        btPickDate.setOnClickListener(this);
+        startDateBtn.setOnClickListener(this);
+        endDateBtn.setOnClickListener(this);
+        customDateRangeBtn.setOnClickListener(this);
         closeReport.setOnClickListener(this);
+
     }
 
 
@@ -85,25 +91,98 @@ public void onClick(View v) {
             Intent intent = new Intent(v.getContext(), ChildRegisterActivity.class);
             startActivityForResult(intent, 0);
             finish();
-        } else if (v == btPickDate ){
-            DatePicker mDatePickerDialogFragment;
-            mDatePickerDialogFragment = new DatePicker();
-            mDatePickerDialogFragment.show(getSupportFragmentManager(), "DATE PICK");
+        } else if (v == startDateBtn){
+
+            // Get Current Date
+            final Calendar c = Calendar.getInstance();
+            mYear = c.get(Calendar.YEAR);
+            mMonth = c.get(Calendar.MONTH);
+            mDay = c.get(Calendar.DAY_OF_MONTH);
+            DatePickerDialog datePickerDialog = new DatePickerDialog(this,
+                    new DatePickerDialog.OnDateSetListener() {
+                        @Override
+                        public void onDateSet(android.widget.DatePicker view, int year, int month, int dayOfMonth) {
+                            startEditTextDate.setText(dayOfMonth + "-" + (month + 1) + "-" + year);
+                        }
+                    }, mYear, mMonth, mDay);
+            datePickerDialog.show();
+
+
+            if (v == startDateBtn){
+                startEditTextDate.setVisibility(View.VISIBLE);
+                startDateBtn.setVisibility(View.GONE);
+            }if (v==endDateBtn){
+                endTextDate.setVisibility(View.VISIBLE);
+                endDateBtn.setVisibility(View.GONE);
+            }
         } else if(v==cancel){
-            startDate.setText("");
-            endDate.setText("");
+            startEditTextDate.setText("");
+            endTextDate.setText("");
+            endTextDate.setVisibility(View.GONE);
+            endDateBtn.setVisibility(View.GONE);
+            endDateBtn.setVisibility(View.VISIBLE);
+            startDateBtn.setVisibility(View.VISIBLE);
+        } else if (v == endDateBtn){
+
+            // Get Current Date
+            final Calendar c = Calendar.getInstance();
+            mYear = c.get(Calendar.YEAR);
+            mMonth = c.get(Calendar.MONTH);
+            mDay = c.get(Calendar.DAY_OF_MONTH);
+            DatePickerDialog datePickerDialog = new DatePickerDialog(this,
+                    new DatePickerDialog.OnDateSetListener() {
+                        @Override
+                        public void onDateSet(android.widget.DatePicker view, int year, int month, int dayOfMonth) {
+                            endTextDate.setText(dayOfMonth + "-" + (month + 1) + "-" + year);
+                        }
+                    }, mYear, mMonth, mDay);
+            datePickerDialog.show();
+
+
+            if (v == startDateBtn){
+                startEditTextDate.setVisibility(View.VISIBLE);
+                startDateBtn.setVisibility(View.GONE);
+            }if (v==endDateBtn){
+                endTextDate.setVisibility(View.VISIBLE);
+                endDateBtn.setVisibility(View.GONE);
+            }
+        } else if (v== customDateRangeBtn){
+            frameLayout.setVisibility(View.VISIBLE);
+            download.setVisibility(View.GONE);
         }
 
     }
 
+    private String dateConverter(String date) {
+        if (date != null) {
+            long l=Long.parseLong(date);
+
+            Date dateParser = new Date(Long.parseLong(date));
+            SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy");
+            return dateFormat.format(dateParser);
+        }
+        return null;
+    }
+
+    Map<Integer, Object[]> reportInfo =
+            new TreeMap<Integer, Object[]>();
+
     public void buttonWriteToExcel(View view){
 
+        int i = 0;
+        for (Moh510SummaryReport report:getIndicatorValues()){
+            reportInfo.put(i++,new Object[]{report.getKipId(), report.getChildFullName(),report.getSex(),
+                    report.getDob(), report.getDateFirstSeen(), report.getFatherName(),report.getMotherName(),
+                    report.getMotherPhoneNumber(), report.getVillage(),report.getTelephone(), dateConverter(report.getBcg()),
+                    dateConverter(report.getPolioBirthDose()), dateConverter(report.getOpv1()), dateConverter(report.getOpv2()),dateConverter(report.getOpv3()), dateConverter(report.getIpv()),
+            dateConverter(report.getDpt1()),dateConverter(report.getDpt2()),dateConverter(report.getDpt3()), dateConverter(report.getPcv1()), dateConverter(report.getPcv2()),dateConverter(report.getPcv3()), dateConverter(report.getRota1()),dateConverter(report.getRota2()),
+            dateConverter(report.getVitaminA()),dateConverter(report.getMeasles1()),dateConverter(report.getYellowFever()), dateConverter(report.getMalaria1()),dateConverter(report.getMalaria2()),dateConverter(report.getMalaria3()),dateConverter(report.getFullyImmunized()),dateConverter(report.getMeasles2()),dateConverter(report.getMalaria4())});
+        }
+
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-            DateTimeFormatter dtf = DateTimeFormatter.ofPattern("dd-MM-yyyy");
-            LocalDateTime now = LocalDateTime.now();
 
             HSSFWorkbook hssfWorkbook = new HSSFWorkbook();
-            HSSFSheet sheets = hssfWorkbook.createSheet("moh 510 Report");
+            HSSFSheet sheets = hssfWorkbook.createSheet("ImmunizationRegister");
             HSSFRow tittle = sheets.createRow(0);
             HSSFRow facility = sheets.createRow(1);
             HSSFRow year = sheets.createRow(2);
@@ -119,12 +198,13 @@ public void buttonWriteToExcel(View view){
             HSSFCell endDate = dateRange.createCell(3);
             tittleCell.setCellValue("Permanent Immunization Register(MOH 510)");
             facilityCell.setCellValue("Health Facility: Asayi Dispensary");
-            yearCell.setCellValue("Year of Enrollment");
+            yearCell.setCellValue("Year of Enrollment: ");
 
             strStart.setCellValue("Start Date");
             strEnd.setCellValue("End Date");
-            endDate.setCellValue(tvDate.getText().toString());
-            startDate.setCellValue(tvDate.getText().toString());
+            endDate.setCellValue(endTextDate.getText().toString());
+            startDate.setCellValue(startEditTextDate.getText().toString());
+
 
 //            Column names
             for (int cell = 0; cell<mohIndicators.size(); cell ++){
@@ -133,19 +213,20 @@ public void buttonWriteToExcel(View view){
                 cell1.setCellValue(value);
             }
 
-            int columnNumber = 10;
+            HSSFRow queryRow;
+            int columnNumber = getIndicatorValues().size();
 
 //            row data
-            for (int dataRow = 5; dataRow < columnNumber; dataRow ++){
-
-                HSSFRow queryRow = sheets.createRow(dataRow);
-                for (int dataCell = 0; dataCell<mohIndicators.size(); dataCell ++){
-
-                    HSSFCell queryDataCell = queryRow.createCell(dataCell);
-
-                    String str = new CellReference(queryDataCell).formatAsString();
-                    queryDataCell.setCellValue(str);
+            Set<Integer> keyId = reportInfo.keySet();
+            for (Integer key: keyId){
+                queryRow = sheets.createRow(columnNumber++);
+                Object [] objectArr = reportInfo.get(key);
+                int cellId = 0;
+                for (Object obj:objectArr){
+                    HSSFCell queryDataCell = queryRow.createCell(cellId++);
+                    queryDataCell.setCellValue((String)obj);
                 }
+
             }
             try {
 
@@ -166,6 +247,12 @@ public void buttonWriteToExcel(View view){
         Utils.showToast(this, "Report Downloaded Successfully");
     }
 
+    private List<Moh510SummaryReport> getIndicatorValues(){
+        Moh510SummaryReportRepository summaryReportRepository = KipApplication.getInstance().moh510SummaryReportRepository();
+        List<Moh510SummaryReport> reportList = summaryReportRepository.getMoh510SummaryReport();
+        return reportList;
+    }
+
     @Override
     public void onDateSet(android.widget.DatePicker view, int year, int month, int dayOfMonth) {
         Calendar mCalender = Calendar.getInstance();
@@ -173,9 +260,7 @@ public void onDateSet(android.widget.DatePicker view, int year, int month, int d
         mCalender.set(Calendar.MONTH, month);
         mCalender.set(Calendar.DAY_OF_MONTH, dayOfMonth);
         String selectedDate = DateFormat.getDateInstance(DateFormat.FULL).format(mCalender.getTime());
-
-        tvDate.setText(selectedDate);
-        endDate.setText(selectedDate);
-        startDate.setText(selectedDate);
+//        endDate.setText(selectedDate);
+//        startDate.setText(selectedDate);
     }
 }
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/activity/SmsActivity.java b/opensrp-kip/src/main/java/org/smartregister/kip/activity/SmsActivity.java
index 4aad21a..6963044 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/activity/SmsActivity.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/activity/SmsActivity.java
@@ -20,7 +20,7 @@
 import org.smartregister.kip.adapter.SmsEnrollmentAdapter;
 import org.smartregister.kip.application.KipApplication;
 import org.smartregister.kip.model.SmsEnrollementModel;
-import org.smartregister.kip.pojo.SmsErolledClient;
+import org.smartregister.kip.pojo.SmsEnrolledClient;
 import org.smartregister.kip.repository.SmsEnrolledClientRepository;
 
 import java.util.ArrayList;
@@ -158,9 +158,9 @@ private ArrayList<SmsEnrollementModel> getModel(boolean isSelected){
     private List<String> getFullName(){
         List<String> list = new ArrayList<>();
         SmsEnrolledClientRepository smsEnrolledClient = KipApplication.getInstance().smsEnrolledClientRepository();
-        List<SmsErolledClient> enrolledClients = smsEnrolledClient.getEnrolledClients();
+        List<SmsEnrolledClient> enrolledClients = smsEnrolledClient.getEnrolledClients();
         if (enrolledClients !=null){
-            for (SmsErolledClient enrolledClient : enrolledClients){
+            for (SmsEnrolledClient enrolledClient : enrolledClients){
                 list.add(enrolledClient.getFirstName() + " " + enrolledClient.getLastName() );
             }
         }
@@ -170,9 +170,9 @@ private List<String> getFullName(){
     public List<String> getPhoneNumber(){
         List<String> list = new ArrayList<>();
         SmsEnrolledClientRepository smsEnrolledClient = KipApplication.getInstance().smsEnrolledClientRepository();
-        List<SmsErolledClient> enrolledClients = smsEnrolledClient.getEnrolledClients();
+        List<SmsEnrolledClient> enrolledClients = smsEnrolledClient.getEnrolledClients();
         if (enrolledClients !=null){
-            for (SmsErolledClient enrolledClient : enrolledClients){
+            for (SmsEnrolledClient enrolledClient : enrolledClients){
                 list.add(enrolledClient.getPhoneNumber());
             }
         }
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/application/KipApplication.java b/opensrp-kip/src/main/java/org/smartregister/kip/application/KipApplication.java
index 9a6b5da..40a3cb8 100755
--- a/opensrp-kip/src/main/java/org/smartregister/kip/application/KipApplication.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/application/KipApplication.java
@@ -67,6 +67,7 @@
 import org.smartregister.kip.repository.KipLocationRepository;
 import org.smartregister.kip.repository.KipOpdVisitSummaryRepository;
 import org.smartregister.kip.repository.KipRepository;
+import org.smartregister.kip.repository.Moh510SummaryReportRepository;
 import org.smartregister.kip.repository.MonthlyTalliesRepository;
 import org.smartregister.kip.repository.OpdCovid19CalculateRiskRepository;
 import org.smartregister.kip.repository.OpdCovid19VaccinationEligibilityRepository;
@@ -140,6 +141,7 @@ public class KipApplication extends DrishtiApplication implements TimeChangedBro
     private OpdMedicalCheckFormRepository opdMedicalCheckAndVaccinateFormRepository;
     private OpdInfluenzaVaccineAdministrationFormRepository opdInfluenzaVaccineAdministrationFormRepository;
     private SmsEnrolledClientRepository smsEnrolledClientRepository;
+    private Moh510SummaryReportRepository moh510SummaryReportRepository;
 
 
     public static JsonSpecHelper getJsonSpecHelper() {
@@ -624,6 +626,13 @@ public SmsEnrolledClientRepository smsEnrolledClientRepository(){
         return smsEnrolledClientRepository;
     }
 
+    public Moh510SummaryReportRepository moh510SummaryReportRepository(){
+        if (moh510SummaryReportRepository == null){
+            moh510SummaryReportRepository = new Moh510SummaryReportRepository();
+        }
+        return moh510SummaryReportRepository;
+    }
+
     public void populateGlobalSettings() {
         Setting setting = getSettings(KipConstants.Settings.VACCINE_STOCK_IDENTIFIER);
         populateGlobalSettingsCore(setting);
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/pojo/Moh510SummaryReport.java b/opensrp-kip/src/main/java/org/smartregister/kip/pojo/Moh510SummaryReport.java
new file mode 100644
index 0000000..422d244
--- /dev/null
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/pojo/Moh510SummaryReport.java
@@ -0,0 +1,351 @@
+package org.smartregister.kip.pojo;
+
+public class Moh510SummaryReport {
+    private String kipId;
+    private String childFullName;
+    private String sex;
+    private String dob;
+    private String dateFirstSeen;
+    private String fatherName;
+    private String motherName;
+    private String motherPhoneNumber;
+    private String village;
+    private String telephone;
+    private String bcg;
+    private String polioBirthDose;
+    private String opv1;
+    private String opv2;
+    private String opv3;
+    private String ipv;
+    private String dpt1;
+    private String dpt2;
+    private String dpt3;
+    private String pcv1;
+    private String pcv2;
+    private String pcv3;
+    private String rota1;
+    private String rota2;
+    private String vitaminA;
+    private String measles1;
+    private String yellowFever;
+    private String malaria1;
+    private String malaria2;
+    private String malaria3;
+    private String fullyImmunized;
+    private String measles2;
+    private String malaria4;
+    private String remarks;
+
+
+    public String getKipId() {
+        return kipId;
+    }
+
+    public void setKipId(String kipId) {
+        this.kipId = kipId;
+    }
+
+    public String getChildFullName() {
+        return childFullName;
+    }
+
+    public void setChildFullName(String childFullName) {
+        this.childFullName = childFullName;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getDob() {
+        return dob;
+    }
+
+    public void setDob(String dob) {
+        this.dob = dob;
+    }
+
+    public String getDateFirstSeen() {
+        return dateFirstSeen;
+    }
+
+    public void setDateFirstSeen(String dateFirstSeen) {
+        this.dateFirstSeen = dateFirstSeen;
+    }
+
+    public String getFatherName() {
+        return fatherName;
+    }
+
+    public void setFatherName(String fatherName) {
+        this.fatherName = fatherName;
+    }
+
+    public String getMotherName() {
+        return motherName;
+    }
+
+    public void setMotherName(String motherName) {
+        this.motherName = motherName;
+    }
+
+    public String getMotherPhoneNumber() {
+        return motherPhoneNumber;
+    }
+
+    public void setMotherPhoneNumber(String motherPhoneNumber) {
+        this.motherPhoneNumber = motherPhoneNumber;
+    }
+
+    public String getVillage() {
+        return village;
+    }
+
+    public void setVillage(String village) {
+        this.village = village;
+    }
+
+    public String getTelephone() {
+        return telephone;
+    }
+
+    public void setTelephone(String telephone) {
+        this.telephone = telephone;
+    }
+
+    public String getBcg() {
+        return bcg;
+    }
+
+    public void setBcg(String bcg) {
+        this.bcg = bcg;
+    }
+
+    public String getPolioBirthDose() {
+        return polioBirthDose;
+    }
+
+    public void setPolioBirthDose(String polioBirthDose) {
+        this.polioBirthDose = polioBirthDose;
+    }
+
+    public String getOpv1() {
+        return opv1;
+    }
+
+    public void setOpv1(String opv1) {
+        this.opv1 = opv1;
+    }
+
+    public String getOpv2() {
+        return opv2;
+    }
+
+    public void setOpv2(String opv2) {
+        this.opv2 = opv2;
+    }
+
+    public String getOpv3() {
+        return opv3;
+    }
+
+    public void setOpv3(String opv3) {
+        this.opv3 = opv3;
+    }
+
+    public String getIpv() {
+        return ipv;
+    }
+
+    public void setIpv(String ipv) {
+        this.ipv = ipv;
+    }
+
+    public String getDpt1() {
+        return dpt1;
+    }
+
+    public void setDpt1(String dpt1) {
+        this.dpt1 = dpt1;
+    }
+
+    public String getDpt2() {
+        return dpt2;
+    }
+
+    public void setDpt2(String dpt2) {
+        this.dpt2 = dpt2;
+    }
+
+    public String getDpt3() {
+        return dpt3;
+    }
+
+    public void setDpt3(String dpt3) {
+        this.dpt3 = dpt3;
+    }
+
+    public String getPcv1() {
+        return pcv1;
+    }
+
+    public void setPcv1(String pcv1) {
+        this.pcv1 = pcv1;
+    }
+
+    public String getPcv2() {
+        return pcv2;
+    }
+
+    public void setPcv2(String pcv2) {
+        this.pcv2 = pcv2;
+    }
+
+    public String getPcv3() {
+        return pcv3;
+    }
+
+    public void setPcv3(String pcv3) {
+        this.pcv3 = pcv3;
+    }
+
+    public String getRota1() {
+        return rota1;
+    }
+
+    public void setRota1(String rota1) {
+        this.rota1 = rota1;
+    }
+
+    public String getRota2() {
+        return rota2;
+    }
+
+    public void setRota2(String rota2) {
+        this.rota2 = rota2;
+    }
+
+    public String getVitaminA() {
+        return vitaminA;
+    }
+
+    public void setVitaminA(String vitaminA) {
+        this.vitaminA = vitaminA;
+    }
+
+    public String getMeasles1() {
+        return measles1;
+    }
+
+    public void setMeasles1(String measles1) {
+        this.measles1 = measles1;
+    }
+
+    public String getYellowFever() {
+        return yellowFever;
+    }
+
+    public void setYellowFever(String yellowFever) {
+        this.yellowFever = yellowFever;
+    }
+
+    public String getFullyImmunized() {
+        return fullyImmunized;
+    }
+
+    public void setFullyImmunized(String fullyImmunized) {
+        this.fullyImmunized = fullyImmunized;
+    }
+
+    public String getMeasles2() {
+        return measles2;
+    }
+
+    public void setMeasles2(String measles2) {
+        this.measles2 = measles2;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getMalaria1() {
+        return malaria1;
+    }
+
+    public void setMalaria1(String malaria1) {
+        this.malaria1 = malaria1;
+    }
+
+    public String getMalaria2() {
+        return malaria2;
+    }
+
+    public void setMalaria2(String malaria2) {
+        this.malaria2 = malaria2;
+    }
+
+    public String getMalaria3() {
+        return malaria3;
+    }
+
+    public void setMalaria3(String malaria3) {
+        this.malaria3 = malaria3;
+    }
+
+    public String getMalaria4() {
+        return malaria4;
+    }
+
+    public void setMalaria4(String malaria4) {
+        this.malaria4 = malaria4;
+    }
+
+    @Override
+    public String toString() {
+        return "Moh510SummaryReport{" +
+                "kipId='" + kipId + '\'' +
+                ", childFullName='" + childFullName + '\'' +
+                ", sex='" + sex + '\'' +
+                ", dob='" + dob + '\'' +
+                ", dateFirstSeen='" + dateFirstSeen + '\'' +
+                ", fatherName='" + fatherName + '\'' +
+                ", motherName='" + motherName + '\'' +
+                ", motherPhoneNumber='" + motherPhoneNumber + '\'' +
+                ", village='" + village + '\'' +
+                ", telephone='" + telephone + '\'' +
+                ", bcg='" + bcg + '\'' +
+                ", polioBirthDose='" + polioBirthDose + '\'' +
+                ", opv1='" + opv1 + '\'' +
+                ", opv2='" + opv2 + '\'' +
+                ", opv3='" + opv3 + '\'' +
+                ", ipv='" + ipv + '\'' +
+                ", dpt1='" + dpt1 + '\'' +
+                ", dpt2='" + dpt2 + '\'' +
+                ", dpt3='" + dpt3 + '\'' +
+                ", pcv1='" + pcv1 + '\'' +
+                ", pcv2='" + pcv2 + '\'' +
+                ", pcv3='" + pcv3 + '\'' +
+                ", rota1='" + rota1 + '\'' +
+                ", rota2='" + rota2 + '\'' +
+                ", vitaminA='" + vitaminA + '\'' +
+                ", measles1='" + measles1 + '\'' +
+                ", yellowFever='" + yellowFever + '\'' +
+                ", malaria1='" + malaria1 + '\'' +
+                ", malaria2='" + malaria2 + '\'' +
+                ", malaria3='" + malaria3 + '\'' +
+                ", fullyImmunized='" + fullyImmunized + '\'' +
+                ", measles2='" + measles2 + '\'' +
+                ", malaria4='" + malaria4 + '\'' +
+                ", remarks='" + remarks + '\'' +
+                '}';
+    }
+}
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/pojo/SmsErolledClient.java b/opensrp-kip/src/main/java/org/smartregister/kip/pojo/SmsEnrolledClient.java
similarity index 96%
rename from opensrp-kip/src/main/java/org/smartregister/kip/pojo/SmsErolledClient.java
rename to opensrp-kip/src/main/java/org/smartregister/kip/pojo/SmsEnrolledClient.java
index 3276a97..2c878c5 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/pojo/SmsErolledClient.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/pojo/SmsEnrolledClient.java
@@ -1,6 +1,6 @@
 package org.smartregister.kip.pojo;
 
-public class SmsErolledClient {
+public class SmsEnrolledClient {
 
     private String phoneNumber;
     private String firstName;
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/repository/Moh510SummaryReportRepository.java b/opensrp-kip/src/main/java/org/smartregister/kip/repository/Moh510SummaryReportRepository.java
new file mode 100644
index 0000000..05d0472
--- /dev/null
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/repository/Moh510SummaryReportRepository.java
@@ -0,0 +1,124 @@
+package org.smartregister.kip.repository;
+
+import net.sqlcipher.Cursor;
+import net.sqlcipher.database.SQLiteDatabase;
+
+import org.smartregister.kip.pojo.Moh510SummaryReport;
+import org.smartregister.repository.BaseRepository;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import timber.log.Timber;
+
+public class Moh510SummaryReportRepository extends BaseRepository {
+
+    private String sql(){
+
+        String sql = "SELECT client.opensrp_id AS kip_id, COALESCE(child_details.first_name , ' ', child_details.last_name) As child_full_name,\n" +
+                "       client.gender As sex, child_details.dob, client.date AS date_first_seen, COALESCE(father_details.first_name , ' ', father_details.last_name) As father_full_name,\n" +
+                "       COALESCE(mother_details.first_name , ' ', mother_details.last_name) As mother_full_name,\n" +
+                "       mother_details.phone_number AS mother_phone, client.village, mother_details.phone_number AS telephone_number,\n" +
+                "       CASE WHEN vaccines.name = 'bcg' THEN vaccines.date ELSE Null END \"bcg\",\n" +
+                "       CASE WHEN vaccines.name = 'opv_0' THEN vaccines.date ELSE Null END \"polio_birth_dose\",\n" +
+                "       CASE WHEN vaccines.name = 'opv_1' THEN vaccines.date ELSE Null END \"opv1\",\n" +
+                "       CASE WHEN vaccines.name = 'opv_2' THEN vaccines.date ELSE Null END \"opv2\",\n" +
+                "       CASE WHEN vaccines.name = 'opv_3' THEN vaccines.date ELSE Null END \"opv3\",\n" +
+                "       CASE WHEN vaccines.name = 'ipv' THEN vaccines.date ELSE Null END \"ipv\",\n" +
+                "       CASE WHEN vaccines.name = 'penta_1' THEN vaccines.date ELSE Null END \"penta1\",\n" +
+                "       CASE WHEN vaccines.name = 'penta_2' THEN vaccines.date ELSE Null END \"penta2\",\n" +
+                "       CASE WHEN vaccines.name = 'penta_3' THEN vaccines.date ELSE Null END \"penta3\",\n" +
+                "       CASE WHEN vaccines.name = 'pcv_1' THEN vaccines.date ELSE Null END \"pcv1\",\n" +
+                "       CASE WHEN vaccines.name = 'pcv_2' THEN vaccines.date ELSE Null END \"pcv2\",\n" +
+                "       CASE WHEN vaccines.name = 'pcv_3' THEN vaccines.date ELSE Null END \"pcv3\",\n" +
+                "       CASE WHEN vaccines.name = 'rota_1' THEN vaccines.date ELSE Null END \"rota1\",\n" +
+                "       CASE WHEN vaccines.name = 'rota_2' THEN vaccines.date ELSE Null END \"rota2\",\n" +
+                "       CASE WHEN vaccines.name = 'mr_1' THEN vaccines.date ELSE Null END \"mr1\",\n" +
+                "       CASE WHEN vaccines.name = 'vitamin_a' THEN vaccines.date ELSE Null END \"vitamin_a\",\n" +
+                "       CASE WHEN vaccines.name = 'yellow_fever' THEN vaccines.date ELSE Null END \"yellow_fever\",\n" +
+                "       CASE WHEN vaccines.name = 'mv_1' THEN vaccines.date ELSE Null END \"mv1\",\n" +
+                "       CASE WHEN vaccines.name = 'mv_2' THEN vaccines.date ELSE Null END \"mv2\",\n" +
+                "       CASE WHEN vaccines.name = 'mv_3' THEN vaccines.date ELSE Null END \"mv3\",\n" +
+                "       CASE WHEN vaccines.name = 'mr_1' THEN vaccines.date ELSE Null END \"fully_immunized\",\n" +
+                "       CASE WHEN vaccines.name = 'mr_2' THEN vaccines.date ELSE Null END \"mr2\",\n" +
+                "       CASE WHEN vaccines.name = 'mv_4' THEN vaccines.date ELSE Null END \"mv4\"\n" +
+                "FROM ec_child_details child_details\n" +
+                "LEFT JOIN ec_mother_details mother_details ON child_details.base_entity_id = mother_details.base_entity_id\n" +
+                "LEFT JOIN ec_father_details father_details ON child_details.base_entity_id = father_details.base_entity_id\n" +
+                "LEFT JOIN ec_client client ON child_details.base_entity_id = client.base_entity_id\n" +
+                "LEFT JOIN vaccines ON vaccines.base_entity_id = child_details.base_entity_id\n" +
+                "GROUP BY child_details.base_entity_id;";
+
+        return sql;
+    }
+
+    public List<Moh510SummaryReport> getMoh510SummaryReport(){
+        List<Moh510SummaryReport> moh510SummaryReports = new ArrayList<>();
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor sCursor = null;
+
+        try {
+            sCursor = db.rawQuery(sql(),null);
+            moh510SummaryReports = readAll(sCursor);
+
+        } catch (Exception e){
+            Timber.d("-->getMoh510SummaryReport" + e.getMessage());
+        } finally {
+            if (sCursor !=null){
+                sCursor.close();
+            }
+        }
+        return moh510SummaryReports;
+    }
+
+    public Moh510SummaryReport getMoh510SummaryReport(Cursor cursor){
+        Moh510SummaryReport moh510SummaryReport = new Moh510SummaryReport();
+        moh510SummaryReport.setKipId(cursor.getString(cursor.getColumnIndex("kip_id")));
+        moh510SummaryReport.setChildFullName(cursor.getString(cursor.getColumnIndex("child_full_name")));
+        moh510SummaryReport.setSex(cursor.getString(cursor.getColumnIndex("sex")));
+        moh510SummaryReport.setDob(cursor.getString(cursor.getColumnIndex("dob")));
+        moh510SummaryReport.setDateFirstSeen(cursor.getString(cursor.getColumnIndex("date_first_seen")));
+        moh510SummaryReport.setFatherName(cursor.getString(cursor.getColumnIndex("father_full_name")));
+        moh510SummaryReport.setMotherName(cursor.getString(cursor.getColumnIndex("mother_full_name")));
+        moh510SummaryReport.setMotherPhoneNumber(cursor.getString(cursor.getColumnIndex("mother_phone")));
+        moh510SummaryReport.setVillage(cursor.getString(cursor.getColumnIndex("village")));
+        moh510SummaryReport.setTelephone(cursor.getString(cursor.getColumnIndex("telephone_number")));
+        moh510SummaryReport.setBcg(cursor.getString(cursor.getColumnIndex("bcg")));
+        moh510SummaryReport.setPolioBirthDose(cursor.getString(cursor.getColumnIndex("polio_birth_dose")));
+        moh510SummaryReport.setOpv1(cursor.getString(cursor.getColumnIndex("opv1")));
+        moh510SummaryReport.setOpv2(cursor.getString(cursor.getColumnIndex("opv2")));
+        moh510SummaryReport.setOpv3(cursor.getString(cursor.getColumnIndex("opv3")));
+        moh510SummaryReport.setIpv(cursor.getString(cursor.getColumnIndex("ipv")));
+        moh510SummaryReport.setDpt1(cursor.getString(cursor.getColumnIndex("penta1")));
+        moh510SummaryReport.setDpt2(cursor.getString(cursor.getColumnIndex("penta2")));
+        moh510SummaryReport.setDpt3(cursor.getString(cursor.getColumnIndex("penta3")));
+        moh510SummaryReport.setPcv1(cursor.getString(cursor.getColumnIndex("pcv1")));
+        moh510SummaryReport.setPcv2(cursor.getString(cursor.getColumnIndex("pcv2")));
+        moh510SummaryReport.setPcv3(cursor.getString(cursor.getColumnIndex("pcv3")));
+        moh510SummaryReport.setRota1(cursor.getString(cursor.getColumnIndex("rota1")));
+        moh510SummaryReport.setRota2(cursor.getString(cursor.getColumnIndex("rota2")));
+        moh510SummaryReport.setVitaminA(cursor.getString(cursor.getColumnIndex("vitamin_a")));
+        moh510SummaryReport.setMeasles1(cursor.getString(cursor.getColumnIndex("mr1")));
+        moh510SummaryReport.setYellowFever(cursor.getString(cursor.getColumnIndex("yellow_fever")));
+        moh510SummaryReport.setMalaria1(cursor.getString(cursor.getColumnIndex("mv1")));
+        moh510SummaryReport.setMalaria2(cursor.getString(cursor.getColumnIndex("mv2")));
+        moh510SummaryReport.setMalaria3(cursor.getString(cursor.getColumnIndex("mv3")));
+        moh510SummaryReport.setFullyImmunized(cursor.getString(cursor.getColumnIndex("fully_immunized")));
+        moh510SummaryReport.setMeasles2(cursor.getString(cursor.getColumnIndex("mr2")));
+        moh510SummaryReport.setMalaria4(cursor.getString(cursor.getColumnIndex("mv4")));
+        moh510SummaryReport.setRemarks(cursor.getString(cursor.getColumnIndex("mv1")));
+        return moh510SummaryReport;
+    }
+
+    private List<Moh510SummaryReport> readAll(Cursor cursor){
+        List<Moh510SummaryReport> moh510SummaryReports = new ArrayList<>();
+        if (cursor !=null && cursor.getCount() > 0 && cursor.moveToNext()){
+            cursor.moveToFirst();
+            while (cursor.getCount() > 0 && !cursor.isAfterLast()){
+                moh510SummaryReports.add(getMoh510SummaryReport(cursor));
+                cursor.moveToNext();
+            }
+        }
+        return moh510SummaryReports;
+    }
+}
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/repository/SmsEnrolledClientRepository.java b/opensrp-kip/src/main/java/org/smartregister/kip/repository/SmsEnrolledClientRepository.java
index bd2f5d5..292931e 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/repository/SmsEnrolledClientRepository.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/repository/SmsEnrolledClientRepository.java
@@ -4,7 +4,7 @@
 import net.sqlcipher.Cursor;
 import net.sqlcipher.database.SQLiteDatabase;
 
-import org.smartregister.kip.pojo.SmsErolledClient;
+import org.smartregister.kip.pojo.SmsEnrolledClient;
 import org.smartregister.repository.BaseRepository;
 
 import java.util.ArrayList;
@@ -14,8 +14,8 @@
 
 public class SmsEnrolledClientRepository extends BaseRepository {
 
-    public List<SmsErolledClient> getEnrolledClients(){
-        List<SmsErolledClient> smsErolledClient = new ArrayList<>();
+    public List<SmsEnrolledClient> getEnrolledClients(){
+        List<SmsEnrolledClient> smsEnrolledClient = new ArrayList<>();
         SQLiteDatabase db = getReadableDatabase();
         Cursor sCursor = null;
 
@@ -24,7 +24,7 @@ public List<SmsErolledClient> getEnrolledClients(){
 
         try {
             sCursor = db.rawQuery(sql,null);
-            smsErolledClient = readAll(sCursor);
+            smsEnrolledClient = readAll(sCursor);
 
         } catch (Exception e){
             Timber.d("-->getEnrolledClients" + e.getMessage());
@@ -33,26 +33,26 @@ public List<SmsErolledClient> getEnrolledClients(){
                 sCursor.close();
             }
         }
-        return smsErolledClient;
+        return smsEnrolledClient;
     }
 
-    public SmsErolledClient getEnrolledClients(Cursor cursor){
-        SmsErolledClient smsErolledClient = new SmsErolledClient();
-        smsErolledClient.setFirstName(cursor.getString(cursor.getColumnIndex("first_name")));
-        smsErolledClient.setLastName(cursor.getString(cursor.getColumnIndex("last_name")));
-        smsErolledClient.setPhoneNumber(cursor.getString(cursor.getColumnIndex("phone_number")));
-        return smsErolledClient;
+    public SmsEnrolledClient getEnrolledClients(Cursor cursor){
+        SmsEnrolledClient smsEnrolledClient = new SmsEnrolledClient();
+        smsEnrolledClient.setFirstName(cursor.getString(cursor.getColumnIndex("first_name")));
+        smsEnrolledClient.setLastName(cursor.getString(cursor.getColumnIndex("last_name")));
+        smsEnrolledClient.setPhoneNumber(cursor.getString(cursor.getColumnIndex("phone_number")));
+        return smsEnrolledClient;
     }
 
-    private List<SmsErolledClient> readAll(Cursor cursor){
-        List<SmsErolledClient> smsErolledClients = new ArrayList<>();
+    private List<SmsEnrolledClient> readAll(Cursor cursor){
+        List<SmsEnrolledClient> smsEnrolledClients = new ArrayList<>();
         if (cursor !=null && cursor.getCount() > 0 && cursor.moveToNext()){
             cursor.moveToFirst();
             while (cursor.getCount() > 0 && !cursor.isAfterLast()){
-                smsErolledClients.add(getEnrolledClients(cursor));
+                smsEnrolledClients.add(getEnrolledClients(cursor));
                 cursor.moveToNext();
             }
         }
-        return smsErolledClients;
+        return smsEnrolledClients;
     }
 }
diff --git a/opensrp-kip/src/main/res/layout/moh510_content_view.xml b/opensrp-kip/src/main/res/layout/moh510_content_view.xml
index 4677385..2e50afe 100644
--- a/opensrp-kip/src/main/res/layout/moh510_content_view.xml
+++ b/opensrp-kip/src/main/res/layout/moh510_content_view.xml
@@ -8,10 +8,11 @@
     android:orientation="horizontal">
 
     <FrameLayout
-        android:id="@+id/www"
+        android:id="@+id/custom_date"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/dialog_shape">
+        android:background="@drawable/dialog_shape"
+        android:visibility="gone">
 
 
         <LinearLayout
@@ -54,12 +55,26 @@
 
                     <EditText
                         android:id="@+id/start_date"
-                        android:layout_width="match_parent"
+                        android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
                         android:focusable="false"
+                        android:layout_alignParentBottom="true"
+                        android:layout_alignParentLeft="true"
                         android:hint="@string/set_start_date"
                         android:inputType="date"
-                        android:textSize="26sp" />
+                        android:textSize="26sp"
+                        android:visibility="gone"/>
+
+                    <Button
+                        android:id="@+id/start_date_button"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:focusable="false"
+                        android:text="@string/set_start_date"
+                        android:src="@drawable/ic_down"
+                        android:background="@color/white"
+                        android:textAllCaps="false"
+                        />
 
 
                 </com.google.android.material.textfield.TextInputLayout>
@@ -80,7 +95,19 @@
                         android:focusable="false"
                         android:hint="@string/set_end_date"
                         android:inputType="date"
-                        android:textSize="26sp" />
+                        android:textSize="26sp"
+                        android:visibility="gone"/>
+
+                    <Button
+                        android:id="@+id/end_date_button"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:focusable="false"
+                        android:text="@string/set_end_date"
+                        android:src="@drawable/ic_down"
+                        android:background="@color/white"
+                        android:textAllCaps="false"
+                        />
                 </com.google.android.material.textfield.TextInputLayout>
 
 
@@ -127,30 +154,92 @@
 
             </LinearLayout>
 
-            <LinearLayout
+        </LinearLayout>
+
+
+    </FrameLayout>
+
+    <FrameLayout
+        android:id="@+id/download"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/dialog_shape">
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginTop="20dp"
+            android:orientation="vertical">
+
+            <org.smartregister.view.customcontrols.CustomFontTextView
+                android:id="@+id/download_child_name"
+                style="@style/CustomFontTextViewStyle.ClientList.Medium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="right"
                 android:layout_marginBottom="10dp"
                 android:layout_marginTop="10dp"
-                android:gravity="center"
-                android:orientation="horizontal">
+                android:text="Download Immunization Register"
+                android:textColor="@color/black"
+                android:textSize="22sp"
+                android:textStyle="bold" />
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginBottom="10dp"
+                android:layout_marginTop="10dp"
+                android:orientation="horizontal"
+                android:weightSum="1">
 
-                <TextView
-                    android:id="@+id/tvDate"
-                    android:layout_width="wrap_content"
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/moh510_start_download_layout"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:text="Date" />
+                    android:layout_marginRight="10dp"
+                    android:layout_weight="0.5"
+                    android:hint="@string/set_start_date">
 
-                <Button
-                    android:id="@+id/btPickDate"
-                    android:layout_width="wrap_content"
+                    <Button
+                        android:id="@+id/custom_date_button"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:focusable="false"
+                        android:text="Custom Date Range"
+                        android:src="@drawable/ic_down"
+                        android:background="@color/white"
+                        android:textAllCaps="false"
+                        />
+
+
+                </com.google.android.material.textfield.TextInputLayout>
+
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/download_layout"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_below="@+id/tvDate"
-                    android:layout_centerInParent="true"
-                    android:text="Pick Date" />
+                    android:layout_marginLeft="10dp"
+                    android:layout_weight="0.5"
+                    android:hint="@string/set_end_date">
+
+                    <Button
+                        android:id="@+id/download_button"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:focusable="false"
+                        android:onClick="buttonWriteToExcel"
+                        android:text="Download Register"
+                        android:src="@drawable/ic_down"
+                        android:background="@color/white"
+                        android:textAllCaps="false"
+                        />
+                </com.google.android.material.textfield.TextInputLayout>
+
 
             </LinearLayout>
 
@@ -161,4 +250,5 @@
 
 
 
+
 </FrameLayout>
\ No newline at end of file

From 09631141edaeda1d8a8fe005143353889a485b65 Mon Sep 17 00:00:00 2001
From: Ogollah <kogollah2011@gmail.com>
Date: Mon, 21 Jun 2021 18:59:27 +0300
Subject: [PATCH 05/12] Upgrade client-core

---
 build.gradle                                  |  24 +--
 opensrp-kip/build.gradle                      |  62 ++++++--
 .../activity/ChildDetailTabbedActivity.java   |   2 +-
 .../activity/ChildImmunizationActivity.java   |   2 +-
 .../kip/activity/ChildRegisterActivity.java   |   4 +-
 .../kip/activity/KipOpdRegisterActivity.java  |   6 +
 .../kip/activity/ReportRegisterActivity.java  |   2 +-
 .../kip/activity/ReportSummaryActivity.java   |   3 +-
 .../kip/application/KipApplication.java       |  20 +--
 .../kip/application/KipSyncConfiguration.java |  15 ++
 .../smartregister/kip/dao/KipChildDao.java    | 150 +++++++++---------
 .../kip/processor/KipProcessorForJava.java    |  10 +-
 .../kip/repository/KipRepository.java         |  11 +-
 .../kip/repository/StockHelperRepository.java |  14 +-
 .../smartregister/kip/util/KipChildUtils.java |   6 +-
 .../kip/util/KipJsonFormUtils.java            | 138 ++++++++--------
 .../kip/util/KipReportUtils.java              |   8 +-
 .../kip/view/NavigationMenu.java              |   6 +-
 18 files changed, 274 insertions(+), 209 deletions(-)

diff --git a/build.gradle b/build.gradle
index ab318eb..ff89848 100755
--- a/build.gradle
+++ b/build.gradle
@@ -5,28 +5,34 @@ buildscript {
     repositories {
         google()
         jcenter()
-//        maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
+        maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
     }
 
-//    dependencies {
-//        classpath 'com.android.tools.build:gradle:4.0.1'
-//        classpath 'org.smartregister:gradle-jarjar-plugin:1.0.0-SNAPSHOT'
-//    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'org.smartregister:gradle-jarjar-plugin:1.0.0-SNAPSHOT'
+    }
 }
 
 
 allprojects {
     repositories {
-        maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
+        google()
+        jcenter()
         mavenLocal()
         mavenCentral()
+        maven { url 'https://maven.google.com' }
+        maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
         maven { url 'https://jitpack.io' }
         maven { url "https://acra.googlecode.com/svn/repository/releases" }
         maven { url "https://repo.maven.apache.org/maven2" }
         maven { url "https://cloudant.github.io/cloudant-sync-eap/repository" }
+        maven { url 'https://maven.fabric.io/public' }
         maven { url "https://s3.amazonaws.com/repo.commonsware.com" }
-        google()
-        jcenter()
+        //aven { url "https://dl.bintray.com/ona/rdt-capture" }
+        //maven { url "http://dl.bintray.com/ona/kujaku" }
+        //maven { url 'https://dl.bintray.com/ibm-watson-health/ibm-fhir-server-releases' }
+        maven { url 'https://repo1.maven.org/maven2/com/ibm/fhir' }
     }
 }
 
@@ -38,7 +44,7 @@ subprojects {
 
     ext.androidToolsBuildGradle = '4.0.1'
     ext.androidBuildToolsVersion = '29.0.3'
-    ext.androidMinSdkVersion = 18
+    ext.androidMinSdkVersion = 27
     ext.androidCompileSdkVersion = 29
     ext.androidTargetSdkVersion = 29
 
diff --git a/opensrp-kip/build.gradle b/opensrp-kip/build.gradle
index d4f4741..f984310 100755
--- a/opensrp-kip/build.gradle
+++ b/opensrp-kip/build.gradle
@@ -44,6 +44,34 @@ android {
         buildConfigField "long", "EVENT_VERSION", System.currentTimeMillis() + "L"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
+        if (project.rootProject.file("local.properties").exists()) {
+
+            Properties properties = new Properties()
+            properties.load(project.rootProject.file("local.properties").newDataInputStream())
+
+            if (properties != null && properties.containsKey("oauth.client.id")) {
+
+                buildConfigField "String", "OAUTH_CLIENT_ID", properties["oauth.client.id"]
+
+            } else {
+                project.logger.error("oauth.client.id variable is not set in your local.properties")
+                buildConfigField "String", "OAUTH_CLIENT_ID", "\"sample_client_id\""
+            }
+
+
+            if (properties != null && properties.containsKey("oauth.client.secret")) {
+
+                buildConfigField "String", "OAUTH_CLIENT_SECRET", properties["oauth.client.secret"]
+
+            } else {
+                project.logger.error("oauth.client.secret variable is not set in your local.properties")
+                buildConfigField "String", "OAUTH_CLIENT_SECRET", "\"sample_client_secret\""
+            }
+        } else {
+            buildConfigField "String", "OAUTH_CLIENT_ID", '""'
+            buildConfigField "String", "OAUTH_CLIENT_SECRET", '""'
+        }
+
         javaCompileOptions {
             annotationProcessorOptions {
                 includeCompileClasspath true
@@ -112,18 +140,21 @@ android {
     }
 
     packagingOptions {
-        exclude 'META-INF/DEPENDENCIES.txt'
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/NOTICE.txt'
-        exclude 'META-INF/NOTICE'
-        exclude 'META-INF/LICENSE'
+        //exclude 'META-INF/DEPENDENCIES.txt'
         exclude 'META-INF/DEPENDENCIES'
-        exclude 'META-INF/notice.txt'
-        exclude 'META-INF/license.txt'
-        exclude 'META-INF/dependencies.txt'
-        exclude 'META-INF/LGPL2.1'
-        exclude 'LICENSE.txt'
-
+        //exclude 'META-INF/LICENSE.txt'
+        //exclude 'META-INF/NOTICE.txt'
+        //exclude 'META-INF/NOTICE'
+        exclude 'META-INF/NOTICE.md'
+        //exclude 'META-INF/LICENSE'
+        exclude 'META-INF/LICENSE.md'
+        exclude 'META-INF/INDEX.LIST'
+        //exclude 'META-INF/DEPENDENCIES'
+        //exclude 'META-INF/notice.txt'
+        //exclude 'META-INF/license.txt'
+        //exclude 'META-INF/dependencies.txt'
+        //exclude 'META-INF/LGPL2.1'
+        //exclude 'LICENSE.txt'
     }
 
     testOptions {
@@ -145,7 +176,7 @@ dependencies {
     implementation 'com.evrencoskun.library:tableview:0.8.8'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.15'
 
-    implementation('org.smartregister:opensrp-client-opd:0.0.16-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-opd:0.0.18-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'org.smartregister', module: 'opensrp-client-core'
         exclude group: 'org.smartregister', module: 'opensrp-client-native-form'
@@ -153,7 +184,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }
 
-    implementation('org.smartregister:opensrp-client-child:0.3.4-00-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-child:0.5.0-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'id.zelory', module: 'compressor'
         exclude group: 'org.smartregister', module: 'opensrp-client-core'
@@ -164,7 +195,7 @@ dependencies {
     }
 
 
-    api('org.smartregister:opensrp-client-core:1.12.01-SNAPSHOT@aar') {
+    api('org.smartregister:opensrp-client-core:4.3.7-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'id.zelory', module: 'compressor'
         exclude group: 'com.github.bmelnychuk', module: 'atv'
@@ -176,6 +207,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'cardview-v7'
         exclude group: 'com.android.support', module: 'support-v4'
         exclude group: 'com.android.support', module: 'design'
+        exclude group: 'com.ibm.fhir', module: 'fhir-model'
     }
 
     api('org.smartregister:opensrp-client-native-form:2.0.2-SNAPSHOT@aar') {
@@ -277,6 +309,8 @@ dependencies {
     }
     implementation group: 'io.fabric.sdk.android', name: 'fabric', version: '1.4.8'
     implementation 'org.apache.poi:poi:3.17'
+    implementation "com.ibm.fhir:fhir-model:4.7.1"
+    implementation "com.ibm.fhir:fhir-path:4.7.1"
 
     def robolectricVersion = '4.1'
     testImplementation("org.robolectric:robolectric:$robolectricVersion") {
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/activity/ChildDetailTabbedActivity.java b/opensrp-kip/src/main/java/org/smartregister/kip/activity/ChildDetailTabbedActivity.java
index 8eb7e46..56101b7 100755
--- a/opensrp-kip/src/main/java/org/smartregister/kip/activity/ChildDetailTabbedActivity.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/activity/ChildDetailTabbedActivity.java
@@ -59,7 +59,7 @@ protected void attachBaseContext(android.content.Context base) {
     }
 
     @Override
-    public void onUniqueIdFetched(Triple<String, String, String> triple, String s) {
+    public void onUniqueIdFetched(Triple<String, Map<String, String>, String> triple, String s) {
 
     }
 
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/activity/ChildImmunizationActivity.java b/opensrp-kip/src/main/java/org/smartregister/kip/activity/ChildImmunizationActivity.java
index d565cdc..13315fe 100755
--- a/opensrp-kip/src/main/java/org/smartregister/kip/activity/ChildImmunizationActivity.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/activity/ChildImmunizationActivity.java
@@ -134,7 +134,7 @@ public void onClick(View view) {
     }
 
     @Override
-    public void onUniqueIdFetched(Triple<String, String, String> triple, String s) {
+    public void onUniqueIdFetched(Triple<String, Map<String, String>, String> triple, String s) {
 
     }
 
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/activity/ChildRegisterActivity.java b/opensrp-kip/src/main/java/org/smartregister/kip/activity/ChildRegisterActivity.java
index f50c828..996b3fd 100755
--- a/opensrp-kip/src/main/java/org/smartregister/kip/activity/ChildRegisterActivity.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/activity/ChildRegisterActivity.java
@@ -27,7 +27,7 @@
 import org.smartregister.child.model.BaseChildRegisterModel;
 import org.smartregister.child.presenter.BaseChildRegisterPresenter;
 import org.smartregister.child.util.Constants;
-import org.smartregister.child.util.JsonFormUtils;
+import org.smartregister.child.util.ChildJsonFormUtils;
 import org.smartregister.child.util.Utils;
 import org.smartregister.helper.BottomNavigationHelper;
 import org.smartregister.kip.R;
@@ -225,7 +225,7 @@ public void startFormActivity(JSONObject jsonForm) {
         }
         intent.putExtra(Constants.INTENT_KEY.JSON, jsonForm.toString());
         intent.putExtra(JsonFormConstants.JSON_FORM_KEY.FORM, getForm());
-        startActivityForResult(intent, JsonFormUtils.REQUEST_CODE_GET_JSON);
+        startActivityForResult(intent, ChildJsonFormUtils.REQUEST_CODE_GET_JSON);
     }
 
     public void finishActivity() {
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/activity/KipOpdRegisterActivity.java b/opensrp-kip/src/main/java/org/smartregister/kip/activity/KipOpdRegisterActivity.java
index a130fc7..965e461 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/activity/KipOpdRegisterActivity.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/activity/KipOpdRegisterActivity.java
@@ -41,6 +41,7 @@
 import org.smartregister.view.fragment.BaseRegisterFragment;
 
 import java.util.HashMap;
+import java.util.Map;
 
 import timber.log.Timber;
 
@@ -112,6 +113,11 @@ protected void onResumption() {
         createDrawer();
     }
 
+    @Override
+    public void startFormActivity(String s, String s1, Map<String, String> map) {
+
+    }
+
 
     @Override
     public void finishActivity() {
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/activity/ReportRegisterActivity.java b/opensrp-kip/src/main/java/org/smartregister/kip/activity/ReportRegisterActivity.java
index 358979f..d3cd328 100755
--- a/opensrp-kip/src/main/java/org/smartregister/kip/activity/ReportRegisterActivity.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/activity/ReportRegisterActivity.java
@@ -97,7 +97,7 @@ public void onClickReport(View view) {
     }
 
     @Override
-    public void onUniqueIdFetched(Triple<String, String, String> triple, String s) {
+    public void onUniqueIdFetched(Triple<String, Map<String, String>, String> triple, String s) {
 
     }
 
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/activity/ReportSummaryActivity.java b/opensrp-kip/src/main/java/org/smartregister/kip/activity/ReportSummaryActivity.java
index 9195c6d..38e4f82 100755
--- a/opensrp-kip/src/main/java/org/smartregister/kip/activity/ReportSummaryActivity.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/activity/ReportSummaryActivity.java
@@ -26,6 +26,7 @@
 import java.util.Comparator;
 import java.util.Date;
 import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  * Created by Ephraim Kigamba - ekigamba@ona.io on 2019-07-11
@@ -189,7 +190,7 @@ private void refreshIndicatorViews() {
     }
 
     @Override
-    public void onUniqueIdFetched(Triple<String, String, String> triple, String s) {
+    public void onUniqueIdFetched(Triple<String, Map<String, String>, String> triple, String s) {
 
     }
 
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/application/KipApplication.java b/opensrp-kip/src/main/java/org/smartregister/kip/application/KipApplication.java
index 40a3cb8..796e88e 100755
--- a/opensrp-kip/src/main/java/org/smartregister/kip/application/KipApplication.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/application/KipApplication.java
@@ -371,13 +371,13 @@ public Repository getRepository() {
         return repository;
     }
 
-    public String getPassword() {
-        if (password == null) {
-            String username = getContext().userService().getAllSharedPreferences().fetchRegisteredANM();
-            password = getContext().userService().getGroupId(username);
-        }
-        return password;
-    }
+//    public String getPassword() {
+//        if (password == null) {
+//            String username = getContext().userService().getAllSharedPreferences().fetchRegisteredANM();
+//            password = getContext().userService().getGroupId(username);
+//        }
+//        return password;
+//    }
 
     public Context getContext() {
         return context;
@@ -466,13 +466,15 @@ public HeightZScoreRepository heightZScoreRepository() {
 
     @Override
     public void onTimeChanged() {
-        context.userService().forceRemoteLogin();
+        String username = getContext().userService().getAllSharedPreferences().fetchRegisteredANM();
+        context.userService().forceRemoteLogin(username);
         logoutCurrentUser();
     }
 
     @Override
     public void onTimeZoneChanged() {
-        context.userService().forceRemoteLogin();
+        String username = getContext().userService().getAllSharedPreferences().fetchRegisteredANM();
+        context.userService().forceRemoteLogin(username);
         logoutCurrentUser();
     }
 
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/application/KipSyncConfiguration.java b/opensrp-kip/src/main/java/org/smartregister/kip/application/KipSyncConfiguration.java
index 2620dd3..2ecee51 100755
--- a/opensrp-kip/src/main/java/org/smartregister/kip/application/KipSyncConfiguration.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/application/KipSyncConfiguration.java
@@ -67,5 +67,20 @@ public String getTopAllowedLocationLevel() {
         return null;
     }
 
+    @Override
+    public String getOauthClientId() {
+        return BuildConfig.OAUTH_CLIENT_ID;
+    }
+
+    @Override
+    public String getOauthClientSecret() {
+        return BuildConfig.OAUTH_CLIENT_SECRET;
+    }
+
+    @Override
+    public Class<? extends BaseLoginActivity> getAuthenticationActivity() {
+        return null;
+    }
+
 }
 
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/dao/KipChildDao.java b/opensrp-kip/src/main/java/org/smartregister/kip/dao/KipChildDao.java
index 320c78d..0f7936a 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/dao/KipChildDao.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/dao/KipChildDao.java
@@ -1,75 +1,75 @@
-//package org.smartregister.kip.dao;
-//
-//import org.smartregister.child.domain.;
-//import org.smartregister.dao.AbstractDao;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-//public class KipChildDao extends ChildDao {
-//
-//    public static List<String> getChildrenAboveFiveYears() {
-//        String sql = "SELECT ec_client.base_entity_id\n" +
-//                "FROM ec_child_details\n" +
-//                "         JOIN ec_client ON ec_client.base_entity_id = ec_child_details.base_entity_id\n" +
-//                "WHERE (julianday(strftime('%Y-%m-%d', 'now')) - julianday(strftime('%Y-%m-%d', ec_client.dob))) / 365 >= 5\n" +
-//                "  AND ec_client.is_closed = '0'\n" +
-//                "  AND ec_client.date_removed is null\n" +
-//                "  AND ec_child_details.is_closed = '0'";
-//
-//        AbstractDao.DataMap<String> dataMap = cursor -> getCursorValue(cursor, "base_entity_id");
-//
-//        List<String> result = readData(sql, dataMap);
-//        if (result == null) return new ArrayList<>();
-//        return result;
-//    }
-//
-//    public static String getBaseEntityIdByOpenSRPId(String openSRPId) {
-//        String sql = String.format("SELECT base_entity_id\n" +
-//                "FROM ec_client\n" +
-//                "WHERE opensrp_id = '%s'\n" +
-//                "  AND ec_client.date_removed is null\n" +
-//                "  AND ec_client.dod is null\n" +
-//                "  AND ec_client.is_closed IS NOT '1';", openSRPId);
-//
-//        AbstractDao.DataMap<String> dataMap = cursor -> getCursorValue(cursor, "base_entity_id");
-//
-//        List<String> result = readData(sql, dataMap);
-//        if (result == null || result.size() != 1)
-//            return null;
-//
-//        return result.get(0);
-//    }
-//
-//    public static boolean clientNeedsCard(String baseEntityId) {
-//        String sql = String.format("SELECT count(*) as count\n" +
-//                "FROM ec_child_details\n" +
-//                "WHERE ec_child_details.card_status = 'needs_card' COLLATE NOCASE\n" +
-//                "  AND ec_child_details.date_removed is null\n" +
-//                "  AND ec_child_details.is_closed IS NOT '1'\n" +
-//                "  AND ec_child_details.base_entity_id = '%s' COLLATE NOCASE;", baseEntityId);
-//
-//        AbstractDao.DataMap<Integer> dataMap = cursor -> getCursorIntValue(cursor, "count");
-//
-//        List<Integer> result = readData(sql, dataMap);
-//        if (result == null || result.size() != 1)
-//            return false;
-//
-//        return result.get(0) > 0;
-//    }
-//
-//    public static int getDueVaccineCount(String vaccine) {
-//        String sql = "SELECT count(*) count\n" +
-//                "FROM alerts\n" +
-//                "WHERE scheduleName = '$s' COLLATE NOCASE\n" +
-//                "  AND startDate LIKE '%' || strftime('%Y-%m', date('now', 'start of month', '+1 month')) || '%'".replace("$s", vaccine);
-//
-//        AbstractDao.DataMap<Integer> dataMap = cursor -> getCursorIntValue(cursor, "count");
-//
-//        List<Integer> result = readData(sql, dataMap);
-//        if (result == null || result.size() != 1)
-//            return result.get(0);
-//
-//        return 0;
-//    }
-//}
+package org.smartregister.kip.dao;
+
+import org.smartregister.child.dao.ChildDao;
+import org.smartregister.dao.AbstractDao;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class KipChildDao extends ChildDao {
+
+    public static List<String> getChildrenAboveFiveYears() {
+        String sql = "SELECT ec_client.base_entity_id\n" +
+                "FROM ec_child_details\n" +
+                "         JOIN ec_client ON ec_client.base_entity_id = ec_child_details.base_entity_id\n" +
+                "WHERE (julianday(strftime('%Y-%m-%d', 'now')) - julianday(strftime('%Y-%m-%d', ec_client.dob))) / 365 >= 5\n" +
+                "  AND ec_client.is_closed = '0'\n" +
+                "  AND ec_client.date_removed is null\n" +
+                "  AND ec_child_details.is_closed = '0'";
+
+        AbstractDao.DataMap<String> dataMap = cursor -> getCursorValue(cursor, "base_entity_id");
+
+        List<String> result = readData(sql, dataMap);
+        if (result == null) return new ArrayList<>();
+        return result;
+    }
+
+    public static String getBaseEntityIdByOpenSRPId(String openSRPId) {
+        String sql = String.format("SELECT base_entity_id\n" +
+                "FROM ec_client\n" +
+                "WHERE opensrp_id = '%s'\n" +
+                "  AND ec_client.date_removed is null\n" +
+                "  AND ec_client.dod is null\n" +
+                "  AND ec_client.is_closed IS NOT '1';", openSRPId);
+
+        AbstractDao.DataMap<String> dataMap = cursor -> getCursorValue(cursor, "base_entity_id");
+
+        List<String> result = readData(sql, dataMap);
+        if (result == null || result.size() != 1)
+            return null;
+
+        return result.get(0);
+    }
+
+    public static boolean clientNeedsCard(String baseEntityId) {
+        String sql = String.format("SELECT count(*) as count\n" +
+                "FROM ec_child_details\n" +
+                "WHERE ec_child_details.card_status = 'needs_card' COLLATE NOCASE\n" +
+                "  AND ec_child_details.date_removed is null\n" +
+                "  AND ec_child_details.is_closed IS NOT '1'\n" +
+                "  AND ec_child_details.base_entity_id = '%s' COLLATE NOCASE;", baseEntityId);
+
+        AbstractDao.DataMap<Integer> dataMap = cursor -> getCursorIntValue(cursor, "count");
+
+        List<Integer> result = readData(sql, dataMap);
+        if (result == null || result.size() != 1)
+            return false;
+
+        return result.get(0) > 0;
+    }
+
+    public static int getDueVaccineCount(String vaccine) {
+        String sql = "SELECT count(*) count\n" +
+                "FROM alerts\n" +
+                "WHERE scheduleName = '$s' COLLATE NOCASE\n" +
+                "  AND startDate LIKE '%' || strftime('%Y-%m', date('now', 'start of month', '+1 month')) || '%'".replace("$s", vaccine);
+
+        AbstractDao.DataMap<Integer> dataMap = cursor -> getCursorIntValue(cursor, "count");
+
+        List<Integer> result = readData(sql, dataMap);
+        if (result == null || result.size() != 1)
+            return result.get(0);
+
+        return 0;
+    }
+}
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/processor/KipProcessorForJava.java b/opensrp-kip/src/main/java/org/smartregister/kip/processor/KipProcessorForJava.java
index 1bcb91d..ba6440c 100755
--- a/opensrp-kip/src/main/java/org/smartregister/kip/processor/KipProcessorForJava.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/processor/KipProcessorForJava.java
@@ -21,7 +21,7 @@
 import org.json.JSONObject;
 import org.smartregister.CoreLibrary;
 import org.smartregister.child.util.ChildDbUtils;
-import org.smartregister.child.util.JsonFormUtils;
+import org.smartregister.child.util.ChildJsonFormUtils;
 import org.smartregister.child.util.Constants;
 import org.smartregister.child.util.MoveToMyCatchmentUtils;
 import org.smartregister.child.util.Utils;
@@ -29,10 +29,10 @@
 import org.smartregister.commonregistry.AllCommonsRepository;
 import org.smartregister.commonregistry.CommonFtsObject;
 import org.smartregister.commonregistry.CommonRepository;
-import org.smartregister.domain.db.Client;
-import org.smartregister.domain.db.Event;
+import org.smartregister.domain.Client;
+import org.smartregister.domain.Event;
 import org.smartregister.domain.db.EventClient;
-import org.smartregister.domain.db.Obs;
+import org.smartregister.domain.Obs;
 import org.smartregister.domain.jsonmapping.ClientClassification;
 import org.smartregister.domain.jsonmapping.ClientField;
 import org.smartregister.domain.jsonmapping.Column;
@@ -169,7 +169,7 @@ public synchronized void processClient(List<EventClient> eventClients) throws Ex
                         continue;
                     }
                     processService(eventClient, serviceTable);
-                } else if (eventType.equals(JsonFormUtils.BCG_SCAR_EVENT)) {
+                } else if (eventType.equals(ChildJsonFormUtils.BCG_SCAR_EVENT)) {
                     processBCGScarEvent(eventClient);
                 } else if (eventType.equals(MoveToMyCatchmentUtils.MOVE_TO_CATCHMENT_EVENT)) {
                     unsyncEvents.add(event);
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/repository/KipRepository.java b/opensrp-kip/src/main/java/org/smartregister/kip/repository/KipRepository.java
index 67ed40e..9b88b07 100755
--- a/opensrp-kip/src/main/java/org/smartregister/kip/repository/KipRepository.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/repository/KipRepository.java
@@ -184,8 +184,8 @@ private void upgradeToVersion11CreateHia2IndicatorsRepository(SQLiteDatabase db)
 
     @Override
     public SQLiteDatabase getReadableDatabase() {
-        String pass = KipApplication.getInstance().getPassword();
-        if (StringUtils.isNotBlank(pass)) {
+        byte[] pass = KipApplication.getInstance().getPassword();
+        if (pass != null && pass.length > 0) {
             return getReadableDatabase(pass);
         } else {
             throw new IllegalStateException("Password is blank");
@@ -194,14 +194,15 @@ public SQLiteDatabase getReadableDatabase() {
 
     @Override
     public SQLiteDatabase getWritableDatabase() {
-        String pass = KipApplication.getInstance().getPassword();
-        if (StringUtils.isNotBlank(pass)) {
-            return getReadableDatabase(pass);
+        byte[] pass = KipApplication.getInstance().getPassword();
+        if (pass != null && pass.length > 0) {
+            return getWritableDatabase(pass);
         } else {
             throw new IllegalStateException("Password is blank");
         }
     }
 
+
     @Override
     public synchronized SQLiteDatabase getWritableDatabase(String password) {
         if (writableDatabase == null || !writableDatabase.isOpen()) {
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/repository/StockHelperRepository.java b/opensrp-kip/src/main/java/org/smartregister/kip/repository/StockHelperRepository.java
index 0b0bcac..d3c74bc 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/repository/StockHelperRepository.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/repository/StockHelperRepository.java
@@ -10,6 +10,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.smartregister.kip.application.KipApplication;
+import org.smartregister.kip.dao.KipChildDao;
 import org.smartregister.repository.Repository;
 import org.smartregister.stock.StockLibrary;
 import org.smartregister.stock.domain.ActiveChildrenStats;
@@ -129,12 +130,11 @@ public ActiveChildrenStats getActiveChildrenStat() {
 
     @Override
     public int getVaccinesDueBasedOnSchedule(JSONObject vaccineObject) {
-//        try {
-//            return KipChildDao.getDueVaccineCount(vaccineObject.getString("name"));
-//        } catch (JSONException e) {
-//            Timber.e(e);
-//            return 0;
-//        }
-        return 10;
+        try {
+            return KipChildDao.getDueVaccineCount(vaccineObject.getString("name"));
+        } catch (JSONException e) {
+            Timber.e(e);
+            return 0;
+        }
     }
 }
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/util/KipChildUtils.java b/opensrp-kip/src/main/java/org/smartregister/kip/util/KipChildUtils.java
index abb81fc..efbbf0c 100755
--- a/opensrp-kip/src/main/java/org/smartregister/kip/util/KipChildUtils.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/util/KipChildUtils.java
@@ -29,10 +29,10 @@
 import org.smartregister.child.util.Constants;
 import org.smartregister.child.util.Utils;
 import org.smartregister.commonregistry.AllCommonsRepository;
-import org.smartregister.domain.db.Client;
-import org.smartregister.domain.db.Event;
+import org.smartregister.domain.Client;
+import org.smartregister.domain.Event;
 import org.smartregister.domain.db.EventClient;
-import org.smartregister.domain.db.Obs;
+import org.smartregister.domain.Obs;
 import org.smartregister.domain.form.FormLocation;
 import org.smartregister.kip.BuildConfig;
 import org.smartregister.kip.application.KipApplication;
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/util/KipJsonFormUtils.java b/opensrp-kip/src/main/java/org/smartregister/kip/util/KipJsonFormUtils.java
index e50803c..3084458 100755
--- a/opensrp-kip/src/main/java/org/smartregister/kip/util/KipJsonFormUtils.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/util/KipJsonFormUtils.java
@@ -18,7 +18,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.smartregister.child.ChildLibrary;
-import org.smartregister.child.util.JsonFormUtils;
+import org.smartregister.child.util.ChildJsonFormUtils;
 import org.smartregister.child.util.Constants;
 import org.smartregister.child.util.Utils;
 import org.smartregister.clientandeventmodel.Event;
@@ -41,7 +41,7 @@
 
 import static org.smartregister.login.task.RemoteLoginTask.getOpenSRPContext;
 
-public class KipJsonFormUtils extends JsonFormUtils {
+public class KipJsonFormUtils extends ChildJsonFormUtils {
     public static final String CONCEPT = "concept";
     public static final String VALUE = "value";
     public static final String VALUES = "values";
@@ -79,26 +79,26 @@ public static String getMetadataForEditForm(Context context, Map<String, String>
             JSONObject birthRegistrationForm = FormUtils.getInstance(context)
                     .getFormJson(Utils.metadata().childRegister.formName);
             updateRegistrationEventType(birthRegistrationForm, childDetails);
-            JsonFormUtils.addChildRegLocHierarchyQuestions(birthRegistrationForm);
+            ChildJsonFormUtils.addRegistrationFormLocationHierarchyQuestions(birthRegistrationForm);
             KipLocationUtility.addChildRegLocHierarchyQuestions(birthRegistrationForm, getOpenSRPContext());
             KipJsonFormUtils.addRelationshipTypesQuestions(birthRegistrationForm);
 
             if (birthRegistrationForm != null) {
-                birthRegistrationForm.put(JsonFormUtils.ENTITY_ID, childDetails.get(Constants.KEY.BASE_ENTITY_ID));
-                birthRegistrationForm.put(JsonFormUtils.ENCOUNTER_TYPE, Utils.metadata().childRegister.updateEventType);
-                birthRegistrationForm.put(JsonFormUtils.RELATIONAL_ID, childDetails.get(RELATIONAL_ID));
+                birthRegistrationForm.put(ChildJsonFormUtils.ENTITY_ID, childDetails.get(Constants.KEY.BASE_ENTITY_ID));
+                birthRegistrationForm.put(ChildJsonFormUtils.ENCOUNTER_TYPE, Utils.metadata().childRegister.updateEventType);
+                birthRegistrationForm.put(ChildJsonFormUtils.RELATIONAL_ID, childDetails.get(RELATIONAL_ID));
                 birthRegistrationForm.put(KipConstants.KEY.FATHER_RELATIONAL_ID, childDetails.get(KipConstants.KEY.FATHER_RELATIONAL_ID));
-                birthRegistrationForm.put(JsonFormUtils.CURRENT_ZEIR_ID, Utils.getValue(childDetails, KipConstants.KEY.MALAWI_ID, true).replace("-", ""));
-                birthRegistrationForm.put(JsonFormUtils.CURRENT_OPENSRP_ID,
+                birthRegistrationForm.put(ChildJsonFormUtils.CURRENT_ZEIR_ID, Utils.getValue(childDetails, KipConstants.KEY.MALAWI_ID, true).replace("-", ""));
+                birthRegistrationForm.put(ChildJsonFormUtils.CURRENT_OPENSRP_ID,
                         Utils.getValue(childDetails, Constants.JSON_FORM_KEY.UNIQUE_ID, false));
 
-                JSONObject metadata = birthRegistrationForm.getJSONObject(JsonFormUtils.METADATA);
-                metadata.put(JsonFormUtils.ENCOUNTER_LOCATION,
+                JSONObject metadata = birthRegistrationForm.getJSONObject(ChildJsonFormUtils.METADATA);
+                metadata.put(ChildJsonFormUtils.ENCOUNTER_LOCATION,
                         ChildLibrary.getInstance().getLocationPickerView(context).getSelectedItem());
 
                 //inject zeir id into the birthRegistrationForm
-                JSONObject stepOne = birthRegistrationForm.getJSONObject(JsonFormUtils.STEP1);
-                JSONArray jsonArray = stepOne.getJSONArray(JsonFormUtils.FIELDS);
+                JSONObject stepOne = birthRegistrationForm.getJSONObject(ChildJsonFormUtils.STEP1);
+                JSONArray jsonArray = stepOne.getJSONArray(ChildJsonFormUtils.FIELDS);
                 updateFormDetailsForEdit(childDetails, jsonArray, nonEditableFields);
                 return birthRegistrationForm.toString();
             }
@@ -116,77 +116,77 @@ private static void updateFormDetailsForEdit(Map<String, String> childDetails, J
             JSONObject jsonObject = jsonArray.getJSONObject(i);
             prefix = getPrefix(jsonObject);
 
-            if (jsonObject.getString(JsonFormUtils.KEY).equalsIgnoreCase(Constants.KEY.PHOTO)) {
+            if (jsonObject.getString(ChildJsonFormUtils.KEY).equalsIgnoreCase(Constants.KEY.PHOTO)) {
                 processPhoto(childDetails.get(Constants.KEY.BASE_ENTITY_ID), jsonObject);
-            } else if (jsonObject.getString(JsonFormUtils.KEY).equalsIgnoreCase("dob_unknown")) {
+            } else if (jsonObject.getString(ChildJsonFormUtils.KEY).equalsIgnoreCase("dob_unknown")) {
                 getDobUnknown(childDetails, jsonObject);
-            } else if (jsonObject.getString(JsonFormUtils.KEY).equalsIgnoreCase(Constants.JSON_FORM_KEY.AGE)) {
+            } else if (jsonObject.getString(ChildJsonFormUtils.KEY).equalsIgnoreCase(Constants.JSON_FORM_KEY.AGE)) {
                 processAge(Utils.getValue(childDetails, Constants.KEY.DOB, false), jsonObject);
             } else if (jsonObject.getString(JsonFormConstants.TYPE).equalsIgnoreCase(JsonFormConstants.DATE_PICKER)) {
                 processDate(childDetails, prefix, jsonObject);
-            } else if (jsonObject.getString(JsonFormUtils.OPENMRS_ENTITY).equalsIgnoreCase(JsonFormUtils.PERSON_INDENTIFIER)) {
-                jsonObject.put(JsonFormUtils.VALUE, Utils.getValue(childDetails,
-                        jsonObject.getString(JsonFormUtils.OPENMRS_ENTITY_ID).toLowerCase(), true).replace("-", ""));
-            } else if (jsonObject.getString(JsonFormUtils.OPENMRS_ENTITY).equalsIgnoreCase(JsonFormUtils.CONCEPT)) {
-                jsonObject.put(JsonFormUtils.VALUE,
-                        getMappedValue(jsonObject.getString(JsonFormUtils.KEY), childDetails));
-            } else if (jsonObject.getString(JsonFormUtils.KEY).equalsIgnoreCase(KipConstants.KEY.MIDDLE_NAME)) {
+            } else if (jsonObject.getString(ChildJsonFormUtils.OPENMRS_ENTITY).equalsIgnoreCase(ChildJsonFormUtils.PERSON_INDENTIFIER)) {
+                jsonObject.put(ChildJsonFormUtils.VALUE, Utils.getValue(childDetails,
+                        jsonObject.getString(ChildJsonFormUtils.OPENMRS_ENTITY_ID).toLowerCase(), true).replace("-", ""));
+            } else if (jsonObject.getString(ChildJsonFormUtils.OPENMRS_ENTITY).equalsIgnoreCase(ChildJsonFormUtils.CONCEPT)) {
+                jsonObject.put(ChildJsonFormUtils.VALUE,
+                        getMappedValue(jsonObject.getString(ChildJsonFormUtils.KEY), childDetails));
+            } else if (jsonObject.getString(ChildJsonFormUtils.KEY).equalsIgnoreCase(KipConstants.KEY.MIDDLE_NAME)) {
                 String middleName = Utils.getValue(childDetails, KipConstants.KEY.MIDDLE_NAME, true);
-                jsonObject.put(JsonFormUtils.VALUE, middleName);
-            } else if (jsonObject.getString(JsonFormUtils.KEY).equalsIgnoreCase(KipConstants.KEY.FATHER_FIRST_NAME)) {
+                jsonObject.put(ChildJsonFormUtils.VALUE, middleName);
+            } else if (jsonObject.getString(ChildJsonFormUtils.KEY).equalsIgnoreCase(KipConstants.KEY.FATHER_FIRST_NAME)) {
                 String fatherFirstName = Utils.getValue(childDetails, KipConstants.KEY.FATHER_FIRST_NAME, true);
-                jsonObject.put(JsonFormUtils.VALUE, fatherFirstName);
-            } else if (jsonObject.getString(JsonFormUtils.KEY).equalsIgnoreCase(KipConstants.KEY.FATHER_LAST_NAME)) {
+                jsonObject.put(ChildJsonFormUtils.VALUE, fatherFirstName);
+            } else if (jsonObject.getString(ChildJsonFormUtils.KEY).equalsIgnoreCase(KipConstants.KEY.FATHER_LAST_NAME)) {
                 String fatherLastName = Utils.getValue(childDetails, KipConstants.KEY.FATHER_LAST_NAME, true);
-                jsonObject.put(JsonFormUtils.VALUE, fatherLastName);
-            } else if (jsonObject.getString(JsonFormUtils.KEY).equalsIgnoreCase(KipConstants.KEY.FATHER_PHONE)) {
+                jsonObject.put(ChildJsonFormUtils.VALUE, fatherLastName);
+            } else if (jsonObject.getString(ChildJsonFormUtils.KEY).equalsIgnoreCase(KipConstants.KEY.FATHER_PHONE)) {
                 String fatherPhoneNumber = Utils.getValue(childDetails, "father_phone_number", true);
-                jsonObject.put(JsonFormUtils.VALUE, fatherPhoneNumber);
-            } else if (jsonObject.getString(JsonFormUtils.KEY).equalsIgnoreCase(KipConstants.KEY.MOTHER_NRC_NUMBER)) {
+                jsonObject.put(ChildJsonFormUtils.VALUE, fatherPhoneNumber);
+            } else if (jsonObject.getString(ChildJsonFormUtils.KEY).equalsIgnoreCase(KipConstants.KEY.MOTHER_NRC_NUMBER)) {
                 String nidNumber = Utils.getValue(childDetails, KipConstants.KEY.MOTHER_NRC_NUMBER, true);
-                jsonObject.put(JsonFormUtils.VALUE, nidNumber);
-            } else if (jsonObject.getString(JsonFormUtils.KEY).equalsIgnoreCase(KipConstants.KEY.MOTHER_SECOND_PHONE_NUMBER)) {
+                jsonObject.put(ChildJsonFormUtils.VALUE, nidNumber);
+            } else if (jsonObject.getString(ChildJsonFormUtils.KEY).equalsIgnoreCase(KipConstants.KEY.MOTHER_SECOND_PHONE_NUMBER)) {
                 String secondaryNumber = Utils.getValue(childDetails, KipConstants.KEY.MOTHER_SECOND_PHONE_NUMBER, true);
-                jsonObject.put(JsonFormUtils.VALUE, secondaryNumber);
+                jsonObject.put(ChildJsonFormUtils.VALUE, secondaryNumber);
             } else if (jsonObject.has(JsonFormConstants.TREE)) {
                 processLocationTree(childDetails, jsonObject);
-            } else if (jsonObject.getString(JsonFormUtils.KEY).equalsIgnoreCase("mother_guardian_first_name")) {
+            } else if (jsonObject.getString(ChildJsonFormUtils.KEY).equalsIgnoreCase("mother_guardian_first_name")) {
                 String secondaryNumber = Utils.getValue(childDetails, KipConstants.KEY.MOTHER_FIRST_NAME, true);
-                jsonObject.put(JsonFormUtils.VALUE, secondaryNumber);
-            } else if (jsonObject.getString(JsonFormUtils.KEY).equalsIgnoreCase("mother_guardian_last_name")) {
+                jsonObject.put(ChildJsonFormUtils.VALUE, secondaryNumber);
+            } else if (jsonObject.getString(ChildJsonFormUtils.KEY).equalsIgnoreCase("mother_guardian_last_name")) {
                 String secondaryNumber = Utils.getValue(childDetails, KipConstants.KEY.MOTHER_LAST_NAME, true);
-                jsonObject.put(JsonFormUtils.VALUE, secondaryNumber);
-            } else if (jsonObject.getString(JsonFormUtils.KEY).equalsIgnoreCase("Sex")) {
-                jsonObject.put(JsonFormUtils.VALUE,
-                        childDetails.get(JsonFormUtils.GENDER));
-            } else if (jsonObject.getString(JsonFormUtils.KEY).equalsIgnoreCase("Ce_County")) {
+                jsonObject.put(ChildJsonFormUtils.VALUE, secondaryNumber);
+            } else if (jsonObject.getString(ChildJsonFormUtils.KEY).equalsIgnoreCase("Sex")) {
+                jsonObject.put(ChildJsonFormUtils.VALUE,
+                        childDetails.get(ChildJsonFormUtils.GENDER));
+            } else if (jsonObject.getString(ChildJsonFormUtils.KEY).equalsIgnoreCase("Ce_County")) {
                 String county = Utils.getValue(childDetails, "stateProvince", true);
-                jsonObject.put(JsonFormUtils.VALUE, county);
-            } else if (jsonObject.getString(JsonFormUtils.KEY).equalsIgnoreCase("Ce_Sub_County")) {
+                jsonObject.put(ChildJsonFormUtils.VALUE, county);
+            } else if (jsonObject.getString(ChildJsonFormUtils.KEY).equalsIgnoreCase("Ce_Sub_County")) {
                 String subcounty = Utils.getValue(childDetails, "countyDistrict", true);
-                jsonObject.put(JsonFormUtils.VALUE, subcounty);
-            } else if (jsonObject.getString(JsonFormUtils.KEY).equalsIgnoreCase("Ce_Ward")) {
+                jsonObject.put(ChildJsonFormUtils.VALUE, subcounty);
+            } else if (jsonObject.getString(ChildJsonFormUtils.KEY).equalsIgnoreCase("Ce_Ward")) {
                 String ward = Utils.getValue(childDetails, "cityVillage", true);
-                jsonObject.put(JsonFormUtils.VALUE, ward);
+                jsonObject.put(ChildJsonFormUtils.VALUE, ward);
             } else {
-                jsonObject.put(JsonFormUtils.VALUE,
-                        childDetails.get(jsonObject.optString(JsonFormUtils.KEY)));
+                jsonObject.put(ChildJsonFormUtils.VALUE,
+                        childDetails.get(jsonObject.optString(ChildJsonFormUtils.KEY)));
             }
-            jsonObject.put(JsonFormUtils.READ_ONLY, nonEditableFields.contains(jsonObject.getString(JsonFormUtils.KEY)));
+            jsonObject.put(ChildJsonFormUtils.READ_ONLY, nonEditableFields.contains(jsonObject.getString(ChildJsonFormUtils.KEY)));
         }
     }
 
     private static void getDobUnknown(Map<String, String> childDetails, JSONObject jsonObject) throws JSONException {
         JSONObject optionsObject = jsonObject.getJSONArray(Constants.JSON_FORM_KEY.OPTIONS).getJSONObject(0);
-        optionsObject.put(JsonFormUtils.VALUE,
+        optionsObject.put(ChildJsonFormUtils.VALUE,
                 Utils.getValue(childDetails, "dob_unknown", false));
     }
 
     @NotNull
     private static String getPrefix(JSONObject jsonObject) throws JSONException {
         String prefix = "";
-        if (jsonObject.has(JsonFormUtils.ENTITY_ID)) {
-            String entityId = jsonObject.getString(JsonFormUtils.ENTITY_ID);
+        if (jsonObject.has(ChildJsonFormUtils.ENTITY_ID)) {
+            String entityId = jsonObject.getString(ChildJsonFormUtils.ENTITY_ID);
             if (!TextUtils.isEmpty(entityId) && entityId.equalsIgnoreCase(Constants.KEY.MOTHER))
                 prefix = "mother_";
             else if (!TextUtils.isEmpty(entityId) && entityId.equalsIgnoreCase(Constants.KEY.FATHER))
@@ -204,8 +204,8 @@ public static void tagEventSyncMetadata(Event event) {
     }
 
     private static void updateBirthFacilityHierarchy(Map<String, String> childDetails, JSONObject jsonObject) throws JSONException {
-        if (jsonObject.getString(JsonFormUtils.KEY).equalsIgnoreCase(KipConstants.KEY.BIRTH_FACILITY_NAME)) {
-            jsonObject.put(JsonFormUtils.READ_ONLY, true);
+        if (jsonObject.getString(ChildJsonFormUtils.KEY).equalsIgnoreCase(KipConstants.KEY.BIRTH_FACILITY_NAME)) {
+            jsonObject.put(ChildJsonFormUtils.READ_ONLY, true);
             List<String> birthFacilityHierarchy = null;
             String birthFacilityName = Utils.getValue(childDetails, KipConstants.KEY.BIRTH_FACILITY_NAME, false);
             if (birthFacilityName != null) {
@@ -222,13 +222,13 @@ private static void updateBirthFacilityHierarchy(Map<String, String> childDetail
                     .javaToJsonString(birthFacilityHierarchy, new TypeToken<List<String>>() {
                     }.getType());
             if (StringUtils.isNotBlank(birthFacilityHierarchyString)) {
-                jsonObject.put(JsonFormUtils.VALUE, birthFacilityHierarchyString);
+                jsonObject.put(ChildJsonFormUtils.VALUE, birthFacilityHierarchyString);
             }
         }
     }
 
     private static void updateResidentialAreaHierarchy(Map<String, String> childDetails, JSONObject jsonObject) throws JSONException {
-        if (jsonObject.getString(JsonFormUtils.KEY).equalsIgnoreCase(KipConstants.KEY.RESIDENTIAL_AREA)) {
+        if (jsonObject.getString(ChildJsonFormUtils.KEY).equalsIgnoreCase(KipConstants.KEY.RESIDENTIAL_AREA)) {
             List<String> residentialAreaHierarchy;
             String address3 = Utils.getValue(childDetails, KipConstants.KEY.ADDRESS_3, false);
             if (address3 != null && address3.equalsIgnoreCase(KipConstants.KEY.OTHER)) {
@@ -243,13 +243,13 @@ private static void updateResidentialAreaHierarchy(Map<String, String> childDeta
                     .javaToJsonString(residentialAreaHierarchy, new TypeToken<List<String>>() {
                     }.getType());
             if (StringUtils.isNotBlank(residentialAreaHierarchyString)) {
-                jsonObject.put(JsonFormUtils.VALUE, residentialAreaHierarchyString);
+                jsonObject.put(ChildJsonFormUtils.VALUE, residentialAreaHierarchyString);
             }
         }
     }
 
     private static void updateHomeFacilityHierarchy(Map<String, String> childDetails, JSONObject jsonObject) throws JSONException {
-        if (jsonObject.getString(JsonFormUtils.KEY).equalsIgnoreCase(KipConstants.KEY.HOME_FACILITY)) {
+        if (jsonObject.getString(ChildJsonFormUtils.KEY).equalsIgnoreCase(KipConstants.KEY.HOME_FACILITY)) {
             List<String> homeFacilityHierarchy = LocationHelper.getInstance()
                     .getOpenMrsLocationHierarchy(Utils.getValue(childDetails,
                             KipConstants.KEY.HOME_FACILITY, false), false);
@@ -261,26 +261,26 @@ private static void updateHomeFacilityHierarchy(Map<String, String> childDetails
             String entireTreeString = AssetHandler.javaToJsonString(entireTree, new TypeToken<List<FormLocation>>() {
             }.getType());
             if (StringUtils.isNotBlank(homeFacilityHierarchyString)) {
-                jsonObject.put(JsonFormUtils.VALUE, homeFacilityHierarchyString);
+                jsonObject.put(ChildJsonFormUtils.VALUE, homeFacilityHierarchyString);
                 jsonObject.put(JsonFormConstants.TREE, new JSONArray(entireTreeString));
             }
         }
     }
 
     private static void addNonEditableFields(List<String> nonEditableFields, JSONObject jsonObject) throws JSONException {
-        jsonObject.put(JsonFormUtils.READ_ONLY,
-                nonEditableFields.contains(jsonObject.getString(JsonFormUtils.KEY)));
+        jsonObject.put(ChildJsonFormUtils.READ_ONLY,
+                nonEditableFields.contains(jsonObject.getString(ChildJsonFormUtils.KEY)));
     }
 
     private static void updateRegistrationEventType(JSONObject form, Map<String, String> childDetails) throws JSONException {
-        if (form.has(JsonFormUtils.ENCOUNTER_TYPE) && form.getString(JsonFormUtils.ENCOUNTER_TYPE)
+        if (form.has(ChildJsonFormUtils.ENCOUNTER_TYPE) && form.getString(ChildJsonFormUtils.ENCOUNTER_TYPE)
                 .equals(Constants.EventType.BITRH_REGISTRATION)) {
-            form.put(JsonFormUtils.ENCOUNTER_TYPE, Constants.EventType.UPDATE_BITRH_REGISTRATION);
+            form.put(ChildJsonFormUtils.ENCOUNTER_TYPE, Constants.EventType.UPDATE_BITRH_REGISTRATION);
         }
 
-        if (form.has(JsonFormUtils.STEP1) && form.getJSONObject(JsonFormUtils.STEP1).has(KipConstants.KEY.TITLE) && form.getJSONObject(JsonFormUtils.STEP1).getString(KipConstants.KEY.TITLE)
+        if (form.has(ChildJsonFormUtils.STEP1) && form.getJSONObject(ChildJsonFormUtils.STEP1).has(KipConstants.KEY.TITLE) && form.getJSONObject(ChildJsonFormUtils.STEP1).getString(KipConstants.KEY.TITLE)
                 .equals(Constants.EventType.BITRH_REGISTRATION)) {
-            form.getJSONObject(JsonFormUtils.STEP1).put(KipConstants.KEY.TITLE, KipConstants.FormTitleUtil.UPDATE_CHILD_FORM);
+            form.getJSONObject(ChildJsonFormUtils.STEP1).put(KipConstants.KEY.TITLE, KipConstants.FormTitleUtil.UPDATE_CHILD_FORM);
         }
 
         //Update father details if it exists or create a new one
@@ -346,11 +346,11 @@ public static void addRelationshipTypesQuestions(JSONObject form) {
                         }
                     }
 
-                    questions.getJSONObject(i).remove(JsonFormUtils.VALUES);
-                    questions.getJSONObject(i).put(JsonFormUtils.VALUES, values);
+                    questions.getJSONObject(i).remove(ChildJsonFormUtils.VALUES);
+                    questions.getJSONObject(i).put(ChildJsonFormUtils.VALUES, values);
                     // Set the default relationship type.
-                    questions.getJSONObject(i).remove(JsonFormUtils.VALUE);
-                    questions.getJSONObject(i).put(JsonFormUtils.VALUE, value);
+                    questions.getJSONObject(i).remove(ChildJsonFormUtils.VALUE);
+                    questions.getJSONObject(i).put(ChildJsonFormUtils.VALUE, value);
                 }
             }
         } catch (JSONException e) {
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/util/KipReportUtils.java b/opensrp-kip/src/main/java/org/smartregister/kip/util/KipReportUtils.java
index 4d4d23d..e6a3fce 100755
--- a/opensrp-kip/src/main/java/org/smartregister/kip/util/KipReportUtils.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/util/KipReportUtils.java
@@ -6,7 +6,7 @@
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.smartregister.child.util.Constants;
-import org.smartregister.child.util.JsonFormUtils;
+import org.smartregister.child.util.ChildJsonFormUtils;
 import org.smartregister.child.util.Utils;
 import org.smartregister.clientandeventmodel.Event;
 import org.smartregister.domain.tag.FormTag;
@@ -34,7 +34,7 @@ public static void createReportAndSaveReport(@NonNull List<ReportHia2Indicator>
             String providerId = KipApplication.getInstance().context().allSharedPreferences().fetchRegisteredANM();
             String locationId = KipApplication.getInstance().context().allSharedPreferences().getPreference(Constants.CURRENT_LOCATION_ID);
             Report report = new Report();
-            report.setFormSubmissionId(JsonFormUtils.generateRandomUUIDString());
+            report.setFormSubmissionId(ChildJsonFormUtils.generateRandomUUIDString());
             report.setHia2Indicators(hia2Indicators);
             report.setLocationId(locationId);
             report.setProviderId(providerId);
@@ -47,7 +47,7 @@ public static void createReportAndSaveReport(@NonNull List<ReportHia2Indicator>
 
             report.setReportDate(new DateTime(calendar.getTime()));
             report.setReportType(reportType);
-            JSONObject reportJson = new JSONObject(JsonFormUtils.gson.toJson(report));
+            JSONObject reportJson = new JSONObject(ChildJsonFormUtils.gson.toJson(report));
             KipApplication.getInstance().hia2ReportRepository().addReport(reportJson);
 
             createReportAndProcessEvent(reportJson);
@@ -58,7 +58,7 @@ public static void createReportAndSaveReport(@NonNull List<ReportHia2Indicator>
 
     private static void createReportAndProcessEvent(@NonNull JSONObject reportJson) throws Exception {
         FormTag formTag = KipJsonFormUtils.formTag(KipChildUtils.getAllSharedPreferences());
-        Event baseEvent = JsonFormUtils.createEvent(new JSONArray(), new JSONObject(),
+        Event baseEvent = ChildJsonFormUtils.createEvent(new JSONArray(), new JSONObject(),
                 formTag, "", KipConstants.EventType.REPORT_CREATION, "");
         baseEvent.addDetails("reportJson", reportJson.toString());
         baseEvent.setFormSubmissionId(reportJson.optString("formSubmissionId"));
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/view/NavigationMenu.java b/opensrp-kip/src/main/java/org/smartregister/kip/view/NavigationMenu.java
index 9c884d4..3664167 100755
--- a/opensrp-kip/src/main/java/org/smartregister/kip/view/NavigationMenu.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/view/NavigationMenu.java
@@ -30,7 +30,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONObject;
 import org.smartregister.child.util.Constants;
-import org.smartregister.child.util.JsonFormUtils;
+import org.smartregister.child.util.ChildJsonFormUtils;
 import org.smartregister.child.util.Utils;
 import org.smartregister.client.utils.domain.Form;
 import org.smartregister.domain.FetchStatus;
@@ -272,7 +272,7 @@ private void recordOutOfArea(final Activity parentActivity) {
     private void startFormActivity(Activity activity) {
         try {
             JSONObject formJson = new FormUtils(activity).getFormJson(KipConstants.JSON_FORM.OUT_OF_CATCHMENT_SERVICE);
-            JsonFormUtils.addAvailableVaccines(activity, formJson);
+            ChildJsonFormUtils.addAvailableVaccines(activity, formJson);
 
             Form form = new Form();
             form.setWizard(false);
@@ -283,7 +283,7 @@ private void startFormActivity(Activity activity) {
             intent.putExtra(Constants.INTENT_KEY.JSON, formJson.toString());
             intent.putExtra(JsonFormConstants.JSON_FORM_KEY.FORM, form);
             intent.putExtra(JsonFormConstants.PERFORM_FORM_TRANSLATION, true);
-            activity.startActivityForResult(intent, JsonFormUtils.REQUEST_CODE_GET_JSON);
+            activity.startActivityForResult(intent, ChildJsonFormUtils.REQUEST_CODE_GET_JSON);
         } catch (Exception e) {
             Timber.e(e);
         }

From 29089e7c702c4b20749e4641663d7c77ab276bf4 Mon Sep 17 00:00:00 2001
From: Ogollah <kogollah2011@gmail.com>
Date: Tue, 22 Jun 2021 15:51:13 +0300
Subject: [PATCH 06/12] Fix layout errors

---
 local.properties                              |  1 +
 .../json.form/out_of_catchment_service.json   |  2 +-
 .../json.form/stock_adjustment_form.json      |  8 ++---
 .../assets/json.form/stock_issued_form.json   | 30 +++++++++----------
 .../assets/json.form/stock_received_form.json |  6 ++--
 .../res/layout/app_bar_report_summary.xml     |  4 +--
 .../main/res/layout/app_moh710_reports.xml    |  4 +--
 .../src/main/res/layout/fragment_stats.xml    |  4 +--
 .../res/layout/opd_profile_overview_row.xml   |  4 +--
 9 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/local.properties b/local.properties
index 1d80b10..681b9ad 100644
--- a/local.properties
+++ b/local.properties
@@ -6,3 +6,4 @@
 # header note.
 #Tue Jun 08 19:44:42 EAT 2021
 sdk.dir=/home/stephen/Android/Sdk
+
diff --git a/opensrp-kip/src/main/assets/json.form/out_of_catchment_service.json b/opensrp-kip/src/main/assets/json.form/out_of_catchment_service.json
index 0907dbd..be9c2d0 100755
--- a/opensrp-kip/src/main/assets/json.form/out_of_catchment_service.json
+++ b/opensrp-kip/src/main/assets/json.form/out_of_catchment_service.json
@@ -54,7 +54,7 @@
         "openmrs_entity_parent": "",
         "openmrs_entity": "",
         "openmrs_entity_id": "",
-        "type": "barcode",
+        "type": "edit_text",
         "barcode_type": "qrcode",
         "hint": "KIP ID ",
         "scanButtonText": "Scan QR Code",
diff --git a/opensrp-kip/src/main/assets/json.form/stock_adjustment_form.json b/opensrp-kip/src/main/assets/json.form/stock_adjustment_form.json
index 381a2f5..534ef0f 100644
--- a/opensrp-kip/src/main/assets/json.form/stock_adjustment_form.json
+++ b/opensrp-kip/src/main/assets/json.form/stock_adjustment_form.json
@@ -93,7 +93,7 @@
         "value": "Physical_recount",
         "v_required": {
           "value": true,
-          "err": ""
+          "err": "Please indicate reason"
         }
       },
       {
@@ -153,9 +153,9 @@
         "text": "",
         "has_bg": true,
         "top_padding": "10dp",
+        "left_padding": "20dp",
         "right_padding": "20dp",
         "bottom_padding": "10dp",
-        "left_padding": "20dp",
         "text_size": "14sp",
         "text_color": "#000000",
         "relevance": {
@@ -172,10 +172,10 @@
         "has_bg": true,
         "text_size": "10sp",
         "text_color": "#737373",
-        "top_padding": "10dp",
+        "left_padding": "20dp",
         "right_padding": "20dp",
         "bottom_padding": "10dp",
-        "left_padding": "20dp",
+        "top_padding": "10dp",
         "openmrs_entity_parent": "",
         "openmrs_entity": "",
         "openmrs_entity_id": "",
diff --git a/opensrp-kip/src/main/assets/json.form/stock_issued_form.json b/opensrp-kip/src/main/assets/json.form/stock_issued_form.json
index dd58ef9..4313b29 100644
--- a/opensrp-kip/src/main/assets/json.form/stock_issued_form.json
+++ b/opensrp-kip/src/main/assets/json.form/stock_issued_form.json
@@ -67,14 +67,13 @@
       {
         "key": "Children_Vaccinated_Count",
         "type": "label",
+        "openmrs_entity_parent": "",
+        "openmrs_entity": "",
+        "openmrs_entity_id": "",
         "text": "Children vaccinated on this date: <Enter date to calculate>",
-        "read_only": true,
-        "hint_on_text": true,
         "text_color": "#000000",
         "text_size": "14sp",
-        "openmrs_entity_parent": "",
-        "openmrs_entity": "",
-        "openmrs_entity_id": ""
+        "hint_on_text": true
       },
       {
         "key": "Vials_Issued_Count",
@@ -83,9 +82,9 @@
         "openmrs_entity": "",
         "openmrs_entity_id": "",
         "text": "Estimated vials issued on this date: <Enter date to calculate>",
-        "hint_on_text": true,
         "text_color": "#000000",
-        "text_size": "14sp"
+        "text_size": "14sp",
+        "hint_on_text": true
       },
       {
         "key": "divider1",
@@ -106,7 +105,7 @@
         "hint": "Actual number of [vaccine] vials issued",
         "v_min": {
           "value": "1",
-          "err": "Issued vials must be greater than 0"
+          "err": "issued vials must be greater than 0"
         },
         "v_numeric_integer": {
           "value": "true",
@@ -170,7 +169,7 @@
         "hint": "Number of wasted vials (e.g. damaged vials)",
         "v_min": {
           "value": "0",
-          "err": "Value cannot be less than zero"
+          "err": "value cannot be less than zero"
         },
         "v_numeric_integer": {
           "value": "true",
@@ -193,9 +192,9 @@
         "read_only": true,
         "has_bg": true,
         "top_padding": "10dp",
+        "left_padding": "20dp",
         "right_padding": "20dp",
         "bottom_padding": "10dp",
-        "left_padding": "20dp",
         "text_size": "14sp",
         "openmrs_entity_parent": "",
         "openmrs_entity": "",
@@ -215,9 +214,9 @@
         "text_size": "10sp",
         "text_color": "#737373",
         "top_padding": "10dp",
+        "left_padding": "20dp",
         "right_padding": "20dp",
         "bottom_padding": "10dp",
-        "left_padding": "20dp",
         "openmrs_entity_parent": "",
         "openmrs_entity": "",
         "openmrs_entity_id": "",
@@ -234,9 +233,9 @@
         "text": "Total wasted doses: 0 doses",
         "has_bg": true,
         "top_padding": "10dp",
+        "left_padding": "20dp",
         "right_padding": "20dp",
         "bottom_padding": "10dp",
-        "left_padding": "20dp",
         "text_size": "14sp",
         "text_color": "#000000",
         "openmrs_entity_parent": "",
@@ -256,13 +255,12 @@
         "has_bg": true,
         "text_size": "10sp",
         "text_color": "#737373",
-        "top_padding": "10dp",
-        "right_padding": "20dp",
         "bottom_padding": "10dp",
+        "top_padding": "10dp",
         "left_padding": "20dp",
-        "bottom_margin": "20dp",
-        "read_only": true,
+        "right_padding": "20dp",
         "openmrs_entity_parent": "",
+        "read_only": true,
         "openmrs_entity": "",
         "openmrs_entity_id": "",
         "relevance": {
diff --git a/opensrp-kip/src/main/assets/json.form/stock_received_form.json b/opensrp-kip/src/main/assets/json.form/stock_received_form.json
index 194b20c..001e22f 100644
--- a/opensrp-kip/src/main/assets/json.form/stock_received_form.json
+++ b/opensrp-kip/src/main/assets/json.form/stock_received_form.json
@@ -125,7 +125,7 @@
         "hint": "Vials [vaccine] received",
         "v_min": {
           "value": "1",
-          "err": "Received vials must be greater than 0"
+          "err": "issued vials must be greater than 0"
         },
         "v_numeric_integer": {
           "value": "true",
@@ -155,9 +155,9 @@
         "text": "",
         "has_bg": true,
         "top_padding": "10dp",
+        "left_padding": "20dp",
         "right_padding": "20dp",
         "bottom_padding": "10dp",
-        "left_padding": "20dp",
         "text_size": "14sp",
         "text_color": "#000000",
         "relevance": {
@@ -175,9 +175,9 @@
         "text_size": "10sp",
         "text_color": "#737373",
         "top_padding": "10dp",
+        "left_padding": "20dp",
         "right_padding": "20dp",
         "bottom_padding": "10dp",
-        "left_padding": "20dp",
         "openmrs_entity_parent": "",
         "openmrs_entity": "",
         "openmrs_entity_id": "",
diff --git a/opensrp-kip/src/main/res/layout/app_bar_report_summary.xml b/opensrp-kip/src/main/res/layout/app_bar_report_summary.xml
index 3c15a3f..468ce32 100755
--- a/opensrp-kip/src/main/res/layout/app_bar_report_summary.xml
+++ b/opensrp-kip/src/main/res/layout/app_bar_report_summary.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -12,4 +12,4 @@
 
     <include layout="@layout/notification_base" />
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/opensrp-kip/src/main/res/layout/app_moh710_reports.xml b/opensrp-kip/src/main/res/layout/app_moh710_reports.xml
index ca79c21..90b29cc 100755
--- a/opensrp-kip/src/main/res/layout/app_moh710_reports.xml
+++ b/opensrp-kip/src/main/res/layout/app_moh710_reports.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_content"
@@ -22,4 +22,4 @@
 
         <include layout="@layout/content_moh710" />
     </FrameLayout>
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/opensrp-kip/src/main/res/layout/fragment_stats.xml b/opensrp-kip/src/main/res/layout/fragment_stats.xml
index 8762932..ed00f36 100755
--- a/opensrp-kip/src/main/res/layout/fragment_stats.xml
+++ b/opensrp-kip/src/main/res/layout/fragment_stats.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -234,4 +234,4 @@
 
     </LinearLayout>
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/opensrp-kip/src/main/res/layout/opd_profile_overview_row.xml b/opensrp-kip/src/main/res/layout/opd_profile_overview_row.xml
index 07b4ee7..0b1874b 100644
--- a/opensrp-kip/src/main/res/layout/opd_profile_overview_row.xml
+++ b/opensrp-kip/src/main/res/layout/opd_profile_overview_row.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/overview_summary_row"
     android:layout_width="match_parent"
@@ -70,4 +70,4 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/overview_subsection_header" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file

From fc28f5225e8a069c2a238f5fd43e832a6a536021 Mon Sep 17 00:00:00 2001
From: Ogollah <kogollah2011@gmail.com>
Date: Thu, 1 Jul 2021 11:01:02 +0300
Subject: [PATCH 07/12] fix date range and out of catchment area search

---
 local.properties                              |  1 -
 .../kip/activity/Moh510ReportActivity.java    | 87 +++++++++++++++----
 .../kip/cursor/CreateRemoteLocalCursor.java   | 55 +++++++++---
 .../kip/pojo/Moh510SummaryReport.java         | 66 ++++++++++----
 .../Moh510SummaryReportRepository.java        | 76 ++++++++++------
 5 files changed, 215 insertions(+), 70 deletions(-)

diff --git a/local.properties b/local.properties
index 681b9ad..1d80b10 100644
--- a/local.properties
+++ b/local.properties
@@ -6,4 +6,3 @@
 # header note.
 #Tue Jun 08 19:44:42 EAT 2021
 sdk.dir=/home/stephen/Android/Sdk
-
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java b/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java
index cf0ed22..750abfd 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java
@@ -16,6 +16,9 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 
+import net.sqlcipher.Cursor;
+import net.sqlcipher.database.SQLiteDatabase;
+
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -25,22 +28,31 @@
 import org.smartregister.kip.application.KipApplication;
 import org.smartregister.kip.pojo.Moh510SummaryReport;
 import org.smartregister.kip.repository.Moh510SummaryReportRepository;
+import org.smartregister.kip.util.KipChildUtils;
+import org.smartregister.location.helper.LocationHelper;
+import org.smartregister.opd.utils.OpdDbConstants;
+import org.smartregister.opd.utils.OpdUtils;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
+import timber.log.Timber;
+
 
 public class Moh510ReportActivity extends AppCompatActivity implements DatePickerDialog.OnDateSetListener, View.OnClickListener {
 
+    Moh510SummaryReportRepository summaryReportRepository = KipApplication.getInstance().moh510SummaryReportRepository();
     private File filePath = new File(Environment.getExternalStorageDirectory()+"/moh510Report.xls");
     private int mYear, mMonth, mDay, mHour, mMinute;
     ImageButton closeReport;
@@ -62,8 +74,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setContentView(R.layout.activity_moh510_report);
         closeReport = findViewById(R.id.close_moh_510_report);
 
-
-
         ActivityCompat.requestPermissions(this, new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE,
                 Manifest.permission.WRITE_EXTERNAL_STORAGE}, PackageManager.PERMISSION_GRANTED);
         endTextDate = findViewById(R.id.end_date);
@@ -81,6 +91,13 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         customDateRangeBtn.setOnClickListener(this);
         closeReport.setOnClickListener(this);
 
+        if (startEditTextDate.getText().toString() == null){
+            startEditTextDate.setVisibility(View.GONE);
+        }
+        if (endTextDate.getText().toString()==null){
+            endTextDate.setVisibility(View.GONE);
+        }
+
     }
 
 
@@ -102,7 +119,7 @@ public void onClick(View v) {
                     new DatePickerDialog.OnDateSetListener() {
                         @Override
                         public void onDateSet(android.widget.DatePicker view, int year, int month, int dayOfMonth) {
-                            startEditTextDate.setText(dayOfMonth + "-" + (month + 1) + "-" + year);
+                            startEditTextDate.setText(dayOfMonth + "-" + "0"+(month + 1) + "-" + year);
                         }
                     }, mYear, mMonth, mDay);
             datePickerDialog.show();
@@ -118,8 +135,6 @@ public void onDateSet(android.widget.DatePicker view, int year, int month, int d
         } else if(v==cancel){
             startEditTextDate.setText("");
             endTextDate.setText("");
-            endTextDate.setVisibility(View.GONE);
-            endDateBtn.setVisibility(View.GONE);
             endDateBtn.setVisibility(View.VISIBLE);
             startDateBtn.setVisibility(View.VISIBLE);
         } else if (v == endDateBtn){
@@ -133,7 +148,8 @@ public void onDateSet(android.widget.DatePicker view, int year, int month, int d
                     new DatePickerDialog.OnDateSetListener() {
                         @Override
                         public void onDateSet(android.widget.DatePicker view, int year, int month, int dayOfMonth) {
-                            endTextDate.setText(dayOfMonth + "-" + (month + 1) + "-" + year);
+
+                            endTextDate.setText(dayOfMonth + "-" + "0"+(month + 1) + "-" + year);
                         }
                     }, mYear, mMonth, mDay);
             datePickerDialog.show();
@@ -155,10 +171,8 @@ public void onDateSet(android.widget.DatePicker view, int year, int month, int d
 
     private String dateConverter(String date) {
         if (date != null) {
-            long l=Long.parseLong(date);
-
             Date dateParser = new Date(Long.parseLong(date));
-            SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy");
+            SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
             return dateFormat.format(dateParser);
         }
         return null;
@@ -168,11 +182,10 @@ private String dateConverter(String date) {
             new TreeMap<Integer, Object[]>();
 
     public void buttonWriteToExcel(View view){
-
         int i = 0;
         for (Moh510SummaryReport report:getIndicatorValues()){
-            reportInfo.put(i++,new Object[]{report.getKipId(), report.getChildFullName(),report.getSex(),
-                    report.getDob(), report.getDateFirstSeen(), report.getFatherName(),report.getMotherName(),
+            reportInfo.put(i++,new Object[]{report.getKipId(), getFullName(report.getChildFirstName(),report.getChildLastName()),report.getSex(),
+                    dateFormat(report.getDob()), dateFormat(report.getDateFirstSeen()), getFullName(report.getFatherFirstName(), report.getFatherLastName()),getFullName(report.getMotherFirstName(),report.getMotherLastName()),
                     report.getMotherPhoneNumber(), report.getVillage(),report.getTelephone(), dateConverter(report.getBcg()),
                     dateConverter(report.getPolioBirthDose()), dateConverter(report.getOpv1()), dateConverter(report.getOpv2()),dateConverter(report.getOpv3()), dateConverter(report.getIpv()),
             dateConverter(report.getDpt1()),dateConverter(report.getDpt2()),dateConverter(report.getDpt3()), dateConverter(report.getPcv1()), dateConverter(report.getPcv2()),dateConverter(report.getPcv3()), dateConverter(report.getRota1()),dateConverter(report.getRota2()),
@@ -197,7 +210,7 @@ public void buttonWriteToExcel(View view){
             HSSFCell strEnd = dateRange.createCell(2);
             HSSFCell endDate = dateRange.createCell(3);
             tittleCell.setCellValue("Permanent Immunization Register(MOH 510)");
-            facilityCell.setCellValue("Health Facility: Asayi Dispensary");
+            facilityCell.setCellValue("Health Facility: "+ LocationHelper.getInstance().getOpenMrsReadableName(KipChildUtils.getCurrentLocality()));
             yearCell.setCellValue("Year of Enrollment: ");
 
             strStart.setCellValue("Start Date");
@@ -248,8 +261,7 @@ public void buttonWriteToExcel(View view){
     }
 
     private List<Moh510SummaryReport> getIndicatorValues(){
-        Moh510SummaryReportRepository summaryReportRepository = KipApplication.getInstance().moh510SummaryReportRepository();
-        List<Moh510SummaryReport> reportList = summaryReportRepository.getMoh510SummaryReport();
+        List<Moh510SummaryReport> reportList = getMoh510SummaryReport();
         return reportList;
     }
 
@@ -263,4 +275,49 @@ public void onDateSet(android.widget.DatePicker view, int year, int month, int d
 //        endDate.setText(selectedDate);
 //        startDate.setText(selectedDate);
     }
+
+    private String dateFormat(String date){
+        String datFt = "";
+        try {
+            SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy", Locale.US);
+            Date formDate = dateFormat.parse(date);
+
+            datFt = OpdUtils.convertDate(formDate, "dd-MM-yyyy");
+        } catch (Exception e){
+            Timber.d("--->dateFormat %s",e.getMessage());
+        }
+
+        return datFt;
+    }
+
+    private List<Moh510SummaryReport> getMoh510SummaryReport(){
+        List<Moh510SummaryReport> moh510SummaryReports = new ArrayList<>();
+        SQLiteDatabase db = summaryReportRepository.getReadable();
+        Cursor sCursor = null;
+
+        String startDate = startEditTextDate.getText().toString();
+        String endDate = endTextDate.getText().toString();
+
+
+        try {
+            if ((startDate == null || startDate.isEmpty()) && (endDate == null || endDate.isEmpty())){
+            sCursor = db.rawQuery(summaryReportRepository.sql(),null);}
+            else {
+                sCursor = db.rawQuery(summaryReportRepository.sqlDateRange( dateFormat(startDate), dateFormat(endDate)),null);
+            }
+            moh510SummaryReports = summaryReportRepository.readAll(sCursor);
+
+        } catch (Exception e){
+            Timber.d("-->getMoh510SummaryReport" + e.getMessage());
+        } finally {
+            if (sCursor !=null){
+                sCursor.close();
+            }
+        }
+        return moh510SummaryReports;
+    }
+
+    private String getFullName(String firstName, String lastName){
+        return firstName + " " + lastName;
+    }
 }
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/cursor/CreateRemoteLocalCursor.java b/opensrp-kip/src/main/java/org/smartregister/kip/cursor/CreateRemoteLocalCursor.java
index 4143fba..00518c8 100755
--- a/opensrp-kip/src/main/java/org/smartregister/kip/cursor/CreateRemoteLocalCursor.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/cursor/CreateRemoteLocalCursor.java
@@ -2,31 +2,40 @@
 
 import android.database.Cursor;
 
-import org.smartregister.kip.util.KipConstants;
-
+import org.smartregister.child.util.DBConstants;
 
 public class CreateRemoteLocalCursor {
     private String id;
     private String relationalId;
     private String firstName;
     private String lastName;
+    private String gender;
     private String dob;
     private String openSrpId;
+    private String motherFirstName;
+    private String motherLastName;
+    private String inactive;
+    private String lostToFollowUp;
 
     private String phoneNumber;
     private String altName;
 
     public CreateRemoteLocalCursor(Cursor cursor, boolean isRemote) {
         if (isRemote) {
-            id = cursor.getString(cursor.getColumnIndex(KipConstants.KEY.ID_LOWER_CASE));
+            id = cursor.getString(cursor.getColumnIndex(DBConstants.KEY.ID_LOWER_CASE));
         } else {
-            id = cursor.getString(cursor.getColumnIndex(KipConstants.KEY.BASE_ENTITY_ID));
+            id = cursor.getString(cursor.getColumnIndex(DBConstants.KEY.BASE_ENTITY_ID));
         }
-        relationalId = cursor.getString(cursor.getColumnIndex(KipConstants.KEY.RELATIONALID));
-        firstName = cursor.getString(cursor.getColumnIndex(KipConstants.KEY.FIRST_NAME));
-        lastName = cursor.getString(cursor.getColumnIndex(KipConstants.KEY.LAST_NAME));
-        dob = cursor.getString(cursor.getColumnIndex(KipConstants.KEY.DOB));
-        openSrpId = cursor.getString(cursor.getColumnIndex(KipConstants.KEY.OPENMRS_ID));
+        relationalId = cursor.getString(cursor.getColumnIndex(DBConstants.KEY.RELATIONALID));
+        firstName = cursor.getString(cursor.getColumnIndex(DBConstants.KEY.FIRST_NAME));
+        lastName = cursor.getString(cursor.getColumnIndex(DBConstants.KEY.LAST_NAME));
+        dob = cursor.getString(cursor.getColumnIndex(DBConstants.KEY.DOB));
+        openSrpId = cursor.getString(cursor.getColumnIndex(DBConstants.KEY.ZEIR_ID));
+        gender = cursor.getString(cursor.getColumnIndex(DBConstants.KEY.GENDER));
+        motherFirstName = cursor.getString(cursor.getColumnIndex(DBConstants.KEY.MOTHER_FIRST_NAME));
+        motherLastName = cursor.getString(cursor.getColumnIndex(DBConstants.KEY.MOTHER_LAST_NAME));
+        inactive = cursor.getString(cursor.getColumnIndex(DBConstants.KEY.INACTIVE));
+        lostToFollowUp = cursor.getString(cursor.getColumnIndex(DBConstants.KEY.LOST_TO_FOLLOW_UP));
     }
 
     public String getId() {
@@ -45,6 +54,10 @@ public String getLastName() {
         return lastName;
     }
 
+    public String getGender() {
+        return gender;
+    }
+
     public String getDob() {
         return dob;
     }
@@ -61,7 +74,27 @@ public String getOpenSrpId() {
         return openSrpId;
     }
 
-    public void setOpenSrpId(String openSrpId) {
-        this.openSrpId = openSrpId;
+    public String getMotherFirstName() {
+        return motherFirstName;
+    }
+
+    public String getMotherLastName() {
+        return motherLastName;
+    }
+
+    public String getInactive() {
+        return inactive;
+    }
+
+    public void setInactive(String inactive) {
+        this.inactive = inactive;
+    }
+
+    public String getLostToFollowUp() {
+        return lostToFollowUp;
+    }
+
+    public void setLostToFollowUp(String lostToFollowUp) {
+        this.lostToFollowUp = lostToFollowUp;
     }
 }
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/pojo/Moh510SummaryReport.java b/opensrp-kip/src/main/java/org/smartregister/kip/pojo/Moh510SummaryReport.java
index 422d244..b62492c 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/pojo/Moh510SummaryReport.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/pojo/Moh510SummaryReport.java
@@ -2,12 +2,15 @@
 
 public class Moh510SummaryReport {
     private String kipId;
-    private String childFullName;
+    private String childFirstName;
+    private String childLastName;
     private String sex;
     private String dob;
     private String dateFirstSeen;
-    private String fatherName;
-    private String motherName;
+    private String fatherFirstName;
+    private String motherFirstName;
+    private String fatherLastName;
+    private String motherLastName;
     private String motherPhoneNumber;
     private String village;
     private String telephone;
@@ -45,12 +48,36 @@ public void setKipId(String kipId) {
         this.kipId = kipId;
     }
 
-    public String getChildFullName() {
-        return childFullName;
+    public String getChildFirstName() {
+        return childFirstName;
     }
 
-    public void setChildFullName(String childFullName) {
-        this.childFullName = childFullName;
+    public String getChildLastName() {
+        return childLastName;
+    }
+
+    public void setChildLastName(String childLastName) {
+        this.childLastName = childLastName;
+    }
+
+    public String getFatherLastName() {
+        return fatherLastName;
+    }
+
+    public void setFatherLastName(String fatherLastName) {
+        this.fatherLastName = fatherLastName;
+    }
+
+    public String getMotherLastName() {
+        return motherLastName;
+    }
+
+    public void setMotherLastName(String motherLastName) {
+        this.motherLastName = motherLastName;
+    }
+
+    public void setChildFirstName(String childFirstName) {
+        this.childFirstName = childFirstName;
     }
 
     public String getSex() {
@@ -77,20 +104,20 @@ public void setDateFirstSeen(String dateFirstSeen) {
         this.dateFirstSeen = dateFirstSeen;
     }
 
-    public String getFatherName() {
-        return fatherName;
+    public String getFatherFirstName() {
+        return fatherFirstName;
     }
 
-    public void setFatherName(String fatherName) {
-        this.fatherName = fatherName;
+    public void setFatherFirstName(String fatherFirstName) {
+        this.fatherFirstName = fatherFirstName;
     }
 
-    public String getMotherName() {
-        return motherName;
+    public String getMotherFirstName() {
+        return motherFirstName;
     }
 
-    public void setMotherName(String motherName) {
-        this.motherName = motherName;
+    public void setMotherFirstName(String motherFirstName) {
+        this.motherFirstName = motherFirstName;
     }
 
     public String getMotherPhoneNumber() {
@@ -313,12 +340,15 @@ public void setMalaria4(String malaria4) {
     public String toString() {
         return "Moh510SummaryReport{" +
                 "kipId='" + kipId + '\'' +
-                ", childFullName='" + childFullName + '\'' +
+                ", childFirstName='" + childFirstName + '\'' +
+                ", childLastName='" + childLastName + '\'' +
                 ", sex='" + sex + '\'' +
                 ", dob='" + dob + '\'' +
                 ", dateFirstSeen='" + dateFirstSeen + '\'' +
-                ", fatherName='" + fatherName + '\'' +
-                ", motherName='" + motherName + '\'' +
+                ", fatherFirstName='" + fatherFirstName + '\'' +
+                ", motherFirstName='" + motherFirstName + '\'' +
+                ", fatherLastName='" + fatherLastName + '\'' +
+                ", motherLastName='" + motherLastName + '\'' +
                 ", motherPhoneNumber='" + motherPhoneNumber + '\'' +
                 ", village='" + village + '\'' +
                 ", telephone='" + telephone + '\'' +
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/repository/Moh510SummaryReportRepository.java b/opensrp-kip/src/main/java/org/smartregister/kip/repository/Moh510SummaryReportRepository.java
index 05d0472..c6f0ce5 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/repository/Moh510SummaryReportRepository.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/repository/Moh510SummaryReportRepository.java
@@ -9,15 +9,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import timber.log.Timber;
-
 public class Moh510SummaryReportRepository extends BaseRepository {
 
-    private String sql(){
+    public String sql(){
 
-        String sql = "SELECT client.opensrp_id AS kip_id, COALESCE(child_details.first_name , ' ', child_details.last_name) As child_full_name,\n" +
-                "       client.gender As sex, child_details.dob, client.date AS date_first_seen, COALESCE(father_details.first_name , ' ', father_details.last_name) As father_full_name,\n" +
-                "       COALESCE(mother_details.first_name , ' ', mother_details.last_name) As mother_full_name,\n" +
+        String sql = "SELECT client.opensrp_id AS kip_id, child_details.first_name AS child_first_name , child_details.last_name AS child_last_name,\n" +
+                "       client.gender As sex, child_details.dob, client.date AS date_first_seen, father_details.first_name AS father_first_name, father_details.last_name AS father_last_name,\n" +
+                "       mother_details.first_name AS mother_first_name, mother_details.last_name AS mother_last_name,\n" +
                 "       mother_details.phone_number AS mother_phone, client.village, mother_details.phone_number AS telephone_number,\n" +
                 "       CASE WHEN vaccines.name = 'bcg' THEN vaccines.date ELSE Null END \"bcg\",\n" +
                 "       CASE WHEN vaccines.name = 'opv_0' THEN vaccines.date ELSE Null END \"polio_birth_dose\",\n" +
@@ -52,34 +50,62 @@ private String sql(){
         return sql;
     }
 
-    public List<Moh510SummaryReport> getMoh510SummaryReport(){
-        List<Moh510SummaryReport> moh510SummaryReports = new ArrayList<>();
-        SQLiteDatabase db = getReadableDatabase();
-        Cursor sCursor = null;
+    public String sqlDateRange( String startDate, String endDate){
+
+        String sql = "SELECT client.opensrp_id AS kip_id, child_details.first_name AS child_first_name , child_details.last_name AS child_last_name,\n" +
+                "       client.gender As sex, child_details.dob, client.date AS date_first_seen, father_details.first_name AS father_first_name, father_details.last_name AS father_last_name,\n" +
+                "       mother_details.first_name AS mother_first_name, mother_details.last_name AS mother_last_name,\n" +
+                "       mother_details.phone_number AS mother_phone, client.village, mother_details.phone_number AS telephone_number,\n" +
+                "       CASE WHEN vaccines.name = 'bcg' THEN vaccines.date ELSE Null END \"bcg\",\n" +
+                "       CASE WHEN vaccines.name = 'opv_0' THEN vaccines.date ELSE Null END \"polio_birth_dose\",\n" +
+                "       CASE WHEN vaccines.name = 'opv_1' THEN vaccines.date ELSE Null END \"opv1\",\n" +
+                "       CASE WHEN vaccines.name = 'opv_2' THEN vaccines.date ELSE Null END \"opv2\",\n" +
+                "       CASE WHEN vaccines.name = 'opv_3' THEN vaccines.date ELSE Null END \"opv3\",\n" +
+                "       CASE WHEN vaccines.name = 'ipv' THEN vaccines.date ELSE Null END \"ipv\",\n" +
+                "       CASE WHEN vaccines.name = 'penta_1' THEN vaccines.date ELSE Null END \"penta1\",\n" +
+                "       CASE WHEN vaccines.name = 'penta_2' THEN vaccines.date ELSE Null END \"penta2\",\n" +
+                "       CASE WHEN vaccines.name = 'penta_3' THEN vaccines.date ELSE Null END \"penta3\",\n" +
+                "       CASE WHEN vaccines.name = 'pcv_1' THEN vaccines.date ELSE Null END \"pcv1\",\n" +
+                "       CASE WHEN vaccines.name = 'pcv_2' THEN vaccines.date ELSE Null END \"pcv2\",\n" +
+                "       CASE WHEN vaccines.name = 'pcv_3' THEN vaccines.date ELSE Null END \"pcv3\",\n" +
+                "       CASE WHEN vaccines.name = 'rota_1' THEN vaccines.date ELSE Null END \"rota1\",\n" +
+                "       CASE WHEN vaccines.name = 'rota_2' THEN vaccines.date ELSE Null END \"rota2\",\n" +
+                "       CASE WHEN vaccines.name = 'mr_1' THEN vaccines.date ELSE Null END \"mr1\",\n" +
+                "       CASE WHEN vaccines.name = 'vitamin_a' THEN vaccines.date ELSE Null END \"vitamin_a\",\n" +
+                "       CASE WHEN vaccines.name = 'yellow_fever' THEN vaccines.date ELSE Null END \"yellow_fever\",\n" +
+                "       CASE WHEN vaccines.name = 'mv_1' THEN vaccines.date ELSE Null END \"mv1\",\n" +
+                "       CASE WHEN vaccines.name = 'mv_2' THEN vaccines.date ELSE Null END \"mv2\",\n" +
+                "       CASE WHEN vaccines.name = 'mv_3' THEN vaccines.date ELSE Null END \"mv3\",\n" +
+                "       CASE WHEN vaccines.name = 'mr_1' THEN vaccines.date ELSE Null END \"fully_immunized\",\n" +
+                "       CASE WHEN vaccines.name = 'mr_2' THEN vaccines.date ELSE Null END \"mr2\",\n" +
+                "       CASE WHEN vaccines.name = 'mv_4' THEN vaccines.date ELSE Null END \"mv4\"\n" +
+                "FROM ec_child_details child_details\n" +
+                "LEFT JOIN ec_mother_details mother_details ON child_details.base_entity_id = mother_details.base_entity_id\n" +
+                "LEFT JOIN ec_father_details father_details ON child_details.base_entity_id = father_details.base_entity_id\n" +
+                "LEFT JOIN ec_client client ON child_details.base_entity_id = client.base_entity_id\n" +
+                "LEFT JOIN vaccines ON vaccines.base_entity_id = child_details.base_entity_id\n" +
+                "WHERE client.date BETWEEN "+startDate+" AND "+endDate+"\n" +
+                "GROUP BY child_details.base_entity_id;";
 
-        try {
-            sCursor = db.rawQuery(sql(),null);
-            moh510SummaryReports = readAll(sCursor);
+        return sql;
+    }
 
-        } catch (Exception e){
-            Timber.d("-->getMoh510SummaryReport" + e.getMessage());
-        } finally {
-            if (sCursor !=null){
-                sCursor.close();
-            }
-        }
-        return moh510SummaryReports;
+    public SQLiteDatabase getReadable(){
+        return getReadableDatabase();
     }
 
     public Moh510SummaryReport getMoh510SummaryReport(Cursor cursor){
         Moh510SummaryReport moh510SummaryReport = new Moh510SummaryReport();
         moh510SummaryReport.setKipId(cursor.getString(cursor.getColumnIndex("kip_id")));
-        moh510SummaryReport.setChildFullName(cursor.getString(cursor.getColumnIndex("child_full_name")));
+        moh510SummaryReport.setChildFirstName(cursor.getString(cursor.getColumnIndex("child_first_name")));
+        moh510SummaryReport.setChildLastName(cursor.getString(cursor.getColumnIndex("child_last_name")));
         moh510SummaryReport.setSex(cursor.getString(cursor.getColumnIndex("sex")));
         moh510SummaryReport.setDob(cursor.getString(cursor.getColumnIndex("dob")));
         moh510SummaryReport.setDateFirstSeen(cursor.getString(cursor.getColumnIndex("date_first_seen")));
-        moh510SummaryReport.setFatherName(cursor.getString(cursor.getColumnIndex("father_full_name")));
-        moh510SummaryReport.setMotherName(cursor.getString(cursor.getColumnIndex("mother_full_name")));
+        moh510SummaryReport.setFatherFirstName(cursor.getString(cursor.getColumnIndex("father_first_name")));
+        moh510SummaryReport.setFatherLastName(cursor.getString(cursor.getColumnIndex("father_last_name")));
+        moh510SummaryReport.setMotherFirstName(cursor.getString(cursor.getColumnIndex("mother_first_name")));
+        moh510SummaryReport.setMotherLastName(cursor.getString(cursor.getColumnIndex("mother_last_name")));
         moh510SummaryReport.setMotherPhoneNumber(cursor.getString(cursor.getColumnIndex("mother_phone")));
         moh510SummaryReport.setVillage(cursor.getString(cursor.getColumnIndex("village")));
         moh510SummaryReport.setTelephone(cursor.getString(cursor.getColumnIndex("telephone_number")));
@@ -110,7 +136,7 @@ public Moh510SummaryReport getMoh510SummaryReport(Cursor cursor){
         return moh510SummaryReport;
     }
 
-    private List<Moh510SummaryReport> readAll(Cursor cursor){
+    public List<Moh510SummaryReport> readAll(Cursor cursor){
         List<Moh510SummaryReport> moh510SummaryReports = new ArrayList<>();
         if (cursor !=null && cursor.getCount() > 0 && cursor.moveToNext()){
             cursor.moveToFirst();

From 02ba5f1af771551e1d38f752994a0f6cf081db73 Mon Sep 17 00:00:00 2001
From: Ogollah <kogollah2011@gmail.com>
Date: Fri, 2 Jul 2021 16:42:04 +0300
Subject: [PATCH 08/12] Fix query grouping

---
 local.properties                              |   2 +
 .../kip/activity/Moh510ReportActivity.java    |  27 +++-
 .../Moh510SummaryReportRepository.java        | 115 +++++++++---------
 3 files changed, 81 insertions(+), 63 deletions(-)

diff --git a/local.properties b/local.properties
index 1d80b10..42e653c 100644
--- a/local.properties
+++ b/local.properties
@@ -6,3 +6,5 @@
 # header note.
 #Tue Jun 08 19:44:42 EAT 2021
 sdk.dir=/home/stephen/Android/Sdk
+oauth.client.id="opensrp-trusted-client"
+oauth.client.secret="O@aTHS#cr3t"
\ No newline at end of file
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java b/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java
index 750abfd..9218a1d 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java
@@ -20,9 +20,15 @@
 import net.sqlcipher.database.SQLiteDatabase;
 
 import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFCreationHelper;
+import org.apache.poi.hssf.usermodel.HSSFFont;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.util.CellRangeAddress;
 import org.smartregister.child.util.Utils;
 import org.smartregister.kip.R;
 import org.smartregister.kip.application.KipApplication;
@@ -30,7 +36,6 @@
 import org.smartregister.kip.repository.Moh510SummaryReportRepository;
 import org.smartregister.kip.util.KipChildUtils;
 import org.smartregister.location.helper.LocationHelper;
-import org.smartregister.opd.utils.OpdDbConstants;
 import org.smartregister.opd.utils.OpdUtils;
 
 import java.io.File;
@@ -41,6 +46,7 @@
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -53,7 +59,8 @@
 public class Moh510ReportActivity extends AppCompatActivity implements DatePickerDialog.OnDateSetListener, View.OnClickListener {
 
     Moh510SummaryReportRepository summaryReportRepository = KipApplication.getInstance().moh510SummaryReportRepository();
-    private File filePath = new File(Environment.getExternalStorageDirectory()+"/moh510Report.xls");
+    private File filePath = new File(
+            Environment.getExternalStorageDirectory()+"/"+ LocationHelper.getInstance().getOpenMrsReadableName(KipChildUtils.getCurrentLocality())+"moh510Report.xls");
     private int mYear, mMonth, mDay, mHour, mMinute;
     ImageButton closeReport;
     EditText endTextDate, startEditTextDate;
@@ -185,7 +192,7 @@ public void buttonWriteToExcel(View view){
         int i = 0;
         for (Moh510SummaryReport report:getIndicatorValues()){
             reportInfo.put(i++,new Object[]{report.getKipId(), getFullName(report.getChildFirstName(),report.getChildLastName()),report.getSex(),
-                    dateFormat(report.getDob()), dateFormat(report.getDateFirstSeen()), getFullName(report.getFatherFirstName(), report.getFatherLastName()),getFullName(report.getMotherFirstName(),report.getMotherLastName()),
+                    report.getDob(), report.getDateFirstSeen(), getFullName(report.getFatherFirstName(), report.getFatherLastName()),getFullName(report.getMotherFirstName(),report.getMotherLastName()),
                     report.getMotherPhoneNumber(), report.getVillage(),report.getTelephone(), dateConverter(report.getBcg()),
                     dateConverter(report.getPolioBirthDose()), dateConverter(report.getOpv1()), dateConverter(report.getOpv2()),dateConverter(report.getOpv3()), dateConverter(report.getIpv()),
             dateConverter(report.getDpt1()),dateConverter(report.getDpt2()),dateConverter(report.getDpt3()), dateConverter(report.getPcv1()), dateConverter(report.getPcv2()),dateConverter(report.getPcv3()), dateConverter(report.getRota1()),dateConverter(report.getRota2()),
@@ -196,6 +203,9 @@ public void buttonWriteToExcel(View view){
 
             HSSFWorkbook hssfWorkbook = new HSSFWorkbook();
             HSSFSheet sheets = hssfWorkbook.createSheet("ImmunizationRegister");
+            sheets.addMergedRegion(CellRangeAddress.valueOf("A1:E1"));
+            sheets.addMergedRegion(CellRangeAddress.valueOf("A2:E2"));
+
             HSSFRow tittle = sheets.createRow(0);
             HSSFRow facility = sheets.createRow(1);
             HSSFRow year = sheets.createRow(2);
@@ -203,6 +213,7 @@ public void buttonWriteToExcel(View view){
             HSSFRow columnName = sheets.createRow(4);
 
             HSSFCell tittleCell = tittle.createCell(0);
+
             HSSFCell facilityCell = facility.createCell(0);
             HSSFCell yearCell = year.createCell(0);
             HSSFCell strStart = dateRange.createCell(0);
@@ -227,7 +238,8 @@ public void buttonWriteToExcel(View view){
             }
 
             HSSFRow queryRow;
-            int columnNumber = getIndicatorValues().size();
+            int columnSize = getIndicatorValues().size()+5;
+            int columnNumber = 5;
 
 //            row data
             Set<Integer> keyId = reportInfo.keySet();
@@ -241,6 +253,10 @@ public void buttonWriteToExcel(View view){
                 }
 
             }
+
+//            for (int col = 0;col<columnSize; col++){
+//                sheets.autoSizeColumn(col);
+//            }
             try {
 
                 if (!filePath.exists()) {
@@ -282,7 +298,7 @@ private String dateFormat(String date){
             SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy", Locale.US);
             Date formDate = dateFormat.parse(date);
 
-            datFt = OpdUtils.convertDate(formDate, "dd-MM-yyyy");
+            datFt = OpdUtils.convertDate(formDate,"yyyy-MM-dd'T'HH:mm:ss.SSS'+03:00'");
         } catch (Exception e){
             Timber.d("--->dateFormat %s",e.getMessage());
         }
@@ -306,6 +322,7 @@ private List<Moh510SummaryReport> getMoh510SummaryReport(){
                 sCursor = db.rawQuery(summaryReportRepository.sqlDateRange( dateFormat(startDate), dateFormat(endDate)),null);
             }
             moh510SummaryReports = summaryReportRepository.readAll(sCursor);
+            Timber.i("--->getMoh510SummaryReport: %s",sCursor);
 
         } catch (Exception e){
             Timber.d("-->getMoh510SummaryReport" + e.getMessage());
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/repository/Moh510SummaryReportRepository.java b/opensrp-kip/src/main/java/org/smartregister/kip/repository/Moh510SummaryReportRepository.java
index c6f0ce5..52c8765 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/repository/Moh510SummaryReportRepository.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/repository/Moh510SummaryReportRepository.java
@@ -12,80 +12,79 @@
 public class Moh510SummaryReportRepository extends BaseRepository {
 
     public String sql(){
-
         String sql = "SELECT client.opensrp_id AS kip_id, child_details.first_name AS child_first_name , child_details.last_name AS child_last_name,\n" +
-                "       client.gender As sex, child_details.dob, client.date AS date_first_seen, father_details.first_name AS father_first_name, father_details.last_name AS father_last_name,\n" +
+                "       client.gender As sex, strftime('%d/%m/%Y',child_details.dob) AS dob, strftime('%d/%m/%Y',client.date) AS date_first_seen, father_details.first_name AS father_first_name, father_details.last_name AS father_last_name,\n" +
                 "       mother_details.first_name AS mother_first_name, mother_details.last_name AS mother_last_name,\n" +
                 "       mother_details.phone_number AS mother_phone, client.village, mother_details.phone_number AS telephone_number,\n" +
-                "       CASE WHEN vaccines.name = 'bcg' THEN vaccines.date ELSE Null END \"bcg\",\n" +
-                "       CASE WHEN vaccines.name = 'opv_0' THEN vaccines.date ELSE Null END \"polio_birth_dose\",\n" +
-                "       CASE WHEN vaccines.name = 'opv_1' THEN vaccines.date ELSE Null END \"opv1\",\n" +
-                "       CASE WHEN vaccines.name = 'opv_2' THEN vaccines.date ELSE Null END \"opv2\",\n" +
-                "       CASE WHEN vaccines.name = 'opv_3' THEN vaccines.date ELSE Null END \"opv3\",\n" +
-                "       CASE WHEN vaccines.name = 'ipv' THEN vaccines.date ELSE Null END \"ipv\",\n" +
-                "       CASE WHEN vaccines.name = 'penta_1' THEN vaccines.date ELSE Null END \"penta1\",\n" +
-                "       CASE WHEN vaccines.name = 'penta_2' THEN vaccines.date ELSE Null END \"penta2\",\n" +
-                "       CASE WHEN vaccines.name = 'penta_3' THEN vaccines.date ELSE Null END \"penta3\",\n" +
-                "       CASE WHEN vaccines.name = 'pcv_1' THEN vaccines.date ELSE Null END \"pcv1\",\n" +
-                "       CASE WHEN vaccines.name = 'pcv_2' THEN vaccines.date ELSE Null END \"pcv2\",\n" +
-                "       CASE WHEN vaccines.name = 'pcv_3' THEN vaccines.date ELSE Null END \"pcv3\",\n" +
-                "       CASE WHEN vaccines.name = 'rota_1' THEN vaccines.date ELSE Null END \"rota1\",\n" +
-                "       CASE WHEN vaccines.name = 'rota_2' THEN vaccines.date ELSE Null END \"rota2\",\n" +
-                "       CASE WHEN vaccines.name = 'mr_1' THEN vaccines.date ELSE Null END \"mr1\",\n" +
-                "       CASE WHEN vaccines.name = 'vitamin_a' THEN vaccines.date ELSE Null END \"vitamin_a\",\n" +
-                "       CASE WHEN vaccines.name = 'yellow_fever' THEN vaccines.date ELSE Null END \"yellow_fever\",\n" +
-                "       CASE WHEN vaccines.name = 'mv_1' THEN vaccines.date ELSE Null END \"mv1\",\n" +
-                "       CASE WHEN vaccines.name = 'mv_2' THEN vaccines.date ELSE Null END \"mv2\",\n" +
-                "       CASE WHEN vaccines.name = 'mv_3' THEN vaccines.date ELSE Null END \"mv3\",\n" +
-                "       CASE WHEN vaccines.name = 'mr_1' THEN vaccines.date ELSE Null END \"fully_immunized\",\n" +
-                "       CASE WHEN vaccines.name = 'mr_2' THEN vaccines.date ELSE Null END \"mr2\",\n" +
-                "       CASE WHEN vaccines.name = 'mv_4' THEN vaccines.date ELSE Null END \"mv4\"\n" +
+                "       SUM(CASE WHEN vaccines.name = 'bcg' THEN vaccines.date ELSE Null END) \"bcg\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'opv_0' THEN vaccines.date ELSE Null END) \"polio_birth_dose\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'opv_1' THEN vaccines.date ELSE Null END) \"opv1\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'opv_2' THEN vaccines.date ELSE Null END) \"opv2\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'opv_3' THEN vaccines.date ELSE Null END) \"opv3\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'ipv' THEN vaccines.date ELSE Null END) \"ipv\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'penta_1' THEN vaccines.date ELSE Null END) \"penta1\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'penta_2' THEN vaccines.date ELSE Null END) \"penta2\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'penta_3' THEN vaccines.date ELSE Null END) \"penta3\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'pcv_1' THEN vaccines.date ELSE Null END) \"pcv1\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'pcv_2' THEN vaccines.date ELSE Null END) \"pcv2\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'pcv_3' THEN vaccines.date ELSE Null END) \"pcv3\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'rota_1' THEN vaccines.date ELSE Null END) \"rota1\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'rota_2' THEN vaccines.date ELSE Null END) \"rota2\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'mr_1' THEN vaccines.date ELSE Null END) \"mr1\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'vitamin_a' THEN vaccines.date ELSE Null END) \"vitamin_a\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'yellow_fever' THEN vaccines.date ELSE Null END) \"yellow_fever\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'mv_1' THEN vaccines.date ELSE Null END) \"mv1\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'mv_2' THEN vaccines.date ELSE Null END) \"mv2\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'mv_3' THEN vaccines.date ELSE Null END) \"mv3\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'mr_1' THEN vaccines.date ELSE Null END) \"fully_immunized\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'mr_2' THEN vaccines.date ELSE Null END) \"mr2\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'mv_4' THEN vaccines.date ELSE Null END) \"mv4\"\n" +
                 "FROM ec_child_details child_details\n" +
-                "LEFT JOIN ec_mother_details mother_details ON child_details.base_entity_id = mother_details.base_entity_id\n" +
-                "LEFT JOIN ec_father_details father_details ON child_details.base_entity_id = father_details.base_entity_id\n" +
+                "LEFT OUTER JOIN ec_mother_details mother_details ON child_details.relational_id = mother_details.base_entity_id\n" +
+                "LEFT JOIN ec_father_details father_details ON child_details.father_relational_id = father_details.base_entity_id\n" +
                 "LEFT JOIN ec_client client ON child_details.base_entity_id = client.base_entity_id\n" +
-                "LEFT JOIN vaccines ON vaccines.base_entity_id = child_details.base_entity_id\n" +
-                "GROUP BY child_details.base_entity_id;";
+                "LEFT JOIN vaccines ON vaccines.base_entity_id = child_details.base_entity_id" +
+                "GROUP BY kip_id;";
 
         return sql;
     }
 
     public String sqlDateRange( String startDate, String endDate){
-
         String sql = "SELECT client.opensrp_id AS kip_id, child_details.first_name AS child_first_name , child_details.last_name AS child_last_name,\n" +
-                "       client.gender As sex, child_details.dob, client.date AS date_first_seen, father_details.first_name AS father_first_name, father_details.last_name AS father_last_name,\n" +
+                "       client.gender As sex, strftime('%d/%m/%Y',child_details.dob) AS dob, strftime('%d/%m/%Y',client.date) AS date_first_seen, father_details.first_name AS father_first_name, father_details.last_name AS father_last_name,\n" +
                 "       mother_details.first_name AS mother_first_name, mother_details.last_name AS mother_last_name,\n" +
                 "       mother_details.phone_number AS mother_phone, client.village, mother_details.phone_number AS telephone_number,\n" +
-                "       CASE WHEN vaccines.name = 'bcg' THEN vaccines.date ELSE Null END \"bcg\",\n" +
-                "       CASE WHEN vaccines.name = 'opv_0' THEN vaccines.date ELSE Null END \"polio_birth_dose\",\n" +
-                "       CASE WHEN vaccines.name = 'opv_1' THEN vaccines.date ELSE Null END \"opv1\",\n" +
-                "       CASE WHEN vaccines.name = 'opv_2' THEN vaccines.date ELSE Null END \"opv2\",\n" +
-                "       CASE WHEN vaccines.name = 'opv_3' THEN vaccines.date ELSE Null END \"opv3\",\n" +
-                "       CASE WHEN vaccines.name = 'ipv' THEN vaccines.date ELSE Null END \"ipv\",\n" +
-                "       CASE WHEN vaccines.name = 'penta_1' THEN vaccines.date ELSE Null END \"penta1\",\n" +
-                "       CASE WHEN vaccines.name = 'penta_2' THEN vaccines.date ELSE Null END \"penta2\",\n" +
-                "       CASE WHEN vaccines.name = 'penta_3' THEN vaccines.date ELSE Null END \"penta3\",\n" +
-                "       CASE WHEN vaccines.name = 'pcv_1' THEN vaccines.date ELSE Null END \"pcv1\",\n" +
-                "       CASE WHEN vaccines.name = 'pcv_2' THEN vaccines.date ELSE Null END \"pcv2\",\n" +
-                "       CASE WHEN vaccines.name = 'pcv_3' THEN vaccines.date ELSE Null END \"pcv3\",\n" +
-                "       CASE WHEN vaccines.name = 'rota_1' THEN vaccines.date ELSE Null END \"rota1\",\n" +
-                "       CASE WHEN vaccines.name = 'rota_2' THEN vaccines.date ELSE Null END \"rota2\",\n" +
-                "       CASE WHEN vaccines.name = 'mr_1' THEN vaccines.date ELSE Null END \"mr1\",\n" +
-                "       CASE WHEN vaccines.name = 'vitamin_a' THEN vaccines.date ELSE Null END \"vitamin_a\",\n" +
-                "       CASE WHEN vaccines.name = 'yellow_fever' THEN vaccines.date ELSE Null END \"yellow_fever\",\n" +
-                "       CASE WHEN vaccines.name = 'mv_1' THEN vaccines.date ELSE Null END \"mv1\",\n" +
-                "       CASE WHEN vaccines.name = 'mv_2' THEN vaccines.date ELSE Null END \"mv2\",\n" +
-                "       CASE WHEN vaccines.name = 'mv_3' THEN vaccines.date ELSE Null END \"mv3\",\n" +
-                "       CASE WHEN vaccines.name = 'mr_1' THEN vaccines.date ELSE Null END \"fully_immunized\",\n" +
-                "       CASE WHEN vaccines.name = 'mr_2' THEN vaccines.date ELSE Null END \"mr2\",\n" +
-                "       CASE WHEN vaccines.name = 'mv_4' THEN vaccines.date ELSE Null END \"mv4\"\n" +
+                "       SUM(CASE WHEN vaccines.name = 'bcg' THEN vaccines.date ELSE Null END) \"bcg\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'opv_0' THEN vaccines.date ELSE Null END) \"polio_birth_dose\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'opv_1' THEN vaccines.date ELSE Null END) \"opv1\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'opv_2' THEN vaccines.date ELSE Null END) \"opv2\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'opv_3' THEN vaccines.date ELSE Null END) \"opv3\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'ipv' THEN vaccines.date ELSE Null END) \"ipv\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'penta_1' THEN vaccines.date ELSE Null END) \"penta1\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'penta_2' THEN vaccines.date ELSE Null END) \"penta2\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'penta_3' THEN vaccines.date ELSE Null END) \"penta3\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'pcv_1' THEN vaccines.date ELSE Null END) \"pcv1\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'pcv_2' THEN vaccines.date ELSE Null END) \"pcv2\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'pcv_3' THEN vaccines.date ELSE Null END) \"pcv3\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'rota_1' THEN vaccines.date ELSE Null END) \"rota1\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'rota_2' THEN vaccines.date ELSE Null END) \"rota2\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'mr_1' THEN vaccines.date ELSE Null END) \"mr1\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'vitamin_a' THEN vaccines.date ELSE Null END) \"vitamin_a\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'yellow_fever' THEN vaccines.date ELSE Null END) \"yellow_fever\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'mv_1' THEN vaccines.date ELSE Null END) \"mv1\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'mv_2' THEN vaccines.date ELSE Null END) \"mv2\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'mv_3' THEN vaccines.date ELSE Null END) \"mv3\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'mr_1' THEN vaccines.date ELSE Null END) \"fully_immunized\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'mr_2' THEN vaccines.date ELSE Null END) \"mr2\",\n" +
+                "       SUM(CASE WHEN vaccines.name = 'mv_4' THEN vaccines.date ELSE Null END) \"mv4\"\n" +
                 "FROM ec_child_details child_details\n" +
-                "LEFT JOIN ec_mother_details mother_details ON child_details.base_entity_id = mother_details.base_entity_id\n" +
-                "LEFT JOIN ec_father_details father_details ON child_details.base_entity_id = father_details.base_entity_id\n" +
+                "LEFT OUTER JOIN ec_mother_details mother_details ON child_details.relational_id = mother_details.base_entity_id\n" +
+                "LEFT JOIN ec_father_details father_details ON child_details.father_relational_id = father_details.base_entity_id\n" +
                 "LEFT JOIN ec_client client ON child_details.base_entity_id = client.base_entity_id\n" +
                 "LEFT JOIN vaccines ON vaccines.base_entity_id = child_details.base_entity_id\n" +
-                "WHERE client.date BETWEEN "+startDate+" AND "+endDate+"\n" +
-                "GROUP BY child_details.base_entity_id;";
+                "LEFT JOIN vaccines ON vaccines.base_entity_id = child_details.base_entity_id\n" +
+                "WHERE client.date BETWEEN '"+startDate+"' AND '"+endDate+"'" +
+                "GROUP BY kip_id;";
 
         return sql;
     }

From 0bd2bbe4e76e519357466c8974b4424baaf97da8 Mon Sep 17 00:00:00 2001
From: Ogollah <kogollah2011@gmail.com>
Date: Fri, 2 Jul 2021 18:53:04 +0300
Subject: [PATCH 09/12] :construction: add jonson and johnson antigen

---
 .../main/assets/covid19_vaccine_stock.json    |  7 ++++
 .../assets/json.form/opd_adverse_event.json   |  6 ++-
 .../opd_covid19_vaccine_administration.json   | 23 ++++++++--
 .../opd_covid19_vaccine_stock_take.json       | 42 +++++++++++++++++++
 .../opd_covid19_vaccine_record_relevance.yml  |  4 +-
 .../kip/activity/KipOpdProfileActivity.java   |  3 ++
 .../smartregister/kip/util/KipConstants.java  |  1 +
 .../kip/util/KipJsonFormUtils.java            | 26 ++++++++++--
 8 files changed, 100 insertions(+), 12 deletions(-)

diff --git a/opensrp-kip/src/main/assets/covid19_vaccine_stock.json b/opensrp-kip/src/main/assets/covid19_vaccine_stock.json
index fbc8f68..a23227c 100644
--- a/opensrp-kip/src/main/assets/covid19_vaccine_stock.json
+++ b/opensrp-kip/src/main/assets/covid19_vaccine_stock.json
@@ -37,6 +37,13 @@
           "type": "SettingConfiguration",
           "value": "100",
           "key": "pfizer_vials_amount"
+        },
+        {
+          "description": "978676-001:2022-02-01",
+          "label": "Johnson and Johnson Stock Details",
+          "type": "SettingConfiguration",
+          "value": "100",
+          "key": "johnson_and_johnson_vials_amount"
         }
       ],
       "type": "SettingConfiguration",
diff --git a/opensrp-kip/src/main/assets/json.form/opd_adverse_event.json b/opensrp-kip/src/main/assets/json.form/opd_adverse_event.json
index f8afab8..62ae82a 100755
--- a/opensrp-kip/src/main/assets/json.form/opd_adverse_event.json
+++ b/opensrp-kip/src/main/assets/json.form/opd_adverse_event.json
@@ -62,14 +62,16 @@
           "Sinopharm",
           "Sinovac",
           "Morderna",
-          "Pfizer"
+          "Pfizer",
+          "Johnson and Johnson"
         ],
         "openmrs_choice_ids": {
           "AZ Oxford": "",
           "Sinopharm": "",
           "Sinovac": "",
           "Morderna": "",
-          "Pfizer": ""
+          "Pfizer": "",
+          "Johnson and Johnson": ""
         },
         "v_required": {
           "value": true,
diff --git a/opensrp-kip/src/main/assets/json.form/opd_covid19_vaccine_administration.json b/opensrp-kip/src/main/assets/json.form/opd_covid19_vaccine_administration.json
index 43c86f1..a68892d 100644
--- a/opensrp-kip/src/main/assets/json.form/opd_covid19_vaccine_administration.json
+++ b/opensrp-kip/src/main/assets/json.form/opd_covid19_vaccine_administration.json
@@ -94,8 +94,8 @@
             "openmrs_entity_id": ""
           },
           {
-            "key": "Pfizer",
-            "text": "pfizer",
+            "key": "pfizer",
+            "text": "Pfizer",
             "openmrs_entity": "",
             "openmrs_entity_id": ""
           },
@@ -104,6 +104,12 @@
             "text": "Moderna",
             "openmrs_entity": "",
             "openmrs_entity_id": ""
+          },
+          {
+            "key": "johnson_and_johnson",
+            "text": "Johnson and Johnson",
+            "openmrs_entity": "",
+            "openmrs_entity_id": ""
           }
         ],
         "v_required": {
@@ -120,6 +126,15 @@
         "read_only": true,
         "hint": "Number of AZ oxford vials"
       },
+      {
+        "key": "johnson_and_johnson_vials_amount",
+        "openmrs_entity_parent": "",
+        "openmrs_entity": "Concept",
+        "openmrs_entity_id": "",
+        "type": "edit_text",
+        "read_only": true,
+        "hint": "Number Johnson and Johnson vials"
+      },
       {
         "key": "sinopharm_vials_amount",
         "openmrs_entity_parent": "",
@@ -127,7 +142,7 @@
         "openmrs_entity_id": "",
         "type": "edit_text",
         "read_only": true,
-        "hint": "Number sinopharm vials"
+        "hint": "Number Sinopharm vials"
       },
       {
         "key": "sinovac_vials_amount",
@@ -136,7 +151,7 @@
         "openmrs_entity_id": "",
         "type": "edit_text",
         "read_only": true,
-        "hint": "Number sinovac vials"
+        "hint": "Number Sinovac vials"
       },
       {
         "key": "pfizer_vials_amount",
diff --git a/opensrp-kip/src/main/assets/json.form/opd_covid19_vaccine_stock_take.json b/opensrp-kip/src/main/assets/json.form/opd_covid19_vaccine_stock_take.json
index 6a225e9..d53a7b8 100644
--- a/opensrp-kip/src/main/assets/json.form/opd_covid19_vaccine_stock_take.json
+++ b/opensrp-kip/src/main/assets/json.form/opd_covid19_vaccine_stock_take.json
@@ -225,6 +225,7 @@
   },
   "step5": {
     "title": "Moderna Vaccine Stock Take",
+    "next": "step6",
     "fields": [
       {
         "key": "moderna_vials_amount",
@@ -263,5 +264,46 @@
         }
       }
     ]
+  },
+  "step6": {
+    "title": "Johnson & Johnson Vaccine Stock Take",
+    "fields": [
+      {
+        "key": "johnson_and_johnson_vials_amount",
+        "openmrs_entity_parent": "",
+        "openmrs_entity": "Concept",
+        "openmrs_entity_id": "",
+        "type": "edit_text",
+        "hint": "Number Johnson and Johnson vials",
+        "v_required": {
+          "value": true,
+          "err": "Enter the number of Johnson and Johnson vials"
+        }
+      },
+      {
+        "key": "johnson_and_johnson_vials_lot_number",
+        "openmrs_entity_parent": "",
+        "openmrs_entity": "Concept",
+        "openmrs_entity_id": "",
+        "type": "edit_text",
+        "hint": "Enter the Johnson and Johnson vials lot number",
+        "v_required": {
+          "value": true,
+          "err": "Enter the number of Moderna vials lot number"
+        }
+      },
+      {
+        "key": "johnson_and_johnson_vials_expiry",
+        "openmrs_entity_parent": "",
+        "openmrs_entity": "Concept",
+        "openmrs_entity_id": "",
+        "hint": "Enter the Johnson and Johnson vials Expiry Date",
+        "type": "date_picker",
+        "v_required": {
+          "value": true,
+          "err": "Enter the Johnson and Johnson vials Expiry Date"
+        }
+      }
+    ]
   }
 }
\ No newline at end of file
diff --git a/opensrp-kip/src/main/assets/rule/opd/opd_covid19_vaccine_record_relevance.yml b/opensrp-kip/src/main/assets/rule/opd/opd_covid19_vaccine_record_relevance.yml
index 84d4376..65b42ec 100644
--- a/opensrp-kip/src/main/assets/rule/opd/opd_covid19_vaccine_record_relevance.yml
+++ b/opensrp-kip/src/main/assets/rule/opd/opd_covid19_vaccine_record_relevance.yml
@@ -2,14 +2,14 @@
 name: step1_re_order_alert
 description: re_order_alert
 priority: 1
-condition: "((step1_az_oxford_vials_amount != '' && step1_az_oxford_vials_amount > 5 && step1_az_oxford_vials_amount < 10) || (step1_sinopharm != '' && step1_sinopharm > 5 && step1_sinopharm < 10) || (step1_sinovac != '' && step1_sinovac > 5 && step1_sinovac < 10))"
+condition: "((step1_az_oxford_vials_amount != '' && step1_az_oxford_vials_amount > 5 && step1_az_oxford_vials_amount < 10) || (step1_sinopharm != '' && step1_sinopharm > 5 && step1_sinopharm < 10) || (step1_sinovac != '' && step1_sinovac > 5 && step1_sinovac < 10) || (step1_johnson_johnson != '' && step1_johnson_johnson > 5 && step1_johnson_johnson < 10))"
 actions:
   - "isRelevant = true"
 ---
 name: step1_must_re_order_alert
 description: must_re_order_alert
 priority: 1
-condition: "((step1_az_oxford_vials_amount != '' && step1_az_oxford_vials_amount < 5) || (step1_sinopharm != '' && step1_sinopharm < 5) || (step1_sinovac != '' && step1_sinovac < 5))"
+condition: "((step1_az_oxford_vials_amount != '' && step1_az_oxford_vials_amount < 5) || (step1_sinopharm != '' && step1_sinopharm < 5) || (step1_sinovac != '' && step1_sinovac < 5)|| (step1_johnson_johnson != '' && step1_johnson_johnson < 5))"
 actions:
   - "isRelevant = true"
 ---
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/activity/KipOpdProfileActivity.java b/opensrp-kip/src/main/java/org/smartregister/kip/activity/KipOpdProfileActivity.java
index 18c1873..456a17e 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/activity/KipOpdProfileActivity.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/activity/KipOpdProfileActivity.java
@@ -181,6 +181,9 @@ private void updateSettings(String jsonForm) {
                             } else if (value.toLowerCase().equalsIgnoreCase("moderna") && settingsKey.equalsIgnoreCase(KipConstants.MODERNA_VIALS_AMOUNT)) {
                                 setValues(metadata);
                                 break;
+                            } else if (value.toLowerCase().equalsIgnoreCase("johnson_and_johnson") && settingsKey.equalsIgnoreCase(KipConstants.JOHNSON_AND_JOHNSON_VIALS_AMOUNT)) {
+                                setValues(metadata);
+                                break;
                             }
                         }
                     }
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/util/KipConstants.java b/opensrp-kip/src/main/java/org/smartregister/kip/util/KipConstants.java
index b3c3e20..d311bf1 100755
--- a/opensrp-kip/src/main/java/org/smartregister/kip/util/KipConstants.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/util/KipConstants.java
@@ -25,6 +25,7 @@ public class KipConstants {
     public static final String PFIZER_VIALS_AMOUNT = "pfizer_vials_amount";
     public static final String MODERNA_VIALS_AMOUNT = "moderna_vials_amount";
     public static final String PHONE_NUMBER = "phone_number";
+    public static final String JOHNSON_AND_JOHNSON_VIALS_AMOUNT = "johnson_and_johnson_vials_amount";
 
     public interface DateFormat {
         String HH_MM_AMPM = "h:mm a";
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/util/KipJsonFormUtils.java b/opensrp-kip/src/main/java/org/smartregister/kip/util/KipJsonFormUtils.java
index 3084458..0d05fc0 100755
--- a/opensrp-kip/src/main/java/org/smartregister/kip/util/KipJsonFormUtils.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/util/KipJsonFormUtils.java
@@ -52,8 +52,7 @@ public class KipJsonFormUtils extends ChildJsonFormUtils {
     public static final String SECTIONS = "sections";
     public static final String attributes = "attributes";
     public static final String ENCOUNTER = "encounter";
-    public static final String
-            AZ_OXFORD_VIALS_AMOUNT = "az_oxford_vials_amount";
+    public static final String AZ_OXFORD_VIALS_AMOUNT = "az_oxford_vials_amount";
     public static final String AZ_OXFORD_VIALS_LOT_NUMBER = "az_oxford_vials_lot_number";
     public static final String AZ_OXFORD_VIALS_EXPIRY = "az_oxford_vials_expiry";
     public static final String SINOPHARM_VIALS_AMOUNT = "sinopharm_vials_amount";
@@ -63,6 +62,10 @@ public class KipJsonFormUtils extends ChildJsonFormUtils {
     public static final String SINOVAC_VIALS_LOT_NUMBER = "sinovac_vials_lot_number";
     public static final String SINOVAC_VIALS_EXPIRY = "sinovac_vials_expiry";
 
+    public static final String JOHNSON_AND_JOHNSON_VIALS_AMOUNT = "johnson_and_johnson_vials_amount";
+    public static final String JOHNSON_AND_JOHNSON_VIALS_EXPIRY = "johnson_and_johnson_vials_expiry";
+    public static final String JOHNSON_AND_JOHNSON_VIALS_LOT_NUMBER = "johnson_and_johnson_vials_lot_number";
+
     public static final String MODERNA_VIALS_AMOUNT = "moderna_vials_amount";
     public static final String MODERNA_VIALS_LOT_NUMBER = "moderna_vials_lot_number";
     public static final String MODERNA_VIALS_EXPIRY = "moderna_vials_expiry";
@@ -456,6 +459,7 @@ private static JSONArray extractValues(JSONArray fields) {
         StringBuilder sinovac = new StringBuilder();
         StringBuilder mordana = new StringBuilder();
         StringBuilder pfizer = new StringBuilder();
+        StringBuilder johnsonJohnson = new StringBuilder();
         try {
             for (int i = 0; i < fields.length(); i++) {
                 JSONObject field = fields.getJSONObject(i);
@@ -475,6 +479,8 @@ private static JSONArray extractValues(JSONArray fields) {
                     }
                     if (key.contains("pfizer_vials") && field.has(KipConstants.KeyUtils.VALUE)) {
                         sinovac.insert(0, field.optString(KipConstants.KeyUtils.VALUE) + ":");
+                    } if (key.contains("johnson_and_johnson_vials") && field.has(KipConstants.KeyUtils.VALUE)) {
+                        sinovac.insert(0, field.optString(KipConstants.KeyUtils.VALUE) + ":");
                     }
                 }
             }
@@ -482,10 +488,10 @@ private static JSONArray extractValues(JSONArray fields) {
             Timber.e(exception);
         }
 
-        return createNewFields(fields, azOxford.toString(), sinopharm.toString(), sinovac.toString(), mordana.toString(), pfizer.toString());
+        return createNewFields(fields, azOxford.toString(), sinopharm.toString(), sinovac.toString(), mordana.toString(), pfizer.toString(), johnsonJohnson.toString());
     }
 
-    private static JSONArray createNewFields(JSONArray fields, String azOxford, String sinopharm, String sinovac, String morderna, String pfzer) {
+    private static JSONArray createNewFields(JSONArray fields, String azOxford, String sinopharm, String sinovac, String morderna, String pfzer, String johnsonJohnson) {
         JSONArray newFormFields = new JSONArray();
         try {
             for (int i = 0; i < fields.length(); i++) {
@@ -512,6 +518,11 @@ private static JSONArray createNewFields(JSONArray fields, String azOxford, Stri
                         field.put(KipConstants.KeyUtils.VALUE, pfzer);
                         newFormFields.put(field);
                     }
+
+                    if (key.equalsIgnoreCase(KipConstants.JOHNSON_AND_JOHNSON_VIALS_AMOUNT)) {
+                        field.put(KipConstants.KeyUtils.VALUE, johnsonJohnson);
+                        newFormFields.put(field);
+                    }
                 }
             }
         } catch (JSONException exception) {
@@ -555,6 +566,7 @@ public static void appendFormValues(Map<String, String> settings, JSONArray fiel
             String[] sinovac = settings.get(KipConstants.SINOVAC_VIALS_AMOUNT).split(":");
             String[] moderna = settings.get(KipConstants.MODERNA_VIALS_AMOUNT).split(":");
             String[] pfizer = settings.get(KipConstants.PFIZER_VIALS_AMOUNT).split(":");
+            String[] johnsonAndJohnson = settings.get(KipConstants.JOHNSON_AND_JOHNSON_VIALS_AMOUNT).split(":");
 
             for (int i = 0; i < fields.length(); i++) {
                 JSONObject field = fields.getJSONObject(i);
@@ -590,6 +602,12 @@ public static void appendFormValues(Map<String, String> settings, JSONArray fiel
                         field.put(KipConstants.VALUE, pfizer[1]);
                     } else if (fieldKey.equalsIgnoreCase(PFIZER_VIALS_EXPIRY)) {
                         field.put(KipConstants.VALUE, pfizer[2]);
+                    } else if (fieldKey.equalsIgnoreCase(JOHNSON_AND_JOHNSON_VIALS_AMOUNT)) {
+                        field.put(KipConstants.VALUE, johnsonAndJohnson[0]);
+                    } else if (fieldKey.equalsIgnoreCase(JOHNSON_AND_JOHNSON_VIALS_LOT_NUMBER)) {
+                        field.put(KipConstants.VALUE, johnsonAndJohnson[1]);
+                    } else if (fieldKey.equalsIgnoreCase(JOHNSON_AND_JOHNSON_VIALS_EXPIRY)) {
+                        field.put(KipConstants.VALUE, johnsonAndJohnson[2]);
                     }
 
                 }

From 730b53d549aeb915699b7d574377dd7f6a76ba9a Mon Sep 17 00:00:00 2001
From: Ogollah <kogollah2011@gmail.com>
Date: Mon, 5 Jul 2021 14:16:04 +0300
Subject: [PATCH 10/12] johnson

---
 .../main/assets/covid19_vaccine_stock.json    | 20 +++++++-------
 .../opd_covid19_vaccine_administration.json   |  2 ++
 .../opd_covid19_vaccine_stock_take.json       | 14 +++++++++-
 .../opd_influenza_vaccine_administration.json |  2 ++
 .../template/covid19_vaccine_stock.json       | 10 +++++--
 .../kip/activity/LoginActivity.java           | 26 +++++++++++--------
 .../KipOpdProfileVisitsFragmentContract.java  |  1 -
 .../kip/interactor/SettingsInteractor.java    |  8 ++++--
 .../Moh510SummaryReportRepository.java        |  4 +--
 9 files changed, 58 insertions(+), 29 deletions(-)

diff --git a/opensrp-kip/src/main/assets/covid19_vaccine_stock.json b/opensrp-kip/src/main/assets/covid19_vaccine_stock.json
index a23227c..97720a6 100644
--- a/opensrp-kip/src/main/assets/covid19_vaccine_stock.json
+++ b/opensrp-kip/src/main/assets/covid19_vaccine_stock.json
@@ -25,24 +25,24 @@
           "key": "sinovac_vials_amount"
         },
         {
-          "description": "978676-001:2022-02-01",
-          "label": "Moderna Stock Details",
+          "description": "978679-001:2022-02-01",
+          "label": "Pfizer Stock Details",
           "type": "SettingConfiguration",
-          "value": "100",
-          "key": "moderna_vials_amount"
+          "value": "110",
+          "key": "pfizer_vials_amount"
         },
         {
-          "description": "978676-001:2022-02-01",
-          "label": "Pfizer Stock Details",
+          "description": "978677-001:2022-02-01",
+          "label": "Moderna Stock Details",
           "type": "SettingConfiguration",
-          "value": "100",
-          "key": "pfizer_vials_amount"
+          "value": "120",
+          "key": "moderna_vials_amount"
         },
         {
-          "description": "978676-001:2022-02-01",
+          "description": "978678-001:2022-02-01",
           "label": "Johnson and Johnson Stock Details",
           "type": "SettingConfiguration",
-          "value": "100",
+          "value": "140",
           "key": "johnson_and_johnson_vials_amount"
         }
       ],
diff --git a/opensrp-kip/src/main/assets/json.form/opd_covid19_vaccine_administration.json b/opensrp-kip/src/main/assets/json.form/opd_covid19_vaccine_administration.json
index a68892d..c2e9250 100644
--- a/opensrp-kip/src/main/assets/json.form/opd_covid19_vaccine_administration.json
+++ b/opensrp-kip/src/main/assets/json.form/opd_covid19_vaccine_administration.json
@@ -380,6 +380,8 @@
         "openmrs_entity": "",
         "openmrs_entity_id": "",
         "type": "date_picker",
+        "min_date": "today",
+        "max_date": "today+20y",
         "hint": "Please add the expiry date",
         "v_required": {
           "value": true,
diff --git a/opensrp-kip/src/main/assets/json.form/opd_covid19_vaccine_stock_take.json b/opensrp-kip/src/main/assets/json.form/opd_covid19_vaccine_stock_take.json
index d53a7b8..4172bd9 100644
--- a/opensrp-kip/src/main/assets/json.form/opd_covid19_vaccine_stock_take.json
+++ b/opensrp-kip/src/main/assets/json.form/opd_covid19_vaccine_stock_take.json
@@ -1,5 +1,5 @@
 {
-  "count": "5",
+  "count": "6",
   "encounter_type": "OPD Covid19 Vaccine Stock Take",
   "entity_id": "",
   "relational_id": "",
@@ -89,6 +89,8 @@
         "openmrs_entity_id": "",
         "hint": "Enter the AZ oxford vials Expiry Date",
         "type": "date_picker",
+        "min_date": "today",
+        "max_date": "today+20y",
         "v_required": {
           "value": true,
           "err": "Enter the AZ oxford vials Expiry Date"
@@ -132,6 +134,8 @@
         "openmrs_entity_id": "",
         "hint": "Enter the  sinopharm vials Expiry Date",
         "type": "date_picker",
+        "min_date": "today",
+        "max_date": "today+20y",
         "v_required": {
           "value": true,
           "err": "Enter the sinopharm vials Expiry Date"
@@ -174,6 +178,8 @@
         "openmrs_entity_id": "",
         "hint": "Enter the sinovac vials Expiry Date",
         "type": "date_picker",
+        "min_date": "today",
+        "max_date": "today+20y",
         "v_required": {
           "value": true,
           "err": "Enter the sinovac vials Expiry Date"
@@ -216,6 +222,8 @@
         "openmrs_entity_id": "",
         "hint": "Enter the Pfizer vials Expiry Date",
         "type": "date_picker",
+        "min_date": "today",
+        "max_date": "today+20y",
         "v_required": {
           "value": true,
           "err": "Enter the Pfizer vials Expiry Date"
@@ -258,6 +266,8 @@
         "openmrs_entity_id": "",
         "hint": "Enter the Moderna vials Expiry Date",
         "type": "date_picker",
+        "min_date": "today",
+        "max_date": "today+20y",
         "v_required": {
           "value": true,
           "err": "Enter the Moderna vials Expiry Date"
@@ -299,6 +309,8 @@
         "openmrs_entity_id": "",
         "hint": "Enter the Johnson and Johnson vials Expiry Date",
         "type": "date_picker",
+        "min_date": "today",
+        "max_date": "today+20y",
         "v_required": {
           "value": true,
           "err": "Enter the Johnson and Johnson vials Expiry Date"
diff --git a/opensrp-kip/src/main/assets/json.form/opd_influenza_vaccine_administration.json b/opensrp-kip/src/main/assets/json.form/opd_influenza_vaccine_administration.json
index 5752928..8eba321 100644
--- a/opensrp-kip/src/main/assets/json.form/opd_influenza_vaccine_administration.json
+++ b/opensrp-kip/src/main/assets/json.form/opd_influenza_vaccine_administration.json
@@ -304,6 +304,8 @@
         "openmrs_entity": "",
         "openmrs_entity_id": "",
         "type": "date_picker",
+        "min_date": "today",
+        "max_date": "today+20y",
         "hint": "Please add the expiry date",
         "v_required": {
           "value": true,
diff --git a/opensrp-kip/src/main/assets/template/covid19_vaccine_stock.json b/opensrp-kip/src/main/assets/template/covid19_vaccine_stock.json
index e597ff6..b460a76 100644
--- a/opensrp-kip/src/main/assets/template/covid19_vaccine_stock.json
+++ b/opensrp-kip/src/main/assets/template/covid19_vaccine_stock.json
@@ -20,16 +20,22 @@
       "key": "sinovac_vials_amount"
     },
     {
-      "description": "978676-001:2022-02-01",
+      "description": "978677-001:2022-02-01",
       "label": "Moderna Stock Details",
       "type": "SettingConfiguration",
       "key": "moderna_vials_amount"
     },
     {
-      "description": "978676-001:2022-02-01",
+      "description": "978679-001:2022-02-01",
       "label": "Pfizer Stock Details",
       "type": "SettingConfiguration",
       "key": "pfizer_vials_amount"
+    },
+    {
+      "description": "978678-001:2022-02-01",
+      "label": "Johnson and Johnson Stock Details",
+      "type": "SettingConfiguration",
+      "key": "johnson_and_johnson_vials_amount"
     }
   ],
   "type": "SettingConfiguration"
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/activity/LoginActivity.java b/opensrp-kip/src/main/java/org/smartregister/kip/activity/LoginActivity.java
index 56cb9d6..cc3460e 100755
--- a/opensrp-kip/src/main/java/org/smartregister/kip/activity/LoginActivity.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/activity/LoginActivity.java
@@ -51,24 +51,28 @@ public void goToHome(boolean remote) {
         if (remote) {
             org.smartregister.util.Utils.startAsyncTask(new SaveTeamLocationsTask(), null);
         }
-        gotToHomeRegister(remote);
+        goToCovid19VaccineStockSettings(remote);
         finish();
     }
 
-    private void gotToHomeRegister(boolean remote) {
-        LoginResponse loginResponse = SUCCESS;
-        String jsonPayload = new Gson().toJson(loginResponse.payload());
-        Intent intent = new Intent(this, ChildRegisterActivity.class);
+//    private void gotToHomeRegister(boolean remote) {
+//        LoginResponse loginResponse = SUCCESS;
+//        String jsonPayload = new Gson().toJson(loginResponse.payload());
+//        Intent intent = new Intent(this, ChildRegisterActivity.class);
+//        intent.putExtra(KipConstants.IntentKeyUtils.IS_REMOTE_LOGIN, remote);
+//        Intent rIntent = new Intent(this, LocationsIntentService.class);
+//        rIntent.putExtra("userInfo", jsonPayload);
+//        startService(rIntent);
+//        startActivity(intent);
+//        finish();
+//    }
+
+    private void goToCovid19VaccineStockSettings(boolean remote) {
+        Intent intent = new Intent(this, Covid19VaccineStockSettingsEnterActivity.class);
         intent.putExtra(KipConstants.IntentKeyUtils.IS_REMOTE_LOGIN, remote);
-        Intent rIntent = new Intent(this, LocationsIntentService.class);
-        rIntent.putExtra("userInfo", jsonPayload);
-        startService(rIntent);
         startActivity(intent);
-        finish();
     }
 
-
-
     @Override
     protected void attachBaseContext(Context base) {
         // get language from prefs
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/contract/KipOpdProfileVisitsFragmentContract.java b/opensrp-kip/src/main/java/org/smartregister/kip/contract/KipOpdProfileVisitsFragmentContract.java
index 962712c..07a211a 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/contract/KipOpdProfileVisitsFragmentContract.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/contract/KipOpdProfileVisitsFragmentContract.java
@@ -3,7 +3,6 @@
 import androidx.annotation.NonNull;
 import androidx.core.util.Pair;
 
-
 import org.jeasy.rules.api.Facts;
 import org.smartregister.kip.pojo.KipOpdVisitSummary;
 import org.smartregister.opd.contract.OpdProfileVisitsFragmentContract;
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/interactor/SettingsInteractor.java b/opensrp-kip/src/main/java/org/smartregister/kip/interactor/SettingsInteractor.java
index 2f410e2..cf609a9 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/interactor/SettingsInteractor.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/interactor/SettingsInteractor.java
@@ -49,6 +49,7 @@ public void saveCovid19VaccineStockSettings(Map<String, String> covid19VaccineSt
             settingObject = new JSONObject(covid19VaccineStockSettings.getValue());
         }
         localSettings = settingObject.has(AllConstants.SETTINGS) ? settingObject.getJSONArray(AllConstants.SETTINGS) : null;
+
         if (localSettings != null) {
             for (int i = 0; i < localSettings.length(); i++) {
                 JSONObject localSetting = localSettings.getJSONObject(i);
@@ -60,9 +61,12 @@ public void saveCovid19VaccineStockSettings(Map<String, String> covid19VaccineSt
                     updateSettings(covid19VaccineStockSettingsMap, localSetting, KipConstants.SINOVAC_VIALS_AMOUNT);
                 } else if (localSetting.getString(KipConstants.KeyUtils.KEY).equalsIgnoreCase(KipConstants.PFIZER_VIALS_AMOUNT)) {
                     updateSettings(covid19VaccineStockSettingsMap, localSetting, KipConstants.PFIZER_VIALS_AMOUNT);
-                } else {
+                } else if (localSetting.getString(KipConstants.KeyUtils.KEY).equalsIgnoreCase(KipConstants.MODERNA_VIALS_AMOUNT)){
                     updateSettings(covid19VaccineStockSettingsMap, localSetting, KipConstants.MODERNA_VIALS_AMOUNT);
+                } else{
+                    updateSettings(covid19VaccineStockSettingsMap, localSetting, KipConstants.JOHNSON_AND_JOHNSON_VIALS_AMOUNT);
                 }
+                System.out.println("localsettings length: ======>"+localSettings.length() + "value of :" + localSetting.toString());
             }
         }
 
@@ -84,7 +88,7 @@ protected AllSettings getAllSettingsRepo() {
     }
 
     private Boolean getPropertyForInitialSaveAction(Context context) {
-        String value = Utils.getProperties(context).getProperty(KipConstants.Properties.CAN_SAVE_SITE_INITIAL_SETTING, "false");
+        String value = Utils.getProperties(context).getProperty(KipConstants.Properties.CAN_SAVE_SITE_INITIAL_SETTING, "true");
         return Boolean.valueOf(value);
     }
 
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/repository/Moh510SummaryReportRepository.java b/opensrp-kip/src/main/java/org/smartregister/kip/repository/Moh510SummaryReportRepository.java
index 52c8765..1c69c84 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/repository/Moh510SummaryReportRepository.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/repository/Moh510SummaryReportRepository.java
@@ -43,7 +43,7 @@ public String sql(){
                 "LEFT OUTER JOIN ec_mother_details mother_details ON child_details.relational_id = mother_details.base_entity_id\n" +
                 "LEFT JOIN ec_father_details father_details ON child_details.father_relational_id = father_details.base_entity_id\n" +
                 "LEFT JOIN ec_client client ON child_details.base_entity_id = client.base_entity_id\n" +
-                "LEFT JOIN vaccines ON vaccines.base_entity_id = child_details.base_entity_id" +
+                "LEFT JOIN vaccines ON vaccines.base_entity_id = child_details.base_entity_id\n" +
                 "GROUP BY kip_id;";
 
         return sql;
@@ -83,7 +83,7 @@ public String sqlDateRange( String startDate, String endDate){
                 "LEFT JOIN ec_client client ON child_details.base_entity_id = client.base_entity_id\n" +
                 "LEFT JOIN vaccines ON vaccines.base_entity_id = child_details.base_entity_id\n" +
                 "LEFT JOIN vaccines ON vaccines.base_entity_id = child_details.base_entity_id\n" +
-                "WHERE client.date BETWEEN '"+startDate+"' AND '"+endDate+"'" +
+                "WHERE client.date BETWEEN '"+startDate+"' AND '"+endDate+"'\n" +
                 "GROUP BY kip_id;";
 
         return sql;

From b4f11aa6b292c987785c56a492a92fcfc14303d2 Mon Sep 17 00:00:00 2001
From: Ogollah <kogollah2011@gmail.com>
Date: Wed, 7 Jul 2021 12:11:38 +0300
Subject: [PATCH 11/12] Fix layout and updated adverse effects

---
 opensrp-kip/build.gradle                      |  2 +-
 .../assets/json.form/opd_adverse_event.json   | 56 ++++++++++-
 .../opd_influenza_adverse_event.json          | 92 +++++++------------
 .../kip/activity/LoginActivity.java           | 30 +++---
 .../kip/activity/Moh510ReportActivity.java    |  9 +-
 .../KipOpdProfileOverviewFragment.java        | 14 +--
 ...KipOpdProfileVisitsFragmentInteractor.java |  3 +
 .../kip/interactor/SettingsInteractor.java    |  1 -
 .../kip/processor/KipProcessorForJava.java    |  2 +-
 .../Moh510SummaryReportRepository.java        |  1 -
 .../src/main/res/layout/fragment_me.xml       |  3 +-
 .../src/main/res/layout/fragment_stats.xml    |  4 +-
 .../main/res/layout/moh510_content_view.xml   | 20 ++--
 .../src/main/res/layout/navigation_drawer.xml |  3 +-
 .../res/layout/opd_profile_overview_row.xml   |  4 +-
 15 files changed, 144 insertions(+), 100 deletions(-)

diff --git a/opensrp-kip/build.gradle b/opensrp-kip/build.gradle
index f984310..7817792 100755
--- a/opensrp-kip/build.gradle
+++ b/opensrp-kip/build.gradle
@@ -195,7 +195,7 @@ dependencies {
     }
 
 
-    api('org.smartregister:opensrp-client-core:4.3.7-SNAPSHOT@aar') {
+    api('org.smartregister:opensrp-client-core:3.3.1-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'id.zelory', module: 'compressor'
         exclude group: 'com.github.bmelnychuk', module: 'atv'
diff --git a/opensrp-kip/src/main/assets/json.form/opd_adverse_event.json b/opensrp-kip/src/main/assets/json.form/opd_adverse_event.json
index 62ae82a..8b85165 100755
--- a/opensrp-kip/src/main/assets/json.form/opd_adverse_event.json
+++ b/opensrp-kip/src/main/assets/json.form/opd_adverse_event.json
@@ -1,6 +1,6 @@
 {
   "count": "1",
-  "encounter_type": "Covid AEFI",
+  "encounter_type": "Covid 19 AEFI",
   "entity_id": "",
   "metadata": {
     "start": {
@@ -47,7 +47,7 @@
     "encounter_location": ""
   },
   "step1": {
-    "title": "Covid Adverse Event Reporting",
+    "title": "Covid 19 Adverse Event Reporting",
     "fields": [
       {
         "key": "Reaction_Vaccine",
@@ -235,6 +235,58 @@
             ]
           }
         }
+      },
+      {
+        "key": "covid_19_client_referred",
+        "openmrs_entity_parent": "",
+        "openmrs_entity": "concept",
+        "openmrs_entity_id": "163340AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_data_type": "select one",
+        "type": "native_radio",
+        "label": "Covid 19 Client Referred?",
+        "label_text_style": "bold",
+        "options": [
+          {
+            "key": "Yes",
+            "text": "Yes",
+            "openmrs_entity_parent": "",
+            "openmrs_entity": "concept",
+            "openmrs_entity_id": "163340AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          {
+            "key": "No",
+            "text": "No",
+            "openmrs_entity_parent": "",
+            "openmrs_entity": "concept",
+            "openmrs_entity_id": "163340AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          }
+        ]
+      },
+      {
+        "key": "covid_19_aefi_form",
+        "openmrs_entity_parent": "",
+        "openmrs_entity": "concept",
+        "openmrs_entity_id": "163340AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_data_type": "select one",
+        "type": "native_radio",
+        "label": "Was the AEFI form completed?",
+        "label_text_style": "bold",
+        "options": [
+          {
+            "key": "Yes",
+            "text": "Yes",
+            "openmrs_entity_parent": "",
+            "openmrs_entity": "concept",
+            "openmrs_entity_id": "163340AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          },
+          {
+            "key": "No",
+            "text": "No",
+            "openmrs_entity_parent": "",
+            "openmrs_entity": "concept",
+            "openmrs_entity_id": "163340AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          }
+        ]
       }
     ]
   }
diff --git a/opensrp-kip/src/main/assets/json.form/opd_influenza_adverse_event.json b/opensrp-kip/src/main/assets/json.form/opd_influenza_adverse_event.json
index ed23dc6..2c364d8 100644
--- a/opensrp-kip/src/main/assets/json.form/opd_influenza_adverse_event.json
+++ b/opensrp-kip/src/main/assets/json.form/opd_influenza_adverse_event.json
@@ -241,78 +241,56 @@
         }
       },
       {
-        "key": "influenza_aefi_action_taken",
+        "key": "influenza_client_referred",
         "openmrs_entity_parent": "",
-        "openmrs_entity": "",
-        "openmrs_entity_id": "",
-        "openmrs_data_type": "",
+        "openmrs_entity": "concept",
+        "openmrs_entity_id": "163340AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_data_type": "select one",
         "type": "native_radio",
-        "label": "Select from the Action Taken",
+        "label": "Influenza Client Referred?",
         "label_text_style": "bold",
         "options": [
           {
-            "key": "none",
-            "text": "None",
+            "key": "Yes",
+            "text": "Yes",
             "openmrs_entity_parent": "",
-            "openmrs_entity": "",
-            "openmrs_entity_id": ""
+            "openmrs_entity": "concept",
+            "openmrs_entity_id": "163340AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
           },
           {
-            "key": "referral",
-            "text": "Referred to a Facility",
+            "key": "No",
+            "text": "No",
             "openmrs_entity_parent": "",
-            "openmrs_entity": "",
-            "openmrs_entity_id": ""
-          },
-          {
-            "key": "admitted_to_hospital",
-            "text": "Admitted to the hospital",
-            "openmrs_entity_parent": "",
-            "openmrs_entity": "",
-            "openmrs_entity_id": ""
-          },
-          {
-            "key": "reported_to_aefi_form",
-            "text": "Reported to AEFI Form",
-            "openmrs_entity_parent": "",
-            "openmrs_entity": "",
-            "openmrs_entity_id": ""
-          },
+            "openmrs_entity": "concept",
+            "openmrs_entity_id": "163340AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+          }
+        ]
+      },
+      {
+        "key": "influenza_aefi_form",
+        "openmrs_entity_parent": "",
+        "openmrs_entity": "concept",
+        "openmrs_entity_id": "163340AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+        "openmrs_data_type": "select one",
+        "type": "native_radio",
+        "label": "Was the AEFI form completed?",
+        "label_text_style": "bold",
+        "options": [
           {
-            "key": "treated",
-            "text": "Treated and Discharged",
+            "key": "Yes",
+            "text": "Yes",
             "openmrs_entity_parent": "",
-            "openmrs_entity": "",
-            "openmrs_entity_id": ""
+            "openmrs_entity": "concept",
+            "openmrs_entity_id": "163340AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
           },
           {
-            "key": "other",
-            "text": "Other (specify)",
+            "key": "No",
+            "text": "No",
             "openmrs_entity_parent": "",
-            "openmrs_entity": "",
-            "openmrs_entity_id": ""
+            "openmrs_entity": "concept",
+            "openmrs_entity_id": "163340AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
           }
-        ],
-        "v_required": {
-          "value": false,
-          "err": "Please select at least one reaction"
-        }
-      },
-      {
-        "key": "other_influenza_aefi_action_taken",
-        "openmrs_entity_parent": "",
-        "openmrs_entity": "",
-        "openmrs_entity_id": "",
-        "openmrs_data_type": "text",
-        "type": "edit_text",
-        "hint": "Other Action Taken",
-        "relevance": {
-          "rules-engine": {
-            "ex-rules": {
-              "rules-file": "opd/opd_influenza_adverse_event_relevance.yml"
-            }
-          }
-        }
+        ]
       }
     ]
   }
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/activity/LoginActivity.java b/opensrp-kip/src/main/java/org/smartregister/kip/activity/LoginActivity.java
index cc3460e..249d6cb 100755
--- a/opensrp-kip/src/main/java/org/smartregister/kip/activity/LoginActivity.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/activity/LoginActivity.java
@@ -51,28 +51,28 @@ public void goToHome(boolean remote) {
         if (remote) {
             org.smartregister.util.Utils.startAsyncTask(new SaveTeamLocationsTask(), null);
         }
-        goToCovid19VaccineStockSettings(remote);
+        gotToHomeRegister(remote);
         finish();
     }
 
-//    private void gotToHomeRegister(boolean remote) {
-//        LoginResponse loginResponse = SUCCESS;
-//        String jsonPayload = new Gson().toJson(loginResponse.payload());
-//        Intent intent = new Intent(this, ChildRegisterActivity.class);
-//        intent.putExtra(KipConstants.IntentKeyUtils.IS_REMOTE_LOGIN, remote);
-//        Intent rIntent = new Intent(this, LocationsIntentService.class);
-//        rIntent.putExtra("userInfo", jsonPayload);
-//        startService(rIntent);
-//        startActivity(intent);
-//        finish();
-//    }
-
-    private void goToCovid19VaccineStockSettings(boolean remote) {
-        Intent intent = new Intent(this, Covid19VaccineStockSettingsEnterActivity.class);
+    private void gotToHomeRegister(boolean remote) {
+        LoginResponse loginResponse = SUCCESS;
+        String jsonPayload = new Gson().toJson(loginResponse.payload());
+        Intent intent = new Intent(this, ChildRegisterActivity.class);
         intent.putExtra(KipConstants.IntentKeyUtils.IS_REMOTE_LOGIN, remote);
+        Intent rIntent = new Intent(this, LocationsIntentService.class);
+        rIntent.putExtra("userInfo", jsonPayload);
+        startService(rIntent);
         startActivity(intent);
+        finish();
     }
 
+//    private void goToCovid19VaccineStockSettings(boolean remote) {
+//        Intent intent = new Intent(this, Covid19VaccineStockSettingsEnterActivity.class);
+//        intent.putExtra(KipConstants.IntentKeyUtils.IS_REMOTE_LOGIN, remote);
+//        startActivity(intent);
+//    }
+
     @Override
     protected void attachBaseContext(Context base) {
         // get language from prefs
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java b/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java
index 9218a1d..c6d60ef 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/activity/Moh510ReportActivity.java
@@ -64,7 +64,7 @@ public class Moh510ReportActivity extends AppCompatActivity implements DatePicke
     private int mYear, mMonth, mDay, mHour, mMinute;
     ImageButton closeReport;
     EditText endTextDate, startEditTextDate;
-    Button cancel, endDateBtn,startDateBtn, customDateRangeBtn;
+    Button cancel, endDateBtn,startDateBtn, customDateRangeBtn, ok;
     FrameLayout frameLayout, download;
 
     private String[] columnsVariable = {"KIP ID", "CHILD'S NAME", "SEX", "DATE OF BIRTH (DD/MM/YYYY)",
@@ -90,6 +90,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         customDateRangeBtn = findViewById(R.id.custom_date_button);
         frameLayout = findViewById(R.id.custom_date);
         download = findViewById(R.id.download);
+        ok = findViewById(R.id.ok);
 
         cancel = findViewById(R.id.cancel);
         cancel.setOnClickListener(this);
@@ -97,6 +98,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         endDateBtn.setOnClickListener(this);
         customDateRangeBtn.setOnClickListener(this);
         closeReport.setOnClickListener(this);
+        ok.setOnClickListener(this);
 
         if (startEditTextDate.getText().toString() == null){
             startEditTextDate.setVisibility(View.GONE);
@@ -172,6 +174,11 @@ public void onDateSet(android.widget.DatePicker view, int year, int month, int d
         } else if (v== customDateRangeBtn){
             frameLayout.setVisibility(View.VISIBLE);
             download.setVisibility(View.GONE);
+        } else if (v == ok){
+            buttonWriteToExcel(v);
+            Intent intent = new Intent(v.getContext(), ChildRegisterActivity.class);
+            startActivityForResult(intent, 0);
+            finish();
         }
 
     }
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/fragment/KipOpdProfileOverviewFragment.java b/opensrp-kip/src/main/java/org/smartregister/kip/fragment/KipOpdProfileOverviewFragment.java
index 85a6b93..e0f602e 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/fragment/KipOpdProfileOverviewFragment.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/fragment/KipOpdProfileOverviewFragment.java
@@ -2,12 +2,6 @@
 
 import android.os.Bundle;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.fragment.app.FragmentActivity;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,6 +9,12 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.fragment.app.FragmentActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.smartregister.commonregistry.CommonPersonObjectClient;
@@ -180,7 +180,7 @@ protected void onResumption() {
                         opdCheckedInTv.setText(R.string.opd_checked_in);
                         showDiagnoseAndTreatBtn();
 
-                            showInfluenzaMedicalConditionBtn();
+                        showInfluenzaMedicalConditionBtn();
 
 
                         if (StringUtils.isNotEmpty(((KipOpdProfileActivity) activity).getOpdMedicalCheck())) {
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/interactor/KipOpdProfileVisitsFragmentInteractor.java b/opensrp-kip/src/main/java/org/smartregister/kip/interactor/KipOpdProfileVisitsFragmentInteractor.java
index baed90d..7483aa0 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/interactor/KipOpdProfileVisitsFragmentInteractor.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/interactor/KipOpdProfileVisitsFragmentInteractor.java
@@ -5,7 +5,10 @@
 import org.smartregister.kip.application.KipApplication;
 import org.smartregister.kip.contract.KipOpdProfileVisitsFragmentContract;
 import org.smartregister.kip.pojo.KipOpdVisitSummary;
+import org.smartregister.opd.OpdLibrary;
+import org.smartregister.opd.contract.OpdProfileVisitsFragmentContract;
 import org.smartregister.opd.interactor.OpdProfileVisitsFragmentInteractor;
+import org.smartregister.opd.pojo.OpdVisitSummary;
 import org.smartregister.opd.utils.AppExecutors;
 
 import java.util.List;
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/interactor/SettingsInteractor.java b/opensrp-kip/src/main/java/org/smartregister/kip/interactor/SettingsInteractor.java
index cf609a9..b1efd6d 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/interactor/SettingsInteractor.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/interactor/SettingsInteractor.java
@@ -66,7 +66,6 @@ public void saveCovid19VaccineStockSettings(Map<String, String> covid19VaccineSt
                 } else{
                     updateSettings(covid19VaccineStockSettingsMap, localSetting, KipConstants.JOHNSON_AND_JOHNSON_VIALS_AMOUNT);
                 }
-                System.out.println("localsettings length: ======>"+localSettings.length() + "value of :" + localSetting.toString());
             }
         }
 
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/processor/KipProcessorForJava.java b/opensrp-kip/src/main/java/org/smartregister/kip/processor/KipProcessorForJava.java
index ba6440c..c0be1c3 100755
--- a/opensrp-kip/src/main/java/org/smartregister/kip/processor/KipProcessorForJava.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/processor/KipProcessorForJava.java
@@ -94,7 +94,7 @@
 
 import timber.log.Timber;
 
-public class KipProcessorForJava extends ClientProcessorForJava implements MiniClientProcessorForJava {
+public class KipProcessorForJava extends OpdMiniClientProcessorForJava implements MiniClientProcessorForJava {
 
     private static KipProcessorForJava instance;
 
diff --git a/opensrp-kip/src/main/java/org/smartregister/kip/repository/Moh510SummaryReportRepository.java b/opensrp-kip/src/main/java/org/smartregister/kip/repository/Moh510SummaryReportRepository.java
index 1c69c84..1923f1b 100644
--- a/opensrp-kip/src/main/java/org/smartregister/kip/repository/Moh510SummaryReportRepository.java
+++ b/opensrp-kip/src/main/java/org/smartregister/kip/repository/Moh510SummaryReportRepository.java
@@ -82,7 +82,6 @@ public String sqlDateRange( String startDate, String endDate){
                 "LEFT JOIN ec_father_details father_details ON child_details.father_relational_id = father_details.base_entity_id\n" +
                 "LEFT JOIN ec_client client ON child_details.base_entity_id = client.base_entity_id\n" +
                 "LEFT JOIN vaccines ON vaccines.base_entity_id = child_details.base_entity_id\n" +
-                "LEFT JOIN vaccines ON vaccines.base_entity_id = child_details.base_entity_id\n" +
                 "WHERE client.date BETWEEN '"+startDate+"' AND '"+endDate+"'\n" +
                 "GROUP BY kip_id;";
 
diff --git a/opensrp-kip/src/main/res/layout/fragment_me.xml b/opensrp-kip/src/main/res/layout/fragment_me.xml
index ded0bb2..7e8ec46 100755
--- a/opensrp-kip/src/main/res/layout/fragment_me.xml
+++ b/opensrp-kip/src/main/res/layout/fragment_me.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white"
@@ -128,7 +129,7 @@
                         android:contentDescription="@string/right_arrow"
                         android:gravity="center"
                         android:src="@drawable/baseline_keyboard_arrow_right"
-                        android:tint="@color/me_page_arrow" />
+                        app:tint="@color/me_page_arrow" />
                 </RelativeLayout>
 
                 <View
diff --git a/opensrp-kip/src/main/res/layout/fragment_stats.xml b/opensrp-kip/src/main/res/layout/fragment_stats.xml
index ed00f36..225a495 100755
--- a/opensrp-kip/src/main/res/layout/fragment_stats.xml
+++ b/opensrp-kip/src/main/res/layout/fragment_stats.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -234,4 +234,4 @@
 
     </LinearLayout>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/opensrp-kip/src/main/res/layout/moh510_content_view.xml b/opensrp-kip/src/main/res/layout/moh510_content_view.xml
index 2e50afe..e788416 100644
--- a/opensrp-kip/src/main/res/layout/moh510_content_view.xml
+++ b/opensrp-kip/src/main/res/layout/moh510_content_view.xml
@@ -132,9 +132,10 @@
                     android:paddingBottom="10dp"
                     android:paddingTop="10dp"
                     android:text="@string/cancel"
+                    android:background="@color/record_weight_red_bg_st"
                     android:textAllCaps="false"
                     android:textAppearance="?android:textAppearanceSmall"
-                    android:textColor="@color/opensrp_accent"
+                    android:textColor="@color/white"
                     android:textSize="22sp" />
 
                 <Button
@@ -143,13 +144,14 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dp"
-                    android:onClick="buttonWriteToExcel"
+                    android:drawableLeft="@drawable/ic_down"
                     android:paddingBottom="10dp"
                     android:paddingTop="10dp"
-                    android:text="@string/ok"
+                    android:text="Download"
                     android:textAllCaps="false"
                     android:textAppearance="?android:textAppearanceSmall"
-                    android:textColor="@color/opensrp_accent"
+                    android:textColor="@color/white"
+                    android:background="@color/light_blue"
                     android:textSize="22sp" />
 
             </LinearLayout>
@@ -210,8 +212,8 @@
                         android:layout_height="wrap_content"
                         android:focusable="false"
                         android:text="Custom Date Range"
-                        android:src="@drawable/ic_down"
-                        android:background="@color/white"
+                        android:background="@color/light_blue"
+                        android:textColor="@color/white"
                         android:textAllCaps="false"
                         />
 
@@ -234,8 +236,10 @@
                         android:focusable="false"
                         android:onClick="buttonWriteToExcel"
                         android:text="Download Register"
-                        android:src="@drawable/ic_down"
-                        android:background="@color/white"
+                        android:textColor="@color/white"
+                        android:drawableLeft="@drawable/ic_down"
+                        android:drawableRight="@drawable/ic_down"
+                        android:background="@color/light_blue"
                         android:textAllCaps="false"
                         />
                 </com.google.android.material.textfield.TextInputLayout>
diff --git a/opensrp-kip/src/main/res/layout/navigation_drawer.xml b/opensrp-kip/src/main/res/layout/navigation_drawer.xml
index 502674c..1014a7e 100755
--- a/opensrp-kip/src/main/res/layout/navigation_drawer.xml
+++ b/opensrp-kip/src/main/res/layout/navigation_drawer.xml
@@ -426,7 +426,8 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="10dp"
                             android:layout_marginBottom="10dp"
-                            android:orientation="horizontal">
+                            android:orientation="horizontal"
+                            android:visibility="gone">
 
                             <ImageView
                                 android:id="@+id/stock_control_image_view"
diff --git a/opensrp-kip/src/main/res/layout/opd_profile_overview_row.xml b/opensrp-kip/src/main/res/layout/opd_profile_overview_row.xml
index 0b1874b..01225c6 100644
--- a/opensrp-kip/src/main/res/layout/opd_profile_overview_row.xml
+++ b/opensrp-kip/src/main/res/layout/opd_profile_overview_row.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/overview_summary_row"
     android:layout_width="match_parent"
@@ -70,4 +70,4 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/overview_subsection_header" />
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 7cd3e1d03ca894a8aa8f1c91e079046dd25fc4bd Mon Sep 17 00:00:00 2001
From: Ogollah <kogollah2011@gmail.com>
Date: Mon, 12 Jul 2021 18:30:38 +0300
Subject: [PATCH 12/12] fix crushing commodity control

---
 opensrp-kip/build.gradle                              | 2 +-
 opensrp-kip/src/main/assets/stock_type.json           | 8 ++++----
 opensrp-kip/src/main/res/layout/navigation_drawer.xml | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/opensrp-kip/build.gradle b/opensrp-kip/build.gradle
index 7817792..230df7c 100755
--- a/opensrp-kip/build.gradle
+++ b/opensrp-kip/build.gradle
@@ -210,7 +210,7 @@ dependencies {
         exclude group: 'com.ibm.fhir', module: 'fhir-model'
     }
 
-    api('org.smartregister:opensrp-client-native-form:2.0.2-SNAPSHOT@aar') {
+    api('org.smartregister:opensrp-client-native-form:1.14.5.3-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'id.zelory', module: 'compressor'
         exclude group: 'com.android.support', module: 'recyclerview-v7'
diff --git a/opensrp-kip/src/main/assets/stock_type.json b/opensrp-kip/src/main/assets/stock_type.json
index 1469ff7..a8fbd95 100755
--- a/opensrp-kip/src/main/assets/stock_type.json
+++ b/opensrp-kip/src/main/assets/stock_type.json
@@ -14,14 +14,14 @@
     "openmrs_quantity_concept_id": ""
   },
   {
-    "quantity": "1",
+    "quantity": "10",
     "name": "Penta",
     "openmrs_parent_entity_id": "",
     "openmrs_date_concept_id": "",
     "openmrs_quantity_concept_id": ""
   },
   {
-    "quantity": "2",
+    "quantity": "4",
     "name": "PCV",
     "openmrs_parent_entity_id": "",
     "openmrs_date_concept_id": "",
@@ -42,14 +42,14 @@
     "openmrs_quantity_concept_id": ""
   },
   {
-    "quantity": "10",
+    "quantity": "2",
     "name": "MV",
     "openmrs_parent_entity_id": "",
     "openmrs_date_concept_id": "",
     "openmrs_quantity_concept_id": ""
   },
   {
-    "quantity": "20",
+    "quantity": "5",
     "name": "IPV",
     "openmrs_parent_entity_id": "",
     "openmrs_date_concept_id": "",
diff --git a/opensrp-kip/src/main/res/layout/navigation_drawer.xml b/opensrp-kip/src/main/res/layout/navigation_drawer.xml
index 1014a7e..5411197 100755
--- a/opensrp-kip/src/main/res/layout/navigation_drawer.xml
+++ b/opensrp-kip/src/main/res/layout/navigation_drawer.xml
@@ -426,8 +426,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="10dp"
                             android:layout_marginBottom="10dp"
-                            android:orientation="horizontal"
-                            android:visibility="gone">
+                            android:orientation="horizontal">
 
                             <ImageView
                                 android:id="@+id/stock_control_image_view"
@@ -448,7 +447,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center_vertical"
                                 android:layout_weight="1"
-                                android:text="KEPI Stock Control"
+                                android:text="KEPI Stock (Commodity)Control"
                                 android:textColor="@color/white"
                                 android:textSize="@dimen/me_page_section_text_size" />