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

[svn r17043] minor - changes in logic - correctly functioning of view flat in the gradebook - see(FS#3280)

Browse Source
skala
Isaac Flores 17 years ago
parent c4aced4aaf
commit fe8c7fb092
5 changed files with 40 additions and 18 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. 6
      main/gradebook/gradebook_edit_all.php
  2. 31
      main/gradebook/index.php
  3. 10
      main/gradebook/lib/fe/displaygradebook.php
  4. 5
      main/gradebook/lib/flatview_data_generator.class.php
  5. 2
      main/gradebook/lib/gradebook_functions.inc.php

6
main/gradebook/gradebook_edit_all.php
Unescape View File

@ -62,8 +62,12 @@ if (!isset($_GET['exportpdf']) and !isset($_GET['export_certificate'])) {
'url' => 'index.php?',
'name' => get_lang('Gradebook'));
$interbreadcrumb[]= array (
'url' => 'index.php?&selectcat='.Security::remove_XSS($_GET['selectcat']),
'name' => get_lang('Details'));
Display :: display_header('');
//api_get_cidreq()
}
}

31
main/gradebook/index.php
Unescape View File

@ -402,11 +402,14 @@ if (!isset($_GET['exportpdf']) and !isset($_GET['export_certificate'])) {
'name' => get_lang('Gradebook')
);
$interbreadcrumb[]= array (
'url' => $_SESSION['gradebook_dest'].'?selectcat=' . Security::remove_XSS($_GET['selectcat']),
'name' => get_lang('Details')
);
Display :: display_header();
if (!isset($_GET['gradebooklist_direction'])) {
$interbreadcrumb[]= array (
'url' => $_SESSION['gradebook_dest'].'?selectcat=' . Security::remove_XSS($_GET['selectcat']),
'name' => get_lang('Details')
);
}
Display :: display_header('');
} else {
Display :: display_header(get_lang('Gradebook'));
}
@ -632,6 +635,13 @@ if (isset($_GET['search'])) {
if (isset ($_GET['studentoverview'])) {
$addparams['studentoverview'] = '';
}
//$addparams['cidReq']='';
if (isset($_GET['cidReq']) && $_GET['cidReq']!='') {
$addparams['cidReq']=$_GET['cidReq'];
} else {
$addparams['cidReq']='';
}
$gradebooktable= new GradebookTable($cats[0], $allcat, $alleval,$alllink, $addparams);
$no_qualification = false;
if (( count($allcat) == 0) && ( count($alleval) == 0 ) && ( count($alllink) == 0 )) {
@ -649,9 +659,14 @@ if ($category != '0') {
}
if (api_is_platform_admin() || api_is_allowed_to_create_course()) {
if (!isset ($_GET['selectcat'])) {
$cats = Category :: load(null, null, $course_code, null, null, $session_id, false);
DisplayGradebook :: display_reduce_header_gradebook($cats[0],$is_course_admin, $is_platform_admin, $simple_search_form, false, false);
if ( (isset ($_GET['selectcat']) && $_GET['selectcat']<>0) ) {
//
} else {
if ( ((isset ($_GET['selectcat']) && $_GET['selectcat']==0) || ((isset($_GET['cidReq']) && $_GET['cidReq']!==''))) ) {
$cats = Category :: load(null, null, $course_code, null, null, $session_id, false);
DisplayGradebook :: display_reduce_header_gradebook($cats[0],$is_course_admin, $is_platform_admin, $simple_search_form, false, false);
}
}
}
$gradebooktable->display();

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

@ -133,7 +133,7 @@ class DisplayGradebook
*/
function display_header_reduce_flatview($catobj, $showeval, $showlink,$simple_search_form) {
$header= '<table border="0" cellpadding="5">';
$header .= '<td style="vertical-align: top;"><a href="index.php' . '"><< ' . get_lang('BackToOverview') . '</a></td>';
$header .= '<td style="vertical-align: top;"><a href="index.php?'.api_get_cidreq().'"><< ' . get_lang('BackToOverview') . '</a></td>';
// $header .= '<td style="vertical-align: top;"><a href="' . api_get_self() . '?exportpdf=&offset='.Security::remove_XSS($_GET['offset']).'&search=' . Security::remove_XSS($_GET['search']).'&selectcat=' . $catobj->get_id() . '"><img src=../img/calendar_up.gif alt=' . get_lang('ExportPDF') . '/> ' . get_lang('ExportPDF') . '</a>';
@ -280,17 +280,17 @@ class DisplayGradebook
$header .= '<a href="gradebook_add_cat.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '" ><img src="../img/folder_new.gif" alt="' . get_lang('NewSubCategory') . '" align="absmiddle" /> ' . get_lang('NewSubCategory') . '</a></td>';
}
if ($show_add_link === true) {
$header .= '<td><a href="gradebook_add_eval.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '" ><img src="../img/filenew.gif" alt="' . get_lang('NewEvaluation') . '" align="absmiddle" /> ' . get_lang('NewEvaluation') . '</a>';
$header .= '<td><a href="gradebook_add_eval.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '" ><img src="../img/filenew.gif" alt="' . get_lang('NewEvaluation') . '" align="absmiddle" /> ' . get_lang('NewEvaluation') . '</a>&nbsp;';
$cats= Category :: load($selectcat);
if ($cats[0]->get_course_code() != null) {
//$header .= '<td><a href="gradebook_add_link.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '"><img src="../img/link.gif" alt="' . get_lang('MakeLink') . '" align="absmiddle" /> ' . get_lang('MakeLink') . '</a>';
$header .= '<td><a href="gradebook_add_link.php?course_code='.api_get_course_id().'&selectcat=' . $catobj->get_id() . '"><img src="../img/link.gif" alt="' . get_lang('MakeLink') . '" align="absmiddle" /> ' . get_lang('MakeLink') . '</a>';
$header .= '<td><a href="gradebook_add_link.php?course_code='.api_get_course_id().'&selectcat=' . $catobj->get_id() . '"><img src="../img/link.gif" alt="' . get_lang('MakeLink') . '" align="absmiddle" /> ' . get_lang('MakeLink') . '</a>&nbsp;';
} else {
$header .= '<td><a href="gradebook_add_link_select_course.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '"><img src="../img/link.gif" alt="' . get_lang('MakeLink') . '" align="absmiddle" /> ' . get_lang('MakeLink') . '</a>';
$header .= '<td><a href="gradebook_add_link_select_course.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '"><img src="../img/link.gif" alt="' . get_lang('MakeLink') . '" align="absmiddle" /> ' . get_lang('MakeLink') . '</a>&nbsp;';
}
}
$header .= '<td><a href="gradebook_edit_all.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '"><img src="../img/quiz.gif" alt="' . get_lang('EditAllWeights') . '" /> ' . get_lang('EditAllWeights') . '</a>';
$header .= '<td><a href="gradebook_edit_all.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '"><img src="../img/quiz.gif" alt="' . get_lang('EditAllWeights') . '" align="absmiddle"/> ' . get_lang('EditAllWeights') . '</a>';
}
} elseif (isset ($_GET['search'])) {
$header .= '<b>'.get_lang('SearchResults').' :</b>';

5
main/gradebook/lib/flatview_data_generator.class.php
Unescape View File

@ -153,7 +153,10 @@ class FlatViewDataGenerator
$count++) {
$item = $this->evals_links [$count + $items_start];
$score = $item->calc_score($user[0]);
$item_value+=$score[0]/$score[1]*$item->get_weight();
$divide=$score[1]*$item->get_weight();
if ($divide!=0) {
$item_value+=$score[0]/$divide;
}
$item_total+=$item->get_weight();
$row[] = $scoredisplay->display_score($score,SCORE_DIV_PERCENT);
}

2
main/gradebook/lib/gradebook_functions.inc.php
Unescape View File

@ -188,7 +188,7 @@ function build_edit_icons_cat($cat, $selectcat) {
if ($cat->is_movable()) {
$modify_icons .= '&nbsp;<a href="' . api_get_self() . '?movecat=' . $cat->get_id() . '&amp;selectcat=' . $selectcat . '"><img src="../img/deplacer_fichier.gif" border="0" title="' . get_lang('Move') . '" alt="" /></a>';
} else {
$modify_icons .= '&nbsp;<img src="../img/deplacer_fichier_na.gif" border="0" title="' . get_lang('Move') . '" alt="" />';
//$modify_icons .= '&nbsp;<img src="../img/deplacer_fichier_na.gif" border="0" title="' . get_lang('Move') . '" alt="" />';
}
$modify_icons .= '&nbsp;<a href="' . api_get_self() . '?visiblecat=' . $cat->get_id() . '&amp;' . $visibility_command . '=&amp;selectcat=' . $selectcat . '"><img src="../img/' . $visibility_icon . '.gif" border="0" title="' . get_lang('Visible') . '" alt="" /></a>';
return $modify_icons;

Write Preview
Loading…
Cancel
Save