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

Fix #368 and #384; part of #369: Ensure progress, thumbnails, and stats are consistent #392

Merged
merged 5 commits into from
Nov 20, 2019

Conversation

BenHenning
Copy link
Sponsor Member

@BenHenning BenHenning commented Nov 17, 2019

Fix #368
Fix #384
Fix part of #369

This change ensures that completed progress is consistent and correct everywhere for fractions and ratios topics. It also ensures that there are thumbnails defined for chapters, and that all thumbnails are consistent regardless of which screen topics, stories, or chapters are viewed from. It updates the reported lesson count to be correct (before we were displaying canonical story count rather than total exploration count).

Verified domain tests pass after fixes. No new tests were added since most of the new code is temporary. There's some logic we may share, and that code has TODOs to track adding tests for it in future work.

This change ensures that completed progress is consistent and correct
everywhere for fractions and ratios topics.

It also ensures that there are thumbnails defined for chapters, and that
all thumbnails are consistent regardless of which screen topics,
stories, or chapters are viewed from.

It updates the reported lesson count to be correct.
@BenHenning BenHenning changed the title Fix #384, part of #369: Ensure progress, thumbnails, and stats are consistent Fix #368 and #384; part of #369: Ensure progress, thumbnails, and stats are consistent Nov 17, 2019
Copy link
Contributor

@jamesxu0 jamesxu0 left a comment

Choose a reason for hiding this comment

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

LGTM.

@jamesxu0 jamesxu0 removed their assignment Nov 19, 2019
Copy link
Contributor

@vinitamurthi vinitamurthi left a comment

Choose a reason for hiding this comment

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

LGTM

@vinitamurthi vinitamurthi removed their assignment Nov 19, 2019
@BenHenning
Copy link
Sponsor Member Author

Thanks!

Conflicts:
	domain/src/main/java/org/oppia/domain/topic/TopicController.kt
@BenHenning BenHenning merged commit aa120e4 into develop Nov 20, 2019
@BenHenning BenHenning deleted the update-story-progress-for-json-lessons branch November 20, 2019 00:43
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.

Properly hardcode story progress Add thumbnails to story tiles
3 participants