Release 0.5.5

New features:
- V{orgunit_code} doesn't work in program rule expression in Android Tracker Capture tool (https://jira.dhis2.org/browse/ACA-362)
- Hide indicators when they're empty (https://jira.dhis2.org/browse/ACA-336)

Bugfixing:
- Android allows to change the enrollment date (https://jira.dhis2.org/browse/ACA-369)

Merge remote-tracking branch 'upstream/development' into develop

README.md

@@ -7,22 +7,22 @@ https://github.com/dhis2/dhis2-android-trackercapture/releases
 
 # Testing
 If you want to try the application out with a demo database, you can use the following:
-- Server: https://apps.dhis2.org/demo
+- Server: https://play.dhis2.org/demo
 - Username: android
 - Password: Android123
 
-# How to Download and Set up in Android Studio
+# How to Download and Set up the development environment in Android Studio
 
 To successfully build and run this project, the dhis2-android-sdk is required.
 
-The dhis2-android-sdk project https://github.com/dhis2/dhis2-android-sdk folder should be in a subfolder called named sdk inside dhis2-android-trackercapture. It is configured as a git submodule, so it will be automatically include when cloned using --recursive. 
+The dhis2-android-sdk project https://github.com/dhis2/dhis2-android-sdk folder should be in a subfolder named sdk inside dhis2-android-trackercapture. It is configured as a git submodule, so it will be automatically included when cloned using --recursive. 
 
-To be compatible with 2.25/2.26/2.27 & 2.28 servers, use 2.23-legacy branch in dhis2-android-trackercapture and tracker-capture branch in dhis2-android-sdk repositories.
+Currently, the compatibility is guaranteed with 2.27, 2.28 and 2.29 servers, use develop branch in dhis2-android-trackercapture and tracker-capture branch in dhis2-android-sdk repositories.
 
 When cloning from zero, it's strongly recommended to do it as follows:
 
 ```
-git clone --recursive -b 2.23-legacy [email protected]:dhis2/dhis2-android-trackercapture.git
+git clone --recursive -b develop [email protected]:dhis2/dhis2-android-trackercapture.git
 cd dhis2-android-trackercapture/sdk
 git checkout tracker-capture
 ```

app/src/main/java/org/hisp/dhis/android/trackercapture/fragments/enrollment/EnrollmentDataEntryFragmentQuery.java

@@ -113,12 +113,12 @@ public EnrollmentDataEntryFragmentForm query(Context context) {
 
         dataEntryRows.add(
                 new EnrollmentDatePickerRow(currentEnrollment.getProgram().getEnrollmentDateLabel(),
-                        currentEnrollment));
+                        currentEnrollment, true));
 
         if (currentEnrollment.getProgram().getDisplayIncidentDate()) {
             dataEntryRows.add(
                     new IncidentDatePickerRow(currentEnrollment.getProgram().getIncidentDateLabel(),
-                            currentEnrollment));
+                            currentEnrollment, true));
         }
 
         for (ProgramTrackedEntityAttribute ptea : programTrackedEntityAttributes) {

app/src/main/java/org/hisp/dhis/android/trackercapture/fragments/enrollmentdate/EnrollmentDateFragmentQuery.java

@@ -58,10 +58,10 @@ public EnrollmentDateFragmentForm query(Context context) {
             return fragmentForm;
 
         List<Row> dataEntryRows = new ArrayList<>();
-        dataEntryRows.add(new EnrollmentDatePickerRow(enrollment.getProgram().getEnrollmentDateLabel(), enrollment));
+        dataEntryRows.add(new EnrollmentDatePickerRow(enrollment.getProgram().getEnrollmentDateLabel(), enrollment, false));
 
         if (enrollment.getProgram().getDisplayIncidentDate()) {
-            dataEntryRows.add(new IncidentDatePickerRow(enrollment.getProgram().getIncidentDateLabel(), enrollment));
+            dataEntryRows.add(new IncidentDatePickerRow(enrollment.getProgram().getIncidentDateLabel(), enrollment, true));
         }
 
         fragmentForm.setEnrollment(enrollment);

app/src/main/java/org/hisp/dhis/android/trackercapture/fragments/programoverview/ProgramOverviewFragment.java

@@ -603,10 +603,12 @@ public void onLoadFinished(Loader<ProgramOverviewFragmentForm> loader,
             }
 
             final Map<Long, FailedItem> failedEvents = getFailedEvents();
-
             for (IndicatorRow indicatorRow : mForm.getProgramIndicatorRows().values()) {
                 View view = indicatorRow.getView(getChildFragmentManager(),
                         getLayoutInflater(getArguments()), null, programIndicatorLayout);
+                if(indicatorRow.getIndicator().isDisplayInForm()){
+                    programIndicatorCardView.setVisibility(View.VISIBLE);
+                }
                 programIndicatorLayout.addView(view);
             }
 
@@ -677,6 +679,7 @@ private void initializeEventsViews(LinearLayout programEventsLayout) {
     }
 
     private void initializeIndicatorViews(LinearLayout programIndicatorLayout) {
+        programIndicatorCardView.setVisibility(View.GONE);
         programIndicatorLayout.removeAllViews();
         FlowLayout keyValueLayout = (FlowLayout) programIndicatorCardView.findViewById(
                 R.id.keyvaluelayout);

build.gradle

@@ -33,8 +33,8 @@ ext {
     minSdkVersion = 15
     compileSdkVersion = 23
     targetSdkVersion = 23
-    versionCode = 62
-    versionName = "0.5.4"
+    versionCode = 63
+    versionName = "0.5.5"
 
     configuration = [
             package          : "org.hisp.dhis.android.trackercapture",
@@ -43,8 +43,8 @@ ext {
             minSdkVersion    : 15,
             compileSdkVersion: 23,
             targetSdkVersion : 23,
-            versionCode      : 62,
-            versionName      : "0.5.4"
+            versionCode      : 63,
+            versionName      : "0.5.5"
     ]
 
     libraries = [