Skip to content

Commit

Permalink
updated the core and native forms library and upgraded the version
Browse files Browse the repository at this point in the history
  • Loading branch information
junaidwarsivd committed Oct 27, 2022
1 parent a4482a7 commit c70884e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
4 changes: 2 additions & 2 deletions opensrp-anc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ tasks.withType(Test) {

dependencies {
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation('org.smartregister:opensrp-client-native-form:3.0.2-PREVIEW-SNAPSHOT@aar') {
implementation('org.smartregister:opensrp-client-native-form:3.1.1-SNAPSHOT@aar') {
transitive = true
exclude group: 'com.android.support', module: 'recyclerview-v7'
exclude group: 'com.android.support', module: 'appcompat-v7'
Expand All @@ -192,7 +192,7 @@ dependencies {
exclude group: 'org.yaml', module: 'snakeyaml'
exclude group: 'io.ona.rdt-capture', module: 'lib'
}
implementation('org.smartregister:opensrp-client-core:6.0.2-PREVIEW-SNAPSHOT@aar') {
implementation('org.smartregister:opensrp-client-core:6.0.0-BETA3-SNAPSHOT@aar') {
transitive = true
exclude group: 'com.github.bmelnychuk', module: 'atv'
exclude group: 'com.google.guava', module: 'guava'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,14 @@ public static void updateCohabitants(String form, String baseEntityId) {
JSONObject jsonObject = new JSONObject(form);
JSONArray fields = ANCJsonFormUtils.getSingleStepFormfields(jsonObject);
JSONObject cohabitants = ANCJsonFormUtils.getFieldJSONObject(fields, DBConstantsUtils.KeyUtils.COHABITANTS);
JSONObject reminder = ANCJsonFormUtils.getFieldJSONObject(fields, DBConstantsUtils.KeyUtils.REMINDERS);

String value = cohabitants.optString(ConstantsUtils.KeyUtils.VALUE, "[]");
String remindersValue = reminder.optString(ConstantsUtils.KeyUtils.VALUE,"{}");

ContentValues contentValues = new ContentValues();
contentValues.put(DBConstantsUtils.KeyUtils.COHABITANTS, value);
contentValues.put(DBConstantsUtils.KeyUtils.REMINDERS,remindersValue);

updatePatient(baseEntityId, contentValues, getRegisterQueryProvider().getDetailsTable());

Expand Down
6 changes: 3 additions & 3 deletions reference-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jacoco {
// This variables are used by the version code & name generators
ext.versionMajor = 1
ext.versionMinor = 6
ext.versionPatch = 14
ext.versionPatch = 15
ext.versionClassifier = null
ext.isSnapshot = false
ext.minimumSdkVersion = androidMinSdkVersion
Expand Down Expand Up @@ -233,7 +233,7 @@ dependencies {
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
def powerMockVersion = '2.0.7'
implementation project(":opensrp-anc")
implementation('org.smartregister:opensrp-client-native-form:3.0.2-PREVIEW-SNAPSHOT@aar') {
implementation('org.smartregister:opensrp-client-native-form:3.1.1-SNAPSHOT@aar') {
transitive = true
exclude group: 'com.android.support', module: 'recyclerview-v7'
exclude group: 'com.android.support', module: 'appcompat-v7'
Expand All @@ -245,7 +245,7 @@ dependencies {
exclude group: 'io.ona.rdt-capture', module: 'lib'
}

implementation('org.smartregister:opensrp-client-core:6.0.2-PREVIEW-SNAPSHOT@aar') {
implementation('org.smartregister:opensrp-client-core:6.0.0-BETA3-SNAPSHOT@aar') {
transitive = true
exclude group: 'com.github.bmelnychuk', module: 'atv'
exclude group: 'com.google.guava', module: 'guava'
Expand Down

0 comments on commit c70884e

Please sign in to comment.