merge build

opensrp · Sep 1, 2020 · c8bc0d2 · c8bc0d2
1 parent 9b2254f
commit c8bc0d2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/opensrp-brac-hnpp/build.gradle b/opensrp-brac-hnpp/build.gradle
@@ -36,8 +36,6 @@ android {
         applicationId "org.smartregister.brac.hnpp"
         minSdkVersion 18
         targetSdkVersion 28
-        versionCode 27
-        versionName "1.3.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 
@@ -62,7 +60,6 @@ android {
             //keystore pass mhealth2019
             minifyEnabled false
             zipAlignEnabled true
-            buildConfigField "boolean", 'IS_TRAINING', 'false'
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '250'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '100'
@@ -80,7 +77,7 @@ android {
         }
 
         debug {
-            buildConfigField "boolean", 'IS_TRAINING', 'false'
+
             buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '250'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '15'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
@@ -92,8 +89,6 @@ android {
             buildConfigField "int", "PULL_SSLOCATION", '180'
             buildConfigField "int", "REPORT_INDICATOR_GENERATION_MINUTES", '15'
             buildConfigField "int", "HOME_VISIT_MINUTES", '10'
-            buildConfigField "String", 'opensrp_url_training', '"http://hnpptest.mpower-social.com:8080/opensrp/"'
-            buildConfigField "String", 'opensrp_url_live', '"http://hnpptest.mpower-social.com:8080/opensrp/"'
             testCoverageEnabled true
         }
     }
@@ -112,14 +107,22 @@ android {
     productFlavors {
 
         training{
+            versionCode 27
+            versionName "3.0.1"
             dimension = 'baseDimension'
             applicationIdSuffix ".training"
             buildConfigField "boolean", 'IS_TRAINING', 'true'
             buildConfigField "String", 'opensrp_url_training', '"http://mhealthtest.brac.net:8080/opensrp/"'
             buildConfigField "String", 'opensrp_url_live', '"http://mhealthtest.brac.net:8080/opensrp/"'
         }
         normal{
+            versionCode 27
+            versionName "1.3.1"
             dimension = 'baseDimension'
+            buildConfigField "boolean", 'IS_TRAINING', 'false'
+            buildConfigField "String", 'opensrp_url_training', '"http://hnpptest.mpower-social.com:8080/opensrp/"'
+            buildConfigField "String", 'opensrp_url_live', '"http://hnpptest.mpower-social.com:8080/opensrp/"'
+
         }
     }
 

diff --git a/...rp-brac-hnpp/src/main/java/org/smartregister/brac/hnpp/fragment/HNPPJsonFormFragment.java b/...rp-brac-hnpp/src/main/java/org/smartregister/brac/hnpp/fragment/HNPPJsonFormFragment.java
@@ -197,6 +197,7 @@ protected Object doInBackground(Object[] objects) {
                 }else{
                     moduleId = HnppConstants.MODULE_ID_TRAINING;
                 }
+                Log.v("MODULE_ID","module id:"+moduleId);
 
                 HouseholdIdRepository householdIdRepo = HnppApplication.getHNPPInstance().getHouseholdIdRepository();
                 village_id = String.valueOf(ssLocations.village.id);