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

Add outcomes label to data set to work around knockout binding #2971 #3039

Merged
merged 2 commits into from
Nov 27, 2023

Conversation

chrisala
Copy link
Collaborator

No description provided.

@chrisala chrisala requested a review from temi November 22, 2023 23:02
@@ -14,6 +15,15 @@ class NHTOutputReportData extends ReportData {
ProjectService projectService

Map getContextData(Map project) {
// Side effect - filter data sets.
project.custom.dataSets = new JSONArray(project.custom.dataSets?.findAll {
it.progress == ActivityService.PROGRESS_FINISHED
Copy link
Contributor

Choose a reason for hiding this comment

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

is this meant to also do filtering on progress?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, we only want users to be able to select "finished" data sets anyway, so this is just so we are sending less data since we are pre-processing anyway. I'm probably going to add a filter for "not submitted or approved" as well but just have to make sure the pre-pop is turned off in view mode first or it will probably stuff up the view mode version of the data set.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I'm probably going to add a filter for "not submitted or approved" as well but just have to make sure the pre-pop is turned off in view mode first or it will probably stuff up the view mode version of the data set.

Actually, this is wrong - the published data sets still need to be selectable in the "Synthesising/finalising data sets service" so likely we'll leave it as is

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Sorry, I misinterpreted your comment -you are right that filtering is broken - that's been fixed now in the commit below.

@chrisala chrisala merged commit ad784fb into dev Nov 27, 2023
1 check passed
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