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

Gradebook - Hide links for tasks in gradebook when the user is a student - refs GH#4427

Browse Source 
Author: @BorjaSanchezBeezNest
pull/4468/head
Borja Sánchez 3 years ago committed by GitHub
parent 6ba2629e82
commit c27974061c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 14 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. 16
      main/exercise/TestCategory.php
  2. 13
      main/exercise/exercise.class.php
  3. 19
      main/gradebook/lib/fe/gradebooktable.class.php
  4. 3
      main/install/configuration.dist.php

16
main/exercise/TestCategory.php
Unescape View File

@ -804,15 +804,15 @@ class TestCategory
continue;
}
$labels[] = $title;
$category_item = $category_list[$category_id];
$categoryItem = $category_list[$category_id];
$table->setCellContents($row, 0, $title);
$table->setCellContents(
$row,
1,
ExerciseLib::show_score(
$category_item['score'],
$category_item['total'],
$categoryItem['score'],
$categoryItem['total'],
false
)
);
@ -820,14 +820,18 @@ class TestCategory
$row,
2,
ExerciseLib::show_score(
$category_item['score'],
$category_item['total'],
$categoryItem['score'],
$categoryItem['total'],
true,
false,
true
)
);
$tempResult[$category_id] = round($category_item['score'] / $category_item['total'] * 10);
if ($categoryItem['total'] > 0) {
$tempResult[$category_id] = round($categoryItem['score'] / $categoryItem['total'] * 10);
} else {
$tempResult[$category_id] = 0;
}
$row++;
}

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

@ -11115,8 +11115,12 @@ class Exercise
$tempResult = [];
foreach ($labelsWithId as $category_id => $title) {
if (isset($categoryList[$category_id])) {
$category_item = $categoryList[$category_id];
$tempResult[] = round($category_item['score'] / $category_item['total'] * 10);
$categoryItem = $categoryList[$category_id];
if ($categoryItem['total'] > 0) {
$tempResult[] = round($categoryItem['score'] / $categoryItem['total'] * 10);
} else {
$tempResult[] = 0;
}
} else {
$tempResult[] = 0;
}
@ -11175,11 +11179,12 @@ class Exercise
$categoryList = $stats['category_list'];
foreach ($labelsWithId as $category_id => $title) {
if (isset($categoryList[$category_id])) {
$category_item = $categoryList[$category_id];
$categoryItem = $categoryList[$category_id];
if (!isset($tempResult[$exerciseId][$category_id])) {
$tempResult[$exerciseId][$category_id] = 0;
}
$tempResult[$exerciseId][$category_id] += $category_item['score'] / $category_item['total'] * 10;
$tempResult[$exerciseId][$category_id] +=
$categoryItem['score'] / $categoryItem['total'] * 10;
}
}
}

19
main/gradebook/lib/fe/gradebooktable.class.php
Unescape View File

@ -300,6 +300,7 @@ class GradebookTable extends SortableTable
global $certificate_min_score;
$isAllowedToEdit = api_is_allowed_to_edit();
$hideLinkForStudent = api_get_configuration_value('gradebook_hide_link_to_item_for_student') ?? false;
// determine sorting type
$col_adjust = $isAllowedToEdit ? 1 : 0;
// By id
@ -427,7 +428,17 @@ class GradebookTable extends SortableTable
'<strong>'.Security::remove_XSS($item->get_name()).'</strong>'.$invisibility_span_close;
$main_categories[$item->get_id()]['name'] = $item->get_name();
} else {
$name = Security::remove_XSS($this->build_name_link($item, $type));
// If the item type is 'Evaluation', or the user is not a student,
// or 'gradebook_hide_link_to_item_for_student' it's true, make links
if ($item->get_item_type() === 'E' || $isAllowedToEdit || !$hideLinkForStudent) {
$name = Security::remove_XSS($this->build_name_link($item, $type));
} else {
$name = Security::remove_XSS(
$item->get_name().' '.Display::label($item->get_type_name(), 'info')
);
}
$row[] = $invisibility_span_open.$name.$invisibility_span_close;
$main_categories[$item->get_id()]['name'] = $name;
}
@ -482,8 +493,8 @@ class GradebookTable extends SortableTable
$ranking = isset($data['ranking']) ? $data['ranking'] : null;
$totalResult = [
$data['result_score'][0],
$data['result_score'][1],
$data['result_score'][0] ?? null,
$data['result_score'][1] ?? null,
];
if (empty($model)) {
@ -538,7 +549,7 @@ class GradebookTable extends SortableTable
$this->dataForGraph['my_result'][] = floatval($totalResultAverageValue);
$this->dataForGraph['average'][] = floatval($totalAverageValue);
$this->dataForGraph['my_result_no_float'][] = $data['result_score'][0];
$this->dataForGraph['my_result_no_float'][] = $data['result_score'][0] ?? null;
if (empty($model)) {
// Ranking

3
main/install/configuration.dist.php
Unescape View File

@ -2310,6 +2310,9 @@ INSERT INTO `extra_field` (`extra_field_type`, `field_type`, `variable`, `displa
// Allow DRH user to access all students from reporting.
// $_configuration['drh_allow_access_to_all_students'] = false;
// Disable links in gradebook view for students
// $_configuration['gradebook_hide_link_to_item_for_student'] = false;
// KEEP THIS AT THE END
// -------- Custom DB changes
// Add user activation by confirmation email

Write Preview
Loading…
Cancel
Save