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

Session progress fix #410

Merged
merged 5 commits into from Jan 10, 2023
Merged

Session progress fix #410

merged 5 commits into from Jan 10, 2023

Conversation

bboudaoud-nv
Copy link
Collaborator

@bboudaoud-nv bboudaoud-nv commented Jan 9, 2023

This branch fixes a bug that appears to have been created when merging trial-level configuration that prevented:

  1. Session-level progress from being logged to the Status.sessions.csv file
  2. Pretrial feedback from being cleared prior to the trial

These issues both seem to be sourced from the changes supporting trial-level config merged in #392.

@bboudaoud-nv bboudaoud-nv added the bug Something isn't working label Jan 9, 2023
@bboudaoud-nv bboudaoud-nv self-assigned this Jan 9, 2023
@bboudaoud-nv
Copy link
Collaborator Author

bboudaoud-nv commented Jan 9, 2023

This branch has merged the 2IFC_Sample (#401) for testing, it should be merged back to master after an initial merge of that branch or modified to avoid checking in this files from another branch.

@bboudaoud-nv
Copy link
Collaborator Author

Most fixes in this branch come from changes in the FPSci state machine management in #392.

For example, the trialFeedback state is no longer used to present the reference target/clear feedback messages, thus an explicit clear of feedback needed to be added when leaving the referenceTarget state.

Similarly a left-over moveOn = true was updating to a new session regardless of whether questions at the end of a session were answered.

Finally an interaction between how the user menu is shown between sessions and a special case for handling showing the menu at startup were interacting to show the user menu between trials in the first session, this has now been corrected.

Copy link
Contributor

@jspjutNV jspjutNV left a comment

Choose a reason for hiding this comment

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

This has fixed the lack of progress issue.

@jspjutNV jspjutNV merged commit 13b4ade into master Jan 10, 2023
@jspjutNV jspjutNV deleted the SessionProgressFix branch January 10, 2023 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants