Merge pull request #95 from dhis2/develop_with_pull

Release of version 0.5.8
dhis2 · Aug 7, 2018 · 5e320e1 · 5e320e1
2 parents a66a982 + 3aa086d
commit 5e320e1
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 56 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -34,7 +34,6 @@ apply plugin: 'jacoco-android'
 android {
 
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
@@ -72,6 +71,7 @@ android {
         exclude 'META-INF/dependencies.txt'
         exclude 'META-INF/LGPL2.1'
     }
+    buildToolsVersion '27.0.3'
 }
 
 dependencies {

diff --git a/...rg/hisp/dhis/android/trackercapture/fragments/enrollment/EnrollmentDataEntryFragment.java b/...rg/hisp/dhis/android/trackercapture/fragments/enrollment/EnrollmentDataEntryFragment.java
@@ -343,8 +343,8 @@ private boolean validate() {
                     getContext().getString(org.hisp.dhis.android.trackercapture.R.string.profile_form_empty));
             return false;
         }
-        if(!validateUniqueValues(form.getTrackedEntityAttributeValueMap())){
-            List<String> listOfUniqueInvalidFields = getNotValidatedUniqueValues(form.getTrackedEntityAttributeValueMap());
+        if(!TrackerController.validateUniqueValues(form.getTrackedEntityAttributeValueMap(), form.getOrganisationUnit().getId())){
+            List<String> listOfUniqueInvalidFields = TrackerController.getNotValidatedUniqueValues(form.getTrackedEntityAttributeValueMap(), form.getOrganisationUnit().getId());
             String listOfInvalidAttributes = " ";
             for(String value:listOfUniqueInvalidFields){
                 listOfInvalidAttributes += value + " ";
@@ -372,45 +372,6 @@ private boolean validate() {
         }
     }
 
-    private List<String> getNotValidatedUniqueValues(
-            Map<String, TrackedEntityAttributeValue> trackedEntityAttributeValueMap) {
-        List<String> listOFUniqueFields = new ArrayList<>();
-        for (String key : trackedEntityAttributeValueMap.keySet()) {
-            TrackedEntityAttributeValue value = trackedEntityAttributeValueMap.get(key);
-            TrackedEntityAttribute trackedEntityAttribute =
-                    MetaDataController.getTrackedEntityAttribute(
-                            value.getTrackedEntityAttributeId());
-            if (trackedEntityAttribute.isUnique()) {
-                if(value.getValue()==null || value.getValue().isEmpty()){
-                    continue;
-                }
-                if (TrackerController.countTrackedEntityAttributeValue(value)!=0) {
-                    listOFUniqueFields.add(trackedEntityAttribute.getDisplayName());
-                }
-            }
-        }
-        return listOFUniqueFields;
-    }
-
-    private boolean validateUniqueValues(
-            Map<String, TrackedEntityAttributeValue> trackedEntityAttributeValueMap) {
-        for (String key : trackedEntityAttributeValueMap.keySet()) {
-            TrackedEntityAttributeValue value = trackedEntityAttributeValueMap.get(key);
-                TrackedEntityAttribute trackedEntityAttribute =
-                        MetaDataController.getTrackedEntityAttribute(
-                                value.getTrackedEntityAttributeId());
-                if (trackedEntityAttribute.isUnique()) {
-                    if(value.getValue()==null || value.getValue().isEmpty()){
-                        continue;
-                    }
-                    if(TrackerController.countTrackedEntityAttributeValue(value) !=0){
-                        return false;
-                    }
-                }
-            }
-        return true;
-    }
-
     private boolean isMapEmpty(
             Map<String, TrackedEntityAttributeValue> trackedEntityAttributeValueMap) {
         boolean isEmpty = true;

diff --git a/...sp/dhis/android/trackercapture/fragments/enrollment/EnrollmentDataEntryFragmentQuery.java b/...sp/dhis/android/trackercapture/fragments/enrollment/EnrollmentDataEntryFragmentQuery.java
@@ -155,9 +155,11 @@ public EnrollmentDataEntryFragmentForm query(Context context) {
         for (int i = 0; i < programTrackedEntityAttributes.size(); i++) {
             boolean editable = true;
             boolean shouldNeverBeEdited = false;
+            ValueType valueType = programTrackedEntityAttributes.get(i).getTrackedEntityAttribute().getValueType();
             if (programTrackedEntityAttributes.get(i).getTrackedEntityAttribute().isGenerated()) {
                 editable = false;
                 shouldNeverBeEdited = true;
+                valueType = ValueType.TEXT;
                 mFragment.getListViewAdapter().disableIndex(programTrackedEntityAttributes.get(
                         i).getTrackedEntityAttribute().getUid());
             }
@@ -178,8 +180,7 @@ public EnrollmentDataEntryFragmentForm query(Context context) {
                     programTrackedEntityAttributes.get(i).getTrackedEntityAttribute().getName(),
                     getTrackedEntityDataValue(programTrackedEntityAttributes.get(i).
                             getTrackedEntityAttribute().getUid(), trackedEntityAttributeValues),
-                    programTrackedEntityAttributes.get(
-                            i).getTrackedEntityAttribute().getValueType(),
+                    valueType,
                     editable, shouldNeverBeEdited, isRadioButton);
             dataEntryRows.add(row);
         }

diff --git a/...rcapture/fragments/trackedentityinstanceprofile/TrackedEntityInstanceProfileFragment.java b/...rcapture/fragments/trackedentityinstanceprofile/TrackedEntityInstanceProfileFragment.java
@@ -49,14 +49,14 @@
 import org.hisp.dhis.android.sdk.controllers.metadata.MetaDataController;
 import org.hisp.dhis.android.sdk.controllers.tracker.TrackerController;
 import org.hisp.dhis.android.sdk.persistence.loaders.DbLoader;
-import org.hisp.dhis.android.sdk.persistence.models.Enrollment;
 import org.hisp.dhis.android.sdk.persistence.models.ProgramRule;
 import org.hisp.dhis.android.sdk.persistence.models.ProgramTrackedEntityAttribute;
 import org.hisp.dhis.android.sdk.persistence.models.TrackedEntityAttributeValue;
 import org.hisp.dhis.android.sdk.persistence.models.TrackedEntityInstance;
 import org.hisp.dhis.android.sdk.ui.activities.OnBackPressedListener;
 import org.hisp.dhis.android.sdk.ui.adapters.SectionAdapter;
 import org.hisp.dhis.android.sdk.ui.adapters.rows.dataentry.DataEntryRow;
+import org.hisp.dhis.android.sdk.ui.adapters.rows.dataentry.DataEntryRowTypes;
 import org.hisp.dhis.android.sdk.ui.adapters.rows.dataentry.Row;
 import org.hisp.dhis.android.sdk.ui.adapters.rows.dataentry.RunProgramRulesEvent;
 import org.hisp.dhis.android.sdk.ui.adapters.rows.events.OnDetailedInfoButtonClick;
@@ -65,7 +65,6 @@
 import org.hisp.dhis.android.sdk.ui.fragments.dataentry.RefreshListViewEvent;
 import org.hisp.dhis.android.sdk.ui.fragments.dataentry.RowValueChangedEvent;
 import org.hisp.dhis.android.sdk.ui.fragments.dataentry.SaveThread;
-import org.hisp.dhis.android.sdk.utils.ScreenSizeConfigurator;
 import org.hisp.dhis.android.sdk.utils.UiUtils;
 import org.hisp.dhis.android.trackercapture.R;
 
@@ -245,6 +244,13 @@ public void onLoadFinished(Loader<TrackedEntityInstanceProfileFragmentForm> load
             form = data;
             listViewAdapter.swapData(form.getDataEntryRows());
             programRuleFragmentHelper.mapFieldsToRulesAndIndicators();
+            if (data.getDataEntryRows() != null && !data.getDataEntryRows().isEmpty()) {
+                listViewAdapter.swapData(data.getDataEntryRows());
+            }
+            if (data.getProgram().getProgramRules() != null &&
+                    !data.getProgram().getProgramRules().isEmpty()) {
+                initiateEvaluateProgramRules();
+            }
         }
     }
 
@@ -482,6 +488,18 @@ private boolean validate() {
             if(dataEntryRow.getValidationError()!=null)
                 validationErrors.add(getContext().getString(dataEntryRow.getValidationError()));
         }
+
+        if(!TrackerController.validateUniqueValues(form.getTrackedEntityAttributeValueMap(), form.getTrackedEntityInstance().getOrgUnit())){
+            List<String> listOfUniqueInvalidFields = TrackerController.getNotValidatedUniqueValues(form.getTrackedEntityAttributeValueMap(), form.getTrackedEntityInstance().getOrgUnit());
+            String listOfInvalidAttributes = " ";
+            for(String value:listOfUniqueInvalidFields){
+                listOfInvalidAttributes += value + " ";
+            }
+            UiUtils.showErrorDialog(getActivity(), getContext().getString(org.hisp.dhis.android.trackercapture.R.string.error_message),
+                    String.format(getContext().getString(org.hisp.dhis.android.trackercapture.R.string.invalid_unique_value_form_empty), listOfInvalidAttributes));
+            return false;
+        }
+
         if (programRulesValidationErrors.isEmpty() && allErrors.isEmpty() && validationErrors.isEmpty()) {
             return true;
         } else {

diff --git a/...ure/fragments/trackedentityinstanceprofile/TrackedEntityInstanceProfileFragmentQuery.java b/...ure/fragments/trackedentityinstanceprofile/TrackedEntityInstanceProfileFragmentQuery.java
@@ -42,6 +42,7 @@
 import org.hisp.dhis.android.sdk.persistence.models.TrackedEntityInstance;
 import org.hisp.dhis.android.sdk.ui.adapters.rows.dataentry.DataEntryRowFactory;
 import org.hisp.dhis.android.sdk.ui.adapters.rows.dataentry.Row;
+import org.hisp.dhis.android.sdk.utils.Utils;
 import org.hisp.dhis.android.sdk.utils.api.ValueType;
 
 import java.util.ArrayList;
@@ -90,6 +91,21 @@ public TrackedEntityInstanceProfileFragmentForm query(Context context) {
             return mForm;
         }
         mForm.setTrackedEntityAttributeValues(trackedEntityAttributeValues);
+
+        List<Enrollment> enrollments = TrackerController.getEnrollments(mProgramId, mTrackedEntityInstance);
+        Enrollment activeEnrollment = null;
+        if(enrollments!=null) {
+            for(Enrollment enrollment: enrollments) {
+                if(enrollment.getStatus().equals(Enrollment.ACTIVE)) {
+                    activeEnrollment = enrollment;
+                }
+            }
+        }
+        if (activeEnrollment==null) {
+            return mForm;
+        }
+
+
         List<Row> dataEntryRows = new ArrayList<>();
         for (int i = 0; i < programTrackedEntityAttributes.size(); i++) {
             boolean shouldNeverBeEdited = false;
@@ -125,6 +141,8 @@ public TrackedEntityInstanceProfileFragmentForm query(Context context) {
                         trackedEntityAttributeValue);
             }
         }
+        activeEnrollment.setAttributes(trackedEntityAttributeValues);
+        mForm.setEnrollment(activeEnrollment);
         mForm.setDataEntryRows(dataEntryRows);
         return mForm;
     }

diff --git a/...apture/fragments/trackedentityinstanceprofile/TrackedEntityInstanceProfileRuleHelper.java b/...apture/fragments/trackedentityinstanceprofile/TrackedEntityInstanceProfileRuleHelper.java
@@ -152,7 +152,7 @@ public void applyShowErrorRuleAction(ProgramRuleAction programRuleAction) {
 
     @Override
     public void applyHideFieldRuleAction(ProgramRuleAction programRuleAction, List<String> affectedFieldsWithValue) {
-        fragment.getListViewAdapter().hideIndex(programRuleAction.getDataElement());
+        fragment.getListViewAdapter().hideIndex(programRuleAction.getTrackedEntityAttribute());
         if (fragment.containsValue(getDataElementValue(programRuleAction.getDataElement()))) {
             affectedFieldsWithValue.add(programRuleAction.getDataElement());
         }

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.3'
         classpath 'com.raizlabs:Griddle:1.0.3'
         classpath 'io.fabric.tools:gradle:1.25.1'
         classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1'
@@ -33,18 +33,18 @@ ext {
     minSdkVersion = 15
     compileSdkVersion = 23
     targetSdkVersion = 23
-    versionCode = 64
-    versionName = "0.5.6"
+    versionCode = 67
+    versionName = "0.5.8"
 
     configuration = [
             package          : "org.hisp.dhis.android.trackercapture",
             applicationId    : "org.hisp.dhis.android.trackercapture",
             buildToolsVersion: "26.0.2",
             minSdkVersion    : 15,
             compileSdkVersion: 23,
-            targetSdkVersion : 23,
-            versionCode      : 64,
-            versionName      : "0.5.6"
+            targetSdkVersion : 26,
+            versionCode      : 66,
+            versionName      : "0.5.8"
     ]
 
     libraries = [

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Feb 09 12:35:04 CET 2018
+#Wed Jul 11 09:14:23 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/sdk b/sdk