chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Exercises: Refactor code to get average instead of user results #3644

Browse Source
pull/3675/head
Julio Montoya 6 years ago
parent 3568c30fbe
commit 5dede15f4d
3 changed files with 109 additions and 10 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 97
      main/exercise/exercise.class.php
  2. 11
      plugin/positioning/start.php
  3. 11
      plugin/positioning/start_student.php

97
main/exercise/exercise.class.php
Unescape View File

@ -10461,7 +10461,7 @@ class Exercise
return $content;
}
public function getRadarsFromUsers($userList, $exercises, $courseId, $sessionId)
public function getRadarsFromUsers($userList, $exercises, $dataSetLabels, $courseId, $sessionId)
{
$dataSet = [];
$labels = [];
@ -10471,7 +10471,7 @@ class Exercise
if (empty($labels)) {
$categoryNameList = TestCategory::getListOfCategoriesNameForTest($exercise->iId);
if (!empty($categoryNameList)) {
$labelsWithId = array_column($categoryNameList, 'title', 'id');
$labelsWithId = array_column($categoryNameList, 'title', 'id');
asort($labelsWithId);
$labels = array_values($labelsWithId);
}
@ -10498,7 +10498,6 @@ class Exercise
ob_end_clean();
$categoryList = $stats['category_list'];
$tempResult = [];
foreach ($labelsWithId as $category_id => $title) {
if (isset($categoryList[$category_id])) {
@ -10514,15 +10513,95 @@ class Exercise
}
}
return $this->getRadar($labels, $dataSet);
return $this->getRadar($labels, $dataSet, $dataSetLabels);
}
public function getAverageRadarsFromUsers($userList, $exercises, $dataSetLabels, $courseId, $sessionId)
{
$dataSet = [];
$labels = [];
$labelsWithId = [];
$totals = [];
$tempResult = [];
/** @var Exercise $exercise */
foreach ($exercises as $exercise) {
$exerciseId = $exercise->iId;
if (empty($labels)) {
$categoryNameList = TestCategory::getListOfCategoriesNameForTest($exercise->iId);
if (!empty($categoryNameList)) {
$labelsWithId = array_column($categoryNameList, 'title', 'id');
asort($labelsWithId);
$labels = array_values($labelsWithId);
}
}
foreach ($userList as $userId) {
$results = Event::getExerciseResultsByUser(
$userId,
$exerciseId,
$courseId,
$sessionId
);
if ($results) {
$firstAttempt = current($results);
$exeId = $firstAttempt['exe_id'];
ob_start();
$stats = ExerciseLib::displayQuestionListByAttempt(
$exercise,
$exeId,
false
);
ob_end_clean();
$categoryList = $stats['category_list'];
foreach ($labelsWithId as $category_id => $title) {
if (isset($categoryList[$category_id])) {
$category_item = $categoryList[$category_id];
if (!isset($tempResult[$exerciseId][$category_id])) {
$tempResult[$exerciseId][$category_id] = 0;
}
//var_dump($exerciseId, $category_id, $category_item['score'] / $category_item['total']);
$tempResult[$exerciseId][$category_id] += $category_item['score'] / $category_item['total'] * 10;
}
}
}
}
}
//var_dump($tempResult);
$totalUsers = count($userList);
foreach ($exercises as $exercise) {
$exerciseId = $exercise->iId;
$data = [];
foreach ($labelsWithId as $category_id => $title) {
if (isset($tempResult[$exerciseId]) && isset($tempResult[$exerciseId][$category_id])) {
$data[] = round($tempResult[$exerciseId][$category_id] / $totalUsers);
} else {
$data[] = 0;
}
}
//var_dump($data);
$dataSet[] = $data;
}
return $this->getRadar($labels, $dataSet, $dataSetLabels);
}
public function getRadar($labels, $dataSet)
public function getRadar($labels, $dataSet, $dataSetLabels = [])
{
if (empty($labels) || empty($dataSet)) {
return '';
}
$displayLegend = 0;
if (!empty($dataSetLabels)) {
$displayLegend = 1;
}
$labels = json_encode($labels);
// Default preset, after that colors are generated randomly. @todo improve colors. Use a js lib?
@ -10539,13 +10618,14 @@ class Exercise
$dataSetToJson = [];
$counter = 0;
foreach ($dataSet as $resultsArray) {
foreach ($dataSet as $index => $resultsArray) {
$color = isset($colorList[$counter]) ? $colorList[$counter] : 'rgb('.rand(0, 255).', '.rand(0, 255).', '.rand(0, 255).', 1.0)';
$label = isset($dataSetLabels[$index]) ? $dataSetLabels[$index] : '';
$background = str_replace('1.0', '0.2', $color);
$dataSetToJson[] = [
'fill' => true,
//'label' => '".get_lang('Categories')."',
'label' => $label,
'backgroundColor' => $background,
'borderColor' => $color,
'pointBackgroundColor' => $color,
@ -10556,6 +10636,7 @@ class Exercise
'pointBorderWidth' => 3,
'pointHoverRadius' => 10,
'data' => $resultsArray,
];
$counter++;
}
@ -10593,7 +10674,7 @@ class Exercise
},
legend: {
//position: 'bottom'
display: false
display: $displayLegend
},
animation: {
animateScale: true,

11
plugin/positioning/start.php
Unescape View File

@ -64,6 +64,11 @@ $actions = function ($row) use ($plugin, $url, $courseId, $sessionId) {
['class' => $classFinal]
);
$actions .= ' '.Display::url(
Display::return_icon('test_results.png', get_lang('Results'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$row['iid']
);
return $actions;
};
@ -111,6 +116,7 @@ $radars = '';
$initialExerciseTitle = '';
if (!empty($users) && $initialData && $initialData['exercise_id']) {
$results = [];
$labels = [];
$users = array_column($users, 'user_id');
$exerciseId = $initialData['exercise_id'];
$initialExercise = new Exercise();
@ -120,9 +126,12 @@ if (!empty($users) && $initialData && $initialData['exercise_id']) {
$finalExercise = new Exercise();
$finalExercise->read($finalData['exercise_id']);
$results[] = $finalExercise;
$labels[] = $plugin->get_lang('FinalTest');
}
$results[] = $initialExercise;
$radars = $initialExercise->getRadarsFromUsers($users, $results, $courseId, $sessionId);
$labels[] = $plugin->get_lang('InitialTest');
//$radars = $initialExercise->getRadarsFromUsers($users, $results, $labels, $courseId, $sessionId);
$radars = $initialExercise->getAverageRadarsFromUsers($users, $results, $labels, $courseId, $sessionId);
$initialExerciseTitle = $initialExercise->get_formated_title();
}

11
plugin/positioning/start_student.php
Unescape View File

@ -26,6 +26,7 @@ $initialExerciseTitle = '';
$radar = '';
$initialResults = null;
$exercisesToRadar = [];
$exercisesToRadarLabel = [];
if ($initialData) {
$exerciseId = $initialData['exercise_id'];
$initialExercise = new Exercise();
@ -43,6 +44,7 @@ if ($initialData) {
$initialExerciseTitle = Display::url($initialExercise->get_formated_title(), $url);
} else {
$exercisesToRadar[] = $initialExercise;
$exercisesToRadarLabel[] = $plugin->get_lang('InitialTest');
}
}
@ -79,10 +81,17 @@ if ($finalData) {
}
}
$exercisesToRadar[] = $finalExercise;
$exercisesToRadarLabel[] = $plugin->get_lang('FinalTest');
}
}
$radars = $initialExercise->getRadarsFromUsers([$currentUserId], $exercisesToRadar, $courseId, $sessionId);
$radars = $initialExercise->getRadarsFromUsers(
[$currentUserId],
$exercisesToRadar,
$exercisesToRadarLabel,
$courseId,
$sessionId
);
$nameTools = $plugin->get_lang('Positioning');
$template = new Template($nameTools);

Write Preview
Loading…
Cancel
Save