[2016] Submit forms offline

app/build.gradle

@@ -32,6 +32,11 @@ android {
         preDexLibraries = false
         javaMaxHeapSize = '4g'
     }
+
+    // Enable multidex support.
+    defaultConfig {
+        multiDexEnabled true
+    }
 }
 dependencies {
     // Build plugins
@@ -44,10 +49,9 @@ dependencies {
     compile project(':third_party:odkcollect')
 
     // External dependencies
-    compile 'com.android.support:appcompat-v7:22.2.0'
-    compile 'com.android.support:support-annotations:22.2.0'
+    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:support-annotations:23.1.1'
     compile 'com.google.code.gson:gson:2.3' // JSON parser
-    compile 'com.google.guava:guava:18.0' // Google common libraries
     compile 'com.jakewharton:butterknife:5.1.2' // View injection
     compile 'com.mcxiaoke.volley:library:1.0.6' // HTTP framework
     compile 'com.joanzapata.android:android-iconify:1.0.8' // Font-based icons
@@ -59,9 +63,14 @@ dependencies {
     compile 'com.mitchellbosecke:pebble:1.5.1' // HTML templating
     compile 'org.slf4j:slf4j-simple:1.7.12' // HTML templating dependency
     compile 'org.apache.commons:commons-lang3:3.4'
+    // Magic sliding panel that we use for the notes view.
+    compile 'com.sothree.slidinguppanel:library:3.2.1'
 
     // Testing
     androidTestCompile 'com.android.support.test:runner:0.3'
+    // Explicitly add this dep at 23.1.1, because the above entry depends on 22.2.0, and the
+    // discrepancy can introduce differences in behaviour between prod and test.
+    androidTestCompile 'com.android.support:support-annotations:23.1.1'
     // Espresso
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2'
     androidTestCompile 'com.android.support.test.espresso:espresso-web:2.2'
@@ -71,6 +80,11 @@ dependencies {
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.0'
     androidTestCompile 'com.google.dexmaker:dexmaker:1.0'
     androidTestCompile 'org.mockito:mockito-core:1.9.5'
+
+    // Multidex.
+    // NOTE: This is temporary only! See https://slack-files.com/T02T5LNM4-F0JQ1UDRV-716ebe431f
+    // for more information.
+    compile 'com.android.support:multidex:1.0.1'
 }
 
 apply plugin: 'spoon'
@@ -170,8 +184,11 @@ logger.info("Default package server root URL: ${packageServerRootUrl}")
 logger.info("Database encryption password: ${encryptionPassword}")
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion '19.1.0'
+    compileSdkVersion 23
+    buildToolsVersion '23.0.2'
+    // TODO: Port the various health checks to use HttpURLConnection instead and remove this
+    // dependency.
+    useLibrary 'org.apache.http.legacy'
 
     sourceSets.main {
         jniLibs.srcDir 'libs'
@@ -231,6 +248,8 @@ android {
         exclude 'META-INF/NOTICE.txt'
         exclude 'META-INF/LICENSE'
         exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/maven/com.google.guava/guava/pom.properties'
+        exclude 'META-INF/maven/com.google.guava/guava/pom.xml'
     }
 
     lintOptions {

app/src/main/assets/chart.html

@@ -77,6 +77,8 @@
             {% set class = summaryValue | format_values(row.item.cssClass) %}
             {% set style = summaryValue | format_values(row.item.cssStyle) %}
             <td id="cell-{{id}}-{{column.start.millis}}"
+              data-start="{{column.start.millis}}"
+              data-stop="{{column.stop.millis}}"
               class="{{column.start == nowColumnStart ? 'now' : ''}} {{class}}"
               style="{{style}}"
               onclick="{% if points is not empty%}
@@ -97,6 +99,14 @@
             {% endif %}
           </td>
           {% endfor %}
+          <script>
+            // Hides the row if not required and no observation is recorded.
+            if (!{{row.item.required}}) {
+              if (isRowEmpty(document.currentScript.parentNode)) {
+                document.currentScript.parentNode.style.display = 'none';
+              }
+            }
+          </script>
         </tr>
       {% endfor %}
     </tbody>
@@ -118,7 +128,7 @@
         <tr class="order">
           <th scope="row" onclick="controller.onOrderHeadingPressed('{{order.uuid}}')">
             <div class="medication">{{order.medication}}</div>
-            <div>{{order.dosage}}&nbsp;</div>
+            <div>{{order.dosage}}&nbsp;{{order.frequency != null ? order.frequency + 'x daily' : ''}}</div>
           </th>
           {% set previousActive = false %}
           {% set future = false %}

app/src/main/assets/chart.js

@@ -1,3 +1,13 @@
+function isRowEmpty(parentNode) {
+  var rowEmpty = true;
+  $(parentNode).find('td').each(function(index, element) {
+    var innerHtml = element.innerHTML.trim();
+    if ( innerHtml != "" ) {
+      rowEmpty = false;
+    }
+  });
+  return rowEmpty;
+}
 
 function popup(name, pairs) {
   // var dialog = document.getElementById('obs-dialog');

app/src/main/java/org/projectbuendia/client/App.java

@@ -12,7 +12,9 @@
 package org.projectbuendia.client;
 
 import android.app.Application;
+import android.content.Context;
 import android.preference.PreferenceManager;
+import android.support.multidex.MultiDex;
 
 import com.facebook.stetho.Stetho;
 
@@ -85,6 +87,13 @@ public static synchronized OpenMrsConnectionDetails getConnectionDetails() {
         mHealthMonitor.start();
     }
 
+    @Override
+    public void attachBaseContext(Context base) {
+        // Set up Multidex.
+        super.attachBaseContext(base);
+        MultiDex.install(this);
+    }
+
     public void inject(Object obj) {
         mObjectGraph.inject(obj);
     }

app/src/main/java/org/projectbuendia/client/diagnostics/DiagnosticsModule.java

@@ -43,7 +43,8 @@ public class DiagnosticsModule {
         return ImmutableSet.of(
             new WifiHealthCheck(application, settings),
             new BuendiaApiHealthCheck(application, connectionDetails),
-            new PackageServerHealthCheck(application, settings));
+            new PackageServerHealthCheck(application, settings),
+            new UnsentFormHealthCheck(application));
     }
 
     @Provides

app/src/main/java/org/projectbuendia/client/diagnostics/HealthIssue.java

@@ -27,7 +27,8 @@ public enum HealthIssue {
     SERVER_INTERNAL_ISSUE,
     SERVER_NOT_RESPONDING,
     PACKAGE_SERVER_HOST_UNREACHABLE,
-    PACKAGE_SERVER_INDEX_NOT_FOUND;
+    PACKAGE_SERVER_INDEX_NOT_FOUND,
+    PENDING_FORM_SUBMISSION;
 
     /** The event to be posted when a health issue is discovered. */
     public final DiscoveredEvent discovered = new DiscoveredEvent();

app/src/main/java/org/projectbuendia/client/diagnostics/Troubleshooter.java

@@ -87,6 +87,16 @@ private Set<TroubleshootingAction> getNetworkConnectivityTroubleshootingActions(
         return actions;
     }
 
+    private Set<TroubleshootingAction> getSynchronizationTroubleshootingActions() {
+        Set<TroubleshootingAction> actions = new HashSet<>();
+
+        if (mActiveIssues.contains(HealthIssue.PENDING_FORM_SUBMISSION)) {
+            actions.add(TroubleshootingAction.RESUBMIT_PENDING_FORM);
+        }
+
+        return actions;
+    }
+
     private Set<TroubleshootingAction> getConfigurationTroubleshootingActions() {
         Set<TroubleshootingAction> actions = new HashSet<>();
 
@@ -118,7 +128,7 @@ private void postTroubleshootingEvents(HealthIssue solvedIssue) {
             actionsBuilder.addAll(getNetworkConnectivityTroubleshootingActions());
             actionsBuilder.addAll(getConfigurationTroubleshootingActions());
             actionsBuilder.addAll(getPackageServerTroubleshootingActions());
-
+            actionsBuilder.addAll(getSynchronizationTroubleshootingActions());
             ImmutableSet<TroubleshootingAction> actions = actionsBuilder.build();
 
             if (mLastTroubleshootingActionsChangedEvent != null) {

app/src/main/java/org/projectbuendia/client/diagnostics/TroubleshootingAction.java

@@ -34,4 +34,6 @@ public enum TroubleshootingAction {
     CHECK_PACKAGE_SERVER_REACHABILITY,
 
     CHECK_PACKAGE_SERVER_CONFIGURATION,
+
+    RESUBMIT_PENDING_FORM
 }

app/src/main/java/org/projectbuendia/client/diagnostics/UnsentFormHealthCheck.java

@@ -0,0 +1,99 @@
+// Copyright 2015 The Project Buendia Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License.  You may obtain a copy
+// of the License at: http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software distrib-
+// uted under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+// OR CONDITIONS OF ANY KIND, either express or implied.  See the License for
+// specific language governing permissions and limitations under the License.
+
+package org.projectbuendia.client.diagnostics;
+
+import android.app.Application;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.HandlerThread;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.conn.HttpHostConnectException;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.projectbuendia.client.App;
+import org.projectbuendia.client.AppSettings;
+import org.projectbuendia.client.models.UnsentForm;
+import org.projectbuendia.client.ui.OdkActivityLauncher;
+import org.projectbuendia.client.utils.Logger;
+
+import java.io.IOException;
+import java.net.UnknownHostException;
+import java.util.List;
+
+/** A {@link HealthCheck} that checks whether there are saved forms which are not submitted and need
+ * to be resubmitted to the server. */
+public class UnsentFormHealthCheck extends HealthCheck {
+
+    private static final Logger LOG = Logger.create();
+
+    /** Check for issues with this frequency. */
+    private static final int CHECK_PERIOD_MS = 10000;
+
+    private final Object mLock = new Object();
+
+    private HandlerThread mHandlerThread;
+    private Handler mHandler;
+    private final Runnable mHealthCheckRunnable = new Runnable() {
+
+        @Override public void run() {
+            performCheck();
+
+            synchronized (mLock) {
+                if (mHandler != null) {
+                    mHandler.postDelayed(this, CHECK_PERIOD_MS);
+                }
+            }
+        }
+
+        private void performCheck() {
+            final List<UnsentForm> forms = OdkActivityLauncher.getUnsetForms(App.getInstance()
+                .getContentResolver());
+
+            if(!forms.isEmpty()) {
+                LOG.w("There are %d unsent forms saved locally and need to be resent to the server",
+                    forms.size());
+                reportIssue(HealthIssue.PENDING_FORM_SUBMISSION);
+                return;
+            } else {
+                resolveIssue(HealthIssue.PENDING_FORM_SUBMISSION);
+            }
+        }
+    };
+
+    UnsentFormHealthCheck(Application application) {
+        super(application);
+    }
+
+    @Override protected void startImpl() {
+        synchronized (mLock) {
+            if (mHandlerThread == null) {
+                mHandlerThread = new HandlerThread("Buendia Unsent Form Health Check");
+                mHandlerThread.start();
+                mHandler = new Handler(mHandlerThread.getLooper());
+                mHandler.post(mHealthCheckRunnable);
+            }
+        }
+    }
+
+    @Override protected void stopImpl() {
+        synchronized (mLock) {
+            if (mHandlerThread != null) {
+                mHandlerThread.quit();
+                mHandlerThread = null;
+                mHandler = null;
+            }
+        }
+    }
+}

app/src/main/java/org/projectbuendia/client/events/SubmitXformFailedEvent.java

@@ -25,7 +25,8 @@ public enum Reason {
         SERVER_BAD_ENDPOINT,
         SERVER_TIMEOUT,
         SERVER_ERROR,
-        CLIENT_ERROR
+        CLIENT_ERROR,
+        PENDING_FORM_SUBMISSION
     }
 
     public SubmitXformFailedEvent(Reason reason, @Nullable Exception exception) {

app/src/main/java/org/projectbuendia/client/events/data/EncounterAddFailedEvent.java

@@ -12,6 +12,7 @@
 package org.projectbuendia.client.events.data;
 
 import org.projectbuendia.client.events.DefaultCrudEventBus;
+import org.projectbuendia.client.models.Encounter;
 
 /**
  * An event bus event indicating that adding an encounter failed.
@@ -21,6 +22,7 @@
 public class EncounterAddFailedEvent {
     public final Reason reason;
     public final Exception exception;
+    public final Encounter encounter;
 
     public enum Reason {
         UNKNOWN,
@@ -33,7 +35,8 @@ public enum Reason {
         FAILED_TO_FETCH_SAVED_OBSERVATION
     }
 
-    public EncounterAddFailedEvent(Reason reason, Exception exception) {
+    public EncounterAddFailedEvent(Encounter encounter, Reason reason, Exception exception) {
+        this.encounter = encounter;
         this.reason = reason;
         this.exception = exception;
     }

app/src/main/java/org/projectbuendia/client/json/JsonEncounter.java

@@ -13,15 +13,13 @@
 
 import org.joda.time.DateTime;
 
-import java.util.Map;
+import java.util.List;
 
 /** JSON representation of an OpenMRS Encounter; call Serializers.registerTo before use. */
 public class JsonEncounter {
     public String patient_uuid;
     public String uuid;
     public DateTime timestamp;
-    public String enterer_id;
-    /** A {conceptUuid: value} map, where value can be a number, string, or answer UUID. */
-    public Map<Object, Object> observations;
+    public List<JsonObservation> observations;
     public String[] order_uuids;  // orders executed during this encounter
 }

app/src/main/java/org/projectbuendia/client/json/JsonPatient.java

@@ -11,8 +11,6 @@
 
 package org.projectbuendia.client.json;
 
-import com.google.common.base.MoreObjects;
-
 import org.joda.time.LocalDate;
 
 import java.io.Serializable;
@@ -34,17 +32,4 @@ public class JsonPatient implements Serializable {
 
     public JsonPatient() {
     }
-
-    @Override public String toString() {
-        return MoreObjects.toStringHelper(this)
-            .add("uuid", uuid)
-            .add("voided", voided)
-            .add("id", id)
-            .add("given_name", given_name)
-            .add("family_name", family_name)
-            .add("sex", sex)
-            .add("birthdate", birthdate.toString())
-            .add("assigned_location", assigned_location)
-            .toString();
-    }
 }