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

#287 fix wrong labels #330

Merged
merged 2 commits into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@
import io.redlink.more.studymanager.core.io.TimeRange;
import io.redlink.more.studymanager.core.properties.ObservationProperties;
import io.redlink.more.studymanager.core.sdk.MoreObservationSDK;
import io.redlink.more.studymanager.core.ui.DataView;
import io.redlink.more.studymanager.core.ui.DataViewData;
import io.redlink.more.studymanager.core.ui.DataViewInfo;
import io.redlink.more.studymanager.core.ui.ViewConfig;
import io.redlink.more.studymanager.core.ui.*;

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;

public class QuestionObservation<C extends ObservationProperties> extends Observation<C> {

Expand Down Expand Up @@ -119,10 +120,59 @@ public DataView getView(String viewName, Integer studyGroupId, Integer participa
return new DataView(
dataView,
dataView.chartType(),
dataViewData
addMissingAnswerOptions(dataView, dataViewData)
);

}

private DataViewData addMissingAnswerOptions(DataViewInfoType dataView, DataViewData dataViewData) {
ArrayList<String> allPossibleAnswerOptions = (ArrayList<String>) this.properties.get("answers");
List<String> labels = new ArrayList<>(dataViewData.labels());
List<DataViewRow> rows = new ArrayList<>(dataViewData.rows());

switch (dataView) {
case response_distribution:
if (allPossibleAnswerOptions.size() == dataViewData.labels().size() || dataViewData.labels().isEmpty()) {
return dataViewData;
}
for (String item : allPossibleAnswerOptions) {
if (!labels.contains(item)) {
labels.add(item);
if (!rows.isEmpty()) {
rows.get(0).values().add(0.0);
}
}
}
break;
case answers_by_group:
if (allPossibleAnswerOptions.size() == dataViewData.rows().size() || dataViewData.rows().isEmpty()) {
return dataViewData;
}
for (String item : allPossibleAnswerOptions) {
if (rows.stream().noneMatch(v -> v.label().equals(item))) {
ArrayList<Double> values = Stream.generate(() -> (Double) null)
.limit(labels.size()).collect(Collectors.toCollection(ArrayList::new));

rows.add(new DataViewRow(item, values));
}
}
break;
case group_by_answers:
if (allPossibleAnswerOptions.size() == dataViewData.labels().size() || dataViewData.labels().isEmpty()) {
return dataViewData;
}

for (String item : allPossibleAnswerOptions) {
if (!labels.contains(item)) {
labels.add(item);
for (DataViewRow row : rows) {
row.values().add(0.0);
}
}
}
break;
}

return new DataViewData(labels, rows);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ public ResponseEntity<BuildInfoDTO> getBuildInfo() {
return ResponseEntity.ok(
new BuildInfoDTO(
"null",
Instant.MIN
Instant.EPOCH
)
.branch("undefined")
.rev("*dirty")
.rev("unknown")
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ private Aggregation.Builder.ContainerBuilder applyAggregation(Aggregation.Builde
.missing(NO_GROUP_KEY)
);
case TERM_FIELD -> a.terms(tf -> tf.field("data_%s.keyword".formatted(operation.field()))
.minDocCount(0)
.minDocCount(1)
);
};
}
Expand Down
Loading