From 8e629645e62c8fdb41daaf3b40f2a95d4beea340 Mon Sep 17 00:00:00 2001 From: Brian Hogg Date: Thu, 22 Aug 2024 11:41:02 -0400 Subject: [PATCH] Removed most changelogs. Fixed resume quiz button text filter (llms vs lifterlms). Removed filters to change resumability (except for resume expiration time). --- .changelogs/feature_quiz-resume-1.yml | 3 --- .changelogs/feature_quiz-resume-10.yml | 3 --- .changelogs/feature_quiz-resume-11.yml | 3 --- .changelogs/feature_quiz-resume-12.yml | 3 --- .changelogs/feature_quiz-resume-13.yml | 3 --- .changelogs/feature_quiz-resume-14.yml | 4 ---- .changelogs/feature_quiz-resume-2.yml | 3 --- .changelogs/feature_quiz-resume-3.yml | 4 ---- .changelogs/feature_quiz-resume-5.yml | 3 --- .changelogs/feature_quiz-resume-6.yml | 3 --- .changelogs/feature_quiz-resume-7.yml | 4 ---- .changelogs/feature_quiz-resume-8.yml | 3 --- .changelogs/feature_quiz-resume-9.yml | 3 --- .changelogs/feature_quiz-resume-akash-1.yml | 4 ---- .changelogs/feature_quiz-resume-akash-2.yml | 3 --- .changelogs/feature_quiz-resume-akash-4.yml | 4 ---- .changelogs/feature_quiz-resume-akash.yml | 3 --- includes/models/model.llms.quiz.attempt.php | 12 +----------- includes/models/model.llms.quiz.php | 14 +------------- templates/quiz/start-button.php | 2 +- 20 files changed, 3 insertions(+), 81 deletions(-) delete mode 100644 .changelogs/feature_quiz-resume-1.yml delete mode 100644 .changelogs/feature_quiz-resume-10.yml delete mode 100644 .changelogs/feature_quiz-resume-11.yml delete mode 100644 .changelogs/feature_quiz-resume-12.yml delete mode 100644 .changelogs/feature_quiz-resume-13.yml delete mode 100644 .changelogs/feature_quiz-resume-14.yml delete mode 100644 .changelogs/feature_quiz-resume-2.yml delete mode 100644 .changelogs/feature_quiz-resume-3.yml delete mode 100644 .changelogs/feature_quiz-resume-5.yml delete mode 100644 .changelogs/feature_quiz-resume-6.yml delete mode 100644 .changelogs/feature_quiz-resume-7.yml delete mode 100644 .changelogs/feature_quiz-resume-8.yml delete mode 100644 .changelogs/feature_quiz-resume-9.yml delete mode 100644 .changelogs/feature_quiz-resume-akash-1.yml delete mode 100644 .changelogs/feature_quiz-resume-akash-2.yml delete mode 100644 .changelogs/feature_quiz-resume-akash-4.yml delete mode 100644 .changelogs/feature_quiz-resume-akash.yml diff --git a/.changelogs/feature_quiz-resume-1.yml b/.changelogs/feature_quiz-resume-1.yml deleted file mode 100644 index 1fe090dd26..0000000000 --- a/.changelogs/feature_quiz-resume-1.yml +++ /dev/null @@ -1,3 +0,0 @@ -significance: minor -type: dev -entry: Added new column `can_be_resumed` to the `lifterlms_attempts` table. diff --git a/.changelogs/feature_quiz-resume-10.yml b/.changelogs/feature_quiz-resume-10.yml deleted file mode 100644 index dcd1b7c52d..0000000000 --- a/.changelogs/feature_quiz-resume-10.yml +++ /dev/null @@ -1,3 +0,0 @@ -significance: minor -type: dev -entry: Added new method `LLMS_Quiz_Attempt::is_last_attempt()`. diff --git a/.changelogs/feature_quiz-resume-11.yml b/.changelogs/feature_quiz-resume-11.yml deleted file mode 100644 index e3f11d7251..0000000000 --- a/.changelogs/feature_quiz-resume-11.yml +++ /dev/null @@ -1,3 +0,0 @@ -significance: minor -type: dev -entry: Added new method `LLMS_Quiz_Attempt::can_be_resumed()`. diff --git a/.changelogs/feature_quiz-resume-12.yml b/.changelogs/feature_quiz-resume-12.yml deleted file mode 100644 index e814ba7750..0000000000 --- a/.changelogs/feature_quiz-resume-12.yml +++ /dev/null @@ -1,3 +0,0 @@ -significance: minor -type: dev -entry: Added new method `LLMS_Quiz::can_be_resumed()`. diff --git a/.changelogs/feature_quiz-resume-13.yml b/.changelogs/feature_quiz-resume-13.yml deleted file mode 100644 index 0b7b17b641..0000000000 --- a/.changelogs/feature_quiz-resume-13.yml +++ /dev/null @@ -1,3 +0,0 @@ -significance: minor -type: dev -entry: Added new method `LLMS_Quiz::can_be_resumed_by_student()`. diff --git a/.changelogs/feature_quiz-resume-14.yml b/.changelogs/feature_quiz-resume-14.yml deleted file mode 100644 index b23c0aee7d..0000000000 --- a/.changelogs/feature_quiz-resume-14.yml +++ /dev/null @@ -1,4 +0,0 @@ -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. diff --git a/.changelogs/feature_quiz-resume-2.yml b/.changelogs/feature_quiz-resume-2.yml deleted file mode 100644 index 43f3fe668d..0000000000 --- a/.changelogs/feature_quiz-resume-2.yml +++ /dev/null @@ -1,3 +0,0 @@ -significance: minor -type: dev -entry: Added new property `can_be_resumed` to the Quiz model. diff --git a/.changelogs/feature_quiz-resume-3.yml b/.changelogs/feature_quiz-resume-3.yml deleted file mode 100644 index bcece4652a..0000000000 --- a/.changelogs/feature_quiz-resume-3.yml +++ /dev/null @@ -1,4 +0,0 @@ -significance: minor -type: changed -entry: Display information about whether or not an incomplete attempt can be - resumed on some reporting screens. diff --git a/.changelogs/feature_quiz-resume-5.yml b/.changelogs/feature_quiz-resume-5.yml deleted file mode 100644 index a7befda064..0000000000 --- a/.changelogs/feature_quiz-resume-5.yml +++ /dev/null @@ -1,3 +0,0 @@ -significance: minor -type: dev -entry: Added method `LLMS_Ajax_Handler:quiz_resume()`. diff --git a/.changelogs/feature_quiz-resume-6.yml b/.changelogs/feature_quiz-resume-6.yml deleted file mode 100644 index ced06b901f..0000000000 --- a/.changelogs/feature_quiz-resume-6.yml +++ /dev/null @@ -1,3 +0,0 @@ -significance: minor -type: dev -entry: Added method `LLMS_Ajax_Handler::quiz_get_question()`. diff --git a/.changelogs/feature_quiz-resume-7.yml b/.changelogs/feature_quiz-resume-7.yml deleted file mode 100644 index 75a4730a02..0000000000 --- a/.changelogs/feature_quiz-resume-7.yml +++ /dev/null @@ -1,4 +0,0 @@ -significance: minor -type: dev -entry: "Added `return` parameter to the method - `LLMS_Quiz_Attempt::quiz_next_question()`." diff --git a/.changelogs/feature_quiz-resume-8.yml b/.changelogs/feature_quiz-resume-8.yml deleted file mode 100644 index 528e5edca8..0000000000 --- a/.changelogs/feature_quiz-resume-8.yml +++ /dev/null @@ -1,3 +0,0 @@ -significance: minor -type: dev -entry: Added new method `LLMS_Quiz_Attempt::get_question()`. diff --git a/.changelogs/feature_quiz-resume-9.yml b/.changelogs/feature_quiz-resume-9.yml deleted file mode 100644 index a2206c4a3c..0000000000 --- a/.changelogs/feature_quiz-resume-9.yml +++ /dev/null @@ -1,3 +0,0 @@ -significance: minor -type: dev -entry: Added new method `LLMS_Quiz_Attempt::get_question_answer()`. diff --git a/.changelogs/feature_quiz-resume-akash-1.yml b/.changelogs/feature_quiz-resume-akash-1.yml deleted file mode 100644 index 9a4cbca347..0000000000 --- a/.changelogs/feature_quiz-resume-akash-1.yml +++ /dev/null @@ -1,4 +0,0 @@ -significance: minor -type: dev -entry: Added filter `llms_quiz_attempt_can_be_resumed` for updating resume - status of an quiz attempt. diff --git a/.changelogs/feature_quiz-resume-akash-2.yml b/.changelogs/feature_quiz-resume-akash-2.yml deleted file mode 100644 index 3b4534699c..0000000000 --- a/.changelogs/feature_quiz-resume-akash-2.yml +++ /dev/null @@ -1,3 +0,0 @@ -significance: minor -type: dev -entry: Added method `LLMS_Quiz:get_student_last_attempt_key()`. diff --git a/.changelogs/feature_quiz-resume-akash-4.yml b/.changelogs/feature_quiz-resume-akash-4.yml deleted file mode 100644 index 2c78f9e9e2..0000000000 --- a/.changelogs/feature_quiz-resume-akash-4.yml +++ /dev/null @@ -1,4 +0,0 @@ -significance: minor -type: dev -entry: Added filter `lifterlms_resume_quiz_button_text` for updating 'Resume - Quiz' button text. diff --git a/.changelogs/feature_quiz-resume-akash.yml b/.changelogs/feature_quiz-resume-akash.yml deleted file mode 100644 index 280a27f3f5..0000000000 --- a/.changelogs/feature_quiz-resume-akash.yml +++ /dev/null @@ -1,3 +0,0 @@ -significance: minor -type: dev -entry: Added filter `llms_quiz_can_be_resumed` for updating resume status for a quiz. diff --git a/includes/models/model.llms.quiz.attempt.php b/includes/models/model.llms.quiz.attempt.php index 9df248fbf9..934cf18c5d 100644 --- a/includes/models/model.llms.quiz.attempt.php +++ b/includes/models/model.llms.quiz.attempt.php @@ -813,17 +813,7 @@ public function is_passing() { */ public function can_be_resumed() { - $can_be_resumed = 1 === (int) $this->get( 'can_be_resumed' ) && 'incomplete' === $this->get( 'status' ) && ! $this->has_resume_attempt_time_expired(); - - /** - * Filters the attempt resumable status. - * - * @since [version] - * - * @param bool $can_be_resumed Whether or not the attempt can be resumed. - * @param LLMS_Quiz_Attempt $attempt The quiz attempt object. - */ - return apply_filters( 'llms_quiz_attempt_can_be_resumed', $can_be_resumed, $this ); + return 1 === (int) $this->get( 'can_be_resumed' ) && 'incomplete' === $this->get( 'status' ) && ! $this->has_resume_attempt_time_expired(); } /** diff --git a/includes/models/model.llms.quiz.php b/includes/models/model.llms.quiz.php index c7080348dc..babca97e36 100644 --- a/includes/models/model.llms.quiz.php +++ b/includes/models/model.llms.quiz.php @@ -213,19 +213,7 @@ public function is_orphan( $deep = false ) { */ public function can_be_resumed() { - $can_be_resumed_status = llms_parse_bool( $this->get( 'can_be_resumed' ) ) && ! $this->has_time_limit(); - - /** - * Filters the quiz resumable status. - * - * @since [version] - * - * @param bool $can_be_resumed Whether or not the quiz can be resumed. - * @param LLMS_Quiz $quiz The LLMS_Quiz instance. - */ - $can_be_resumed = apply_filters( 'llms_quiz_can_be_resumed', $can_be_resumed_status, $this ); - - return $can_be_resumed; + return llms_parse_bool( $this->get( 'can_be_resumed' ) ) && ! $this->has_time_limit(); } /** diff --git a/templates/quiz/start-button.php b/templates/quiz/start-button.php index 74190e696f..96ef17750e 100644 --- a/templates/quiz/start-button.php +++ b/templates/quiz/start-button.php @@ -85,7 +85,7 @@ * @param LLMS_Quiz $quiz The current quiz instance. * @param LLMS_Lesson $lesson The parent lesson instance. */ - echo esc_html( apply_filters( 'llms_resume_quiz_button_text', esc_html__( 'Resume Quiz', 'lifterlms' ), $quiz, $lesson ) ); + echo esc_html( apply_filters( 'lifterlms_resume_quiz_button_text', esc_html__( 'Resume Quiz', 'lifterlms' ), $quiz, $lesson ) ); ?>