diff --git a/plugin/positioning/start_student.php b/plugin/positioning/start_student.php index 2fff32ff4f..4191a59c23 100644 --- a/plugin/positioning/start_student.php +++ b/plugin/positioning/start_student.php @@ -55,7 +55,6 @@ $studentAverage = Tracking::get_avg_student_progress( $averageToUnlock = (float) $plugin->get('average_percentage_to_unlock_final_exercise'); $finalExerciseTitle = ''; -$lpUrl = ''; if ($finalData) { $exerciseId = $finalData['exercise_id']; $finalExercise = new Exercise(); @@ -69,8 +68,6 @@ if ($finalData) { $finalExerciseTitle = $finalExercise->get_formated_title(); if (!empty($initialResults)) { - $lpUrl = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq(); - $lpUrl = Display::url(get_lang('LearningPath'), $lpUrl); if ($studentAverage >= $averageToUnlock) { $url = api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.api_get_cidreq().'&exerciseId='.$exerciseId; if (empty($finalResults)) { @@ -82,9 +79,13 @@ if ($finalData) { } } // Set the initial results as second series to make sure it appears on top +$lpUrlAndProgress = $studentAverage.'%'; if (!empty($initialExercise)) { $exercisesToRadar[] = $initialExercise; $exercisesToRadarLabel[] = $plugin->get_lang('InitialTest'); + if (!empty($initialResults)) { + $lpUrlAndProgress = ''.$studentAverage.'%'; + } } $radars = $initialExercise->getRadarsFromUsers( @@ -101,8 +102,7 @@ $template = new Template($nameTools); $template->assign('initial_exercise', $initialExerciseTitle); $template->assign('final_exercise', $finalExerciseTitle); $template->assign('average_percentage_to_unlock_final_exercise', $averageToUnlock); -$template->assign('average', $studentAverage); -$template->assign('lp_url', $lpUrl); +$template->assign('lp_url_and_progress', $lpUrlAndProgress); $template->assign('radars', $radars); $template->assign('content', $template->fetch('positioning/view/start_student.tpl')); $template->display_one_col_template(); diff --git a/plugin/positioning/view/start_student.tpl b/plugin/positioning/view/start_student.tpl index 3e9d305761..97192e1f67 100644 --- a/plugin/positioning/view/start_student.tpl +++ b/plugin/positioning/view/start_student.tpl @@ -4,10 +4,10 @@ - + - +
{{ "InviteToTakePositioningTest"| get_plugin_lang('Positioning') }}
{{ "InitialTest"| get_plugin_lang('Positioning') }}:
{{ initial_exercise }}
{{ "InviteToTakePositioningTest"| get_plugin_lang('Positioning') }}
{{ "InitialTest"| get_plugin_lang('Positioning') }}: {{ initial_exercise }}
{{ "YouMustCompleteAThresholdToTakeFinalTest"| get_plugin_lang('Positioning') | format(average_percentage_to_unlock_final_exercise) }}
{{ "Average"| get_lang }}: {{ average }} %
{{ "YouMustCompleteAThresholdToTakeFinalTest"| get_plugin_lang('Positioning') | format(average_percentage_to_unlock_final_exercise) }}
{{ "Average"| get_lang }}: {{ lp_url_and_progress }}
{{ "FinalTest"| get_plugin_lang('Positioning') }}: {{ final_exercise }}