1.0.3 bugfixing

dhis2 · Oct 1, 2018 · 895389c · 895389c
1 parent db350a8
commit 895389c
Show file tree

Hide file tree

Showing 19 changed files with 182 additions and 74 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -32,7 +32,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 27
         versionCode 33
-        versionName "1.0.2"
+        versionName "1.0.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true

diff --git a/app/src/main/java/org/dhis2/Bindings/Bindings.java b/app/src/main/java/org/dhis2/Bindings/Bindings.java
@@ -33,7 +33,6 @@
 import org.dhis2.data.tuples.Pair;
 import org.dhis2.utils.CatComboAdapter;
 import org.dhis2.utils.DateUtils;
-import org.hisp.dhis.android.core.category.CategoryComboModel;
 import org.hisp.dhis.android.core.category.CategoryOptionComboModel;
 import org.hisp.dhis.android.core.common.State;
 import org.hisp.dhis.android.core.enrollment.EnrollmentModel;
@@ -429,7 +428,7 @@ public static void setEventIcon(ImageView view, EventModel event, EnrollmentMode
                                 .observeOn(AndroidSchedulers.mainThread())
                                 .subscribe(
                                         program -> {
-                                            if (DateUtils.getInstance().hasExpired(event, program.expiryDays(), program.completeEventsExpiryDays(), eventProgramStage.periodType()!=null?eventProgramStage.periodType():program.expiryPeriodType())) {
+                                            if (DateUtils.getInstance().hasExpired(event, program.expiryDays(), program.completeEventsExpiryDays(), eventProgramStage.periodType() != null ? eventProgramStage.periodType() : program.expiryPeriodType())) {
                                                 view.setImageDrawable(ContextCompat.getDrawable(view.getContext(), R.drawable.ic_eye_red));
                                             } else {
                                                 view.setImageDrawable(ContextCompat.getDrawable(view.getContext(), R.drawable.ic_edit));
@@ -479,7 +478,7 @@ public static void setEventText(TextView view, EventModel event, EnrollmentModel
                                 .observeOn(AndroidSchedulers.mainThread())
                                 .subscribe(
                                         program -> {
-                                            if (DateUtils.getInstance().hasExpired(event, program.expiryDays(), program.completeEventsExpiryDays(), eventProgramStage.periodType()!=null?eventProgramStage.periodType():program.expiryPeriodType())) {
+                                            if (DateUtils.getInstance().hasExpired(event, program.expiryDays(), program.completeEventsExpiryDays(), eventProgramStage.periodType() != null ? eventProgramStage.periodType() : program.expiryPeriodType())) {
                                                 view.setText(view.getContext().getString(R.string.event_expired));
                                             } else {
                                                 view.setText(view.getContext().getString(R.string.event_open));
@@ -495,7 +494,7 @@ public static void setEventText(TextView view, EventModel event, EnrollmentModel
                                 .observeOn(AndroidSchedulers.mainThread())
                                 .subscribe(
                                         program -> {
-                                            if (DateUtils.getInstance().hasExpired(event, program.expiryDays(), program.completeEventsExpiryDays(), eventProgramStage.periodType()!=null?eventProgramStage.periodType():program.expiryPeriodType())) {
+                                            if (DateUtils.getInstance().hasExpired(event, program.expiryDays(), program.completeEventsExpiryDays(), eventProgramStage.periodType() != null ? eventProgramStage.periodType() : program.expiryPeriodType())) {
                                                 view.setText(view.getContext().getString(R.string.event_expired));
                                             } else {
                                                 view.setText(view.getContext().getString(R.string.event_completed));
@@ -511,7 +510,7 @@ public static void setEventText(TextView view, EventModel event, EnrollmentModel
                                 .observeOn(AndroidSchedulers.mainThread())
                                 .subscribe(
                                         program -> {
-                                            if (DateUtils.getInstance().hasExpired(event, program.expiryDays(), program.completeEventsExpiryDays(), eventProgramStage.periodType()!=null?eventProgramStage.periodType():program.expiryPeriodType())) {
+                                            if (DateUtils.getInstance().hasExpired(event, program.expiryDays(), program.completeEventsExpiryDays(), eventProgramStage.periodType() != null ? eventProgramStage.periodType() : program.expiryPeriodType())) {
                                                 view.setText(view.getContext().getString(R.string.event_expired));
                                             } else {
                                                 view.setText(view.getContext().getString(R.string.event_schedule));
@@ -632,8 +631,10 @@ public static void setCategoryOptionComboName(TextView textView, String category
                                     .subscribe(
                                             categoryOptionModel -> {
                                                 if (!categoryOptionModel.isDefault()) {
+                                                    textView.setVisibility(View.VISIBLE);
                                                     textView.setText(categoryOptionComboModel.displayName());
                                                 } else {
+                                                    textView.setVisibility(View.GONE);
                                                     textView.setText("");
                                                 }
                                             },

diff --git a/app/src/main/java/org/dhis2/data/forms/EventRepository.java b/app/src/main/java/org/dhis2/data/forms/EventRepository.java
@@ -109,7 +109,9 @@ public class EventRepository implements FormRepository {
             "  Field.allowFutureDate,\n" +
             "  Event.status,\n" +
             "  Field.formLabel,\n" +
-            "  Field.displayDescription\n" +
+            "  Field.displayDescription,\n" +
+            "  Field.formOrder,\n" +
+            "  Field.sectionOrder\n" +
             "FROM Event\n" +
             "  LEFT OUTER JOIN (\n" +
             "      SELECT\n" +
@@ -121,11 +123,13 @@ public class EventRepository implements FormRepository {
             "        ProgramStageDataElement.sortOrder AS formOrder,\n" +
             "        ProgramStageDataElement.programStage AS stage,\n" +
             "        ProgramStageDataElement.compulsory AS mandatory,\n" +
-            "        ProgramStageDataElement.programStageSection AS section,\n" +
+            "        ProgramStageSectionDataElementLink.programStageSection AS section,\n" +
             "        ProgramStageDataElement.allowFutureDate AS allowFutureDate,\n" +
-            "        DataElement.displayDescription AS displayDescription\n" +
+            "        DataElement.displayDescription AS displayDescription,\n" +
+            "        ProgramStageSectionDataElementLink.sortOrder AS sectionOrder\n" +
             "      FROM ProgramStageDataElement\n" +
             "        INNER JOIN DataElement ON DataElement.uid = ProgramStageDataElement.dataElement\n" +
+            "        LEFT JOIN ProgramStageSectionDataElementLink ON ProgramStageSectionDataElementLink.dataElement = ProgramStageDataElement.dataElement\n" +
             "    ) AS Field ON (Field.stage = Event.programStage)\n" +
             "  LEFT OUTER JOIN TrackedEntityDataValue AS Value ON (\n" +
             "    Value.event = Event.uid AND Value.dataElement = Field.id\n" +
@@ -134,7 +138,10 @@ public class EventRepository implements FormRepository {
             "    Field.optionSet = Option.optionSet AND Value.value = Option.code\n" +
             "  )\n" +
             " %s  " +
-            "ORDER BY Field.formOrder ASC;";
+            "ORDER BY CASE" +
+            " WHEN Field.sectionOrder IS NULL THEN Field.formOrder" +
+            " WHEN Field.sectionOrder IS NOT NULL THEN Field.sectionOrder" +
+            " END ASC;";
 
     @NonNull
     private final BriteDatabase briteDatabase;

diff --git a/app/src/main/java/org/dhis2/data/forms/dataentry/ProgramStageRepository.java b/app/src/main/java/org/dhis2/data/forms/dataentry/ProgramStageRepository.java
@@ -43,7 +43,9 @@ final class ProgramStageRepository implements DataEntryRepository {
             "  Field.allowFutureDate,\n" +
             "  Event.status,\n" +
             "  Field.formLabel,\n" +
-            "  Field.displayDescription\n" +
+            "  Field.displayDescription,\n" +
+            "  Field.formOrder,\n" +
+            "  Field.sectionOrder\n" +
             "FROM Event\n" +
             "  LEFT OUTER JOIN (\n" +
             "      SELECT\n" +
@@ -55,11 +57,13 @@ final class ProgramStageRepository implements DataEntryRepository {
             "        ProgramStageDataElement.sortOrder AS formOrder,\n" +
             "        ProgramStageDataElement.programStage AS stage,\n" +
             "        ProgramStageDataElement.compulsory AS mandatory,\n" +
-            "        ProgramStageDataElement.programStageSection AS section,\n" +
+            "        ProgramStageSectionDataElementLink.programStageSection AS section,\n" +
             "        ProgramStageDataElement.allowFutureDate AS allowFutureDate,\n" +
-            "        DataElement.displayDescription AS displayDescription\n" +
+            "        DataElement.displayDescription AS displayDescription,\n" +
+            "        ProgramStageSectionDataElementLink.sortOrder AS sectionOrder\n" + //This should override dataElement formOrder
             "      FROM ProgramStageDataElement\n" +
             "        INNER JOIN DataElement ON DataElement.uid = ProgramStageDataElement.dataElement\n" +
+            "        LEFT JOIN ProgramStageSectionDataElementLink ON ProgramStageSectionDataElementLink.dataElement = ProgramStageDataElement.dataElement\n" +
             "    ) AS Field ON (Field.stage = Event.programStage)\n" +
             "  LEFT OUTER JOIN TrackedEntityDataValue AS Value ON (\n" +
             "    Value.event = Event.uid AND Value.dataElement = Field.id\n" +
@@ -68,7 +72,10 @@ final class ProgramStageRepository implements DataEntryRepository {
             "    Field.optionSet = Option.optionSet AND Value.value = Option.code\n" +
             "  )\n" +
             " %s  " +
-            "ORDER BY Field.formOrder ASC;";
+            "ORDER BY CASE" +
+            " WHEN Field.sectionOrder IS NULL THEN Field.formOrder" +
+            " WHEN Field.sectionOrder IS NOT NULL THEN Field.sectionOrder" +
+            " END ASC;";
 
     private static final String SECTION_RENDERING_TYPE = "SELECT ProgramStageSection.mobileRenderType FROM ProgramStageSection WHERE ProgramStageSection.uid = ?";
     private static final String ACCESS_QUERY = "SELECT ProgramStage.accessDataWrite FROM ProgramStage JOIN Event ON Event.programStage = ProgramStage.uid WHERE Event.uid = ?";

diff --git a/...rg/dhis2/usescases/eventsWithoutRegistration/eventSummary/EventSummaryRepositoryImpl.java b/...rg/dhis2/usescases/eventsWithoutRegistration/eventSummary/EventSummaryRepositoryImpl.java
@@ -89,7 +89,9 @@ public class EventSummaryRepositoryImpl implements EventSummaryRepository {
             "  Field.allowFutureDate,\n" +
             "  Event.status,\n" +
             "  Field.formLabel,\n" +
-            "  Field.displayDescription\n" +
+            "  Field.displayDescription,\n" +
+            "  Field.formOrder,\n" +
+            "  Field.sectionOrder\n" +
             "FROM Event\n" +
             "  LEFT OUTER JOIN (\n" +
             "      SELECT\n" +
@@ -101,11 +103,13 @@ public class EventSummaryRepositoryImpl implements EventSummaryRepository {
             "        ProgramStageDataElement.sortOrder AS formOrder,\n" +
             "        ProgramStageDataElement.programStage AS stage,\n" +
             "        ProgramStageDataElement.compulsory AS mandatory,\n" +
-            "        ProgramStageDataElement.programStageSection AS section,\n" +
+            "        ProgramStageSectionDataElementLink.programStageSection AS section,\n" +
             "        ProgramStageDataElement.allowFutureDate AS allowFutureDate,\n" +
-            "        DataElement.displayDescription AS displayDescription\n" +
+            "        DataElement.displayDescription AS displayDescription,\n" +
+            "        ProgramStageSectionDataElementLink.sortOrder AS sectionOrder\n" +
             "      FROM ProgramStageDataElement\n" +
             "        INNER JOIN DataElement ON DataElement.uid = ProgramStageDataElement.dataElement\n" +
+            "        LEFT JOIN ProgramStageSectionDataElementLink ON ProgramStageSectionDataElementLink.dataElement = ProgramStageDataElement.dataElement\n" +
             "    ) AS Field ON (Field.stage = Event.programStage)\n" +
             "  LEFT OUTER JOIN TrackedEntityDataValue AS Value ON (\n" +
             "    Value.event = Event.uid AND Value.dataElement = Field.id\n" +
@@ -114,7 +118,10 @@ public class EventSummaryRepositoryImpl implements EventSummaryRepository {
             "    Field.optionSet = Option.optionSet AND Value.value = Option.code\n" +
             "  )\n" +
             " %s  " +
-            "ORDER BY Field.formOrder ASC;";
+            "ORDER BY CASE" +
+            " WHEN Field.sectionOrder IS NULL THEN Field.formOrder" +
+            " WHEN Field.sectionOrder IS NOT NULL THEN Field.sectionOrder" +
+            " END ASC;";
 
 
     private static final String QUERY_EVENT = "SELECT Event.uid,\n" +

diff --git a/app/src/main/java/org/dhis2/usescases/login/LoginActivity.java b/app/src/main/java/org/dhis2/usescases/login/LoginActivity.java
@@ -52,7 +52,7 @@ public class LoginActivity extends ActivityGlobalAbstract implements LoginContra
     private boolean isPinScreenVisible = false;
 
     enum SyncState {
-        METADATA, EVENTS, TEI
+        METADATA, EVENTS, TEI, RESERVED_VALUES
     }
 
     @Override

diff --git a/app/src/main/java/org/dhis2/usescases/login/LoginPresenter.java b/app/src/main/java/org/dhis2/usescases/login/LoginPresenter.java
@@ -191,11 +191,13 @@ public void syncNext(LoginActivity.SyncState syncState, SyncResult syncResult) {
                     syncEvents();
                     break;
                 case EVENTS:
-                    syncReservedValues();
-                    syncAggregatesData();
+//                    syncAggregatesData();
                     syncTrackedEntities();
                     break;
                 case TEI:
+                    syncReservedValues();
+                    break;
+                case RESERVED_VALUES:
                     Intent intent = new Intent(view.getContext(), MainActivity.class);
                     intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                     view.getContext().startActivity(intent);
@@ -324,10 +326,7 @@ public void syncTrackedEntities() {
 
         disposable.add(trackerData()
                 .subscribeOn(Schedulers.io())
-                .map(response -> {
-//                    userManager.getD2().syncAllTrackedEntityAttributeReservedValues();
-                    return SyncResult.success();
-                })
+                .map(response -> SyncResult.success())
                 .observeOn(AndroidSchedulers.mainThread())
                 .onErrorReturn(throwable -> SyncResult.failure(
                         throwable.getMessage() == null ? "" : throwable.getMessage()))
@@ -350,10 +349,11 @@ public void syncReservedValues() {
                     userManager.getD2().syncAllTrackedEntityAttributeReservedValues();
                     return true;
                 })
+                .map(response -> SyncResult.success())
                 .subscribeOn(Schedulers.io())
                 .observeOn(Schedulers.io())
                 .subscribe(
-                        data -> Timber.log(1, "DONE"),
+                        update(LoginActivity.SyncState.RESERVED_VALUES),
                         Timber::d
                 )
         );

diff --git a/app/src/main/java/org/dhis2/usescases/main/program/HomeRepositoryImpl.java b/app/src/main/java/org/dhis2/usescases/main/program/HomeRepositoryImpl.java
@@ -68,7 +68,7 @@ class HomeRepositoryImpl implements HomeRepository {
             "Program.trackedEntityType," +
             "Program.description " +
             "FROM Program LEFT JOIN ObjectStyle ON ObjectStyle.uid = Program.uid " +
-            "JOIN OrganisationUnitProgramLink ON OrganisationUnitProgramLink.program = Program.uid GROUP BY Program.uid " +
+            "JOIN OrganisationUnitProgramLink ON OrganisationUnitProgramLink.program = Program.uid GROUP BY Program.uid "/* +
             "UNION " +
             "SELECT DataSet.uid, " +
             "DataSet.displayName, " +
@@ -78,7 +78,7 @@ class HomeRepositoryImpl implements HomeRepository {
             "'', " +
             "DataSet.description " +
             "FROM DataSet " +
-            "JOIN DataSetOrganisationUnitLink ON DataSetOrganisationUnitLink.dataSet = DataSet.uid GROUP BY DataSet.uid";
+            "JOIN DataSetOrganisationUnitLink ON DataSetOrganisationUnitLink.dataSet = DataSet.uid GROUP BY DataSet.uid"*/;
 
     private final static String AGGREGATE_FROM_DATASET = "SELECT * FROM DataSetDataElementLink " +
             "WHERE dataSet = ? ";