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

Interface improvements(?) for gradebook - refs #4047

Browse Source
skala
Yannick Warnier 14 years ago
parent dbde98a3df
commit 586128517a
2 changed files with 14 additions and 13 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. 13
      main/gradebook/lib/fe/displaygradebook.php
  2. 14
      main/gradebook/lib/fe/gradebooktable.class.php

13
main/gradebook/lib/fe/displaygradebook.php
Unescape View File

@ -328,7 +328,7 @@ class DisplayGradebook
//Right icons
$modify_icons = '<a href="gradebook_edit_cat.php?editcat='.$catobj->get_id().'&cidReq='.$catobj->get_course_code().'">'.Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_MEDIUM).'</a>';
//$modify_icons .= '<a href="../document/document.php?curdirpath=/certificates&'.$my_api_cidreq.'&origin=gradebook&selectcat=' . $catobj->get_id() . '">'.
Display::return_icon('certificate.png', get_lang('AttachCertificate'),'',ICON_SIZE_MEDIUM).'</a>';
//Display::return_icon('certificate.png', get_lang('AttachCertificate'),'',ICON_SIZE_MEDIUM).'</a>';
//hide or delete are not options available
//$modify_icons .= '&nbsp;<a href="' . api_get_self() . '?visiblecat=' . $catobj->get_id() . '&amp;' . $visibility_command . '=&amp;selectcat=0 ">'.Display::return_icon($visibility_icon.'.png', get_lang('Visible'),'',ICON_SIZE_MEDIUM).'</a>';
@ -544,14 +544,17 @@ class DisplayGradebook
echo $header;
if (api_is_allowed_to_edit(null, true)) {
$weight = ((intval($catobj->get_weight())>0) ? $catobj->get_weight() : 0);
$weight = Display::tag('h3', get_lang('TotalWeight').' : '.$weight);
$weight = ((intval($catobj->get_weight())>0) ? $catobj->get_weight() : 0);
$weight = get_lang('TotalWeight').' : '.$weight;
$min_certification = (intval($catobj->get_certificate_min_score()>0) ? $catobj->get_certificate_min_score() : 0);
$min_certification = Display::tag('h3', get_lang('CertificateMinScore').' : '.$min_certification);
$min_certification = get_lang('CertificateMinScore').' : '.$min_certification;
$edit_icon = '<a href="gradebook_edit_cat.php?editcat='.$catobj->get_id().'&amp;cidReq='.$catobj->get_course_code().'">'.Display::return_icon('edit.png', get_lang('Edit'),array('class'=>'right'),ICON_SIZE_SMALL).'</a>';
//$msg = Display::tag('h3', $weight.' - '.$min_certification);
$msg = Display::tag('h3', $weight.' - '.$min_certification.$edit_icon);
//@todo show description
$description = (($catobj->get_description() == "" || is_null($catobj->get_description())) ? '' : '<strong>'.get_lang('GradebookDescriptionLog').'</strong>'.': '.$catobj->get_description());
Display::display_normal_message($weight.$min_certification, false);
Display::display_normal_message($msg, false);
if (!empty($description)) {
echo Display::div($description, array());
}

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

@ -397,14 +397,10 @@ class GradebookTable extends SortableTable {
$course_code = $this->build_course_code($category[0]);
$weight_total_links = round($weight_total_links);
if ($weight_total_links > $weight_category) {
$warning_message = get_lang('TotalWeightMustNotBeMoreThan').'&nbsp;'.$weight_category;
Display::display_warning_message($warning_message,false);
}
if ($weight_total_links < $weight_category ||$weight_total_links > $weight_category) {
if ($weight_total_links > $weight_category || $weight_total_links < $weight_category || $weight_total_links > $weight_category) {
$warning_message = sprintf(get_lang('TotalWeightMustBeX'), $weight_category);
$modify_icons = '<a href="gradebook_edit_cat.php?editcat='.$id_cat.'&cidReq='.$course_code.'">'.Display::return_icon('edit.png', $warning_message,array('class'=>'right'),ICON_SIZE_TINY).'</a>';
$warning_message .= $modify_icons;
Display::display_warning_message($warning_message,false);
}
@ -415,7 +411,9 @@ class GradebookTable extends SortableTable {
if (empty($new_content[0])) {
$warning_message = get_lang('ThereIsNotACertificateAvailableByDefault');
Display::display_warning_message($warning_message);
$cert_icon = '<a href="../document/document.php?curdirpath=/certificates&'.$course_code.'&origin=gradebook&selectcat=' . $id_cat . '">'.Display::return_icon('certificate.png', get_lang('AttachCertificate'),array('class'=>'right'),ICON_SIZE_TINY).'</a>';
Display::display_warning_message($warning_message.$cert_icon,false);
}
}

Write Preview
Loading…
Cancel
Save