- add rule calculation indicator

dhis2 · Aug 21, 2019 · 50fc45b · 50fc45b
1 parent 7b7444e
commit 50fc45b
Show file tree

Hide file tree

Showing 12 changed files with 104 additions and 14 deletions.
diff --git a/app/src/main/java/org/dhis2/data/forms/EnrollmentFormRepository.java b/app/src/main/java/org/dhis2/data/forms/EnrollmentFormRepository.java
@@ -231,12 +231,13 @@ public EnrollmentFormRepository(@NonNull BriteDatabase briteDatabase,
                         rulesRepository.ruleVariables(program),
                         rulesRepository.enrollmentEvents(enrollmentUid),
                         rulesRepository.queryConstants(),
-                        (rules, variables, events, constants) -> {
+                        rulesRepository.getSuplementaryData(d2),
+                        (rules, variables, events, constants,supplementaryData) -> {
                             RuleEngine.Builder builder = RuleEngineContext.builder(expressionEvaluator)
                                     .rules(rules)
                                     .ruleVariables(variables)
                                     .calculatedValueMap(new HashMap<>())
-                                    .supplementaryData(new HashMap<>())
+                                    .supplementaryData(supplementaryData)
                                     .constantsValue(constants)
                                     .build().toEngineBuilder();
                             builder.triggerEnvironment(TriggerEnvironment.ANDROIDCLIENT);
@@ -254,12 +255,13 @@ public Flowable<RuleEngine> restartRuleEngine() {
                         rulesRepository.ruleVariables(program),
                         rulesRepository.enrollmentEvents(enrollmentUid),
                         rulesRepository.queryConstants(),
-                        (rules, variables, events, constants) -> {
+                        rulesRepository.getSuplementaryData(d2),
+                        (rules, variables, events, constants,supplementaryData) -> {
                             RuleEngine.Builder builder = RuleEngineContext.builder(expressionEvaluator)
                                     .rules(rules)
                                     .ruleVariables(variables)
                                     .calculatedValueMap(new HashMap<>())
-                                    .supplementaryData(new HashMap<>())
+                                    .supplementaryData(supplementaryData)
                                     .constantsValue(constants)
                                     .build().toEngineBuilder();
                             builder.triggerEnvironment(TriggerEnvironment.ANDROIDCLIENT);

diff --git a/app/src/main/java/org/dhis2/data/forms/EventRepository.java b/app/src/main/java/org/dhis2/data/forms/EventRepository.java
@@ -187,14 +187,15 @@ public EventRepository(@NonNull BriteDatabase briteDatabase,
                         rulesRepository.otherEvents(eventUid),
                         rulesRepository.enrollment(eventUid),
                         rulesRepository.queryConstants(),
-                        (rules, variables, events, enrollment, constants) -> {
+                        rulesRepository.getSuplementaryData(d2),
+                        (rules, variables, events, enrollment, constants,supplementaryData) -> {
 
                             RuleEngine.Builder builder = RuleEngineContext.builder(evaluator)
                                     .rules(rules)
                                     .ruleVariables(variables)
                                     .constantsValue(constants)
                                     .calculatedValueMap(new HashMap<>())
-                                    .supplementaryData(new HashMap<>())
+                                    .supplementaryData(supplementaryData)
                                     .build().toEngineBuilder();
                             builder.triggerEnvironment(TriggerEnvironment.ANDROIDCLIENT);
                             builder.events(events);
@@ -215,14 +216,15 @@ public Flowable<RuleEngine> restartRuleEngine() {
                         rulesRepository.otherEvents(eventUid),
                         rulesRepository.enrollment(eventUid),
                         rulesRepository.queryConstants(),
-                        (rules, variables, events, enrollment, constants) -> {
+                        rulesRepository.getSuplementaryData(d2),
+                        (rules, variables, events, enrollment, constants,supplementaryData) -> {
 
                             RuleEngine.Builder builder = RuleEngineContext.builder(evaluator)
                                     .rules(rules)
                                     .ruleVariables(variables)
                                     .constantsValue(constants)
                                     .calculatedValueMap(new HashMap<>())
-                                    .supplementaryData(new HashMap<>())
+                                    .supplementaryData(supplementaryData)
                                     .build().toEngineBuilder();
                             builder.triggerEnvironment(TriggerEnvironment.ANDROIDCLIENT);
                             builder.events(events);

diff --git a/app/src/main/java/org/dhis2/data/forms/RulesRepository.java b/app/src/main/java/org/dhis2/data/forms/RulesRepository.java
@@ -9,6 +9,7 @@
 import org.dhis2.data.tuples.Pair;
 import org.dhis2.utils.DateUtils;
 import org.hisp.dhis.android.core.D2;
+import org.hisp.dhis.android.core.arch.helpers.UidsHelper;
 import org.hisp.dhis.android.core.common.BaseIdentifiableObject;
 import org.hisp.dhis.android.core.common.State;
 import org.hisp.dhis.android.core.common.ValueType;
@@ -785,6 +786,10 @@ public Flowable<Map<String, List<String>>> getSuplementaryData(D2 d2) {
                 }
             }
 
+            //USER ROLES
+            List<String> userRoleUids = UidsHelper.getUidsList(d2.userModule().userRoles.get());
+            supData.put("USER", userRoleUids);
+
             return supData;
         });
     }

diff --git a/app/src/main/java/org/dhis2/data/server/ServerModule.java b/app/src/main/java/org/dhis2/data/server/ServerModule.java
@@ -83,9 +83,9 @@ OkHttpClient okHttpClient(Authenticator authenticator, Context context) {
                     Timber.d(originalRequest.url().encodedPath());
                     return chain.proceed(withUserAgent);
                 })
-                .readTimeout(2, TimeUnit.MINUTES)
-                .connectTimeout(2, TimeUnit.MINUTES)
-                .writeTimeout(2, TimeUnit.MINUTES)
+                .readTimeout(10, TimeUnit.MINUTES)
+                .connectTimeout(10, TimeUnit.MINUTES)
+                .writeTimeout(10, TimeUnit.MINUTES)
                 .addNetworkInterceptor(new StethoInterceptor())
                 .dispatcher(dispatcher);
 

diff --git a/...java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureActivity.java b/...java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureActivity.java
@@ -27,6 +27,7 @@
 import org.dhis2.databinding.WidgetDatepickerBinding;
 import org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity;
 import org.dhis2.usescases.general.ActivityGlobalAbstract;
+import org.dhis2.utils.ColorUtils;
 import org.dhis2.utils.Constants;
 import org.dhis2.utils.DateUtils;
 import org.dhis2.utils.DialogClickListener;
@@ -82,6 +83,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         binding.setPresenter(presenter);
         gestureScanner = new GestureDetector(this, this);
 
+        binding.calculationIndicator.text.setTextColor(ColorUtils.getContrastColor(ColorUtils.getPrimaryColor(this, ColorUtils.ColorType.PRIMARY_LIGHT)));
+
         presenter.init(this);
 
     }
@@ -184,6 +187,11 @@ public void setProgramStage(String programStageUid) {
         this.programStageUid = programStageUid;
     }
 
+    @Override
+    public void showRuleCalculation(Boolean shouldShow) {
+        binding.calculationIndicator.getRoot().setVisibility(shouldShow ? View.VISIBLE : View.GONE);
+    }
+
     private void setAction(FormBottomDialog.ActionType actionType) {
         switch (actionType) {
             case COMPLETE:

diff --git a/...java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureContract.java b/...java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureContract.java
@@ -61,6 +61,8 @@ public interface View extends AbstractActivityContracts.View {
         void attemptToReschedule();
 
         void setProgramStage(String programStageUid);
+
+        void showRuleCalculation(Boolean shouldShow);
     }
 
     public interface Presenter extends AbstractActivityContracts.Presenter {

diff --git a/...org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterImpl.java b/...org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCapturePresenterImpl.java
@@ -36,6 +36,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import io.reactivex.Flowable;
 import io.reactivex.Observable;
@@ -64,6 +65,7 @@ public class EventCapturePresenterImpl implements EventCaptureContract.Presenter
     private int currentPosition;
     private ObservableField<String> currentSection;
     private FlowableProcessor<Integer> currentSectionPosition;
+    private FlowableProcessor<Boolean> showCalculationProcessor;
     private List<FormSectionViewModel> sectionList;
     private Map<String, FieldViewModel> emptyMandatoryFields;
     //Rules data
@@ -104,6 +106,7 @@ public EventCapturePresenterImpl(String eventUid, EventCaptureContract.EventCapt
         this.sectionList = new ArrayList<>();
         currentSectionPosition = PublishProcessor.create();
         sectionProcessor = PublishProcessor.create();
+        showCalculationProcessor = PublishProcessor.create();
 
     }
 
@@ -112,6 +115,18 @@ public void init(EventCaptureContract.View view) {
         this.compositeDisposable = new CompositeDisposable();
         this.view = view;
 
+        compositeDisposable.add(
+                showCalculationProcessor
+                        .startWith(true)
+                        .switchMap(shouldShow -> Flowable.just(shouldShow).delay(1, TimeUnit.SECONDS, Schedulers.io()))
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(
+                                view::showRuleCalculation,
+                                Timber::e
+                        )
+        );
+
         compositeDisposable.add(
                 Flowable.zip(
                         eventCaptureRepository.programStageName(),
@@ -253,6 +268,7 @@ public void init(EventCaptureContract.View view) {
                         .observeOn(AndroidSchedulers.mainThread())
                         .subscribe(
                                 updates -> {
+                                    showCalculationProcessor.onNext(false);
                                     EventCaptureFormFragment.getInstance().showFields(updates, lastFocusItem);
                                     checkProgress();
                                 },
@@ -390,7 +406,10 @@ public void subscribeToSection() {
                                     emptyMandatoryFields.remove(action.id());
                                 return dataEntryStore.save(action.id(), action.value());
                             }
-                    ).subscribe(result -> Timber.d("SAVED VALUE AT %s", System.currentTimeMillis()),
+                    ).subscribe(result -> {
+                                Timber.d("SAVED VALUE AT %s", System.currentTimeMillis());
+                                showCalculationProcessor.onNext(true);
+                            },
                             Timber::d)
             );
         }

diff --git a/...n/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionRepositoryImpl.java b/...n/java/org/dhis2/usescases/programStageSelection/ProgramStageSelectionRepositoryImpl.java
@@ -84,12 +84,13 @@ public class ProgramStageSelectionRepositoryImpl implements ProgramStageSelectio
                         rulesRepository.rulesNew(programUid),
                         rulesRepository.ruleVariablesProgramStages(programUid),
                         ruleEvents(enrollmentUid),
-                        (rules, variables, ruleEvents) -> {
+                        rulesRepository.getSuplementaryData(d2),
+                        (rules, variables, ruleEvents,supplementaryData) -> {
                             RuleEngine.Builder builder = RuleEngineContext.builder(evaluator)
                                     .rules(rules)
                                     .ruleVariables(variables)
                                     .calculatedValueMap(new HashMap<>())
-                                    .supplementaryData(new HashMap<>())
+                                    .supplementaryData(supplementaryData)
                                     .build().toEngineBuilder();
                             return builder.events(ruleEvents)
                                     .triggerEnvironment(TriggerEnvironment.ANDROIDCLIENT)

diff --git a/app/src/main/res/drawable/indicator_progress_bg.xml b/app/src/main/res/drawable/indicator_progress_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="?colorPrimaryLight"/>
+    <corners android:bottomLeftRadius="10dp" android:topLeftRadius="10dp"/>
+</shape>
diff --git a/app/src/main/res/layout/activity_event_capture.xml b/app/src/main/res/layout/activity_event_capture.xml
@@ -139,5 +139,15 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toBottomOf="@id/eventTabLayout" />
 
+        <include
+            android:id="@+id/calculationIndicator"
+            layout="@layout/indicator_progress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:visibility="gone"
+            app:layout_constraintTop_toTopOf="@id/eventViewPager" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/indicator_progress.xml b/app/src/main/res/layout/indicator_progress.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/indicator_progress_bg"
+        android:padding="2dp">
+
+        <com.airbnb.lottie.LottieAnimationView
+            android:id="@+id/lottieView"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginEnd="20dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/text"
+            app:layout_constraintTop_toTopOf="parent"
+            app:lottie_autoPlay="true"
+            app:lottie_loop="true"
+            app:lottie_rawRes="@raw/calculation_progress" />
+
+        <TextView
+            android:id="@+id/text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Calculating result..."
+            android:textColor="?colorAccent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>