-
Notifications
You must be signed in to change notification settings - Fork 521
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
BenHenning
merged 32 commits into
develop
from
introduce-question-progress-controller-interface
Nov 20, 2019
Merged
Fix #112: Introduce question progress controller interface #218
BenHenning
merged 32 commits into
develop
from
introduce-question-progress-controller-interface
Nov 20, 2019
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
empty test suite.
This is blocked on #217 and can't yet be reviewed until that PR is updated to develop and gets merged in. |
/cc @jamesxu0 to unblock you. |
… training controller
…ler-interface Conflicts: domain/src/main/java/org/oppia/domain/question/QuestionAssessmentProgressController.kt domain/src/main/java/org/oppia/domain/question/QuestionTrainingController.kt domain/src/test/java/org/oppia/domain/question/QuestionTrainingControllerTest.kt model/src/main/proto/question.proto
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
@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
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
This is now up-to-date with develop and the recent changes from #227. PTAL @jamesxu0 & @vinitamurthi. |
BenHenning
changed the title
Fix #112: Introduce question progress controller interface [Blocked: #227]
Fix #112: Introduce question progress controller interface
Oct 28, 2019
jamesxu0
approved these changes
Oct 28, 2019
jamesxu0
reviewed
Oct 28, 2019
domain/src/main/java/org/oppia/domain/question/QuestionTrainingController.kt
Show resolved
Hide resolved
vinitamurthi
suggested changes
Oct 29, 2019
domain/src/main/java/org/oppia/domain/question/QuestionTrainingConstantsProvider.kt
Outdated
Show resolved
Hide resolved
domain/src/test/java/org/oppia/domain/question/QuestionTrainingControllerTest.kt
Outdated
Show resolved
Hide resolved
domain/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
Outdated
Show resolved
Hide resolved
…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
vinitamurthi
approved these changes
Nov 20, 2019
Thanks! |
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This introduces only the interface for the question progress controller, based on the exploration progress controller which operates similarly.