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 #112: Introduce question progress controller interface #218

Merged
merged 32 commits into from
Nov 20, 2019

Conversation

BenHenning
Copy link
Member

This introduces only the interface for the question progress controller, based on the exploration progress controller which operates similarly.

@BenHenning
Copy link
Member Author

This is blocked on #217 and can't yet be reviewed until that PR is updated to develop and gets merged in.

@BenHenning
Copy link
Member Author

/cc @jamesxu0 to unblock you.

@BenHenning BenHenning changed the title Fix #112: Introduce question progress controller interface [Blocked #217] Fix #112: Introduce question progress controller interface [Blocked: #217] Oct 20, 2019
@BenHenning
Copy link
Member Author

BenHenning commented Oct 20, 2019

@vinitamurthi & @jamesxu0 PTAL. I'll wait to merge this into develop until after #227 is merged in, but this is now a complete solution of #112.

@BenHenning BenHenning changed the title Fix #112: Introduce question progress controller interface [Blocked: #217] Fix #112: Introduce question progress controller interface [Blocked: #227] Oct 20, 2019
…terface

Conflicts:
	domain/src/main/assets/sample_questions.json
	domain/src/main/java/org/oppia/domain/question/QuestionAssessmentProgressController.kt
	domain/src/main/java/org/oppia/domain/question/QuestionTrainingController.kt
	domain/src/main/java/org/oppia/domain/util/JsonAssetRetriever.kt
	domain/src/test/java/org/oppia/domain/question/QuestionTrainingControllerTest.kt
@BenHenning BenHenning changed the base branch from question_data to develop October 28, 2019 05:08
@BenHenning
Copy link
Member Author

This is now up-to-date with develop and the recent changes from #227. PTAL @jamesxu0 & @vinitamurthi.

@BenHenning BenHenning changed the title Fix #112: Introduce question progress controller interface [Blocked: #227] Fix #112: Introduce question progress controller interface Oct 28, 2019
@jamesxu0 jamesxu0 assigned BenHenning and unassigned jamesxu0 Oct 28, 2019
@vinitamurthi vinitamurthi removed their assignment Oct 29, 2019
…terface

Conflicts:
	domain/src/main/java/org/oppia/domain/question/QuestionAssessmentProgressController.kt
	domain/src/main/java/org/oppia/domain/question/QuestionTrainingController.kt
	model/src/main/proto/question.proto
…thub.com:oppia/oppia-android into introduce-question-progress-controller-interface
@BenHenning
Copy link
Member Author

Thanks!

@BenHenning BenHenning merged commit 5be79f2 into develop Nov 20, 2019
@BenHenning BenHenning deleted the introduce-question-progress-controller-interface branch November 20, 2019 00:51
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.

3 participants