Merge branch 'dev' into syllabus-lesson-has-quiz-assignment

gocodebox · Dec 16, 2024 · a2a39a7 · a2a39a7
2 parents 8252720 + 0c6e64b
commit a2a39a7
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 20 deletions.
diff --git a/.changelogs/additional-attempt-check.yml b/.changelogs/additional-attempt-check.yml
@@ -0,0 +1,5 @@
+significance: patch
+type: fixed
+links:
+  - "#2824"
+entry: Adds additional check for valid quiz attempt key when ending or exiting a quiz.
diff --git a/.changelogs/fix_daylight-savings-when-scheduling-engagements.yml b/.changelogs/fix_daylight-savings-when-scheduling-engagements.yml
@@ -0,0 +1,5 @@
+significance: patch
+type: fixed
+links:
+  - "#2799"
+entry: Fix for daylight savings and leap years when scheduling engagements.
diff --git a/.changelogs/fix_start-date-error.yml b/.changelogs/fix_start-date-error.yml
@@ -0,0 +1,5 @@
+significance: patch
+type: fixed
+links:
+  - "#2810"
+entry: Avoid showing course opens message if no Course Start Date has been set.
diff --git a/.changelogs/lesson-preview-accessibility.yml b/.changelogs/lesson-preview-accessibility.yml
@@ -0,0 +1,6 @@
+significance: patch
+type: fixed
+links:
+  - "#2827"
+entry: Improved accessibility of the lessons listing on a course page, when a
+  lesson is restricted.
diff --git a/assets/js/app/llms-lesson-preview.js b/assets/js/app/llms-lesson-preview.js
@@ -109,7 +109,12 @@ LLMS.LessonPreview = {
 	 */
 	get_tooltip: function( msg ) {
 		var $el = $( '<div class="llms-tooltip" />' );
-		$el.append( '<div class="llms-tooltip-content">' + msg + '</div>' );
+		$el.append(
+			$('<div>', {
+				'class': 'llms-tooltip-content',
+				'aria-hidden': 'true'
+			}).text( msg )
+		);
 		return $el;
 	},
 

diff --git a/includes/class.llms.ajax.handler.php b/includes/class.llms.ajax.handler.php
@@ -947,6 +947,10 @@ public static function quiz_end( $request, $attempt = null ) {
 
 			$attempt = $student->quizzes()->get_attempt_by_key( sanitize_text_field( $request['attempt_key'] ) );
 
+			if ( ! $attempt ) {
+				$err->add( 404, __( 'The requested attempt could not be found.', 'lifterlms' ) );
+				return $err;
+			}
 		}
 
 		// Record the attempt's completion.

diff --git a/includes/class.llms.engagements.php b/includes/class.llms.engagements.php
@@ -104,7 +104,6 @@ private function add_actions() {
 		}
 
 		add_action( 'deleted_post', array( $this, 'unschedule_delayed_engagements' ), 20, 2 );
-
 	}
 
 	/**
@@ -208,7 +207,6 @@ private function get_engagements( $trigger_type, $related_post_id = '' ) {
 		 * @param int      $related_post_id WP_Post ID of the related post.
 		 */
 		return apply_filters( 'lifterlms_get_engagements', $results, $trigger_type, $related_post_id );
-
 	}
 
 	/**
@@ -249,7 +247,6 @@ protected function get_trigger_hooks() {
 		 * @param string[] $hooks List of hook names.
 		 */
 		return apply_filters( 'lifterlms_engagement_actions', $hooks );
-
 	}
 
 	/**
@@ -405,7 +402,6 @@ private function parse_hook( $action, $args ) {
 		$parsed['related_post_id'] = $related_post_id;
 
 		return $parsed;
-
 	}
 
 	/**
@@ -450,7 +446,6 @@ private function parse_hook_find_trigger_type( $action, $related_post_id ) {
 		}
 
 		return $trigger_type;
-
 	}
 
 	/**
@@ -485,7 +480,6 @@ public function maybe_trigger_engagement() {
 			$this->trigger_engagement( $handler, $engagement->delay );
 
 		}
-
 	}
 
 	/**
@@ -570,7 +564,6 @@ private function parse_engagement( $engagement, $trigger_data ) {
 		);
 
 		return $parsed;
-
 	}
 
 	/**
@@ -594,7 +587,7 @@ private function trigger_engagement( $data, $delay ) {
 		if ( $delay ) {
 
 			as_schedule_single_action(
-				time() + ( DAY_IN_SECONDS * $delay ),
+				current_datetime()->modify( "+{$delay} days" )->getTimestamp(),
 				$data['handler_action'],
 				array( $data['handler_args'] ),
 				! empty( $data['handler_args'][3] ) ? $this->get_delayed_group_id( $data['handler_args'][3] ) : null
@@ -616,7 +609,6 @@ private function trigger_engagement( $data, $delay ) {
 			remove_filter( 'llms_skip_engagement_processing_checks', '__return_true' );
 
 		}
-
 	}
 
 	/**
@@ -640,7 +632,6 @@ public function unschedule_delayed_engagements( $post_id, $post = null ) {
 		if ( 'llms_engagement' === $post_type ) {
 			as_unschedule_all_actions( '', array(), $this->get_delayed_group_id( $post_id ) );
 		}
-
 	}
 
 	/**
@@ -660,7 +651,5 @@ public function log( $log ) {
 		if ( $this->debug ) {
 			llms_log( $log, 'engagements' );
 		}
-
 	}
-
 }
diff --git a/packages/llms-e2e-test-utils/src/import-course.js b/packages/llms-e2e-test-utils/src/import-course.js
@@ -2,7 +2,7 @@
 import { clickAndWait } from './click-and-wait';
 
 // External dependencies.
-import { visitAdminPage } from '@wordpress/e2e-test-utils';
+import { visitAdminPage, clickButton } from '@wordpress/e2e-test-utils';
 
 /**
  * Import a course JSON file
@@ -28,7 +28,7 @@ export async function importCourse(
 	await visitAdminPage( 'admin.php', 'page=llms-import' );
 
 	// Upload button
-	await page.click( '.llms-setting-group.top button.llms-button-primary' );
+	await clickButton('Upload');
 
 	const inputSelector = 'input[name="llms_import"]';
 	await page.waitForSelector( inputSelector );
@@ -37,7 +37,7 @@ export async function importCourse(
 	fileUpload.uploadFile( file );
 	await page.waitForTimeout( 1000 );
 
-	await clickAndWait( '#llms-import-file-submit' );
+	await clickButton( 'Import' );
 
 	if ( navigate ) {
 		await clickAndWait( '.llms-admin-notice.notice-success a' );

diff --git a/templates/content-single-course-before.php b/templates/content-single-course-before.php
@@ -17,7 +17,7 @@
 
 if ( 'yes' === $course->get( 'time_period' ) ) {
 	// If the start date hasn't passed yet.
-	if ( ! $course->has_date_passed( 'start_date' ) ) {
+	if ( $course->get( 'start_date' ) && ! $course->has_date_passed( 'start_date' ) ) {
 
 		llms_add_notice( $course->get( 'course_opens_message' ), 'notice' );
 
@@ -30,4 +30,3 @@
 
 llms_print_notices();
 do_action( 'lifterlms_single_course_before_summary' );
-
diff --git a/templates/course/lesson-preview.php b/templates/course/lesson-preview.php
@@ -19,11 +19,10 @@
 defined( 'ABSPATH' ) || exit;
 
 $restrictions = llms_page_restricted( $lesson->get( 'id' ), get_current_user_id() );
-$data_msg     = $restrictions['is_restricted'] ? ' data-tooltip-msg="' . esc_html( strip_tags( llms_get_restriction_message( $restrictions ) ) ) . '"' : '';
 ?>
 
 <div class="llms-lesson-preview<?php echo esc_attr( $lesson->get_preview_classes() ); ?>">
-	<a class="llms-lesson-link<?php echo $restrictions['is_restricted'] ? ' llms-lesson-link-locked' : ''; ?>" href="<?php echo ( ! $restrictions['is_restricted'] ) ? esc_url( get_permalink( $lesson->get( 'id' ) ) ) : '#llms-lesson-locked'; ?>"<?php echo $restrictions['is_restricted'] ? ' data-tooltip-msg="' . esc_attr( strip_tags( llms_get_restriction_message( $restrictions ) ) ) . '"' : ''; ?>>
+	<a class="llms-lesson-link<?php echo $restrictions['is_restricted'] ? ' llms-lesson-link-locked' : ''; ?>" href="<?php echo ( ! $restrictions['is_restricted'] ) ? esc_url( get_permalink( $lesson->get( 'id' ) ) ) : '#llms-lesson-locked'; ?>"<?php echo $restrictions['is_restricted'] ? ' aria-disabled="true" data-tooltip-msg="' . esc_attr( strip_tags( llms_get_restriction_message( $restrictions ) ) ) . '"' : ''; ?>>
 
 		<?php if ( 'course' === get_post_type( get_the_ID() ) ) : ?>
 
@@ -102,6 +101,9 @@
 			</section>
 
 			<?php if ( $restrictions['is_restricted'] ) : ?>
+				<span class="sr-only">
+					<?php echo esc_attr( strip_tags( llms_get_restriction_message( $restrictions ) ) ); ?>
+				</span>
 			<?php endif; ?>
 
 		</div>