Skip to content

Fix issues with incremental question #6998

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

Merged
seadowg merged 14 commits into from
Dec 19, 2025
Merged

Fix issues with incremental question #6998

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
599a5dc
Don't answer geo questions until they are the correct length
seadowg Dec 17, 2025
5b23837
Don't dismiss same snackbar
seadowg Dec 17, 2025
a5537ec
Set empty result rather than null to clear question answer
seadowg Dec 17, 2025
72d9667
Hook up back pressed dispatcher for geo poly UI
seadowg Dec 17, 2025
2f28141
incremental is an additional (body) attribute
seadowg Dec 17, 2025
c67fbef
Fix rotate for GeoPolyFragment
seadowg Dec 18, 2025
f30097c
Add failing test for discard flow
seadowg Dec 18, 2025
695b04e
Add failing test for discard when editing a polygon
seadowg Dec 18, 2025
012d069
Fix discard flow
seadowg Dec 18, 2025
09d3f0c
Add test for discard after recreation
seadowg Dec 18, 2025
a5281f3
Simplify FragmentResultRecorder
seadowg Dec 18, 2025
4e452a8
Reduce test noise with new helpers
seadowg Dec 18, 2025
da11967
Add test for invalid length polygon defaults
seadowg Dec 18, 2025
97c7144
Make result routes distinct
seadowg Dec 18, 2025
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
Prev Previous commit
Next Next commit
incremental is an additional (body) attribute
  • Loading branch information
@seadowg
seadowg committed Dec 17, 2025
commit 2f28141f0bd7fbbeccb3900c6bb55d43029f0f7f
5 changes: 5 additions & 0 deletions collect_app/src/main/java/org/odk/collect/android/widgets/utilities/AdditionalAttributes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package org.odk.collect.android.widgets.utilities

object AdditionalAttributes {
const val INCREMENTAL = "incremental"
}
1 change: 0 additions & 1 deletion collect_app/src/main/java/org/odk/collect/android/widgets/utilities/BindAttributes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package org.odk.collect.android.widgets.utilities

object BindAttributes {
const val ALLOW_MOCK_ACCURACY = "allow-mock-accuracy"
const val INCREMENTAL = "incremental"
const val QUALITY = "quality"

enum class Quality(val value: String) {
Expand Down
4 changes: 2 additions & 2 deletions collect_app/src/main/java/org/odk/collect/android/widgets/utilities/GeoPolyDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import org.javarosa.core.model.Constants
import org.javarosa.core.model.data.StringData
import org.javarosa.form.api.FormEntryPrompt
import org.odk.collect.android.utilities.FormEntryPromptUtils
import org.odk.collect.android.widgets.utilities.AdditionalAttributes.INCREMENTAL
import org.odk.collect.android.widgets.utilities.BindAttributes.ALLOW_MOCK_ACCURACY
import org.odk.collect.android.widgets.utilities.BindAttributes.INCREMENTAL
import org.odk.collect.geo.geopoly.GeoPolyFragment
import org.odk.collect.geo.geopoly.GeoPolyFragment.OutputMode
import org.odk.collect.geo.geopoly.GeoPolyUtils
Expand All @@ -26,7 +26,7 @@ class GeoPolyDialogFragment(viewModelFactory: ViewModelProvider.Factory) :
) { _, result ->
val geopolyChange = result.getString(GeoPolyFragment.RESULT_GEOPOLY_CHANGE)
val geopoly = result.getString(GeoPolyFragment.RESULT_GEOPOLY)
val incremental = FormEntryPromptUtils.getBindAttribute(prompt, INCREMENTAL)
val incremental = FormEntryPromptUtils.getAdditionalAttribute(prompt, INCREMENTAL)
Copy link
Copy Markdown
Member Author

@seadowg seadowg Dec 18, 2025

Choose a reason for hiding this comment

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

Reading a bind attribute was a mistake. incremental is a body attribute (https://www.w3.org/TR/xforms20/#ui-input).


if (geopolyChange != null) {
if (incremental == "true") {
Expand Down
9 changes: 5 additions & 4 deletions ..._app/src/test/java/org/odk/collect/android/widgets/utilities/GeoPolyDialogFragmentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import org.odk.collect.android.formentry.FormEntryViewModel
import org.odk.collect.android.javarosawrapper.FailedValidationResult
import org.odk.collect.android.support.CollectHelpers
import org.odk.collect.android.support.MockFormEntryPromptBuilder
import org.odk.collect.android.widgets.utilities.AdditionalAttributes.INCREMENTAL
import org.odk.collect.android.widgets.utilities.WidgetAnswerDialogFragment.Companion.ARG_FORM_INDEX
import org.odk.collect.androidshared.ui.FragmentFactoryBuilder
import org.odk.collect.fragmentstest.FragmentScenarioLauncherRule
Expand Down Expand Up @@ -231,7 +232,7 @@ class GeoPolyDialogFragmentTest {
@Test
fun `sets answer with validate when REQUEST_GEOPOLY_CHANGE is returned if question is incremental`() {
prompt = MockFormEntryPromptBuilder(prompt)
.withBindAttribute("", "incremental", "true")
.withAdditionalAttribute(INCREMENTAL, "true")
.build()

val answer = "0.0 0.0 1.0 1.0; 0.0 1.0 1.0 1.0"
Expand Down Expand Up @@ -267,7 +268,7 @@ class GeoPolyDialogFragmentTest {
verify(formEntryViewModel, never()).answerQuestion(prompt.index, StringData(answer))

prompt = MockFormEntryPromptBuilder(prompt)
.withBindAttribute("", "incremental", "false")
.withAdditionalAttribute(INCREMENTAL, "false")
.build()

launcherRule.launch(
Expand All @@ -286,7 +287,7 @@ class GeoPolyDialogFragmentTest {
@Test
fun `does not dismiss when REQUEST_GEOPOLY_CHANGE is returned regardless of incremental value`() {
prompt = MockFormEntryPromptBuilder(prompt)
.withBindAttribute("", "incremental", "true")
.withAdditionalAttribute(INCREMENTAL, "true")
.build()

val answer = "0.0 0.0 1.0 1.0; 0.0 1.0 1.0 1.0"
Expand All @@ -305,7 +306,7 @@ class GeoPolyDialogFragmentTest {
}

prompt = MockFormEntryPromptBuilder(prompt)
.withBindAttribute("", "incremental", "false")
.withAdditionalAttribute(INCREMENTAL, "false")
.build()

launcherRule.launch(
Expand Down