Skip to content
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

Fix/v3 lunatic processing paramater triggers #729

Merged
merged 3 commits into from
Sep 27, 2023
Merged

Fix/v3 lunatic processing paramater triggers #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22643b5
fix: trigger lunatic processing in function of parameters
nsenave Sep 26, 2023
ba02b47
chore: bump version
nsenave Sep 26, 2023
04aacef
Merge branch 'v3-develop' into fix/v3-lunatic-processing-paramater-tr…
nsenave Sep 26, 2023
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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {

allprojects {
group = 'fr.insee.eno'
version = '3.10.3-SNAPSHOT'
version = '3.10.4-SNAPSHOT'
sourceCompatibility = '17'
}

Expand Down
6 changes: 3 additions & 3 deletions eno-core/src/main/java/fr/insee/eno/core/processing/out/LunaticProcessing.java
View file
Open in desktop
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I should have added tests, but it is a bit tedious -> test the activation or not of some processing in larger functional tests

Copy link
Contributor

Choose a reason for hiding this comment

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

i agree

Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,16 @@ public void applyProcessing(Questionnaire lunaticQuestionnaire, EnoQuestionnaire
.then(new LunaticSortComponents(enoQuestionnaire))
.then(new LunaticLoopResolution(enoQuestionnaire))
.then(new LunaticTableProcessing(enoQuestionnaire))
.then(new LunaticAddMissingVariables(enoCatalog, parameters.isMissingVariables()))
.thenIf(parameters.isMissingVariables(), new LunaticAddMissingVariables(enoCatalog, parameters.isMissingVariables()))
.then(new LunaticAddResizing(enoQuestionnaire))
.then(new LunaticAddHierarchy())
.then(new LunaticAddPageNumbers(parameters.getLunaticPaginationMode()))
.then(new LunaticAddCleaningVariables())
.then(new LunaticAddControlFormat())
.thenIf(parameters.isControls(), new LunaticAddControlFormat())
.then(new LunaticReverseConsistencyControlLabel())
.then(new LunaticAddShapeToCalculatedVariables(enoQuestionnaire, shapefromAttributeRetrieval))
.then(new LunaticFinalizePairwise(enoQuestionnaire))
.then(new LunaticFilterResult(enoQuestionnaire, shapefromAttributeRetrieval));
.thenIf(parameters.isFilterResult(), new LunaticFilterResult(enoQuestionnaire, shapefromAttributeRetrieval));

}

Expand Down