MI | merge with ec-indonesia-module and resolve conflict #433

Signed-off-by: mib.iqbal <[email protected]>

.gitignore

@@ -19,3 +19,4 @@ build/
 .gradle
 !opensrp-app/assets/web/build/
 !opensrp-app/assets/web/lib/enketo-core/build/
+opensrp-device/

.travis.yml

@@ -34,7 +34,7 @@ addons:
 
 before_script:
   # Emulator Management: Create, Start and Wait
-  - echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a
+  - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
   - emulator -avd test -no-skin -no-audio -no-window &
   - adb wait-for-device
   - adb shell input keyevent 82 &
@@ -55,4 +55,4 @@ after_failure:
 
 notifications:
   slack:
-    secure: fAiZ4yA7DM6nUKh7nqsCTqZBb03VEAvi5NcRu5mNh5coNn/50XNeZl+qpv7Dw70Ef85Y/k68uc6KwTGVqPXEmVq9Hk3e7lqpBNN8rufvgCYDDGPmywBmU5BhSeykKo0Ee7llM3mRR/EipjIWw1+YvMcS3hCoygf/UlMDDhG0Jo0=
+    secure: fAiZ4yA7DM6nUKh7nqsCTqZBb03VEAvi5NcRu5mNh5coNn/50XNeZl+qpv7Dw70Ef85Y/k68uc6KwTGVqPXEmVq9Hk3e7lqpBNN8rufvgCYDDGPmywBmU5BhSeykKo0Ee7llM3mRR/EipjIWw1+YvMcS3hCoygf/UlMDDhG0Jo0=

build.gradle

@@ -31,6 +31,7 @@ subprojects {
         maven { url "http://nexus.motechproject.org/content/repositories/snapshots" }
         maven { url "http://acra.googlecode.com/svn/repository/releases" }
         maven { url "http://repo.maven.apache.org/maven2" }
+        maven { url "http://cloudant.github.io/cloudant-sync-eap/repository" }
         maven {
             url "${projectDir}/opensrp-app/../libs/"
         }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Jun 30 10:30:31 WITA 2015
+#Wed Feb 15 10:27:32 WITA 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip

opensrp-app/AndroidManifest.xml

@@ -138,5 +138,6 @@
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
             </intent-filter>
         </receiver>
+        <service android:name=".service.intentservices.ReplicationIntentService"/>
     </application>
 </manifest>

opensrp-app/assets/web/forms/footer

@@ -1,3 +1,4 @@
+
 <!-- The comment below is used in enketo-core-performance-monitor. -->
 		<!-- {{<form>}} -->
 
@@ -25,5 +26,4 @@
 <!-- all the scripts -->
 <!-- IMPORTANT: leave the minified script in the committed index.html, to not throw off enketo-core-performance-monitor -->
 <script type="text/javascript" src="../build/js/enketo-bundle.min.js"></script>
-</body></html>
-
+</body></html>

opensrp-app/assets/web/index.html

@@ -48,7 +48,7 @@
 
 
 		<form autocomplete="off" novalidate="novalidate" class="or clearfix" id="FWNewHH">
-			<!--This form was created by transforming a OpenRosa-flavored (X)Form using an XSLT sheet created by Enketo LLC.--><section class="form-logo"> </section><h3 id="form-title">&#x9A8;&#x9A4;&#x9C1;&#x9A8; &#x996;&#x9BE;&#x9A8;&#x9BE; &#x9A8;&#x9BF;&#x9AC;&#x9A8;&#x9CD;&#x9A7;&#x9A8; &#x9AB;&#x9B0;&#x9CD;&#x9AE;</h3><select id="form-languages" data-default-lang="bn"><option value="bn">Bengali</option> <option value="en">English</option> </select>
+			<!--This form was created by transforming a OpenRosa-flavored (X)Form using an XSLT sheet created by Enketo LLC.--><section class="form-logo"> </section><h3 id="form-title">&#x9A8;&#x9A4;&#x9C1;&#x9A8; &#x996;&#x9BE;&#x9A8;&#x9BE; &#x9A8;&#x9BF;&#x9AC;&#x9A8;&#x9CD;&#x9A7;&#x9A8; &#x9AB;&#x9B0;&#x9CD;&#x9AE;</h3><select id="form-languages" data-default-lang="id"><option value="id">Bahasa</option> <option value="en">English</option> </select>
 
 
 			<label class="question non-select "><span lang="bn" class="or-constraint-msg active" data-itext-id="/FWNewHH/FWNHREGDATE:jr:constraintMsg">&#x986;&#x99C;&#x995;&#x9C7;&#x9B0; &#x9A4;&#x9BE;&#x9B0;&#x9BF;&#x996;&#x9C7;&#x9B0; &#x9AA;&#x9B0;&#x9C7;&#x9B0; &#x995;&#x9CB;&#x9A8; &#x9A4;&#x9BE;&#x9B0;&#x9BF;&#x996;

opensrp-app/assets/web/template.html

@@ -43,7 +43,7 @@
 
 
 		<form autocomplete="off" novalidate="novalidate" class="or clearfix" dir="ltr" id="FWNewHH">
-			<!--This form was created by transforming a OpenRosa-flavored (X)Form using an XSLT sheet created by Enketo LLC.--><section class="form-logo"> </section><h3 id="form-title">&#x9A8;&#x9A4;&#x9C1;&#x9A8; &#x996;&#x9BE;&#x9A8;&#x9BE; &#x9A8;&#x9BF;&#x9AC;&#x9A8;&#x9CD;&#x9A7;&#x9A8; &#x9AB;&#x9B0;&#x9CD;&#x9AE;</h3><select id="form-languages" data-default-lang="bn"><option value="bn">Bengali</option> <option value="en">English</option> </select>
+			<!--This form was created by transforming a OpenRosa-flavored (X)Form using an XSLT sheet created by Enketo LLC.--><section class="form-logo"> </section><h3 id="form-title">&#x9A8;&#x9A4;&#x9C1;&#x9A8; &#x996;&#x9BE;&#x9A8;&#x9BE; &#x9A8;&#x9BF;&#x9AC;&#x9A8;&#x9CD;&#x9A7;&#x9A8; &#x9AB;&#x9B0;&#x9CD;&#x9AE;</h3><select id="form-languages" data-default-lang="id"><option value="id">Bahasa</option> <option value="en">English</option> </select>
 
 
 			<label class="question non-select "><span lang="bn" class="question-label active" data-itext-id="/FWNewHH/FWNHREGDATE:label">&#x9B8;&#x9BE;&#x995;&#x9CD;&#x9B7;&#x9BE;&#x9CE;&#x995;&#x9BE;&#x9B0;&#x9C7;&#x9B0; &#x9A4;&#x9BE;&#x9B0;&#x9BF;&#x996;</span><span lang="en" class="question-label " data-itext-id="/FWNewHH/FWNHREGDATE:label">Date of Interview</span><span class="required">*</span><span lang="bn" class="or-hint active" data-itext-id="/FWNewHH/FWNHREGDATE:hint">&#x986;&#x99C;&#x995;&#x9C7;&#x9B0; &#x9A4;&#x9BE;&#x9B0;&#x9BF;&#x996; &#x9A6;&#x9BF;&#x9A8;</span><span lang="en" class="or-hint " data-itext-id="/FWNewHH/FWNHREGDATE:hint">Please enter today's date.</span><input type="date" name="/FWNewHH/FWNHREGDATE" required="required" data-constraint=".&lt;= /FWNewHH/today " data-type-xml="date"/><span lang="bn" class="or-constraint-msg active" data-itext-id="/FWNewHH/FWNHREGDATE:jr:constraintMsg">&#x986;&#x99C;&#x995;&#x9C7;&#x9B0; &#x9A4;&#x9BE;&#x9B0;&#x9BF;&#x996;&#x9C7;&#x9B0; &#x9AA;&#x9B0;&#x9C7;&#x9B0; &#x995;&#x9CB;&#x9A8; &#x9A4;&#x9BE;&#x9B0;&#x9BF;&#x996;

opensrp-app/build.gradle

@@ -48,7 +48,8 @@ android {
     }
 
     defaultConfig {
-        // multiDexEnabled = true
+        // Enabling multidex support.
+        multiDexEnabled true
         //applicationId "org.ei.opensrp"
         minSdkVersion 16
         targetSdkVersion 21
@@ -104,29 +105,38 @@ task copyTestResources() {
 assembleDebug.dependsOn(copyTestResources)
 
 configurations.all {
-    resolutionStrategy.force 'commons-codec:commons-codec:1.6'
+    resolutionStrategy.force 'commons-codec:commons-codec:1.10'
 }
 
 dependencies {
+    compile 'com.android.support:multidex:1.0.0'
+    compile 'org.ei.drishti:drishti-interface:0.1-SNAPSHOT'
     compile 'com.android.support:appcompat-v7:21.0.3'
     compile "org.apache.httpcomponents:httpmime:4.2.3"
-    compile 'commons-io:commons-io:2.1'
     compile 'com.google.code.gson:gson:2.3'
-    compile 'org.apache.commons:commons-lang3:3.1'
+    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:'2.1.1'
+    compile group: 'commons-codec', name: 'commons-codec', version:'1.10'
+    compile group: 'com.google.guava', name: 'guava', version:'15.0'
+    compile group: 'commons-io', name: 'commons-io', version:'2.4'
+    compile 'org.apache.commons:commons-lang3:3.2'
     compile 'org.mozilla:rhino:1.7R4'
     compile 'com.ocpsoft:ocpsoft-pretty-time:1.0.7'
     compile 'joda-time:joda-time:2.3'
     compile 'com.github.bmelnychuk:atv:1.2.+'
     compile 'com.github.johnkil.print:print:1.2.3'
     compile 'ch.acra:acra:4.5.0'
+
     compile 'com.google.guava:guava:18.0'
     compile 'com.mcxiaoke.volley:library:1.0.+'
     compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile 'com.cloudant:cloudant-http:2.7.0'
 
 }
 
 dependencies {
     androidTestCompile 'com.jayway.android.robotium:robotium-solo:4.3'
+    androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.0'
+    androidTestCompile 'junit:junit:4.11'
 
     testCompile group: 'com.google.android', name: 'android-test', version:'4.1.1.4'
     testCompile 'junit:junit:4.11'

opensrp-app/res/layout/smart_register_nav_bar.xml

@@ -3,8 +3,9 @@
                 android:layout_width="fill_parent"
                 android:layout_height="@dimen/ec_main_header_height"
                 android:background="@color/light_blue"
+
                 android:focusableInTouchMode="true"
-    android:id="@+id/register_nav_bar_container">
+                android:id="@+id/register_nav_bar_container">
 
     <ImageButton
             android:id="@+id/btn_back_to_home"
@@ -140,12 +141,8 @@
             android:scaleType="fitXY"
             android:layout_toRightOf="@+id/sort_selection"/>
 
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"></LinearLayout>
 
-        <org.ei.opensrp.view.customControls.CustomFontTextView
+    <org.ei.opensrp.view.customControls.CustomFontTextView
             android:id="@+id/service_mode_selection"
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"

opensrp-app/res/layout/smart_register_status_bar.xml

@@ -12,26 +12,27 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:text="@string/label_sorted_by"
-            style="@style/CustomFontTextViewStyle.StatusBar.Bold.NoPadding"/>
+            style="@style/CustomFontTextViewStyle.StatusBar.Bold"/>
 
     <org.ei.opensrp.view.customControls.CustomFontTextView
             android:id="@+id/sorted_by"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:paddingLeft="1dp"
+            android:paddingLeft="5dp"
             style="@style/CustomFontTextViewStyle.StatusBar.Black"/>
 
     <org.ei.opensrp.view.customControls.CustomFontTextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:text="@string/label_village"
-            style="@style/CustomFontTextViewStyle.StatusBar.Bold.NoPadding" />
+            style="@style/CustomFontTextViewStyle.StatusBar.Bold"/>
 
     <org.ei.opensrp.view.customControls.CustomFontTextView
             android:id="@+id/village"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:paddingLeft="1dp"
+            android:paddingLeft="5dp"
+
             style="@style/CustomFontTextViewStyle.StatusBar.Black"/>
 
 </LinearLayout>

opensrp-app/res/values-kn/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">OpenSRP</string>
+    <string name="app_name">opensrp-gizi</string>
     <string name="userNameEditText">ಬಳಕೆದಾರರ ಐಡಿ</string>
     <string name="passwordEditText">ಬಳಕೆದಾರರ ಪಾಸ್ವರ್ಡ್</string>
     <string name="login_text">ಲಾಗಿನ್</string>

opensrp-app/res/values/constants.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="couchdb_user"></string>
+    <string name="couchdb_dbname">opensrp_devtest</string>
+    <string name="couchdb_server_url">http://46.101.51.199</string>
+    <string name="couchdb_server_port">5984</string>
+    <string name="datastore_name">opensrp_clients_events</string>
+
+</resources>

opensrp-app/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="empty_string"></string>
-    <string name="app_name">OpenSRP</string>
+    <string name="app_name">opensrp-gizi</string>
     <string name="userNameEditText">Enter user name</string>
     <string name="passwordEditText">Enter password</string>
     <string name="login_text">Log In</string>
@@ -51,7 +51,7 @@
     <string name="header_edit"></string>
 
     <string name="couple_selection">All Eligible Couples</string>
-    <string name="str_ec_search_hint">Search</string>
+    <string name="str_ec_search_hint">Search EC Register</string>
     <string name="str_fp_search_hint">Search FP Register</string>
     <string name="str_pnc_search_hint">Search PNC Register</string>
     <string name="str_child_search_hint">Search Child Register</string>
@@ -249,6 +249,7 @@
     <string name="anc_register_title_in_short">ANC:</string>
     <string name="str_bp">BP</string>
     <string name="str_weight">Wt.</string>
+    <string name="str_weight1">Weight</string>
     <string name="str_anc_search_hint">Search ANC Register</string>
     <string name="anc_service_mode_overview">Overview</string>
     <string name="anc_service_mode_anc_visits">ANC Visits</string>
@@ -307,4 +308,7 @@
     <string name="ic_keyboard_arrow_right">&#xe0c7;</string>
     <string name="ic_keyboard_arrow_up">&#xe0c8;</string>
 
+    <string name="event_fields_extractor">{       \"obs\": [         {\"name\":\"father_name\"}       ],       \"attributes\" : [         {\"name\":\"voided\"},{\"name\":\"providerId\"}       ]     }</string>
+    <string name="client_fields_extractor">{       \"property\": [         {\"name\":\"father_name\"}       ],       \"attributes\" : [        ]     }</string>
+
 </resources>

opensrp-app/res/values/styles.xml

@@ -49,12 +49,6 @@
         <!--<item name="android:paddingLeft">10dp</item>-->
         <item name="android:ellipsize">none</item>
     </style>
-    <style name="CustomFontTextViewStyle.ListView.Small.paddingNoHeight" parent="@android:style/Widget.TextView">
-        <item name="fontVariant">medium</item>
-        <item name="android:textColor">@android:color/black</item>
-        <item name="android:paddingLeft">10dp</item>
-        <item name="android:ellipsize">none</item>
-    </style>
 
     <style name="CustomFontTextViewStyle.ListView.VerySmall" parent="CustomFontTextViewStyle">
         <item name="fontVariant">medium</item>
@@ -141,10 +135,6 @@
     <style name="CustomFontTextViewStyle.StatusBar.Bold">
         <item name="fontVariant">bold</item>
     </style>
-    <style name="CustomFontTextViewStyle.StatusBar.Bold.NoPadding">
-        <item name="fontVariant">bold</item>
-        <item name="android:paddingLeft">0dp</item>
-    </style>
 
     <style name="CustomFontTextViewStyle.StatusBar.Black">
         <item name="fontVariant">black</item>

opensrp-app/res/xml/preferences.xml

@@ -8,7 +8,7 @@
             android:summary="Defines the base server url that handles requests"
             android:dialogTitle="OpenSRP base URL"
             android:dialogMessage="Enter Base Server Url"
-            android:defaultValue="http://27.147.129.50:9979"
+            android:defaultValue="http://192.168.12.1:8080/opensrp"
             android:persistent="true"/>
 
     </PreferenceCategory>

opensrp-app/src/main/java/org/ei/opensrp/AllConstants.java

@@ -3,7 +3,7 @@
 public class AllConstants {
     public static final String DRISHTI_BASE_URL = "DRISHTI_BASE_URL";
     public static final String PROFILE_IMAGES_DOWNLOAD_PATH = "/multimedia/profileimage";
-    public static final String PROFILE_IMAGES_UPLOAD_PATH = "/multimedia-file";
+    public static final String PROFILE_IMAGES_UPLOAD_PATH = "/multimedia/upload";
 
 
     public static final String REPORT_CATEGORY = "reportCategory";
@@ -14,6 +14,8 @@ public class AllConstants {
     public static final String INDICATOR = "indicator";
     public static final String CASE_ID = "caseId";
     public static final String APP_NAME_INDONESIA = "OpenSRPIndonesia";
+    public static final String DATABASE_NAME="drishti.db";
+    public static final int DATABASE_VERSION=1;
 
     public static final String LANGUAGE_PREFERENCE_KEY = "locale";
     public static final String ENGLISH_LOCALE = "en";
@@ -323,12 +325,43 @@ public class DeliveryPlanFields {
         public static final String DELIVERY_FACILITY_SDH_VALUE = "sdh";
         public static final String DELIVERY_FACILITY_DH_VALUE = "dh";
     }
+
+    public static final String DATASTORE_MANAGER_DIR = "data";
+
+    public static class CloudantSync {
+
+        public static final String ACTION_DATABASE_CREATED = "org.ei.opensrp.DATABASE_CREATED_ACTION";
+        public static final String ACTION_REPLICATION_ERROR = "org.ei.opensrp.REPLICATION_ERROR_ACTION";
+        public static final String ACTION_REPLICATION_COMPLETED = "org.ei.opensrp.REPLICATION_COMPLETED_ACTION";
+        public static final String REPLICATION_ERROR = "REPLICATION_ERROR";
+        public static final String DOCUMENTS_REPLICATED = "DOCUMENTS_REPLICATED";
+        public static final String BATCHES_REPLICATED = "BATCHES_REPLICATED";
+        public static final String COUCHDB_PORT = "5984";
+
+        public static final String COUCH_DATABASE_NAME = "opensrp2";
+        public static final String COUCH_DATABASE_USER = "admin";
+        public static final String COUCH_DATABASE_PASS = "Satu2345";
+    }
+
+    public static class SyncFilters {
+        // These pull filters must be defined in your couchDB server for them to work
+        // Filters
+        public static final String FILTER_LOCATION_ID = "locationId";
+        public static final String FILTER_PROVIDER = "providerId";
+
+        //filter by team e.g. team = user1,user2,user3
+        public static final String FILTER_TEAM = "team";
+
+    }
+
     public static final int ANIMATION_FADE_IN_TIME = 250;
 
     public  final class ImageCache {
         public static final int DISK_CACHE_MAX_SIZE = 250 * 1024 * 1024; // in bytes totalling 250MB
         public static final float MEM_CACHE_PERCENT = 0.05f; // Default memory cache size as a percent of device memory class
         public static final int MEM_CACHE_MAX_SIZE = 10 * 1024; // in kilobytes (value calculated using MEM_CACHE_PERCENT should not exceed this maximum 10MB)
         public static final String DISK_CACHE_DIR = "opensrp-images";
+
     }
+
 }