This repository has been archived by the owner on Oct 30, 2023. It is now read-only.
fix: numeric constraints and range values are numeric #31
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* livescript is terse, but at least the numeric cast operator is a big plus * expr-value casts to numeric (do we expect dates or types other than string and numeric here?) * convert-question for type "range" casts min, max, step to numeric * no extensive testing done yet with different ranges and constraints * existing tests passing, no new tests added (coming next) * tested: numeric question with appearance slider > XLSForm > Central > Collect works * tested: numeric question with valid range > XLSForm > Central > Collect works
* Constraints work even if the values are strings * Add tests for range parameters given as string getting converted to int
florianm
commented
Mar 10, 2022
| @@ -220,7 +220,7 @@ convert-question = (question, context, prefix = []) -> | |||
| # range parameters. | |||
| if question.type is \range | |||
| select-range = (delete question.selectRange) | |||
| question.parameters = { start: select-range?.min, end: select-range?.max, step: (delete question.selectStep) } | |||
| question.parameters = { start: +select-range?.min, end: +select-range?.max, step: +(delete question.selectStep) } | |||
There was a problem hiding this comment.
The explicit cast to numeric is the main and only source code change of this PR.
florianm
commented
Mar 10, 2022
| @@ -545,4 +545,7 @@ describe 'parameters' -> | |||
| for appearance in [ 'Slider', 'Vertical Slider', 'Picker' ] | |||
| result = { type: \inputNumeric, appearance, selectRange: { min: 13, max: 42 }, selectStep: 1.5 } |> convert-simple | |||
| expect(result.parameters).toBe('start=13 end=42 step=1.5') | |||
|
|
|||
| # Slider parameters are quoted in XForm but must be numeric in XLSForm | |||
There was a problem hiding this comment.
This new test shows the intended added behaviour: string values get cast to numeric.
florianm
commented
Mar 10, 2022
spec/src/convert-question-spec.ls
Outdated
| @@ -228,7 +228,7 @@ describe \constraint -> | |||
|
|
|||
| test 'build number range constraint generation (max)' -> | |||
| result = { type: \inputNumber, range: { max: 3, maxInclusive: true } } |> convert-simple | |||
| expect(result.constraint).toBe('(. <= 3)') | |||
| expect(result.constraint).toBe('(. <= 3)') | |||
There was a problem hiding this comment.
That extra whitespace is a dud, sorry.
lognaturel
approved these changes
Mar 10, 2022
|
Of course - there's always space for improvement. |
lognaturel
approved these changes
Mar 10, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
update: