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.

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

rel export combine feature+outcome date ranges #2309

Merged
merged 5 commits into from
Jun 27, 2022

Conversation

thoniTUB
Copy link
Collaborator

No description provided.

@@ -19,4 +22,7 @@
* @return the localization or a fallback.
*/
String toString(Locale locale);

@CPSBase
interface Provider extends BiFunction<Object,Locale,String>{}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
interface Provider extends BiFunction<Object,Locale,String>{}
@FunctionalInterface
interface Provider {
public String apply(Object value, Locale locale);
}

Copy link
Collaborator

Choose a reason for hiding this comment

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

Jetzt könntest du sogar generische Sachen damit machen, und mir fehlt an der Klasse etwas Dokumentation

//features
resultInfos.addAll(featureInfos);
resultInfos.addAll(outcomeInfos);

return resultInfos;
}


private boolean hasMultipleObservationScopes(List<ResultInfo> featureInfos, List<ResultInfo> outcomeInfos) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Doku

@@ -25,10 +28,10 @@ public class ConqueryConstants {
public static final String SINGLE_RESULT_TABLE_NAME = "results";
public static final ResultInfo CONTEXT_INDEX_INFO = new LocalizedDefaultResultInfo((l) -> C10N.get(ResultHeadersC10n.class, l).index(), ResultType.IntegerT.INSTANCE);
public static final ResultInfo DATE_RANGE_INFO = new LocalizedDefaultResultInfo((l) -> C10N.get(ResultHeadersC10n.class, l).dateRange(), ResultType.DateRangeT.INSTANCE);
public static final ResultInfo RESOLUTION_INFO = new LocalizedDefaultResultInfo((l) -> C10N.get(ResultHeadersC10n.class, l).resolution(), ResultType.ResolutionT.INSTANCE);
public static final ResultInfo RESOLUTION_INFO = new LocalizedDefaultResultInfo((l) -> C10N.get(ResultHeadersC10n.class, l).resolution(), new ResultType.StringLocalizedT(new Resolution.LocalizationProvider()));
Copy link
Collaborator

Choose a reason for hiding this comment

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

Ich weiß immer blöd der letzte der was angefasstt zu haben zu sein, aber kannst du die ResultInfos hier dokumentieren?

return result;
}

private int getDateRangeResultPosition() {
return constantCount - 1;
return constantCount - (withObservationScope ? 2 : 1 );
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
return constantCount - (withObservationScope ? 2 : 1 );
return constantCount - 1 - (withObservationScope ? 1 : 0 );

Copy link
Collaborator

Choose a reason for hiding this comment

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

Oder

Suggested change
return constantCount - (withObservationScope ? 2 : 1 );
if(withObservationScope) return constantCount - 2;
return constantCount - 1;

private int getFirstAggregatorPosition() {
if (outcomePlan.getAggregatorSize() <= 0 && featurePlan.getAggregatorSize() <= 0) {
throw new ConqueryError.ExecutionProcessingError();
}
if (outcomePlan.getAggregatorSize() > 0 && featurePlan.getAggregatorSize() <= 0
|| featurePlan.getAggregatorSize() > 0 && outcomePlan.getAggregatorSize() <= 0) {
if (isSingleScope()) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Dass beides geht ist noch drin? Will man nicht auf nur ein Scope komplett umsteigen?

@awildturtok
Copy link
Collaborator

Sind vor allem Kleinigkeiten aber über Doku würde ich mich freuen

@thoniTUB thoniTUB merged commit a1ed937 into develop Jun 27, 2022
@delete-merged-branch delete-merged-branch bot deleted the feature/rel-export-combine-date-col branch June 27, 2022 09:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants