diff --git a/opensrp-anc/build.gradle b/opensrp-anc/build.gradle index 74142a1..ce04d81 100644 --- a/opensrp-anc/build.gradle +++ b/opensrp-anc/build.gradle @@ -191,7 +191,7 @@ dependencies { exclude group: 'org.yaml', module: 'snakeyaml' exclude group: 'io.ona.rdt-capture', module: 'lib' } - implementation('org.smartregister:opensrp-client-core:6.1.2-SNAPSHOT@aar') { + implementation('org.smartregister:opensrp-client-core:6.1.5-ALPHA8-SNAPSHOT@aar') { transitive = true exclude group: 'com.github.bmelnychuk', module: 'atv' exclude group: 'com.google.guava', module: 'guava' @@ -259,6 +259,7 @@ dependencies { implementation 'org.jacoco:org.jacoco.agent:0.8.7:runtime' testImplementation 'org.jacoco:org.jacoco.agent:0.8.7:runtime' implementation 'org.smartregister:android-p2p-sync:0.4.0-DEV-SNAPSHOT' + implementation 'com.fasterxml.jackson.datatype:jackson-datatype-joda' testImplementation 'junit:junit:4.13.1' testImplementation 'org.apache.maven:maven-ant-tasks:2.1.3' @@ -283,6 +284,7 @@ dependencies { androidTestImplementation('androidx.test.espresso:espresso-core:3.4.0') { exclude group: 'com.google.code.findbugs' } + debugImplementation 'com.amitshekhar.android:debug-db-encrypt:1.0.6' } task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', /*'createDebugCoverageReport'*/]) { diff --git a/opensrp-anc/src/main/AndroidManifest.xml b/opensrp-anc/src/main/AndroidManifest.xml index 42c1376..815925e 100644 --- a/opensrp-anc/src/main/AndroidManifest.xml +++ b/opensrp-anc/src/main/AndroidManifest.xml @@ -38,7 +38,9 @@ android:name="org.smartregister.sync.intent.P2pProcessRecordsService" android:description="@string/component_desc_p2p_process_records_service" android:exported="false" /> - + \ No newline at end of file diff --git a/opensrp-anc/src/main/assets/config/profile-overview.yml b/opensrp-anc/src/main/assets/config/profile-overview.yml index 2634781..9ecdf65 100644 --- a/opensrp-anc/src/main/assets/config/profile-overview.yml +++ b/opensrp-anc/src/main/assets/config/profile-overview.yml @@ -14,9 +14,9 @@ fields: --- sub_group: current_pregnancy fields: - - template: "{{profile_overview.overview_of_pregnancy.current_pregnancy.ga}}: {gest_age}" - relevance: "gest_age != ''" - isRedFont: "gest_age > 40" + - template: "{{profile_overview.overview_of_pregnancy.current_pregnancy.ga}}: {current_gest_age}" + relevance: "current_gest_age != ''" + isRedFont: "current_gest_age > 40" - template: "{{profile_overview.overview_of_pregnancy.current_pregnancy.edd}}: {edd}" relevance: "edd != ''" diff --git a/opensrp-anc/src/main/assets/ec_client_fields.json b/opensrp-anc/src/main/assets/ec_client_fields.json index f9ecca1..bb127ce 100644 --- a/opensrp-anc/src/main/assets/ec_client_fields.json +++ b/opensrp-anc/src/main/assets/ec_client_fields.json @@ -209,8 +209,7 @@ "field": "attributes.sector" } - } - , + }, { "column_name": "cell", "type": "Client", @@ -231,6 +230,13 @@ "json_mapping": { "field": "attributes.visit_start_date" } + }, + { + "column_name": "visit_date", + "type": "Client", + "json_mapping": { + "field": "attributes.visit_date" + } } ] }, @@ -299,6 +305,13 @@ "json_mapping": { "field": "addresses.address2" } + }, + { + "column_name": "data_migration_is_dirty", + "type": "Client", + "json_mapping": { + "field": "attributes.data_migration_is_dirty" + } } ] } diff --git a/opensrp-anc/src/main/assets/json.form/anc_quick_check.json b/opensrp-anc/src/main/assets/json.form/anc_quick_check.json index ccc98ec..93f680d 100644 --- a/opensrp-anc/src/main/assets/json.form/anc_quick_check.json +++ b/opensrp-anc/src/main/assets/json.form/anc_quick_check.json @@ -104,7 +104,7 @@ "type": "date_picker", "hint": "Date of Contact", "expanded": "false", - "min_date": "today-1m", + "min_date": "today-6m", "max_date": "today", "v_required": { "value": true, diff --git a/opensrp-anc/src/main/java/org/smartregister/anc/library/activity/BaseHomeRegisterActivity.java b/opensrp-anc/src/main/java/org/smartregister/anc/library/activity/BaseHomeRegisterActivity.java index f0a9462..8bf85e7 100644 --- a/opensrp-anc/src/main/java/org/smartregister/anc/library/activity/BaseHomeRegisterActivity.java +++ b/opensrp-anc/src/main/java/org/smartregister/anc/library/activity/BaseHomeRegisterActivity.java @@ -16,6 +16,7 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; +import com.amitshekhar.DebugDB; import com.google.android.gms.vision.barcode.Barcode; import com.google.android.material.bottomnavigation.LabelVisibilityMode; import com.vijay.jsonwizard.activities.FormConfigurationJsonFormActivity; @@ -28,6 +29,7 @@ import org.json.JSONObject; import org.smartregister.AllConstants; import org.smartregister.anc.library.AncLibrary; +import org.smartregister.anc.library.BuildConfig; import org.smartregister.anc.library.R; import org.smartregister.anc.library.contract.RegisterContract; import org.smartregister.anc.library.domain.AttentionFlag; diff --git a/opensrp-anc/src/main/java/org/smartregister/anc/library/activity/ProfileActivity.java b/opensrp-anc/src/main/java/org/smartregister/anc/library/activity/ProfileActivity.java index 402b44f..fc5af25 100644 --- a/opensrp-anc/src/main/java/org/smartregister/anc/library/activity/ProfileActivity.java +++ b/opensrp-anc/src/main/java/org/smartregister/anc/library/activity/ProfileActivity.java @@ -3,11 +3,13 @@ import android.Manifest; import android.app.Activity; import android.app.AlertDialog; +import android.content.ContentValues; import android.content.Intent; import android.content.pm.PackageManager; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.net.Uri; +import android.os.AsyncTask; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -17,16 +19,25 @@ import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; +import android.widget.Toast; import androidx.annotation.NonNull; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.joda.JodaModule; + import org.apache.commons.lang3.StringUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; +import org.joda.time.LocalDate; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; import org.smartregister.anc.library.AncLibrary; import org.smartregister.anc.library.R; import org.smartregister.anc.library.adapter.ProfileViewPagerAdapter; @@ -37,18 +48,31 @@ import org.smartregister.anc.library.fragment.ProfileOverviewFragment; import org.smartregister.anc.library.fragment.ProfileTasksFragment; import org.smartregister.anc.library.presenter.ProfilePresenter; +import org.smartregister.anc.library.repository.PatientRepository; +import org.smartregister.anc.library.rule.ContactRule; +import org.smartregister.anc.library.sync.BaseAncClientProcessorForJava; +import org.smartregister.anc.library.task.RegenerateContactSchedulesTask; import org.smartregister.anc.library.util.ANCJsonFormUtils; import org.smartregister.anc.library.util.ConstantsUtils; import org.smartregister.anc.library.util.DBConstantsUtils; import org.smartregister.anc.library.util.Utils; import org.smartregister.anc.library.view.CopyToClipboardDialog; +import org.smartregister.domain.Event; import org.smartregister.repository.AllSharedPreferences; import org.smartregister.util.PermissionUtils; import org.smartregister.util.StringUtil; import org.smartregister.view.activity.BaseProfileActivity; import java.io.Serializable; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Calendar; import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; import timber.log.Timber; @@ -118,8 +142,10 @@ private void getButtonAlertStatus() { detailMap = (HashMap) getIntent().getSerializableExtra(ConstantsUtils.IntentKeyUtils.CLIENT_MAP); contactNo = String.valueOf(Utils.getTodayContact(detailMap.get(DBConstantsUtils.KeyUtils.NEXT_CONTACT))); buttonAlertStatus = Utils.processContactDoneToday(detailMap.get(DBConstantsUtils.KeyUtils.LAST_CONTACT_RECORD_DATE), - ConstantsUtils.AlertStatusUtils.ACTIVE.equals(detailMap.get(DBConstantsUtils.KeyUtils.CONTACT_STATUS)) ? - ConstantsUtils.AlertStatusUtils.IN_PROGRESS : ""); + ConstantsUtils.AlertStatusUtils.ACTIVE.equals(detailMap.get(DBConstantsUtils.KeyUtils.CONTACT_STATUS)) ? + ConstantsUtils.AlertStatusUtils.IN_PROGRESS : ""); + + } protected void updateTasksTabTitle() { @@ -151,12 +177,18 @@ protected ViewPager setupViewPager(ViewPager viewPager) { public void onClick(View view) { if (view.getId() == R.id.profile_overview_due_button) { String baseEntityId = getIntent().getStringExtra(ConstantsUtils.IntentKeyUtils.BASE_ENTITY_ID); - - if (StringUtils.isNotBlank(baseEntityId)) { - Utils.proceedToContact(baseEntityId, detailMap, getActivity()); - finish(); + Object viewTag = view.getTag(R.string.regenerate_contact_schedule); + if (viewTag!= null && (viewTag).equals(ConstantsUtils.AlertStatusUtils.REGENERATE)) { + new RegenerateContactSchedulesTask(getActivity(), baseEntityId).execute(); + } else { + if (StringUtils.isNotBlank(baseEntityId)) { + Utils.proceedToContact(baseEntityId, detailMap, getActivity()); + finish(); + } } + + } else { super.onClick(view); } @@ -394,4 +426,5 @@ public Button getDueButton() { public ProfilePresenter getProfilePresenter() { return (ProfilePresenter) presenter; } + } diff --git a/opensrp-anc/src/main/java/org/smartregister/anc/library/fragment/ProfileContactsFragment.java b/opensrp-anc/src/main/java/org/smartregister/anc/library/fragment/ProfileContactsFragment.java index c92b5e3..4226368 100644 --- a/opensrp-anc/src/main/java/org/smartregister/anc/library/fragment/ProfileContactsFragment.java +++ b/opensrp-anc/src/main/java/org/smartregister/anc/library/fragment/ProfileContactsFragment.java @@ -1,6 +1,9 @@ package org.smartregister.anc.library.fragment; +import android.app.Activity; +import android.content.ContentValues; import android.content.Intent; +import android.os.AsyncTask; import android.os.Bundle; import android.text.TextUtils; import android.view.LayoutInflater; @@ -10,13 +13,21 @@ import android.widget.LinearLayout; import android.widget.ScrollView; import android.widget.TextView; -import org.apache.commons.lang3.StringUtils; +import android.widget.Toast; + import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import org.apache.commons.lang3.StringUtils; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.joda.JodaModule; + import org.jeasy.rules.api.Facts; +import org.joda.time.LocalDate; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; import org.smartregister.anc.library.AncLibrary; import org.smartregister.anc.library.R; import org.smartregister.anc.library.activity.PreviousContactsDetailsActivity; @@ -29,25 +40,33 @@ import org.smartregister.anc.library.domain.YamlConfig; import org.smartregister.anc.library.domain.YamlConfigItem; import org.smartregister.anc.library.domain.YamlConfigWrapper; -import org.smartregister.anc.library.model.PreviousContact; import org.smartregister.anc.library.model.Task; import org.smartregister.anc.library.presenter.ProfileFragmentPresenter; +import org.smartregister.anc.library.repository.PatientRepository; +import org.smartregister.anc.library.rule.ContactRule; +import org.smartregister.anc.library.sync.BaseAncClientProcessorForJava; import org.smartregister.anc.library.util.ANCJsonFormUtils; -import org.smartregister.anc.library.util.AppExecutors; import org.smartregister.anc.library.util.ConstantsUtils; import org.smartregister.anc.library.util.DBConstantsUtils; import org.smartregister.anc.library.util.FilePathUtils; import org.smartregister.anc.library.util.Utils; +import org.smartregister.domain.Event; import org.smartregister.view.fragment.BaseProfileFragment; import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Locale; +import java.util.Map; +import java.util.Objects; import timber.log.Timber; @@ -108,7 +127,9 @@ protected void onCreation() { clientDetails = (HashMap) getActivity().getIntent().getSerializableExtra(ConstantsUtils.IntentKeyUtils.CLIENT_MAP); } + buttonAlertStatus = Utils.getButtonAlertStatus(clientDetails, getActivity(), true); + } } @@ -183,51 +204,52 @@ private void populatePreviousContactMissingEssentials(HashMap cl } private void setUpAlertStatusButton() { +// if (clientDetails.get(ConstantsUtils.DATA_MIGRATION_IS_DIRTY) != null && clientDetails.get(ConstantsUtils.DATA_MIGRATION_IS_DIRTY).equals("1")) { +// buttonAlertStatus.buttonAlertStatus = ConstantsUtils.AlertStatusUtils.REGENERATE; +// } Utils.processButtonAlertStatus(getActivity(), dueButton, buttonAlertStatus); + } private void initializeLastContactDetails(HashMap clientDetails) { if (clientDetails != null) { - List lastContactDetailsWrapperList = new ArrayList<>(); - List lastContactDetailsTestsWrapperList = new ArrayList<>(); - Facts facts = presenter.getImmediatePreviousContact(clientDetails, baseEntityId, contactNo); - try { - addOtherRuleObjects(facts); - addAttentionFlagsRuleObjects(facts); - contactNo = (String) facts.asMap().get(ConstantsUtils.CONTACT_NO); - - addTestsRuleObjects(facts); - } catch (IOException e) { - throw new RuntimeException(e); - } + List lastContactDetailsWrapperList = new ArrayList<>(); + List lastContactDetailsTestsWrapperList = new ArrayList<>(); + Facts facts = presenter.getImmediatePreviousContact(clientDetails, baseEntityId, contactNo); + try { + addOtherRuleObjects(facts); + addAttentionFlagsRuleObjects(facts); + contactNo = (String) facts.asMap().get(ConstantsUtils.CONTACT_NO); + + addTestsRuleObjects(facts); + } catch (IOException e) { + throw new RuntimeException(e); + } String displayContactDate = ""; - // Extract visit date from facts - String manualEncounterDate = (String) facts.asMap().get(ConstantsUtils.JsonFormKeyUtils.VISIT_DATE); + // If no visit date, try to get contact date + String contactDate = (String) facts.asMap().get(ConstantsUtils.JsonFormKeyUtils.VISIT_DATE); + if (contactDate != null) { + contactDate = Utils.reverseHyphenSeperatedValues(contactDate, "-"); + } else { + contactDate = + clientDetails.get(DBConstantsUtils.KeyUtils.LAST_CONTACT_RECORD_DATE) != null ? + clientDetails.get(DBConstantsUtils.KeyUtils.LAST_CONTACT_RECORD_DATE) : + (String) facts.asMap().get(ConstantsUtils.CONTACT_DATE); + } + - if (!TextUtils.isEmpty(manualEncounterDate)) { - // If there's a visit date, parse it and format for display + if (!TextUtils.isEmpty(contactDate)) { + // If contact date exists, parse and format for display try { - Date lastContactDate = new SimpleDateFormat("dd-MM-yyyy", Locale.getDefault()).parse(manualEncounterDate); + Date lastContactDate = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).parse(contactDate); displayContactDate = new SimpleDateFormat("dd MMM yyyy", Locale.getDefault()).format(lastContactDate); } catch (ParseException e) { // Handle parsing exceptions throw new RuntimeException(e); } - } else { - // If no visit date, try to get contact date - String contactDate = (String) facts.asMap().get(ConstantsUtils.CONTACT_DATE); - if (!TextUtils.isEmpty(contactDate)) { - // If contact date exists, parse and format for display - try { - Date lastContactDate = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).parse(contactDate); - displayContactDate = new SimpleDateFormat("dd MMM yyyy", Locale.getDefault()).format(lastContactDate); - } catch (ParseException e) { - // Handle parsing exceptions - throw new RuntimeException(e); - } - } + } if (lastContactDetails.isEmpty()) { @@ -360,9 +382,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa dueButton = ((ProfileActivity) getActivity()).getDueButton(); // if (!ConstantsUtils.AlertStatusUtils.TODAY.equals(buttonAlertStatus.buttonAlertStatus)) { - dueButton.setOnClickListener((ProfileActivity) getActivity()); + dueButton.setOnClickListener((ProfileActivity) getActivity()); // } else { - dueButton.setEnabled(true); + dueButton.setEnabled(true); // } return fragmentView; @@ -421,4 +443,6 @@ public void onClick(View view) { } } + + } diff --git a/opensrp-anc/src/main/java/org/smartregister/anc/library/fragment/ProfileOverviewFragment.java b/opensrp-anc/src/main/java/org/smartregister/anc/library/fragment/ProfileOverviewFragment.java index 385e654..442f96c 100644 --- a/opensrp-anc/src/main/java/org/smartregister/anc/library/fragment/ProfileOverviewFragment.java +++ b/opensrp-anc/src/main/java/org/smartregister/anc/library/fragment/ProfileOverviewFragment.java @@ -10,6 +10,9 @@ import androidx.recyclerview.widget.RecyclerView; import org.jeasy.rules.api.Facts; +import org.joda.time.DateTime; +import org.joda.time.format.DateTimeFormat; +import org.joda.time.format.DateTimeFormatter; import org.smartregister.anc.library.AncLibrary; import org.smartregister.anc.library.R; import org.smartregister.anc.library.activity.ProfileActivity; @@ -97,6 +100,28 @@ protected void onResumption() { fetchContactAndAlertStatus(); yamlConfigListGlobal = new ArrayList<>(); //This makes sure no data duplication happens Facts facts = presenter.getImmediatePreviousContact(clientDetails, baseEntityId, contactNo); + String usgEdd = facts.get("ultrasound_edd").toString(); + String lmpEdd = facts.get("lmp_edd").toString(); + String sfhEdd = facts.get("sfh_edd").toString(); + String eddDate = !usgEdd.isEmpty() && !usgEdd.equals("0")? + usgEdd: !lmpEdd.isEmpty() && !lmpEdd.equals("0")? lmpEdd: + sfhEdd; + + // Define the date format pattern from ConstantsUtils + String pattern = ConstantsUtils.OPENSRP_DATE_TIME_FORMAT; + + // Create a DateTimeFormatter with the pattern + DateTimeFormatter formatter = DateTimeFormat.forPattern(pattern); + + // Get the current date and time + DateTime now = new DateTime(); + + // Format the current date and time as a string + String todaysDateString = now.toString(formatter); + String currentGestAge = Utils.calculateGaBasedOnUltrasoundEdd(eddDate, todaysDateString); + +// String currentGestAge = updateGaAsOfTodaysDate(facts); + facts.put("current_gest_age", currentGestAge); Iterable ruleObjects = utils.loadRulesFiles(FilePathUtils.FileUtils.PROFILE_OVERVIEW); for (Object ruleObject : ruleObjects) { @@ -125,9 +150,10 @@ protected void onResumption() { yamlConfigListGlobal.addAll(yamlConfigList); } } - +// if (clientDetails.get(ConstantsUtils.DATA_MIGRATION_IS_DIRTY) != null && clientDetails.get(ConstantsUtils.DATA_MIGRATION_IS_DIRTY).equals("1")) { +// buttonAlertStatus.buttonAlertStatus = ConstantsUtils.AlertStatusUtils.REGENERATE; +// } Utils.processButtonAlertStatus(getActivity(), dueButton, buttonAlertStatus); - attachRecyclerView(facts); if (yamlConfigListGlobal.isEmpty()) { @@ -178,4 +204,5 @@ public void updateTask(Task task) { public void refreshTasksList(boolean refresh) { // Implement here } + } diff --git a/opensrp-anc/src/main/java/org/smartregister/anc/library/fragment/ProfileTasksFragment.java b/opensrp-anc/src/main/java/org/smartregister/anc/library/fragment/ProfileTasksFragment.java index c83512c..5d2c3af 100644 --- a/opensrp-anc/src/main/java/org/smartregister/anc/library/fragment/ProfileTasksFragment.java +++ b/opensrp-anc/src/main/java/org/smartregister/anc/library/fragment/ProfileTasksFragment.java @@ -93,6 +93,9 @@ protected void onCreation() { @Override protected void onResumption() { +// if (clientDetails.get(ConstantsUtils.DATA_MIGRATION_IS_DIRTY) != null && clientDetails.get(ConstantsUtils.DATA_MIGRATION_IS_DIRTY).equals("1")) { +// buttonAlertStatus.buttonAlertStatus = ConstantsUtils.AlertStatusUtils.REGENERATE; +// } Utils.processButtonAlertStatus(getActivity(), dueButton, buttonAlertStatus); if (getActivity() != null && getActivity().getIntent() != null) { baseEntityId = getActivity().getIntent().getStringExtra(ConstantsUtils.IntentKeyUtils.BASE_ENTITY_ID); diff --git a/opensrp-anc/src/main/java/org/smartregister/anc/library/interactor/ContactInteractor.java b/opensrp-anc/src/main/java/org/smartregister/anc/library/interactor/ContactInteractor.java index 59523ba..5be84c6 100644 --- a/opensrp-anc/src/main/java/org/smartregister/anc/library/interactor/ContactInteractor.java +++ b/opensrp-anc/src/main/java/org/smartregister/anc/library/interactor/ContactInteractor.java @@ -198,10 +198,9 @@ private void updateWomanDetails(Map details, WomanDetail womanDe details.put(DBConstantsUtils.KeyUtils.CONTACT_STATUS, womanDetail.getContactStatus()); } else { details.put(DBConstantsUtils.KeyUtils.CONTACT_STATUS, womanDetail.getContactStatus()); - details.put(DBConstantsUtils.KeyUtils.LAST_CONTACT_RECORD_DATE, Utils.getDBDateToday()); details.put(DBConstantsUtils.KeyUtils.YELLOW_FLAG_COUNT, womanDetail.getYellowFlagCount().toString()); details.put(DBConstantsUtils.KeyUtils.RED_FLAG_COUNT, womanDetail.getRedFlagCount().toString()); - + details.put(DBConstantsUtils.KeyUtils.LAST_CONTACT_RECORD_DATE, details.get(DBConstantsUtils.KeyUtils.LAST_CONTACT_RECORD_DATE)); } details.put(DBConstantsUtils.KeyUtils.NEXT_CONTACT, womanDetail.getNextContact().toString()); details.put(DBConstantsUtils.KeyUtils.NEXT_CONTACT_DATE, womanDetail.getNextContactDate()); @@ -262,8 +261,12 @@ protected PreviousContactRepository getPreviousContactRepository() { } public int getGestationAge(Map details) { - return details.containsKey(DBConstantsUtils.KeyUtils.EDD) && details.get(DBConstantsUtils.KeyUtils.EDD) != null ? Utils - .getGestationAgeFromEDDate(details.get(DBConstantsUtils.KeyUtils.EDD)) : 4; + if (!details.containsKey(DBConstantsUtils.KeyUtils.EDD) || details.get(DBConstantsUtils.KeyUtils.EDD) == null) return 4; + String edd = details.get(DBConstantsUtils.KeyUtils.EDD); + String visitDate = details.get(ConstantsUtils.JsonFormKeyUtils.VISIT_DATE); + + if (visitDate == null) return Utils.getGestationAgeFromEDDate(edd); + return Utils.getGAFromEDDateOnVisitDate(edd, visitDate); } diff --git a/opensrp-anc/src/main/java/org/smartregister/anc/library/provider/RegisterProvider.java b/opensrp-anc/src/main/java/org/smartregister/anc/library/provider/RegisterProvider.java index 5714127..6473d85 100644 --- a/opensrp-anc/src/main/java/org/smartregister/anc/library/provider/RegisterProvider.java +++ b/opensrp-anc/src/main/java/org/smartregister/anc/library/provider/RegisterProvider.java @@ -1,5 +1,6 @@ package org.smartregister.anc.library.provider; +import android.app.Activity; import android.content.Context; import android.database.Cursor; import android.text.TextUtils; @@ -18,6 +19,8 @@ import org.smartregister.anc.library.R; import org.smartregister.anc.library.domain.ButtonAlertStatus; import org.smartregister.anc.library.fragment.HomeRegisterFragment; +import org.smartregister.anc.library.task.RegenerateContactSchedulesTask; +import org.smartregister.anc.library.util.ConstantsUtils; import org.smartregister.anc.library.util.DBConstantsUtils; import org.smartregister.anc.library.util.Utils; import org.smartregister.commonregistry.CommonPersonObject; @@ -207,6 +210,12 @@ private void populateLastColumn(CommonPersonObjectClient pc, RegisterViewHolder Utils.getButtonAlertStatus(pc.getColumnmaps(), context, false); Utils.processButtonAlertStatus(context, viewHolder.dueButton, viewHolder.contactDoneTodayButton, buttonAlertStatus); + if (buttonAlertStatus.buttonAlertStatus.equals(ConstantsUtils.AlertStatusUtils.REGENERATE)) { + + viewHolder.dueButton.setOnClickListener(view -> { + new RegenerateContactSchedulesTask((Activity) view.getContext(), pc.entityId()); + }); + } } else { viewHolder.dueButton.setVisibility(View.GONE); diff --git a/opensrp-anc/src/main/java/org/smartregister/anc/library/repository/PatientRepository.java b/opensrp-anc/src/main/java/org/smartregister/anc/library/repository/PatientRepository.java index 0ced2a4..40dd61e 100644 --- a/opensrp-anc/src/main/java/org/smartregister/anc/library/repository/PatientRepository.java +++ b/opensrp-anc/src/main/java/org/smartregister/anc/library/repository/PatientRepository.java @@ -181,11 +181,12 @@ public static void updateEDDDate(String baseEntityId, String edd) { } updatePatient(baseEntityId, contentValues, getRegisterQueryProvider().getDetailsTable()); } - public static void updateLastContactDate(String baseEntityId, String edd) { + public static void updateLastContactDate(String baseEntityId, String lstVisitDate) { ContentValues contentValues = new ContentValues(); - if (edd != null) { - contentValues.put(DBConstantsUtils.KeyUtils.LAST_CONTACT_RECORD_DATE, edd); + if (lstVisitDate != null) { + contentValues.put(DBConstantsUtils.KeyUtils.LAST_CONTACT_RECORD_DATE, lstVisitDate); + contentValues.put(ConstantsUtils.JsonFormKeyUtils.VISIT_DATE, lstVisitDate); // contentValues.put(DBConstantsUtils.KeyUtils.CONTACT_STATUS, patientDetail.getPreviousContactStatus()) } // else { @@ -193,6 +194,18 @@ public static void updateLastContactDate(String baseEntityId, String edd) { // } updatePatient(baseEntityId, contentValues, getRegisterQueryProvider().getDetailsTable()); } + + public static void updateLastVisitDate(String baseEntityId, String visitDate) { + + ContentValues contentValues = new ContentValues(); + if (visitDate != null) { + contentValues.put(ConstantsUtils.JsonFormKeyUtils.VISIT_DATE, visitDate); + } else { + contentValues.putNull(ConstantsUtils.JsonFormKeyUtils.VISIT_DATE); + } + updatePatient(baseEntityId, contentValues, getRegisterQueryProvider().getDetailsTable()); + } + public static void updateContactVisitStartDate(String baseEntityId, String contactVisitStartDate) { ContentValues contentValues = new ContentValues(); diff --git a/opensrp-anc/src/main/java/org/smartregister/anc/library/repository/PreviousContactRepository.java b/opensrp-anc/src/main/java/org/smartregister/anc/library/repository/PreviousContactRepository.java index fbbbeca..f9001ae 100644 --- a/opensrp-anc/src/main/java/org/smartregister/anc/library/repository/PreviousContactRepository.java +++ b/opensrp-anc/src/main/java/org/smartregister/anc/library/repository/PreviousContactRepository.java @@ -327,11 +327,17 @@ public Facts getPreviousContactFacts(String baseEntityId, String contactNo, bool Facts previousContactFacts = new Facts(); try { SQLiteDatabase db = getReadableDatabase(); - if (StringUtils.isNotBlank(baseEntityId) && StringUtils.isNotBlank(contactNo)) { - selection = BASE_ENTITY_ID + " = ? AND " + CONTACT_NO + " = ?"; + if (StringUtils.isBlank(baseEntityId)) + throw new IllegalStateException("No Base Entity Id provided to PreviousContactRepository.getPreviousContactFacts("); + selection = BASE_ENTITY_ID + " = ? "; + selectionArgs = new String[]{baseEntityId, null}; + + if (StringUtils.isNotBlank(contactNo)) { + selection += "AND " + CONTACT_NO + " = ?"; selectionArgs = new String[]{baseEntityId, contactNo}; } + mCursor = db.query(TABLE_NAME, projectionArgs, selection, selectionArgs, KEY, null, orderBy, null); // mCursor = db.query(TABLE_NAME, projectionArgs, selection, selectionArgs, KEY, null, orderBy, "1"); @@ -402,6 +408,9 @@ public Facts getImmediatePreviousSchedule(String baseEntityId, String contactNo) try { SQLiteDatabase db = getWritableDatabase(); db.setMaximumSize(4 * 1024 * 1024); + if(StringUtils.isBlank(contactNo)) + throw new IllegalStateException("contactNo. not provided for " + + "PreviousContactRepository.getImmediatePreviousSchedule()"); if (StringUtils.isNotBlank(baseEntityId) && StringUtils.isNotBlank(contactNo)) { selection = BASE_ENTITY_ID + " = ? AND " + CONTACT_NO + " = ? AND " + KEY + " = " + "'" + ConstantsUtils.CONTACT_SCHEDULE + "'"; diff --git a/opensrp-anc/src/main/java/org/smartregister/anc/library/repository/RegisterQueryProvider.java b/opensrp-anc/src/main/java/org/smartregister/anc/library/repository/RegisterQueryProvider.java index be18f50..cec9ea3 100644 --- a/opensrp-anc/src/main/java/org/smartregister/anc/library/repository/RegisterQueryProvider.java +++ b/opensrp-anc/src/main/java/org/smartregister/anc/library/repository/RegisterQueryProvider.java @@ -84,6 +84,8 @@ DBConstantsUtils.KeyUtils.DOB_UNKNOWN, getDetailsTable() + "." + DBConstantsUtil getDetailsTable() + "." + ConstantsUtils.SpinnerKeyConstants.VILLAGE ,getDetailsTable()+ "." + DBConstantsUtils.KeyUtils.INSURANCE, getDetailsTable()+ "." + DBConstantsUtils.KeyUtils.VILLAGE,getDetailsTable()+ "." + DBConstantsUtils.KeyUtils.UBUDEHE_CATEGORY, getDetailsTable()+ "." + DBConstantsUtils.KeyUtils.NATIONAL_ID,getDetailsTable()+ "." + DBConstantsUtils.KeyUtils.DOCUMENT_TYPE, + getDetailsTable() + "." + ConstantsUtils.JsonFormKeyUtils.VISIT_DATE, + getDemographicTable()+ "." + ConstantsUtils.DATA_MIGRATION_IS_DIRTY, getDetailsTable()+ "." + DBConstantsUtils.KeyUtils.PASSPORT_ID,getDetailsTable()+ "." + DBConstantsUtils.KeyUtils.OTHER_ID }; } diff --git a/opensrp-anc/src/main/java/org/smartregister/anc/library/task/LoadContactSummaryDataTask.java b/opensrp-anc/src/main/java/org/smartregister/anc/library/task/LoadContactSummaryDataTask.java index 546fbec..0a28702 100644 --- a/opensrp-anc/src/main/java/org/smartregister/anc/library/task/LoadContactSummaryDataTask.java +++ b/opensrp-anc/src/main/java/org/smartregister/anc/library/task/LoadContactSummaryDataTask.java @@ -81,22 +81,26 @@ protected void onPostExecute(Void result) { ((ContactSummaryFinishActivity) context).saveFinishMenuItem.setEnabled(true); } - String lstVisitDate=facts.get(ConstantsUtils.JsonFormKeyUtils.VISIT_DATE); + try { + String lstVisitDate = facts.get(ConstantsUtils.JsonFormKeyUtils.VISIT_DATE); // Log.d("DATE",lstVisitDate); // Toast.makeText(context.getApplicationContext(), "DATE IS"+lstVisitDate,Toast.LENGTH_LONG).show(); - SimpleDateFormat inputFormat = new SimpleDateFormat("dd-MM-yyyy"); - Date date = null; - try { - date = inputFormat.parse(lstVisitDate); - } catch (ParseException e) { - throw new RuntimeException(e); - } - String formattedDate = Utils.DB_DF.format(date); - if (formattedDate != null && ((ContactSummaryFinishActivity) context).saveFinishMenuItem != null) { - PatientRepository.updateLastContactDate(baseEntityId, formattedDate); - ((ContactSummaryFinishActivity) context).saveFinishMenuItem.setEnabled(true); - - } + SimpleDateFormat inputFormat = new SimpleDateFormat("dd-MM-yyyy"); + Date date = null; + try { + date = inputFormat.parse(lstVisitDate); + } catch (ParseException e) { + throw new RuntimeException(e); + } + String formattedDate = Utils.DB_DF.format(date); + if (formattedDate != null && ((ContactSummaryFinishActivity) context).saveFinishMenuItem != null) { + PatientRepository.updateLastContactDate(baseEntityId, formattedDate); + ((ContactSummaryFinishActivity) context).saveFinishMenuItem.setEnabled(true); + + } + } catch (Exception e){ + Timber.e(e); + } ContactSummaryFinishAdapter adapter = new ContactSummaryFinishAdapter(context, ((ContactSummaryFinishActivity) context).getYamlConfigList(), facts); adapter.notifyDataSetChanged(); diff --git a/opensrp-anc/src/main/java/org/smartregister/anc/library/task/RegenerateContactSchedulesTask.java b/opensrp-anc/src/main/java/org/smartregister/anc/library/task/RegenerateContactSchedulesTask.java new file mode 100644 index 0000000..bb9bd10 --- /dev/null +++ b/opensrp-anc/src/main/java/org/smartregister/anc/library/task/RegenerateContactSchedulesTask.java @@ -0,0 +1,157 @@ +package org.smartregister.anc.library.task; + +import android.app.Activity; +import android.content.ContentValues; +import android.os.AsyncTask; +import android.provider.ContactsContract; +import android.widget.Toast; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.joda.JodaModule; + +import org.joda.time.LocalDate; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; +import org.smartregister.anc.library.AncLibrary; +import org.smartregister.anc.library.R; +import org.smartregister.anc.library.activity.ProfileActivity; +import org.smartregister.anc.library.repository.PatientRepository; +import org.smartregister.anc.library.rule.ContactRule; +import org.smartregister.anc.library.sync.BaseAncClientProcessorForJava; +import org.smartregister.anc.library.util.ConstantsUtils; +import org.smartregister.anc.library.util.DBConstantsUtils; +import org.smartregister.anc.library.util.Utils; +import org.smartregister.domain.Event; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import timber.log.Timber; + +public class RegenerateContactSchedulesTask extends AsyncTask { + + Activity activity; + + String baseEntityId = ""; + + public RegenerateContactSchedulesTask(Activity context, String baseEntityId) { + this.activity = context; + this.baseEntityId = baseEntityId; + } + + @Override + protected String doInBackground(Void... voids) { + HashMap clientDetails = (HashMap) PatientRepository.getWomanProfileDetails(baseEntityId); + + try { + int contactNo = 1; + if (clientDetails.get(DBConstantsUtils.KeyUtils.NEXT_CONTACT) != null) { + contactNo = Integer.parseInt(Objects.requireNonNull(clientDetails.get(DBConstantsUtils.KeyUtils.NEXT_CONTACT))) - 1; + } + + boolean isFirst = contactNo == 1; + int gestationAge = Utils.getLastContactGA(clientDetails.get(DBConstantsUtils.KeyUtils.EDD), clientDetails.get(DBConstantsUtils.KeyUtils.LAST_CONTACT_RECORD_DATE)); + ContactRule contactRule = new ContactRule(gestationAge, isFirst, baseEntityId); + + + List integerList = AncLibrary.getInstance().getAncRulesEngineHelper() + .getContactVisitSchedule(contactRule, ConstantsUtils.RulesFileUtils.CONTACT_RULES); + + int nextContactVisitWeeks = integerList.get(0); + + JSONObject contactScheduleObject = new JSONObject(); + contactScheduleObject.put(ConstantsUtils.DetailsKeyUtils.CONTACT_SCHEDULE, integerList); + AncLibrary.getInstance().getDetailsRepository().add(baseEntityId, ConstantsUtils.DetailsKeyUtils.CONTACT_SCHEDULE, contactScheduleObject.toString(), + Calendar.getInstance().getTimeInMillis()); + + ContentValues ecClientsCv = new ContentValues(); + ContentValues ecMotherDetailsCv = new ContentValues(); + ecClientsCv.put(ConstantsUtils.DATA_MIGRATION_IS_DIRTY, "0"); + PatientRepository.updatePatient(baseEntityId, ecClientsCv, DBConstantsUtils.RegisterTable.DEMOGRAPHIC); + + LocalDate localDate = new LocalDate(clientDetails.get(DBConstantsUtils.KeyUtils.EDD)); + String nextContactVisitDate = + localDate.minusWeeks(ConstantsUtils.DELIVERY_DATE_WEEKS).plusWeeks(nextContactVisitWeeks).toString(); + ecMotherDetailsCv.put(DBConstantsUtils.KeyUtils.NEXT_CONTACT_DATE, nextContactVisitDate); + + PatientRepository.updatePatient(baseEntityId, ecMotherDetailsCv, DBConstantsUtils.RegisterTable.DETAILS); + JSONObject eventsForBaseEntityId = AncLibrary.getInstance().getEventClientRepository().getEventsByBaseEntityId(baseEntityId); + + + JSONArray jsonArray = eventsForBaseEntityId.getJSONArray("events"); + int bound = eventsForBaseEntityId.getJSONArray("events").length(); + List visits = new ArrayList<>(); + for (int i = 0; i < bound; i++) { + JSONObject eventObject = jsonArray.getJSONObject(i); + if ("Contact Visit".equals(eventObject.optString("eventType"))) { + visits.add(eventObject); + } + } + + String contactKey = "Contact " + clientDetails.get(DBConstantsUtils.KeyUtils.NEXT_CONTACT); + + for (int j = 0; j < visits.size(); j++) { + JSONObject details = visits.get(j).getJSONObject("details"); + if (details.get("Contact").equals(contactKey)) { + JSONObject visitToUpdate = visits.get(j); + // remove details since it is causing errors during deserialization + visitToUpdate.remove("details"); + ObjectMapper objectMapper = new ObjectMapper(); + // Register JodaModule + objectMapper.registerModule(new JodaModule()); + Event visitEvent = objectMapper.readValue(visitToUpdate.toString(), Event.class); + JSONObject previousContact = new JSONObject(details.get("previous_contacts").toString()); + previousContact.put("contact_schedule", contactScheduleObject.toString()); + details.put("previous_contacts", previousContact.toString()); + + Map eventDetails = new HashMap<>(); + Iterator keys = details.keys(); + while (keys.hasNext()) { + String key = (String) keys.next(); + eventDetails.put(key, (String) details.get(key)); + } + visitEvent.setDetails(eventDetails); + + BaseAncClientProcessorForJava baseAncClientProcessorForJava = BaseAncClientProcessorForJava.getInstance(activity); + Method processVisitMethod = baseAncClientProcessorForJava.getClass().getDeclaredMethod("processVisit", Event.class); + processVisitMethod.setAccessible(true); + + processVisitMethod.invoke(baseAncClientProcessorForJava, visitEvent); + // mark event as UnSynced and Invalid so that it can be uploaded in the next sync cycle + AncLibrary.getInstance().getEventClientRepository().markEventValidationStatus(visitEvent.getFormSubmissionId(), false); + break; + } + } + + return "success"; + } catch (JSONException | NoSuchMethodException | JsonProcessingException | + InvocationTargetException | IllegalAccessException e) { + Timber.e(e); + return "failure"; + } + + + } + + @Override + protected void onPostExecute(String message) { + if (message.equals("success")) { + Toast.makeText(activity, R.string.successfully_updated_contact_schedule, Toast.LENGTH_LONG).show(); + } else + Toast.makeText(activity, R.string.an_error_occurred_while_regenerating_contact_schedule, Toast.LENGTH_LONG).show(); + if(activity instanceof ProfileActivity){ + activity.finish(); + } else activity.recreate(); + } + + +} \ No newline at end of file diff --git a/opensrp-anc/src/main/java/org/smartregister/anc/library/util/ConstantsUtils.java b/opensrp-anc/src/main/java/org/smartregister/anc/library/util/ConstantsUtils.java index 3f37650..3d58411 100644 --- a/opensrp-anc/src/main/java/org/smartregister/anc/library/util/ConstantsUtils.java +++ b/opensrp-anc/src/main/java/org/smartregister/anc/library/util/ConstantsUtils.java @@ -6,10 +6,14 @@ public abstract class ConstantsUtils { public static final String SQLITE_DATE_TIME_FORMAT = "yyyy-MM-dd"; + + public static final String OPENSRP_DATE_TIME_FORMAT = "dd-MM-yyyy"; public static final String CONTACT_DATE_FORMAT = "dd/MM/yyyy"; public static final String CONTACT_SUMMARY_DATE_FORMAT = "dd MMMM yyyy"; public static final String VIEW_CONFIGURATION_PREFIX = "ViewConfiguration_"; public static final String FORM = "form"; + + public static final String DATA_MIGRATION_IS_DIRTY = "data_migration_is_dirty"; public static final String ACCORDION_INFO_TEXT = "accordion_info_text"; public static final String ACCORDION_INFO_TITLE = "accordion_info_title"; public static final String DISPLAY_BOTTOM_SECTION = "display_bottom_section"; @@ -215,6 +219,7 @@ public static final class AlertStatusUtils { public static final String EXPIRED = "expired"; public static final String TODAY = "today"; public static final String ACTIVE = "active"; + public static final String REGENERATE = "regenerate"; } public static final class PrescriptionUtils{ diff --git a/opensrp-anc/src/main/java/org/smartregister/anc/library/util/Utils.java b/opensrp-anc/src/main/java/org/smartregister/anc/library/util/Utils.java index a47287b..06349a4 100644 --- a/opensrp-anc/src/main/java/org/smartregister/anc/library/util/Utils.java +++ b/opensrp-anc/src/main/java/org/smartregister/anc/library/util/Utils.java @@ -24,7 +24,6 @@ import com.itextpdf.kernel.pdf.PdfDocument; import com.itextpdf.kernel.pdf.PdfWriter; import com.itextpdf.layout.Document; -import com.itextpdf.layout.element.IBlockElement; import com.itextpdf.layout.element.Paragraph; import com.itextpdf.layout.property.HorizontalAlignment; import com.itextpdf.layout.property.TextAlignment; @@ -79,7 +78,6 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; -import java.io.OutputStream; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -111,7 +109,7 @@ public class Utils extends org.smartregister.util.Utils { public static final String HOME_ADDRESS = "Home Address"; private static final DateTimeFormatter SQLITE_DATE_DF = DateTimeFormat.forPattern(ConstantsUtils.SQLITE_DATE_TIME_FORMAT); private static final String OTHER_SUFFIX = ", other]"; - private static String visitDate; + private static String mVisitDate; static { ALLOWED_LEVELS = new ArrayList<>(); @@ -317,7 +315,7 @@ public static boolean hasPendingRequiredFields(JSONObject object) throws Excepti */ public static void finalizeForm(Activity context, HashMap womanDetails, boolean isRefferal) { try { - Log.d("TAG", "finalizeForm: "+womanDetails.get(DBConstantsUtils.KeyUtils.LAST_CONTACT_RECORD_DATE)); + Log.d("TAG", "finalizeForm: " + womanDetails.get(DBConstantsUtils.KeyUtils.LAST_CONTACT_RECORD_DATE)); Intent contactSummaryFinishIntent = new Intent(context, ContactSummaryFinishActivity.class); contactSummaryFinishIntent @@ -454,11 +452,16 @@ public static String getDBDateToday() { nextContactDate = StringUtils.isNotBlank(nextContactDate) ? Utils.reverseHyphenSeperatedValues(nextContactDate, "/") : null; - buttonAlertStatus.buttonText = String.format(getDisplayTemplate(context, alertStatus, isProfile), nextContact, (nextContactDate != null ? nextContactDate : - Utils.convertDateFormat(Calendar.getInstance().getTime(), Utils.CONTACT_DF))); + if(details.get(ConstantsUtils.DATA_MIGRATION_IS_DIRTY)!= null && details.get(ConstantsUtils.DATA_MIGRATION_IS_DIRTY).equals("1")){ + alertStatus = ConstantsUtils.AlertStatusUtils.REGENERATE; + buttonAlertStatus.buttonText = context.getResources().getString(R.string.regenerate_contact_schedule); + } else { + alertStatus = + Utils.processContactDoneToday(details.get(DBConstantsUtils.KeyUtils.LAST_CONTACT_RECORD_DATE), alertStatus); + buttonAlertStatus.buttonText = String.format(getDisplayTemplate(context, alertStatus, isProfile), nextContact, (nextContactDate != null ? nextContactDate : + Utils.convertDateFormat(Calendar.getInstance().getTime(), Utils.CONTACT_DF))); + } - alertStatus = - Utils.processContactDoneToday(details.get(DBConstantsUtils.KeyUtils.LAST_CONTACT_RECORD_DATE), alertStatus); buttonAlertStatus.buttonAlertStatus = alertStatus; buttonAlertStatus.gestationAge = gestationAge; @@ -474,9 +477,9 @@ public static int getGestationAgeFromEDDate(String expectedDeliveryDate) { LocalDate date = SQLITE_DATE_DF.withOffsetParsed().parseLocalDate(expectedDeliveryDate); LocalDate lmpDate = date.minusWeeks(ConstantsUtils.DELIVERY_DATE_WEEKS); Weeks weeks; - if(visitDate != null){ + if (mVisitDate != null) { weeks = Weeks.weeksBetween(lmpDate, DateTimeFormat.forPattern("dd-MM-yyyy").withOffsetParsed() - .parseLocalDate(visitDate)); + .parseLocalDate(mVisitDate)); } else weeks = Weeks.weeksBetween(lmpDate, LocalDate.now()); return weeks.getWeeks(); } else { @@ -488,6 +491,23 @@ public static int getGestationAgeFromEDDate(String expectedDeliveryDate) { } } + public static int getGAFromEDDateOnVisitDate(String expectedDeliveryDate, String visitDate) { + try { + if (visitDate != null && !"0".equals(expectedDeliveryDate) && expectedDeliveryDate.length() > 0) { + LocalDate date = SQLITE_DATE_DF.withOffsetParsed().parseLocalDate(expectedDeliveryDate); + LocalDate visitDateLocal = SQLITE_DATE_DF.withOffsetParsed().parseLocalDate(visitDate); + LocalDate lmpDate = date.minusWeeks(ConstantsUtils.DELIVERY_DATE_WEEKS); + Weeks weeks = Weeks.weeksBetween(lmpDate, visitDateLocal); + return weeks.getWeeks(); + } else { + return 0; + } + } catch (Exception e) { + Timber.e(e, " --> getGestationAgeFromEDDate"); + return 0; + } + } + public static String reverseHyphenSeperatedValues(String rawString, String outputSeparator) { if (StringUtils.isNotBlank(rawString)) { String resultString = rawString; @@ -600,6 +620,10 @@ public static void processButtonAlertStatus(Context context, Button dueButton, T dueButton.setText(String.format(context.getString(R.string.contact_recorded_today_no_break), Utils.getTodayContact(String.valueOf(buttonAlertStatus.nextContact)))); break; + case ConstantsUtils.AlertStatusUtils.REGENERATE: + dueButton.setText(R.string.regenerate_contact_schedule); + dueButton.setTag(R.string.regenerate_contact_schedule, ConstantsUtils.AlertStatusUtils.REGENERATE); + break; default: dueButton.setBackground(context.getResources().getDrawable(R.drawable.contact_due)); dueButton.setTextColor(context.getResources().getColor(R.color.vaccine_blue_bg_st)); @@ -735,10 +759,10 @@ public static String getClientLastVisitDate(String entityId) { } } if (visitDates.size() == 0) return null; - String visitDate = visitDates.get(visitDates.size()-1); - String day = visitDate.substring(0,2); - String month = visitDate.substring(3,5); - String year = visitDate.substring(6,10); + String visitDate = visitDates.get(visitDates.size() - 1); + String day = visitDate.substring(0, 2); + String month = visitDate.substring(3, 5); + String year = visitDate.substring(6, 10); return year + "-" + month + "-" + day; } catch (JSONException e) { return null; @@ -758,6 +782,7 @@ public static String getActualEDD(String edd, String recordDate, String visitDat return null; } } + /** * Loads yaml files that contain rules for the profile displays * @@ -813,6 +838,7 @@ private void createAndPersistPartialContact(String baseEntityId, int contactNo, ANCFormUtils.persistPartial(baseEntityId, contact); } + /** * Returns the Contact Tasks Repository {@link ContactTasksRepository} * @@ -1056,8 +1082,6 @@ public static String returnTranslatedStringJoinedValue(String value) { } - - @Nullable public String getManifestVersion(Context context) { if (StringUtils.isNotBlank(CoreLibrary.getInstance().context().allSharedPreferences().fetchManifestVersion())) { @@ -1067,9 +1091,9 @@ public String getManifestVersion(Context context) { } } - public void createSavePdf(Context context, List yamlConfigList, Facts facts,String womanName) throws FileNotFoundException { - setVisitDate(facts); - String FILENAME = womanName+"_"+context.getResources().getString(R.string.contact_summary_data_file); + public void createSavePdf(Context context, List yamlConfigList, Facts facts, String womanName) throws FileNotFoundException { +// setmVisitDate(facts); + String FILENAME = womanName + "_" + context.getResources().getString(R.string.contact_summary_data_file); String filePath = getAppPath(context) + FILENAME; if ((new File(filePath)).exists()) { @@ -1081,7 +1105,7 @@ public void createSavePdf(Context context, List yamlConfigList, Fact Document layoutDocument = new Document(pdfDocument); - addTitle(layoutDocument, context.getResources().getString(R.string.contact_summary_data, getTodaysDate(),womanName)); + addTitle(layoutDocument, context.getResources().getString(R.string.contact_summary_data, getTodaysDate(), womanName)); for (YamlConfig yamlConfig : yamlConfigList) { @@ -1091,13 +1115,14 @@ public void createSavePdf(Context context, List yamlConfigList, Fact List fields = yamlConfig.getFields(); StringBuilder outputBuilder = new StringBuilder(); for (YamlConfigItem yamlConfigItem : fields) { - for (String key :facts.asMap().keySet()) { + for (String key : facts.asMap().keySet()) { String value = Utils.returnTranslatedStringJoinedValue(facts.get(key).toString()); if (StringUtils.isNotBlank(value)) { facts.put(key, value); } else { facts.put(key, ""); - }} + } + } if (yamlConfigItem.isMultiWidget() != null && yamlConfigItem.isMultiWidget()) { prefillInjectableFacts(facts, yamlConfigItem.getTemplate()); } @@ -1137,7 +1162,7 @@ private void addParagraph(Document layoutDocument, HorizontalAlignment horizonta } private final String getAppPath(Context context) { - File dir = new File(Environment.getExternalStorageDirectory()+ File.separator + context.getResources().getString(R.string.app_name) + File.separator); + File dir = new File(Environment.getExternalStorageDirectory() + File.separator + context.getResources().getString(R.string.app_name) + File.separator); if (!dir.exists()) { dir.mkdir(); } @@ -1167,12 +1192,11 @@ public static List getLocationTagsByTagName(String tagName) { } public static List getLocationsByParentId(String parentId) { - try{ + try { JSONObject valueObject = new JSONObject(parentId); parentId = valueObject.getString(VALUE); - } - catch (JSONException e){ + } catch (JSONException e) { e.printStackTrace(); } @@ -1291,7 +1315,22 @@ public static Calendar nextWeekday(Calendar date) { } } - public static void setVisitDate(Facts facts){ - visitDate = facts.get(ConstantsUtils.JsonFormKeyUtils.VISIT_DATE); + public static void setmVisithstDate(Facts facts) { + mVisitDate = facts.get(ConstantsUtils.JsonFormKeyUtils.VISIT_DATE); + } + + public static String calculateGaBasedOnUltrasoundEdd(String ultrasoundDateEddDateString, String manualEncounterDateString) { + if (ultrasoundDateEddDateString != null && manualEncounterDateString != null) { + DateTimeFormatter formatter = DateTimeFormat.forPattern(ConstantsUtils.OPENSRP_DATE_TIME_FORMAT); + LocalDate ultrasoundDateEddDate = LocalDate.parse(ultrasoundDateEddDateString, formatter); + LocalDate manualEncounterDate = LocalDate.parse(manualEncounterDateString, formatter); + Days interval = Days.daysBetween(manualEncounterDate, ultrasoundDateEddDate); + + long daysBetween = 280 - Math.abs(interval.getDays()); + long weeks = daysBetween / 7; + long days = daysBetween % 7; + return weeks + " weeks " + days + " days"; + } + return "0"; } } \ No newline at end of file diff --git a/opensrp-anc/src/main/res/values/strings.xml b/opensrp-anc/src/main/res/values/strings.xml index a257646..527389e 100644 --- a/opensrp-anc/src/main/res/values/strings.xml +++ b/opensrp-anc/src/main/res/values/strings.xml @@ -476,5 +476,8 @@ RPR positive Expected deliveries Late visits + Regenerate Contact Schedule + Successfully updated contact schedule + An error occurred while regenerating contact schedule \ No newline at end of file diff --git a/reference-app/build.gradle b/reference-app/build.gradle index 6a96a3c..34e0af9 100644 --- a/reference-app/build.gradle +++ b/reference-app/build.gradle @@ -26,7 +26,7 @@ jacoco { // This variables are used by the version code & name generators ext.versionMajor = 1 ext.versionMinor = 6 -ext.versionPatch = 19 +ext.versionPatch = 21 ext.versionClassifier = null ext.isSnapshot = false ext.minimumSdkVersion = androidMinSdkVersion @@ -153,7 +153,7 @@ android { buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '250' buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '100' buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '1' - buildConfigField "int", "DATABASE_VERSION", '3' + buildConfigField "int", "DATABASE_VERSION", '5' buildConfigField "long", "MAX_SERVER_TIME_DIFFERENCE", "1800000l" buildConfigField "boolean", "TIME_CHECK", "false" buildConfigField "int", "DATA_SYNC_DURATION_MINUTES", '15' @@ -168,11 +168,11 @@ android { //resValue "string", 'opensrp_url', '"https://opensrp.ths.rw/opensrp/"' // resValue "string", 'opensrp_url', '"https://anc-opensrp.ths.rw/opensrp/"' resValue "string", 'opensrp_url', '"https://ancopensrp-stage.ths.rw/"' - //resValue "string", 'opensrp_url', '"https://anc.labs.smartregister.org/opensrp/"' +// resValue "string", 'opensrp_url', '"https://anc.labs.smartregister.org/opensrp/"' buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '250' buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '100' buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '1' - buildConfigField "int", "DATABASE_VERSION", '3' + buildConfigField "int", "DATABASE_VERSION", '5' buildConfigField "long", "MAX_SERVER_TIME_DIFFERENCE", "1800000l" buildConfigField "boolean", "TIME_CHECK", "false" buildConfigField "int", "DATA_SYNC_DURATION_MINUTES", '15' @@ -311,7 +311,6 @@ dependencies { implementation 'org.jeasy:easy-rules-core:3.3.0' implementation 'org.jeasy:easy-rules-mvel:3.3.0' implementation 'com.flurry.android:analytics:11.6.0@aar' - implementation 'com.flurry.android:analytics:11.6.0@aar' implementation 'androidx.multidex:multidex:2.0.1' // Import the BoM for the Firebase platform implementation platform('com.google.firebase:firebase-bom:28.3.1') @@ -328,6 +327,7 @@ dependencies { } implementation 'com.google.firebase:firebase-perf' implementation 'com.android.volley:volley:1.2.1' + implementation 'com.fasterxml.jackson.datatype:jackson-datatype-joda' testImplementation 'junit:junit:4.13.1' testImplementation 'org.apache.maven:maven-ant-tasks:2.1.3' @@ -347,6 +347,8 @@ dependencies { testImplementation 'org.mockito:mockito-core:3.5.15' testImplementation 'org.apache.maven:maven-ant-tasks:2.1.3' testImplementation 'org.skyscreamer:jsonassert:1.5.0' + + debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14' } task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'createDebugCoverageReport']) { diff --git a/reference-app/src/main/AndroidManifest.xml b/reference-app/src/main/AndroidManifest.xml index 500db02..9f4e559 100644 --- a/reference-app/src/main/AndroidManifest.xml +++ b/reference-app/src/main/AndroidManifest.xml @@ -19,6 +19,7 @@