diff --git a/opensrp-app/src/main/java/org/ei/opensrp/AllConstants.java b/opensrp-app/src/main/java/org/ei/opensrp/AllConstants.java index 31d63266f..ea586c011 100644 --- a/opensrp-app/src/main/java/org/ei/opensrp/AllConstants.java +++ b/opensrp-app/src/main/java/org/ei/opensrp/AllConstants.java @@ -5,7 +5,6 @@ public class AllConstants { public static final String PROFILE_IMAGES_DOWNLOAD_PATH = "/multimedia/profileimage"; public static final String PROFILE_IMAGES_UPLOAD_PATH = "/multimedia/upload"; - public static final String REPORT_CATEGORY = "reportCategory"; public static final String INDICATOR_DETAIL = "indicatorDetail"; public static final String CATEGORY_DESCRIPTION = "categoryDescription"; @@ -336,7 +335,7 @@ public static class CloudantSync { public static final String REPLICATION_ERROR = "REPLICATION_ERROR"; public static final String DOCUMENTS_REPLICATED = "DOCUMENTS_REPLICATED"; public static final String BATCHES_REPLICATED = "BATCHES_REPLICATED"; - public static final String COUCHDB_PORT = "5984"; + public static final String COUCHDB_PORT = "5983"; public static final String COUCH_DATABASE_NAME = "opensrp"; public static final String COUCH_DATABASE_USER = "admin"; diff --git a/opensrp-indonesia/build.gradle b/opensrp-indonesia/build.gradle index 35292865c..92f8d4205 100644 --- a/opensrp-indonesia/build.gradle +++ b/opensrp-indonesia/build.gradle @@ -32,7 +32,7 @@ android { buildToolsVersion androidBuildToolsVersion defaultConfig { - applicationId "org.ei.opensrp.indonesia.demo" + applicationId "org.ei.opensrp.indonesia.ec_parana" minSdkVersion 16 targetSdkVersion 21 diff --git a/opensrp-indonesia/src/main/java/org/ei/opensrp/indonesia/parana/KIParanaClientsProvider.java b/opensrp-indonesia/src/main/java/org/ei/opensrp/indonesia/parana/KIParanaClientsProvider.java index ab4b0d2d4..d3d66b857 100644 --- a/opensrp-indonesia/src/main/java/org/ei/opensrp/indonesia/parana/KIParanaClientsProvider.java +++ b/opensrp-indonesia/src/main/java/org/ei/opensrp/indonesia/parana/KIParanaClientsProvider.java @@ -80,6 +80,11 @@ public void getView(SmartRegisterClient smartRegisterClient, View convertView) { viewHolder.wife_age = (TextView) convertView.findViewById(R.id.wife_age); + viewHolder.parana1 = (LinearLayout) convertView.findViewById(R.id.parana1); + viewHolder.parana2 = (LinearLayout) convertView.findViewById(R.id.parana2); + viewHolder.parana3 = (LinearLayout) convertView.findViewById(R.id.parana3); + viewHolder.parana4 = (LinearLayout) convertView.findViewById(R.id.parana4); + viewHolder.mmn_date = (TextView) convertView.findViewById(R.id.lbl_tgl); viewHolder.txt_total = (TextView) convertView.findViewById(R.id.txt_total); @@ -125,7 +130,6 @@ public void getView(SmartRegisterClient smartRegisterClient, View convertView) { AllCommonsRepository kiRepository = org.ei.opensrp.Context.getInstance().allCommonsRepositoryobjects("ibu"); CommonPersonObject kiobject = kiRepository.findByCaseID(pc.entityId()); - viewHolder.wife_name.setText(pc.getColumnmaps().get("namalengkap")!=null?pc.getColumnmaps().get("namalengkap"):""); viewHolder.husband_name.setText(pc.getColumnmaps().get("namaSuami")!=null?pc.getColumnmaps().get("namaSuami"):""); @@ -154,8 +158,14 @@ public void getView(SmartRegisterClient smartRegisterClient, View convertView) { Status_parana(pc.getDetails().get("paranaStatus2"),pc.getDetails().get("tanggal_sesi2"),viewHolder.tgl2,viewHolder.sesi2); Status_parana(pc.getDetails().get("paranaStatus3"),pc.getDetails().get("tanggal_sesi3"),viewHolder.tgl3,viewHolder.sesi3); Status_parana(pc.getDetails().get("paranaStatus4"),pc.getDetails().get("tanggal_sesi4"),viewHolder.tgl4,viewHolder.sesi4); - String invitation = pc.getDetails().get("date_invitation")!=null?pc.getDetails().get("date_invitation"):""; + + viewHolder.parana1.setBackgroundColor(context.getResources().getColor(R.color.status_bar_text_almost_white)); + viewHolder.parana2.setBackgroundColor(context.getResources().getColor(R.color.status_bar_text_almost_white)); + viewHolder.parana3.setBackgroundColor(context.getResources().getColor(R.color.status_bar_text_almost_white)); + viewHolder.parana4.setBackgroundColor(context.getResources().getColor(R.color.status_bar_text_almost_white)); + + String invitation = pc.getDetails().get("date_invitation")!=null?pc.getDetails().get("date_invitation"):""; if(StringUtils.isNotBlank(pc.getDetails().get("date_invitation"))) { String _invitation = invitation; String _due_invitation = ""; diff --git a/opensrp-indonesia/src/main/res/layout/smart_register_parana_client.xml b/opensrp-indonesia/src/main/res/layout/smart_register_parana_client.xml index b46b7ea7d..064d80a1a 100644 --- a/opensrp-indonesia/src/main/res/layout/smart_register_parana_client.xml +++ b/opensrp-indonesia/src/main/res/layout/smart_register_parana_client.xml @@ -73,6 +73,7 @@ >