From 3f1c6b07d8e6be2f8653a83eaf2b86439b4404b7 Mon Sep 17 00:00:00 2001 From: chaneylc Date: Mon, 10 Jul 2023 17:12:48 -0500 Subject: [PATCH] fix unique/primary/secondary ids when reloading with new study --- .../com/fieldbook/tracker/activities/CollectActivity.java | 8 +++++++- .../main/java/com/fieldbook/tracker/views/RangeBoxView.kt | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/fieldbook/tracker/activities/CollectActivity.java b/app/src/main/java/com/fieldbook/tracker/activities/CollectActivity.java index d8e42f35d..4e6800ed4 100644 --- a/app/src/main/java/com/fieldbook/tracker/activities/CollectActivity.java +++ b/app/src/main/java/com/fieldbook/tracker/activities/CollectActivity.java @@ -267,7 +267,13 @@ private void switchField(int studyId, String fieldName, @Nullable String obsUnit //updates obs. range view in database database.switchField(studyId); - //rangeBox.setAllRangeID(); + FieldObject fo = database.getFieldObject(studyId); + + ep.edit().putString(GeneralKeys.UNIQUE_NAME, fo.getUnique_id()).apply(); + ep.edit().putString(GeneralKeys.PRIMARY_NAME, fo.getPrimary_id()).apply(); + ep.edit().putString(GeneralKeys.SECONDARY_NAME, fo.getSecondary_id()).apply(); + + rangeBox.setAllRangeID(); int[] rangeID = rangeBox.getRangeID(); //refresh collect activity UI diff --git a/app/src/main/java/com/fieldbook/tracker/views/RangeBoxView.kt b/app/src/main/java/com/fieldbook/tracker/views/RangeBoxView.kt index f71a51473..84ffc41e5 100644 --- a/app/src/main/java/com/fieldbook/tracker/views/RangeBoxView.kt +++ b/app/src/main/java/com/fieldbook/tracker/views/RangeBoxView.kt @@ -414,6 +414,11 @@ class RangeBoxView : ConstraintLayout { } fun reload() { + + firstName = controller.getPreferences().getString(GeneralKeys.PRIMARY_NAME, "") ?: "" + secondName = controller.getPreferences().getString(GeneralKeys.SECONDARY_NAME, "") ?: "" + uniqueName = controller.getPreferences().getString(GeneralKeys.UNIQUE_NAME, "") ?: "" + switchVisibility(controller.getPreferences().getBoolean(GeneralKeys.QUICK_GOTO, false)) setName(8) paging = 1