← All changes | templates/single-course/sidebar/user-progress.php +62 -19 4.2.0 → 4.4.8 View file →

		@@ -3,11 +3,15 @@
3	3	* Template for displaying progress of single course.
4	4	*
5	5	* @author ThimPress
6	6	* @package Learnpress/Templates
7		- * @version 4.0.2
	7	+ * @version 4.0.3
8	8	*/
9	9
	10	+use LearnPress\Models\QuizPostModel;
	11	+use LearnPress\Models\UserItems\UserCourseModel;
	12	+use LearnPress\TemplateHooks\UserItem\UserCourseTemplate;
	13	+
10	14	defined( 'ABSPATH' ) || exit();
11	15
12	16	if ( ! isset( $user ) || ! isset( $course ) || ! isset( $course_data ) || ! isset( $course_results ) ) {
13	17	return;
		@@ -12,9 +16,32 @@
12	16	if ( ! isset( $user ) || ! isset( $course ) || ! isset( $course_data ) || ! isset( $course_results ) ) {
13	17	return;
14	18	}
15	19
16		-$passing_condition = $course->get_passing_condition();
	20	+$passing_condition = $course->get_passing_condition();
	21	+$progress_items_completed_percent = 0;
	22	+$userCourseModel = UserCourseModel::find( $user->get_id(), $course->get_id(), true );
	23	+if ( $userCourseModel && $user->get_id() > 0 ) {
	24	+ $courseModel = $userCourseModel->get_course_model();
	25	+ $calculate = $userCourseModel->calculate_course_results();
	26	+ $total_items = $courseModel->count_items();
	27	+ $evaluation_type = $courseModel::get_evaluation_types( $courseModel->get_evaluation_type() );
	28	+ if ( $courseModel->get_evaluation_type() === 'evaluate_final_quiz' ) {
	29	+ $final_quiz = $courseModel->get_final_quiz();
	30	+ if ( $final_quiz ) {
	31	+ $quizModel = QuizPostModel::find( $final_quiz, true );
	32	+ $passing_condition = $quizModel->get_passing_grade();
	33	+ }
	34	+ }
	35	+
	36	+ $progress_items_completed_percent = round(
	37	+ $total_items > 0 ? $calculate['completed_items'] * 100 / $total_items : 0,
	38	+ 2
	39	+ );
	40	+ if ( $progress_items_completed_percent > 100 ) {
	41	+ $progress_items_completed_percent = 100;
	42	+ }
	43	+}
17	44	?>
18	45
19	46	<div class="course-results-progress">
20	47	<?php
		@@ -23,9 +50,10 @@
23	50	<div class="items-progress">
24	51	<h4 class="items-progress__heading">
25	52	<?php esc_html_e( 'Lessons completed:', 'learnpress' ); ?>
26	53	</h4>
27		- <span class="number"><?php esc_attr( printf( '%1$d/%2$d', $course_results['items']['lesson']['completed'], $course_results['items']['lesson']['total'] ) ); ?></span>
	54	+ <span
	55	+ class="number"><?php echo esc_html( sprintf( '%1$d/%2$d', $course_results['items']['lesson']['completed'], $course_results['items']['lesson']['total'] ) ); ?></span>
28	56	</div>
29	57	<?php endif; ?>
30	58
31	59	<?php
		@@ -35,35 +63,50 @@
35	63	<div class="items-progress">
36	64	<h4 class="items-progress__heading">
37	65	<?php esc_html_e( 'Quizzes finished:', 'learnpress' ); ?>
38	66	</h4>
39		- <span class="number" title="<?php echo esc_attr( sprintf( __( 'Failed %1$d, Passed %2$d', 'learnpress' ), $quiz_false, $course_results['items']['quiz']['passed'] ) ); ?>"><?php printf( __( '%1$d/%2$d', 'learnpress' ), $course_results['items']['quiz']['completed'], $course_results['items']['quiz']['total'] ); ?></span>
	67	+ <span class="number"
	68	+ title="<?php echo esc_attr( sprintf( __( 'Failed %1$d, Passed %2$d', 'learnpress' ), $quiz_false, $course_results['items']['quiz']['passed'] ) ); ?>"><?php printf( __( '%1$d/%2$d', 'learnpress' ), $course_results['items']['quiz']['completed'], $course_results['items']['quiz']['total'] ); ?></span>
40	69	</div>
41	70	<?php endif; ?>
42	71
43	72	<?php do_action( 'learn-press/user-item-progress', $course_results, $course_data, $user, $course ); ?>
44	73
45		- <div class="course-progress">
	74	+ <div class="course-progress" style="margin-top: 10px;">
46	75	<h4 class="items-progress__heading">
47	76	<?php esc_html_e( 'Course progress:', 'learnpress' ); ?>
48	77	</h4>
49	78
50	79	<div class="lp-course-status">
51		- <span class="number"><?php echo esc_html( $course_results['result'] ); ?><span class="percentage-sign">%</span></span>
	80	+ <span class="number">
	81	+ <?php echo esc_html( $progress_items_completed_percent ); ?>
	82	+ <span class="percentage-sign">%</span>
	83	+ </span>
52	84	</div>
	85	+ </div>
	86	+ <?php
	87	+ echo UserCourseTemplate::instance()->html_items_completed_progress_bar( $userCourseModel );
	88	+ ?>
53	89
54		- <div class="learn-press-progress lp-course-progress <?php echo esc_attr( $course_data->is_passed() ? ' passed' : '' ); ?>"
55		- data-value="<?php echo esc_attr( $course_results['result'] ); ?>"
56		- data-passing-condition="<?php echo esc_attr( $passing_condition ); ?>"
57		- title="<?php echo esc_attr( learn_press_translate_course_result_required( $course ) ); ?>">
58		- <div class="progress-bg lp-progress-bar">
59		- <div class="progress-active lp-progress-value" style="left: <?php echo esc_attr( $course_results['result'] ); ?>%;">
60		- </div>
61		- </div>
62		- <div class="lp-passing-conditional"
63		- data-content="<?php esc_attr( printf( esc_html__( 'Passing condition: %s%%', 'learnpress' ), $passing_condition ) ); ?>"
64		- style="left: <?php echo esc_attr( $passing_condition ); ?>%;">
65		- </div>
	90	+ <div class="course-progress" style="margin-top: 10px">
	91	+ <h4 class="items-progress__heading">
	92	+ <?php
	93	+ esc_html_e( 'Passing grade', 'learnpress' );
	94	+ printf(
	95	+ ' <span class="lp-icon-question-circle" title="%s"></span>',
	96	+ sprintf(
	97	+ '%s. %s',
	98	+ isset( $evaluation_type['label'] ) ? esc_attr( $evaluation_type['label'] ) : '',
	99	+ esc_attr( sprintf( __( 'Passing condition: %s%%', 'learnpress' ), $passing_condition ) )
	100	+ )
	101	+ )
	102	+ ?>
	103	+ </h4>
	104	+
	105	+ <div class="lp-course-status">
	106	+ <span class="number">
	107	+ <?php echo esc_html( $course_results['result'] ); ?>
	108	+ <span class="percentage-sign">%</span>
	109	+ </span>
66	110	</div>
67	111	</div>
68		-
69	112	</div>