-
Notifications
You must be signed in to change notification settings - Fork 139
Feature/quiz resume #2519
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
Merged
Merged
Feature/quiz resume #2519
Changes from 48 commits
Commits
Show all changes
83 commits
Select commit
Hold shift + click to select a range
f897916
initial work
eri-trabiccolo 1b836de
Add changelogs
eri-trabiccolo 9463363
push quiz.js
eri-trabiccolo ae96a26
Update llms-quiz.js
eri-trabiccolo 99805bb
Added resume button with filter
actuallyakash 96cfab4
added filter for resuming attempt
actuallyakash 305b1e3
disable resume button after quiz is resumed
actuallyakash d694949
fixed a bug with showing previous question answers
actuallyakash c842afd
added resume support for blank questions
actuallyakash 61e6093
added changelogs and updated docblocks
actuallyakash 8b8cdf5
removed leave page confirmation alert
actuallyakash aecd38c
updated button string for restarting quiz
actuallyakash 65ddd46
removing 'resumed' quiz if restart quiz is clicked
actuallyakash 1144f25
added Action schedule for quiz resume
actuallyakash 8951f97
added support for images in tinyMCE
actuallyakash 3dfe82e
fixed warning issue when quiz is not resumable
actuallyakash 3c3dc6c
added changelogs
actuallyakash 19fa143
abstracted the start_quiz() with resume_quiz()
actuallyakash ee7bacb
minor fixes
actuallyakash e220e17
minor typos
actuallyakash f80c24e
Revert "added support for images in tinyMCE"
actuallyakash 1b30ac2
fix tyoo in the changelogs
eri-trabiccolo 3ed5d30
fix can_be_resumed_by_student logic
eri-trabiccolo 6f00dd6
fix some version tags
eri-trabiccolo 3f47803
Merge branch 'feature/quiz-resume' into feature/quiz-resume-akash
eri-trabiccolo 97611e0
Apply suggestions from code review
actuallyakash 8b474cb
code improvements
actuallyakash 4d601b0
fix failing tests
actuallyakash ea4cc8b
hide grades/answers/points/clarifications for incomplete resumed attempt
actuallyakash 21969b4
minor fixes
actuallyakash bc3330d
Apply suggestions from code review
actuallyakash 22c343d
Apply suggestions from code review
eri-trabiccolo 6cd1d77
Apply suggestions from code review
eri-trabiccolo 013c072
Merge pull request #2480 from actuallyakash/feature/quiz-resume-akash
eri-trabiccolo 83760d2
Merge branch 'dev' into feature/quiz-resume
eri-trabiccolo aaa6bce
Merge branch 'dev' into feature/quiz-resume
actuallyakash 11df99d
added exit button for exiting quiz
actuallyakash 51a7c68
added exit button for resumable quiz
actuallyakash 140a87f
added button to clear resumable attempts
actuallyakash 47e4656
added condition to hide clear resumables btn
actuallyakash 283e4c0
added button to disable resume attempt
actuallyakash 0e53043
fixed clear resume button visible on all layouts
actuallyakash b5dfd12
fix resume button not showing when the last resumable attempt is the …
eri-trabiccolo fd0863d
Merge branch 'dev' into feature/quiz-resume
eri-trabiccolo 587d675
Merge branch 'dev' into feature/quiz-resume
eri-trabiccolo 78f4035
Merge branch 'dev' into feature/quiz-resume
eri-trabiccolo a2a22a9
fix some php8.2 warnings
eri-trabiccolo 9dcbc25
Merge pull request #2562 from actuallyakash/akash/quiz-resume
brianhogg 09da400
Merge branch 'dev' into feature/quiz-resume
brianhogg 5841b23
Removing build files.
brianhogg c39a9f5
Re-adding the refresh warning.
brianhogg 837569b
Adding todo for validation.
brianhogg 05d1467
Merge branch 'dev' into feature/quiz-resume
brianhogg 648884e
Removing unused variable.
brianhogg 8e62964
Removed most changelogs. Fixed resume quiz button text filter (llms v…
brianhogg 292d6be
Saves the last question on Previous. However if you hit Previous on t…
brianhogg 9504456
When resuming quiz, show the question they were last on instead of th…
brianhogg 3ec2665
Separating Restart from Resume button with a notice.
brianhogg b2b443f
Resume message improvements, avoid asking to reload or sending Comple…
brianhogg d29c385
Avoid sending the "complete quiz" action on refresh if the quiz is re…
brianhogg 43304d9
Check if the quiz is the latest attempt to see if it can be resumed.
brianhogg 6510531
Avoid showing warnings if there's no end date recorded.
brianhogg c2fe063
Explicitly end the previous quiz attempt if Restarting the quiz inste…
brianhogg 5fead71
Don't show "you can resume..." message in admin.
brianhogg eaecaed
End the quiz attempt when disabling resumability.
brianhogg 91687c3
Prevent answers being saved or changed if the attempt is not incomplete.
brianhogg c10e547
Reverting label change.
brianhogg 08700db
Fix expiry calculation to take timezone into account. Switch expiry t…
brianhogg bbd8d8b
Check if a resumeable quiz can be resumed before allowing an answer t…
brianhogg 85e4525
Refactor. Removing "what" comment.
brianhogg 7c0552b
Additional checks for getting a question. Refactor to remove if/else.
brianhogg 4b68549
Actually adding image support for question result clarifications.
brianhogg 09ceb97
Undo spacing changes.
brianhogg 2f3c91c
Escaping.
brianhogg 338a904
Fixing last attempt key to check if there is a last attempt first.
brianhogg 4c0ae00
Changing test. We now check for status of "incomplete" before allowin…
brianhogg 8f50201
Fixing answer check.
brianhogg 9b8ee34
Merge branch 'dev' into feature/quiz-resume
brianhogg 3bbc790
Show progress in the progress bar on quiz resume.
brianhogg 9b2de51
Removing error log.
brianhogg 29bf711
Removing "what" comments.
brianhogg 98f3e7b
Merge branch 'dev' into feature/quiz-resume
brianhogg 0bc0dfe
Merge branch 'dev' into feature/quiz-resume
brianhogg File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| significance: minor | ||
| type: dev | ||
| entry: Added new column `can_be_resumed` to the `lifterlms_attempts` table. |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| significance: minor | ||
| type: dev | ||
| entry: Added new method `LLMS_Quiz_Attempt::is_last_attempt()`. |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| significance: minor | ||
| type: dev | ||
| entry: Added new method `LLMS_Quiz_Attempt::can_be_resumed()`. |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| significance: minor | ||
| type: dev | ||
| entry: Added new method `LLMS_Quiz::can_be_resumed()`. |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| significance: minor | ||
| type: dev | ||
| entry: Added new method `LLMS_Quiz::can_be_resumed_by_student()`. |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| significance: minor | ||
| type: changed | ||
| entry: Question types template will show the selected answer when an attempt is | ||
| passed along. Used to show saved selected answers of a resumed attempt. |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| significance: minor | ||
| type: dev | ||
| entry: Added new property `can_be_resumed` to the Quiz model. |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| significance: minor | ||
| type: changed | ||
| entry: Display information about whether or not an incomplete attempt can be | ||
| resumed on some reporting screens. |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| significance: patch | ||
| type: fixed | ||
| entry: Fixed reference in `LLMS_Ajax_Handler::quiz_start()` to | ||
| `LLMS_Quiz_Attempt::get_status()` method removed since LifterLMS 4.0.0. |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| significance: minor | ||
| type: dev | ||
| entry: Added method `LLMS_Ajax_Handler:quiz_resume()`. |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| significance: minor | ||
| type: dev | ||
| entry: Added method `LLMS_Ajax_Handler::quiz_get_question()`. |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| significance: minor | ||
| type: dev | ||
| entry: "Added `return` parameter to the method | ||
| `LLMS_Quiz_Attempt::quiz_next_question()`." |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| significance: minor | ||
| type: dev | ||
| entry: Added new method `LLMS_Quiz_Attempt::get_question()`. |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| significance: minor | ||
| type: dev | ||
| entry: Added new method `LLMS_Quiz_Attempt::get_question_answer()`. |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| significance: minor | ||
| type: dev | ||
| entry: Added filter `llms_quiz_attempt_can_be_resumed` for updating resume | ||
| status of an quiz attempt. |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| significance: minor | ||
| type: dev | ||
| entry: Added method `LLMS_Quiz:get_student_last_attempt_key()`. |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| significance: minor | ||
| type: changed | ||
| entry: Added support for image upload in Result Clarifications box for quizzes. |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| significance: minor | ||
| type: dev | ||
| entry: Added filter `lifterlms_resume_quiz_button_text` for updating 'Resume | ||
| Quiz' button text. |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| significance: minor | ||
| type: dev | ||
| entry: Added filter `llms_quiz_attempt_resume_time_period` for updating quiz resume | ||
| allowed time period. |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| significance: minor | ||
| type: dev | ||
| entry: Added filter `llms_quiz_can_be_resumed` for updating resume status for a quiz. |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| significance: minor | ||
| type: added | ||
| entry: "Added new feature: Quiz Resume." |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.