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

Minor - Format code - refs BT#12515

Browse Source
remotes/angel/1.11.x
Angel Fernando Quiroz Campos 8 years ago
parent 34ea1196ef
commit 0f08798b0e
1 changed files with 309 additions and 301 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. 610
      main/gradebook/lib/fe/gradebooktable.class.php

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

@ -71,7 +71,7 @@ class GradebookTable extends SortableTable
$this->set_additional_parameters($addparams); $this->set_additional_parameters($addparams);
} }
$column= 0; $column = 0;
if ($this->teacherView) { if ($this->teacherView) {
if ($this->exportToPdf == false) { if ($this->exportToPdf == false) {
$this->set_header($column++, '', '', 'width="25px"'); $this->set_header($column++, '', '', 'width="25px"');
@ -242,7 +242,7 @@ class GradebookTable extends SortableTable
); );
$total_categories_weight = 0; $total_categories_weight = 0;
$scoredisplay = ScoreDisplay :: instance(); $scoredisplay = ScoreDisplay::instance();
$totalResult = [0, 0]; $totalResult = [0, 0];
$totalBest = [0, 0]; $totalBest = [0, 0];
@ -254,307 +254,311 @@ class GradebookTable extends SortableTable
} }
// Categories. // Categories.
if (!empty($data_array)) if (!empty($data_array)) {
foreach ($data_array as $data) { foreach ($data_array as $data) {
// list of items inside the gradebook (exercises, lps, forums, etc) // list of items inside the gradebook (exercises, lps, forums, etc)
$row = array(); $row = array();
/** @var AbstractLink $item */ /** @var AbstractLink $item */
$item = $mainCategory = $data[0]; $item = $mainCategory = $data[0];
//if the item is invisible, wrap it in a span with class invisible //if the item is invisible, wrap it in a span with class invisible
$invisibility_span_open = api_is_allowed_to_edit() && $item->is_visible() == '0' ? '<span class="text-muted">' : ''; $invisibility_span_open = api_is_allowed_to_edit() && $item->is_visible() == '0' ? '<span class="text-muted">' : '';
$invisibility_span_close = api_is_allowed_to_edit() && $item->is_visible() == '0' ? '</span>' : ''; $invisibility_span_close = api_is_allowed_to_edit() && $item->is_visible() == '0' ? '</span>' : '';
// Id // Id
if ($this->teacherView) { if ($this->teacherView) {
if ($this->exportToPdf == false) { if ($this->exportToPdf == false) {
$row[] = $this->build_id_column($item); $row[] = $this->build_id_column($item);
}
} }
}
// Type. // Type.
$row[] = $this->build_type_column($item); $row[] = $this->build_type_column($item);
// Name.
if (get_class($item) == 'Category') {
$row[] = $invisibility_span_open.'<strong>'.$item->get_name().'</strong>'.$invisibility_span_close;
$main_categories[$item->get_id()]['name'] = $item->get_name();
} else {
$name = $this->build_name_link($item, $type);
$row[] = $invisibility_span_open.$name. $invisibility_span_close;
$main_categories[$item->get_id()]['name'] = $name;
}
$this->dataForGraph['categories'][] = $item->get_name(); // Name.
if (get_class($item) == 'Category') {
$row[] = $invisibility_span_open.'<strong>'.$item->get_name().'</strong>'.$invisibility_span_close;
$main_categories[$item->get_id()]['name'] = $item->get_name();
} else {
$name = $this->build_name_link($item, $type);
$row[] = $invisibility_span_open.$name.$invisibility_span_close;
$main_categories[$item->get_id()]['name'] = $name;
}
$main_categories[$item->get_id()]['weight']= $item->get_weight(); $this->dataForGraph['categories'][] = $item->get_name();
$total_categories_weight += $item->get_weight();
// Description. $main_categories[$item->get_id()]['weight'] = $item->get_weight();
if ($this->exportToPdf == false) { $total_categories_weight += $item->get_weight();
$row[] = $invisibility_span_open.$data[2].$invisibility_span_close;
}
// Weight. // Description.
$weight = $scoredisplay->display_score( if ($this->exportToPdf == false) {
array( $row[] = $invisibility_span_open.$data[2].$invisibility_span_close;
$data['3'], }
$this->currentcat->get_weight()
),
SCORE_SIMPLE,
SCORE_BOTH,
true
);
if ($this->teacherView) { // Weight.
$row[] = $invisibility_span_open .Display::tag('p', $weight, array('class' => 'score')).$invisibility_span_close; $weight = $scoredisplay->display_score(
} else { array(
$row[] = $invisibility_span_open .$weight.$invisibility_span_close; $data['3'],
} $this->currentcat->get_weight()
),
SCORE_SIMPLE,
SCORE_BOTH,
true
);
$category_weight = $item->get_weight(); if ($this->teacherView) {
$mainCategoryWeight = $main_cat[0]->get_weight(); $row[] = $invisibility_span_open.Display::tag('p', $weight,
array('class' => 'score')).$invisibility_span_close;
} else {
$row[] = $invisibility_span_open.$weight.$invisibility_span_close;
}
if ($this->teacherView) { $category_weight = $item->get_weight();
$weight_total_links += $data[3]; $mainCategoryWeight = $main_cat[0]->get_weight();
} else {
$cattotal = Category::load($_GET['selectcat']);
$scoretotal = $cattotal[0]->calc_score($this->userId);
$item_value = $scoredisplay->display_score($scoretotal, SCORE_SIMPLE);
}
// Edit (for admins). if ($this->teacherView) {
if ($this->teacherView) { $weight_total_links += $data[3];
$cat = new Category();
$show_message = $cat->show_message_resource_delete($item->get_course_code());
if ($show_message === false) {
$row[] = $this->build_edit_column($item);
}
} else {
$score = $item->calc_score($this->userId);
if (!empty($score[1])) {
$completeScore = $scoredisplay->display_score($score, SCORE_DIV_PERCENT);
$score = $score[0]/$score[1]*$item->get_weight();
$score = $scoredisplay->display_score(array($score, null), SCORE_SIMPLE);
$scoreToDisplay = Display::tip($score, $completeScore);
} else { } else {
$scoreToDisplay = '-'; $cattotal = Category::load($_GET['selectcat']);
$categoryScore = null; $scoretotal = $cattotal[0]->calc_score($this->userId);
$item_value = $scoredisplay->display_score($scoretotal, SCORE_SIMPLE);
} }
// Students get the results and certificates columns // Edit (for admins).
//if (count($this->evals_links) > 0 && $status_user != 1) { if ($this->teacherView) {
if (1) { $cat = new Category();
$value_data = isset($data[4]) ? $data[4] : null; $show_message = $cat->show_message_resource_delete($item->get_course_code());
$best = isset($data['best']) ? $data['best'] : null; if ($show_message === false) {
$average = isset($data['average']) ? $data['average'] : null; $row[] = $this->build_edit_column($item);
$ranking = isset($data['ranking']) ? $data['ranking'] : null;
$totalResult = [
$data['result_score'][0],
$data['result_score'][1],
];
$totalBest = [
$totalBest[0] + $data['best_score'][0],
$totalBest[1] + $data['best_score'][1],
];
$totalAverage = [
$data['average_score'][0],
$data['average_score'][1],
];
// Student result
$row[] = $value_data;
$totalResultAverageValue = strip_tags($scoredisplay->display_score($totalResult, SCORE_AVERAGE));
$this->dataForGraph['my_result'][] = floatval($totalResultAverageValue);
$totalAverageValue = strip_tags($scoredisplay->display_score($totalAverage, SCORE_AVERAGE));
$this->dataForGraph['average'][] = floatval($totalAverageValue);
// Ranking
$row[] = $ranking;
// Best
$row[] = $best;
// Average
$row[] = $average;
if (get_class($item) == 'Category') {
if ($this->exportToPdf == false) {
$row[] = $this->build_edit_column($item);
}
} }
} else { } else {
$row[] = $scoreToDisplay; $score = $item->calc_score($this->userId);
if (!empty($this->cats)) { if (!empty($score[1])) {
if ($this->exportToPdf == false) { $completeScore = $scoredisplay->display_score($score, SCORE_DIV_PERCENT);
$row[] = $this->build_edit_column($item); $score = $score[0] / $score[1] * $item->get_weight();
} $score = $scoredisplay->display_score(array($score, null), SCORE_SIMPLE);
$scoreToDisplay = Display::tip($score, $completeScore);
} else {
$scoreToDisplay = '-';
$categoryScore = null;
} }
}
}
// Category added. // Students get the results and certificates columns
$sortable_data[] = $row; //if (count($this->evals_links) > 0 && $status_user != 1) {
if (1) {
// Loading children $value_data = isset($data[4]) ? $data[4] : null;
if (get_class($item) == 'Category') { $best = isset($data['best']) ? $data['best'] : null;
$course_code = api_get_course_id(); $average = isset($data['average']) ? $data['average'] : null;
$session_id = api_get_session_id(); $ranking = isset($data['ranking']) ? $data['ranking'] : null;
$parent_id = $item->get_id();
$cats = Category::load( $totalResult = [
$parent_id, $data['result_score'][0],
null, $data['result_score'][1],
null, ];
null,
null, $totalBest = [
null $totalBest[0] + $data['best_score'][0],
); $totalBest[1] + $data['best_score'][1],
];
$totalAverage = [
$data['average_score'][0],
$data['average_score'][1],
];
// Student result
$row[] = $value_data;
$totalResultAverageValue = strip_tags($scoredisplay->display_score($totalResult,
SCORE_AVERAGE));
$this->dataForGraph['my_result'][] = floatval($totalResultAverageValue);
$totalAverageValue = strip_tags($scoredisplay->display_score($totalAverage, SCORE_AVERAGE));
$this->dataForGraph['average'][] = floatval($totalAverageValue);
// Ranking
$row[] = $ranking;
// Best
$row[] = $best;
// Average
$row[] = $average;
if (get_class($item) == 'Category') {
if ($this->exportToPdf == false) {
$row[] = $this->build_edit_column($item);
}
}
} else {
$row[] = $scoreToDisplay;
if (isset($cats[0])) { if (!empty($this->cats)) {
$allcat = $cats[0]->get_subcategories($this->userId, $course_code, $session_id); if ($this->exportToPdf == false) {
$alleval = $cats[0]->get_evaluations($this->userId); $row[] = $this->build_edit_column($item);
$alllink = $cats[0]->get_links($this->userId); }
}
}
}
$sub_cat_info = new GradebookDataGenerator($allcat, $alleval, $alllink); // Category added.
$sub_cat_info->userId = $user_id; $sortable_data[] = $row;
$data_array2 = $sub_cat_info->get_data( // Loading children
$sorting, if (get_class($item) == 'Category') {
$from, $course_code = api_get_course_id();
$this->per_page, $session_id = api_get_session_id();
false, $parent_id = $item->get_id();
$this->studentList $cats = Category::load(
$parent_id,
null,
null,
null,
null,
null
); );
$total_weight = 0;
// Links.
foreach ($data_array2 as $data) {
$row = array();
$item = $data[0];
//if the item is invisible, wrap it in a span with class invisible if (isset($cats[0])) {
$invisibility_span_open = api_is_allowed_to_edit() && $item->is_visible() == '0' ? '<span class="text-muted">' : ''; $allcat = $cats[0]->get_subcategories($this->userId, $course_code, $session_id);
$invisibility_span_close = api_is_allowed_to_edit() && $item->is_visible() == '0' ? '</span>' : ''; $alleval = $cats[0]->get_evaluations($this->userId);
$alllink = $cats[0]->get_links($this->userId);
if (isset($item)) {
$main_categories[$parent_id]['children'][$item->get_id()]['name'] = $item->get_name(); $sub_cat_info = new GradebookDataGenerator($allcat, $alleval, $alllink);
$main_categories[$parent_id]['children'][$item->get_id()]['weight'] = $item->get_weight(); $sub_cat_info->userId = $user_id;
}
$data_array2 = $sub_cat_info->get_data(
$sorting,
$from,
$this->per_page,
false,
$this->studentList
);
$total_weight = 0;
// Links.
foreach ($data_array2 as $data) {
$row = array();
$item = $data[0];
//if the item is invisible, wrap it in a span with class invisible
$invisibility_span_open = api_is_allowed_to_edit() && $item->is_visible() == '0' ? '<span class="text-muted">' : '';
$invisibility_span_close = api_is_allowed_to_edit() && $item->is_visible() == '0' ? '</span>' : '';
if (isset($item)) {
$main_categories[$parent_id]['children'][$item->get_id()]['name'] = $item->get_name();
$main_categories[$parent_id]['children'][$item->get_id()]['weight'] = $item->get_weight();
}
if ($this->teacherView) { if ($this->teacherView) {
if ($this->exportToPdf == false) { if ($this->exportToPdf == false) {
$row[] = $this->build_id_column($item); $row[] = $this->build_id_column($item);
}
} }
}
// Type // Type
$row[] = $this->build_type_column($item, array('style' => 'padding-left:5px')); $row[] = $this->build_type_column($item, array('style' => 'padding-left:5px'));
// Name. // Name.
$row[] = $invisibility_span_open."&nbsp;&nbsp;&nbsp; ".$this->build_name_link($item, $type) . $invisibility_span_close; $row[] = $invisibility_span_open."&nbsp;&nbsp;&nbsp; ".$this->build_name_link($item,
$type).$invisibility_span_close;
// Description. // Description.
if ($this->exportToPdf == false) { if ($this->exportToPdf == false) {
$row[] = $invisibility_span_open.$data[2].$invisibility_span_close; $row[] = $invisibility_span_open.$data[2].$invisibility_span_close;
} }
$weight = $data[3]; $weight = $data[3];
$total_weight += $weight; $total_weight += $weight;
// Weight // Weight
$row[] = $invisibility_span_open.$weight.$invisibility_span_close; $row[] = $invisibility_span_open.$weight.$invisibility_span_close;
if ($this->teacherView) { if ($this->teacherView) {
//$weight_total_links += intval($data[3]); //$weight_total_links += intval($data[3]);
} else { } else {
$cattotal = Category::load($_GET['selectcat']); $cattotal = Category::load($_GET['selectcat']);
$scoretotal = $cattotal[0]->calc_score($this->userId); $scoretotal = $cattotal[0]->calc_score($this->userId);
$item_value = $scoretotal[0]; $item_value = $scoretotal[0];
} }
// Admins get an edit column. // Admins get an edit column.
if (api_is_allowed_to_edit(null, true) && if (api_is_allowed_to_edit(null, true) &&
isset($_GET['user_id']) == false && isset($_GET['user_id']) == false &&
(isset($_GET['action']) && $_GET['action'] != 'export_all' || !isset($_GET['action']) (isset($_GET['action']) && $_GET['action'] != 'export_all' || !isset($_GET['action'])
) )
) { ) {
$cat = new Category(); $cat = new Category();
$show_message = $cat->show_message_resource_delete($item->get_course_code()); $show_message = $cat->show_message_resource_delete($item->get_course_code());
if ($show_message === false) { if ($show_message === false) {
if ($this->exportToPdf == false) { if ($this->exportToPdf == false) {
$row[] = $this->build_edit_column($item); $row[] = $this->build_edit_column($item);
}
} }
} } else {
} else { // Students get the results and certificates columns
// Students get the results and certificates columns $eval_n_links = array_merge($alleval, $alllink);
$eval_n_links = array_merge($alleval, $alllink);
if (count($eval_n_links) > 0) {
if (count($eval_n_links)> 0) { $value_data = isset($data[4]) ? $data[4] : null;
$value_data = isset($data[4]) ? $data[4] : null; if (!is_null($value_data)) {
if (!is_null($value_data)) { //$score = $item->calc_score(api_get_user_id());
//$score = $item->calc_score(api_get_user_id()); //$new_score = $data[3] * $score[0] / $score[1];
//$new_score = $data[3] * $score[0] / $score[1]; //$new_score = floatval(number_format($new_score, api_get_setting('gradebook_number_decimals')));
//$new_score = floatval(number_format($new_score, api_get_setting('gradebook_number_decimals')));
// Result
// Result $row[] = $value_data;
$row[] = $value_data; $best = isset($data['best']) ? $data['best'] : null;
$best = isset($data['best']) ? $data['best'] : null; $average = isset($data['average']) ? $data['average'] : null;
$average = isset($data['average']) ? $data['average'] : null; $ranking = isset($data['ranking']) ? $data['ranking'] : null;
$ranking = isset($data['ranking']) ? $data['ranking'] : null;
// Ranking
// Ranking $row[] = $ranking;
$row[] = $ranking; // Best
// Best $row[] = $best;
$row[] = $best; // Average
// Average $row[] = $average;
$row[] = $average; }
} }
}
if (!empty($cats)) { if (!empty($cats)) {
if ($this->exportToPdf == false) { if ($this->exportToPdf == false) {
$row[] = null; $row[] = null;
}
} }
} }
}
if ($this->exportToPdf == false) { if ($this->exportToPdf == false) {
$row['child_of'] = $parent_id; $row['child_of'] = $parent_id;
}
$sortable_data[] = $row;
} }
$sortable_data[] = $row;
}
// "Warning row" // "Warning row"
if (!empty($data_array)) { if (!empty($data_array)) {
if ($this->teacherView) { if ($this->teacherView) {
// Compare the category weight to the sum of all weights inside the category // Compare the category weight to the sum of all weights inside the category
if (intval($total_weight) == $category_weight) { if (intval($total_weight) == $category_weight) {
$label = null; $label = null;
$total = GradebookUtils::score_badges( $total = GradebookUtils::score_badges(
array( array(
$total_weight.' / '.$category_weight, $total_weight.' / '.$category_weight,
'100' '100'
) )
); );
} else { } else {
$label = Display::return_icon( $label = Display::return_icon(
'warning.png', 'warning.png',
sprintf(get_lang('TotalWeightMustBeX'), $category_weight) sprintf(get_lang('TotalWeightMustBeX'), $category_weight)
);
$total = Display::badge($total_weight.' / '.$category_weight, 'warning');
}
$row = array(
null,
null,
"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<h5>".get_lang('SubTotal').'</h5>',
null,
$total.' '.$label,
'child_of' => $parent_id
); );
$total = Display::badge($total_weight.' / '.$category_weight, 'warning'); $sortable_data[] = $row;
} }
$row = array(
null,
null,
"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<h5>".get_lang('SubTotal').'</h5>',
null,
$total.' '.$label,
'child_of' => $parent_id
);
$sortable_data[] = $row;
} }
} }
} }
@ -588,7 +592,7 @@ class GradebookTable extends SortableTable
$row = array( $row = array(
null, null,
null, null,
'<strong>' . get_lang('Total') . '</strong>', '<strong>'.get_lang('Total').'</strong>',
null, null,
$total $total
); );
@ -658,7 +662,7 @@ class GradebookTable extends SortableTable
if ($this->exportToPdf) { if ($this->exportToPdf) {
$row = array( $row = array(
null, null,
'<h3>' . get_lang('Total') . '</h3>', '<h3>'.get_lang('Total').'</h3>',
$main_weight, $main_weight,
$totalResult, $totalResult,
$totalRanking, $totalRanking,
@ -668,7 +672,7 @@ class GradebookTable extends SortableTable
} else { } else {
$row = array( $row = array(
null, null,
'<h3>' . get_lang('Total') . '</h3>', '<h3>'.get_lang('Total').'</h3>',
null, null,
$main_weight, $main_weight,
$totalResult, $totalResult,
@ -683,7 +687,7 @@ class GradebookTable extends SortableTable
} }
// Warning messages // Warning messages
$view = isset($_GET['view']) ? $_GET['view']: null; $view = isset($_GET['view']) ? $_GET['view'] : null;
if ($this->teacherView) { if ($this->teacherView) {
if (isset($_GET['selectcat']) && if (isset($_GET['selectcat']) &&
@ -694,14 +698,14 @@ class GradebookTable extends SortableTable
$category = Category::load($id_cat); $category = Category::load($id_cat);
$weight_category = intval($this->build_weight($category[0])); $weight_category = intval($this->build_weight($category[0]));
$course_code = $this->build_course_code($category[0]); $course_code = $this->build_course_code($category[0]);
$weight_total_links = round($weight_total_links); $weight_total_links = round($weight_total_links);
if ($weight_total_links > $weight_category || if ($weight_total_links > $weight_category ||
$weight_total_links < $weight_category || $weight_total_links < $weight_category ||
$weight_total_links > $weight_category $weight_total_links > $weight_category
) { ) {
$warning_message = sprintf(get_lang('TotalWeightMustBeX'), $weight_category); $warning_message = sprintf(get_lang('TotalWeightMustBeX'), $weight_category);
$modify_icons = '<a href="gradebook_edit_cat.php?editcat='.$id_cat.'&cidReq='.$course_code.'&id_session='.api_get_session_id().'">'. $modify_icons = '<a href="gradebook_edit_cat.php?editcat='.$id_cat.'&cidReq='.$course_code.'&id_session='.api_get_session_id().'">'.
Display::return_icon('edit.png', $warning_message, array(), ICON_SIZE_SMALL).'</a>'; Display::return_icon('edit.png', $warning_message, array(), ICON_SIZE_SMALL).'</a>';
$warning_message .= $modify_icons; $warning_message .= $modify_icons;
Display::display_warning_message($warning_message, false); Display::display_warning_message($warning_message, false);
@ -725,7 +729,7 @@ class GradebookTable extends SortableTable
} }
if (empty($_GET['selectcat'])) { if (empty($_GET['selectcat'])) {
$categories = Category :: load(); $categories = Category::load();
$weight_categories = $certificate_min_scores = $course_codes = array(); $weight_categories = $certificate_min_scores = $course_codes = array();
foreach ($categories as $category) { foreach ($categories as $category) {
$course_code_category = $this->build_course_code($category); $course_code_category = $this->build_course_code($category);
@ -756,7 +760,7 @@ class GradebookTable extends SortableTable
if (empty($certificate_min_score) || if (empty($certificate_min_score) ||
($certificate_min_score > $weight_category) ($certificate_min_score > $weight_category)
) { ) {
$warning_message .= $course_code .'&nbsp;-&nbsp;'.get_lang('CertificateMinimunScoreIsRequiredAndMustNotBeMoreThan').'&nbsp;'.$weight_category.'<br />'; $warning_message .= $course_code.'&nbsp;-&nbsp;'.get_lang('CertificateMinimunScoreIsRequiredAndMustNotBeMoreThan').'&nbsp;'.$weight_category.'<br />';
} }
} }
@ -821,7 +825,7 @@ class GradebookTable extends SortableTable
$pChart->setGraphArea(50, 30, $xSize - 50, $ySize - 70); $pChart->setGraphArea(50, 30, $xSize - 50, $ySize - 70);
$pChart->setFontProperties( $pChart->setFontProperties(
array( array(
'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf', 'FontName' => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
'FontSize' => 10, 'FontSize' => 10,
) )
); );
@ -870,14 +874,15 @@ class GradebookTable extends SortableTable
$chartHash = $myCache->getHash($dataSet); $chartHash = $myCache->getHash($dataSet);
$myCache->writeToCache($chartHash, $pChart); $myCache->writeToCache($chartHash, $pChart);
$imgSysPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash; $imgSysPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
$myCache->saveFromCache($chartHash, $imgSysPath); $myCache->saveFromCache($chartHash, $imgSysPath);
$imgWebPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash; $imgWebPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
if (file_exists($imgSysPath)) { if (file_exists($imgSysPath)) {
$result = '<div id="contentArea" style="text-align: center;" >'; $result = '<div id="contentArea" style="text-align: center;" >';
$result .= '<img src="' . $imgWebPath.'" >'; $result .= '<img src="'.$imgWebPath.'" >';
$result .= '</div>'; $result .= '</div>';
return $result; return $result;
} }
} }
@ -921,13 +926,13 @@ class GradebookTable extends SortableTable
switch ($item->get_item_type()) { switch ($item->get_item_type()) {
// category // category
case 'C': case 'C':
return 'CATE' . $item->get_id(); return 'CATE'.$item->get_id();
// evaluation // evaluation
case 'E': case 'E':
return 'EVAL' . $item->get_id(); return 'EVAL'.$item->get_id();
// link // link
case 'L': case 'L':
return 'LINK' . $item->get_id(); return 'LINK'.$item->get_id();
} }
} }
@ -955,54 +960,56 @@ class GradebookTable extends SortableTable
switch ($item->get_item_type()) { switch ($item->get_item_type()) {
// category // category
case 'C': case 'C':
$prms_uri='?selectcat=' . $item->get_id() . '&amp;view='.$view; $prms_uri = '?selectcat='.$item->get_id().'&amp;view='.$view;
if (isset($_GET['isStudentView'])) { if (isset($_GET['isStudentView'])) {
if ( isset($is_student) || (isset($_SESSION['studentview']) && $_SESSION['studentview']=='studentview') ) { if (isset($is_student) || (isset($_SESSION['studentview']) && $_SESSION['studentview'] == 'studentview')) {
$prms_uri=$prms_uri.'&amp;isStudentView='.Security::remove_XSS($_GET['isStudentView']); $prms_uri = $prms_uri.'&amp;isStudentView='.Security::remove_XSS($_GET['isStudentView']);
} }
} }
$cat = new Category(); $cat = new Category();
$show_message = $cat->show_message_resource_delete($item->get_course_code()); $show_message = $cat->show_message_resource_delete($item->get_course_code());
return '&nbsp;<a href="'.Security::remove_XSS($_SESSION['gradebook_dest']).$prms_uri.'">' return '&nbsp;<a href="'.Security::remove_XSS($_SESSION['gradebook_dest']).$prms_uri.'">'
. $item->get_name() .$item->get_name()
. '</a>' .'</a>'
. ($item->is_course() ? ' &nbsp;[' . $item->get_course_code() . ']'.$show_message : ''); .($item->is_course() ? ' &nbsp;['.$item->get_course_code().']'.$show_message : '');
// evaluation // evaluation
case 'E': case 'E':
$cat = new Category(); $cat = new Category();
$course_id = CourseManager::get_course_by_category($categoryId); $course_id = CourseManager::get_course_by_category($categoryId);
$show_message = $cat->show_message_resource_delete($course_id); $show_message = $cat->show_message_resource_delete($course_id);
// course/platform admin can go to the view_results page // course/platform admin can go to the view_results page
if (api_is_allowed_to_edit() && $show_message===false) { if (api_is_allowed_to_edit() && $show_message === false) {
if ($item->get_type() == 'presence') { if ($item->get_type() == 'presence') {
return '&nbsp;' return '&nbsp;'
. '<a href="gradebook_view_result.php?cidReq='.$course_id.'&amp;selecteval=' . $item->get_id() . '">' .'<a href="gradebook_view_result.php?cidReq='.$course_id.'&amp;selecteval='.$item->get_id().'">'
. $item->get_name() .$item->get_name()
. '</a>'; .'</a>';
} else { } else {
$extra = Display::label(get_lang('Evaluation')); $extra = Display::label(get_lang('Evaluation'));
if ($type == 'simple') { if ($type == 'simple') {
$extra = ''; $extra = '';
} }
return '&nbsp;' return '&nbsp;'
. '<a href="gradebook_view_result.php?' . api_get_cidreq() . '&selecteval=' . $item->get_id() . '">' .'<a href="gradebook_view_result.php?'.api_get_cidreq().'&selecteval='.$item->get_id().'">'
. $item->get_name() .$item->get_name()
. '</a>&nbsp;'.$extra; .'</a>&nbsp;'.$extra;
} }
} elseif (ScoreDisplay :: instance()->is_custom() && $show_message===false) { } elseif (ScoreDisplay::instance()->is_custom() && $show_message === false) {
// students can go to the statistics page (if custom display enabled) // students can go to the statistics page (if custom display enabled)
return '&nbsp;' return '&nbsp;'
. '<a href="gradebook_statistics.php?' . api_get_cidreq() . '&selecteval=' . $item->get_id() . '">' .'<a href="gradebook_statistics.php?'.api_get_cidreq().'&selecteval='.$item->get_id().'">'
. $item->get_name() .$item->get_name()
. '</a>'; .'</a>';
} elseif ($show_message === false && !api_is_allowed_to_edit() && !ScoreDisplay :: instance()->is_custom()) { } elseif ($show_message === false && !api_is_allowed_to_edit() && !ScoreDisplay::instance()->is_custom()) {
return '&nbsp;' return '&nbsp;'
. '<a href="gradebook_statistics.php?' . api_get_cidreq() . '&selecteval=' . $item->get_id() . '">' .'<a href="gradebook_statistics.php?'.api_get_cidreq().'&selecteval='.$item->get_id().'">'
. $item->get_name() .$item->get_name()
. '</a>'; .'</a>';
} else { } else {
return '['.get_lang('Evaluation').']&nbsp;&nbsp;'.$item->get_name().$show_message; return '['.get_lang('Evaluation').']&nbsp;&nbsp;'.$item->get_name().$show_message;
} }
@ -1015,9 +1022,9 @@ class GradebookTable extends SortableTable
$url = $item->get_link(); $url = $item->get_link();
if (isset($url) && $show_message === false) { if (isset($url) && $show_message === false) {
$text = '&nbsp;<a href="' . $item->get_link() . '">' $text = '&nbsp;<a href="'.$item->get_link().'">'
. $item->get_name() .$item->get_name()
. '</a>'; .'</a>';
} else { } else {
$text = $item->get_name(); $text = $item->get_name();
} }
@ -1032,6 +1039,7 @@ class GradebookTable extends SortableTable
if (empty($cc)) { if (empty($cc)) {
$text .= '&nbsp;[<a href="'.api_get_path(REL_COURSE_PATH).$item->get_course_code().'/">'.$item->get_course_code().'</a>]'; $text .= '&nbsp;[<a href="'.api_get_path(REL_COURSE_PATH).$item->get_course_code().'/">'.$item->get_course_code().'</a>]';
} }
return $text; return $text;
} }
} }

Write Preview
Loading…
Cancel
Save