Skip to content

issue fix # 838 #872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
junaidwarsivd wants to merge 2 commits into
base: master
Choose a base branch
from
Open

issue fix # 838 #872

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19ec275
added Contact number in Each contact json object while generating eve…
junaidwarsivd Aug 15, 2022
ecf3ba5
Merge branch 'master' into issue-fix-838
junaidwarsivd Sep 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion opensrp-anc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ tasks.withType(Test) {

dependencies {
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation('org.smartregister:opensrp-client-native-form:2.1.17-SNAPSHOT@aar') {
implementation('org.smartregister:opensrp-client-native-form:2.1.19-PREVIEW-SNAPSHOT@aar') {
Copy link
Member

@dubdabasoduba dubdabasoduba Aug 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we using a preview version for NativeForms?

Copy link
Contributor Author

@junaidwarsivd junaidwarsivd Aug 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the latest translation changes are currently in the preview version as the translation branch is not merged yet that is why preview version is used

transitive = true
exclude group: 'com.android.support', module: 'recyclerview-v7'
exclude group: 'com.android.support', module: 'appcompat-v7'
Expand Down
4 changes: 3 additions & 1 deletion opensrp-anc/src/main/java/org/smartregister/anc/library/model/ContactVisit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,9 @@ private void updateEventAndRequiredStepsField(String baseEntityId, PartialContac
formSubmissionIDs.add(event.getFormSubmissionId());

JSONObject eventJson = new JSONObject(ANCJsonFormUtils.gson.toJson(event));
eventJson.put(JsonFormConstants.Properties.DETAILS, JsonFormUtils.getJSONObject(formObject, JsonFormConstants.Properties.DETAILS));
JSONObject detailsObject = JsonFormUtils.getJSONObject(formObject, JsonFormConstants.Properties.DETAILS);
detailsObject.put(ConstantsUtils.KeyUtils.CONTACT_NO, partialContact.getContactNo());
eventJson.put(JsonFormConstants.Properties.DETAILS, detailsObject);
AncLibrary.getInstance().getEcSyncHelper().addEvent(baseEntityId, eventJson);

processTasks(formObject);
Expand Down
Loading