Feature #1742 - Cleaning some if() conditions.

skala
Ivan Tcholakov 16 years ago
parent 26477da201
commit 62a5c76c2a
  1. 4
      main/gradebook/lib/flatview_data_generator.class.php
  2. 2
      main/gradebook/lib/gradebook_functions.inc.php
  3. 6
      main/gradebook/lib/results_data_generator.class.php

@ -58,13 +58,13 @@ class FlatViewDataGenerator
for ($count=0; ($count < $items_count ) && ($items_start + $count < count($this->evals_links)); $count++) {
$item = $this->evals_links [$count + $items_start];
$headers[] = $item->get_name();
if ($show_detail == true) {
if ($show_detail) {
$headers[] = $item->get_name().' ('.get_lang('Detail').')';
}
}
$headers[] = get_lang('GradebookQualificationTotal');
if ($show_detail == true) {
if ($show_detail) {
$headers[] = get_lang('GradebookQualificationTotal').' ('.get_lang('Detail').')';
}
return $headers;

@ -254,7 +254,7 @@ function build_edit_icons_link($link, $selectcat) {
//$modify_icons .= '&nbsp;<a href="' . api_get_self() . '?movelink=' . $link->get_id() . '&selectcat=' . $selectcat . '"><img src="../img/deplacer_fichier.gif" border="0" title="' . get_lang('Move') . '" alt="" /></a>';
$modify_icons .= '&nbsp;<a href="' . api_get_self() . '?visiblelink=' . $link->get_id() . '&amp;' . $visibility_command . '=&amp;selectcat=' . $selectcat . ' "><img src="../img/' . $visibility_icon . '.gif" border="0" title="' . get_lang('Visible') . '" alt="" /></a>';
$modify_icons .= '&nbsp;<a href="gradebook_showlog_link.php?visiblelink=' . $link->get_id() . '&amp;selectcat=' . $selectcat . '&amp;cidReq='.$link->get_course_code().'"><img src="../img/file_txt_small.gif" border="0" title="' . get_lang('GradebookQualifyLog') . '" alt="" /></a>';
//if (api_is_course_admin() == true) {
//if (api_is_course_admin()) {
//$modify_icons .= '&nbsp;<a href="gradebook_showlog_eval.php?visiblelog=' . $eval->get_id() . '&amp;' . $visibility_command . '=&amp;selectcat=' . $selectcat . '"><img src="../img/file_txt_small.gif" border="0" title="' . get_lang('GradebookQualifyLog') . '" alt="" /></a>';
//}
return $modify_icons;

@ -70,18 +70,18 @@ class ResultsDataGenerator
$user = array();
$info = get_user_info_from_id($result->get_user_id());
$user['id'] = $result->get_user_id();
if ($pdf == true){
if ($pdf){
$user['username'] = $info['username'];
}
$user['result_id'] = $result->get_id();
$user['lastname'] = $info['lastname'];
$user['firstname'] = $info['firstname'];
if ($pdf == true){
if ($pdf){
$user['score'] = $result->get_score();
} else {
$user['score'] = $this->get_score_display($result->get_score(),true, $ignore_score_color);
}
if ($pdf == true and $number_decimals == null){
if ($pdf && $number_decimals == null){
$user['scoreletter'] = $result->get_score();
}
if ($scoredisplay->is_custom())

Loading…
Cancel
Save