Skip to content

fix: option filter ucq #1384

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

Closed
QRuhier wants to merge 2 commits into from
Closed

fix: option filter ucq #1384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb14f64
fix: set optionFilter in response for dynamic ucq
QRuhier Apr 22, 2026
e85323f
fix: bump pogues-model 1.15.5
QRuhier May 12, 2026
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
3 changes: 2 additions & 1 deletion eno-core/src/main/java/fr/insee/eno/core/model/question/UniqueChoiceQuestion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ public enum DisplayFormat {RADIO, CHECKBOX, DROPDOWN}
/**
* Filter applied to dynamic response options (VTL expression).
*/
@Pogues("getOptionFilter()")
@Pogues("getResponse().getFirst().getChoiceType() == T(fr.insee.pogues.model.ChoiceTypeEnum).VARIABLE ? " +
"getResponse().getFirst().getOptionFilter() : null")
@Lunatic("setOptionFilter(#param)")
CalculatedExpression optionFilter;

Expand Down
9 changes: 9 additions & 0 deletions eno-core/src/main/java/fr/insee/eno/core/model/question/table/UniqueChoiceCell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import fr.insee.eno.core.annotations.Lunatic;
import fr.insee.eno.core.annotations.Pogues;
import fr.insee.eno.core.exceptions.technical.MappingException;
import fr.insee.eno.core.model.calculated.CalculatedExpression;
import fr.insee.eno.core.model.code.CodeItem;
import fr.insee.eno.core.model.question.UniqueChoiceQuestion;
import fr.insee.eno.core.parameter.Format;
Expand Down Expand Up @@ -56,6 +57,14 @@ public class UniqueChoiceCell extends ResponseCell {
@Lunatic("setOptionSource(#param)")
String optionSource;

/**
* Filter applied to dynamic response options (VTL expression).
*/
@Pogues("getChoiceType() == T(fr.insee.pogues.model.ChoiceTypeEnum).VARIABLE ? " +
"#root.getOptionFilter() : null")
@Lunatic("setOptionFilter(#param)")
CalculatedExpression optionFilter;

@Lunatic("getOptions()")
List<CodeItem> codeItems = new ArrayList<>();

Expand Down
4 changes: 4 additions & 0 deletions eno-core/src/test/java/fr/insee/eno/core/mapping/in/pogues/UniqueChoiceQuestionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ void variableOptionsCase() {
poguesUCQ.getResponse().getFirst().setChoiceType(ChoiceTypeEnum.VARIABLE);
poguesUCQ.getResponse().getFirst().setVariableReference("variable-id");

// option filter
poguesUCQ.getResponse().getFirst().setOptionFilter("my filter");

poguesSequence.getChild().add(poguesUCQ);
poguesQuestionnaire.getChild().add(poguesSequence);

Expand All @@ -103,6 +106,7 @@ void variableOptionsCase() {
// Then
enoUCQ = assertInstanceOf(UniqueChoiceQuestion.class, enoQuestionnaire.getSingleResponseQuestions().getFirst());
assertEquals("SOME_ITERATION_VARIABLE", enoUCQ.getOptionSource());
assertEquals("my filter", enoUCQ.getOptionFilter().getValue());
}

}
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<!-- Plugin versions -->
<jacoco.version>0.8.14</jacoco.version>
<!-- Model versions -->
<poguesModel.version>1.15.3</poguesModel.version>
<poguesModel.version>1.15.5</poguesModel.version>
<lunaticModel.version>5.15.0</lunaticModel.version>
</properties>

Expand Down
Loading