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

Progress: Pair programming icon - attempt #2 #22999

Merged
merged 6 commits into from Jun 11, 2018
Merged

Conversation

Erin007
Copy link
Contributor

@Erin007 Erin007 commented Jun 9, 2018

Follow up to #22878.

The progress tab now shows the pairing icon if a students paired on that level on the detail view of the progress tab.
screen shot 2018-06-08 at 5 52 15 pm

This PR includes the following changes:

1.) ProgressBubble now has an additional prop pairingIconEnabled (passed in from ProgressBubbleSet from StudentProgressDetailCell that handles whether that ProgressBubble has the potential to show the pairing icon. ProgressBubble Stories have been added to cover these additional scenarios.

2.) ProgressBubble also handles some new logic that determines whether to show the pairing icon based on the aforementioned pairingIconEnabled prop and new information from level.paired

3.) level.paired is an available field on the level passed to the ProgressBubble because we updated levelsWithStatus and levelsByLesson in progressRedux, which are called from sectionProgressRedux

4.) sectionProgressRedux has been updated to include a new function addStudentLevelPairing, which parallels addStudentLevelProgress.

5.) Increased test coverage for sectionProgressRedux

@Erin007 Erin007 requested a review from islemaster June 9, 2018 00:36
return {
type: ADD_STUDENT_LEVEL_PAIRING, scriptId, studentLevelPairing
};
};
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like we need some whitespace adjustments here. Did we want to put in a more helpful error message if our validation fails?

@islemaster
Copy link
Contributor

🎉 🎉 🎉

@Erin007 Erin007 requested a review from balderdash June 9, 2018 00:54
Copy link
Contributor

@balderdash balderdash left a comment

Choose a reason for hiding this comment

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

LGTM!

@Erin007 Erin007 merged commit 3948997 into staging Jun 11, 2018
@Erin007 Erin007 deleted the pair-programming-2 branch June 11, 2018 19:41
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.

None yet

3 participants