Skip to content

Fix issues with incremental question#6998

Merged
seadowg merged 14 commits intogetodk:masterfrom
seadowg:intersects-validate-issues
Dec 19, 2025
Merged

Fix issues with incremental question#6998
seadowg merged 14 commits intogetodk:masterfrom
seadowg:intersects-validate-issues

Conversation

@seadowg
Copy link
Member

@seadowg seadowg commented Dec 17, 2025

Closes #6996
Closes #6995
Closes #6992
Closes #6997

Why is this the best possible solution? Were any other approaches considered?

Not a lot to discuss here. I've just fixed the issues above as well as fixing the problem of incremental being read from the wrong place.

How does this change affect users? Describe intentional changes to behavior and behavior that could have accidentally been affected by code changes. In other words, what are the regression risks?

The changes are pretty small - I've avoided doing too much refactoring as it's still feeling like the test coverage isn't amazing for the geo poly flow. The main thing to verify is just that the above issues have been fixed and that there isn't any new issues playing around with geo trace/shape with incremental both enabled and disabled.

Before submitting this PR, please make sure you have:

  • added or modified tests for any new or changed behavior
  • run ./gradlew connectedAndroidTest (or ./gradlew testLab) and confirmed all checks still pass
  • added a comment above any new strings describing it for translators
  • added any new strings with date formatting to DateFormatsTest
  • verified that any code or assets from external sources are properly credited in comments and/or in the about file.
  • verified that any new UI elements use theme colors. UI Components Style guidelines

@seadowg seadowg force-pushed the intersects-validate-issues branch from 90838c5 to d9ab2ad Compare December 17, 2025 16:31
@seadowg seadowg force-pushed the intersects-validate-issues branch from d9ab2ad to 72d9667 Compare December 17, 2025 17:18
@dbemke
Copy link

dbemke commented Dec 18, 2025

I just verified issues and they're fixed.

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
Member Author

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).

@seadowg seadowg marked this pull request as ready for review December 18, 2025 17:08
@seadowg seadowg requested a review from grzesiek2010 December 18, 2025 17:08
@seadowg
Copy link
Member Author

seadowg commented Dec 19, 2025

@dbemke is this "behaviour verified" or is there more you'd like to test?

@dbemke
Copy link

dbemke commented Dec 19, 2025

is this "behaviour verified" or is there more you'd like to test?

When it comes to issues it's verified, there are some minor issues/question which we'll file when it's merged.
If it's the last PR for the whole invalid polygon feature before the beta then we're still testing -regression testing + exploratory testing.

@seadowg
Copy link
Member Author

seadowg commented Dec 19, 2025

@dbemke I think we merge this so we can keep the fix PRs relatively small. That keeps the review noise down for @grzesiek2010. We've still got a few features (UX improvements and styling changes) to work on as well as issues, so we're not near the "final" PR yet!

@seadowg seadowg merged commit 706ab1a into getodk:master Dec 19, 2025
7 checks passed
@seadowg seadowg deleted the intersects-validate-issues branch December 19, 2025 11:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

3 participants