adds predefined resolution sets for export form #2818
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| package com.bakdata.conquery.models.forms.util; | ||
|
|
||
| import java.util.stream.Stream; | ||
|
|
||
| /** | ||
| * This enum exists for compatibility reasons with the stratification | ||
| * dropdown menu in the frontend. This way the actual Resolution/Alignment logic does not need to be touched. | ||
| * <br><br> | ||
| * Because of uniformity and accessibility there are options like | ||
| * {@link ResolutionShortNames#COMPLETE_YEARS_QUARTERS}, for which the frontend could send a list of resolutions (<code>"value": ["COMPLETE","YEARS", "QUARTERS"]</code>). | ||
| * <br> | ||
| * However, setting this list as the <strong>default option</strong> does not work (see export_form.frontend_conf.json). | ||
| * Only a string applies, hence <code>"value": "COMPLETE_YEARS_QUARTERS"</code>. | ||
| */ | ||
| public enum ResolutionShortNames { | ||
|
|
||
| // SINGLE RESOLUTIONS (map directly to Resolution) | ||
| COMPLETE { | ||
| @Override | ||
| public Stream<Resolution> correspondingResolutions() { | ||
| return Stream.of(Resolution.COMPLETE); | ||
| } | ||
| }, | ||
| YEARS { | ||
| @Override | ||
| public Stream<Resolution> correspondingResolutions() { | ||
| return Stream.of(Resolution.YEARS); | ||
| } | ||
| }, | ||
| QUARTERS { | ||
| @Override | ||
| public Stream<Resolution> correspondingResolutions() { | ||
| return Stream.of(Resolution.QUARTERS); | ||
| } | ||
| }, | ||
| DAYS { | ||
| @Override | ||
| public Stream<Resolution> correspondingResolutions() { | ||
| return Stream.of(Resolution.DAYS); | ||
| } | ||
| }, | ||
| // SPECIAL RESOLUTION SETS | ||
| YEARS_QUARTERS { | ||
| @Override | ||
| public Stream<Resolution> correspondingResolutions() { | ||
| return Stream.of(Resolution.YEARS, Resolution.QUARTERS); | ||
| } | ||
| }, | ||
| COMPLETE_YEARS { | ||
| @Override | ||
| public Stream<Resolution> correspondingResolutions() { | ||
| return Stream.of(Resolution.COMPLETE, Resolution.YEARS); | ||
| } | ||
| }, | ||
| COMPLETE_QUARTERS { | ||
| @Override | ||
| public Stream<Resolution> correspondingResolutions() { | ||
| return Stream.of(Resolution.COMPLETE, Resolution.QUARTERS); | ||
| } | ||
| }, | ||
| COMPLETE_YEARS_QUARTERS { | ||
| @Override | ||
| public Stream<Resolution> correspondingResolutions() { | ||
| return Stream.of(Resolution.COMPLETE, Resolution.YEARS, Resolution.QUARTERS); | ||
| } | ||
| }; | ||
|
|
||
| public abstract Stream<Resolution> correspondingResolutions(); | ||
| } |
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
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
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,64 +1,65 @@ | ||
| { | ||
| "type": "FORM_TEST", | ||
| "label": "REL-EXPORT-FORM Test", | ||
| "expectedCsv": { | ||
| "results": "tests/form/EXPORT_FORM/RELATIVE/RELATIVE_ONLY_OUTCOME/expected.csv" | ||
| }, | ||
| "form": { | ||
| "type": "EXPORT_FORM", | ||
| "queryGroup": "00000000-0000-0000-0000-000000000001", | ||
| "resolution": "QUARTERS", | ||
| "alsoCreateCoarserSubdivisions": true, | ||
| "timeMode": { | ||
| "value": "RELATIVE", | ||
| "indexSelector": "EARLIEST", | ||
| "timeUnit": "QUARTERS", | ||
| "features": [ | ||
| { | ||
| "type": "OR", | ||
| "children": [ | ||
| { | ||
| "ids": [ | ||
| "alter" | ||
| ], | ||
| "type": "CONCEPT", | ||
| "tables": [ | ||
| { | ||
| "id": "alter.alter", | ||
| "filters": [] | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "ids": [ | ||
| "alter" | ||
| ], | ||
| "type": "CONCEPT", | ||
| "tables": [ | ||
| { | ||
| "id": "alter.alter", | ||
| "filters": [] | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "timeCountAfter": 4, | ||
| "indexPlacement": "BEFORE" | ||
| } | ||
| }, | ||
| "concepts": [ | ||
| "/tests/form/shared/alter.concept.json", | ||
| "/tests/form/shared/geschlecht.concept.json", | ||
| "/tests/form/shared/versichertentage.concept.json" | ||
| ], | ||
| "content": { | ||
| "tables": [ | ||
| "/tests/form/shared/vers_stamm.table.json", | ||
| "/tests/form/shared/vers_tage_range.table.json" | ||
| ], | ||
| "previousQueryResults": [ | ||
| "tests/form/EXPORT_FORM/RELATIVE/RELATIVE_ONLY_OUTCOME/query_results_1.csv" | ||
| ] | ||
| } | ||
| } |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Heißt das, dass ich effektiv ein Export Formular machen kann, mit mehreren unterschiedlichen Resolutions auf einmal?
Also geschlüsselt auf Quartale, und dann noch für's ganze Jahr?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Genau, das geht schon immer und das JupyEnd hat das auch schon immer so genutzt :)