Plugin: Positioning, fix fatal error + show progress instead of score.

pull/3565/head^2
Julio Montoya 5 years ago
parent c7cd24cd16
commit aa8c044c81
  1. 2
      main/exercise/exercise.class.php
  2. 38
      plugin/positioning/start.php
  3. 8
      plugin/positioning/start_student.php
  4. 2
      plugin/positioning/view/start.tpl

@ -8670,7 +8670,7 @@ class Exercise
* @param int $filterByResultDisabled * @param int $filterByResultDisabled
* @param int $filterByAttempt * @param int $filterByAttempt
* *
* @return string * @return string|SortableTableFromArrayConfig
*/ */
public static function exerciseGrid( public static function exerciseGrid(
$categoryId, $categoryId,

@ -81,17 +81,27 @@ $table = Exercise::exerciseGrid(
true true
); );
$table->headers = []; $exercisesToString = '';
$table->set_header(0, get_lang('ExerciseName'), false); if (!empty($table)) {
$table->set_header(1, get_lang('QuantityQuestions'), false); if ($table instanceof SortableTableFromArrayConfig) {
$table->set_header(2, get_lang('Actions'), false); $table->headers = [];
$exerciseList = []; $table->set_header(0, get_lang('ExerciseName'), false);
foreach ($table->table_data as &$data) { $table->set_header(1, get_lang('QuantityQuestions'), false);
$data = [ $table->set_header(2, get_lang('Actions'), false);
$data[1], $exerciseList = [];
$data[2], foreach ($table->table_data as &$data) {
$data[3], $data = [
]; $data[1],
$data[2],
$data[3],
];
}
$table->set_form_actions([]);
$exercisesToString = $table->return_table();
} else {
$exercisesToString = Display::return_message(get_lang('NoDataAvailable'), 'warning');
}
} }
$initialData = $plugin->getInitialExercise($courseId, $sessionId); $initialData = $plugin->getInitialExercise($courseId, $sessionId);
@ -108,15 +118,11 @@ if (!empty($users) && $initialData && $initialData['exercise_id']) {
$initialExerciseTitle = $initialExercise->get_formated_title(); $initialExerciseTitle = $initialExercise->get_formated_title();
} }
$table->set_form_actions([]);
$exercises = $table->return_table();
$template->assign( $template->assign(
'positioning_introduction', 'positioning_introduction',
//Display::return_message(sprintf($plugin->get_lang('PositioningIntroduction'), $courseInfo['title']))
Display::return_message($plugin->get_lang('PositioningIntroduction')) Display::return_message($plugin->get_lang('PositioningIntroduction'))
); );
$template->assign('grid', $exercises); $template->assign('table', $exercisesToString);
$template->assign('radars', $radars); $template->assign('radars', $radars);
$template->assign('initial_exercise', $initialExerciseTitle); $template->assign('initial_exercise', $initialExerciseTitle);
$template->assign('content', $template->fetch('positioning/view/start.tpl')); $template->assign('content', $template->fetch('positioning/view/start.tpl'));

@ -46,7 +46,13 @@ if ($initialData) {
} }
} }
$studentAverage = (int) Tracking::getAverageStudentScore($currentUserId, $courseCode, [], $sessionId); $studentAverage = Tracking::get_avg_student_progress(
$currentUserId,
$courseCode,
[],
$sessionId
);
$averageToUnlock = (int) $plugin->get('average_percentage_to_unlock_final_exercise'); $averageToUnlock = (int) $plugin->get('average_percentage_to_unlock_final_exercise');
$finalExerciseTitle = ''; $finalExerciseTitle = '';

@ -1,7 +1,7 @@
{{ positioning_introduction }} {{ positioning_introduction }}
{{ grid }} {{ table }}
{% if radars %} {% if radars %}
<h4>{{ "InitialTest"| get_plugin_lang('Positioning') }}: {{ initial_exercise }}</h4> <h4>{{ "InitialTest"| get_plugin_lang('Positioning') }}: {{ initial_exercise }}</h4>

Loading…
Cancel
Save