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 r18620] Adding the div actions, fixing the user's image see FS#3510

Browse Source
skala
Julio Montoya 16 years ago
parent a37f3f61a4
commit 814b63701e
6 changed files with 44 additions and 31 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. 21
      main/gradebook/lib/fe/displaygradebook.php
  2. 2
      main/gradebook/lib/fe/linkaddeditform.class.php
  3. 2
      main/gradebook/lib/flatview_data_generator.class.php
  4. 5
      main/gradebook/lib/scoredisplay.class.php
  5. 29
      main/gradebook/user_info.php
  6. 16
      main/gradebook/user_stats.php

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

@ -33,22 +33,23 @@ class DisplayGradebook
*/
function display_header_result($evalobj, $selectcat, $shownavbar) {
if ($shownavbar == '1' && api_is_course_tutor()) {
$header= '<table border="0" cellpadding="5"><tr><td>';
$header .= '<a href="'.$_SESSION['gradebook_dest'].'?selectcat=' . $selectcat . '"><img src="../img/lp_leftarrow.gif" alt="' . get_lang('BackToOverview') . '" align="absmiddle"/> ' . get_lang('BackToOverview') . '</a></td>';
$header = '<div class="actions">';
$header .= '<a href="'.$_SESSION['gradebook_dest'].'?selectcat=' . $selectcat . '"> &#60;&#60; ' . get_lang('BackToOverview') . '</a>';
if ($evalobj->get_course_code() == null) {
$header .= '<td><a href="gradebook_add_user.php?selecteval=' . $evalobj->get_id() . '"><img src="../img/add_user_big.gif" alt="' . get_lang('AddStudent') . '" align="absmiddle" /> ' . get_lang('AddStudent') . '</a></td>';
$header .= '<a href="gradebook_add_user.php?selecteval=' . $evalobj->get_id() . '"><img src="../img/add_user_big.gif" alt="' . get_lang('AddStudent') . '" align="absmiddle" /> ' . get_lang('AddStudent') . '</a>';
}
elseif (!$evalobj->has_results()) {
$header .= '<td><a href="gradebook_add_result.php?selectcat=' . $selectcat . '&selecteval=' . $evalobj->get_id() . '"><img src="../img/filenew.gif" alt="' . get_lang('AddResult') . '" align="absmiddle"/> ' . get_lang('AddResult') . '</a></td>';
$header .= '<a href="gradebook_add_result.php?selectcat=' . $selectcat . '&selecteval=' . $evalobj->get_id() . '"><img src="../img/filenew.gif" alt="' . get_lang('AddResult') . '" align="absmiddle"/> ' . get_lang('AddResult') . '</a>';
}
$header .= '<td><a href="' . api_get_self() . '?&selecteval=' . $evalobj->get_id() . '&import="><img src="../img/calendar_down.gif" border="0" alt="" />' . ' ' . get_lang('ImportResult') . '</a></td>';
$header .= '<a href="' . api_get_self() . '?&selecteval=' . $evalobj->get_id() . '&import="><img src="../img/calendar_down.gif" border="0" alt="" />' . ' ' . get_lang('ImportResult') . '</a>';
if ($evalobj->has_results()) {
$header .= '<td><a href="' . api_get_self() . '?&selecteval=' . $evalobj->get_id() . '&export="><img src="../img/calendar_up.gif" border="0" alt="" />' . ' ' . get_lang('ExportResult') . '</a></td>';
$header .= '<td><a href="gradebook_edit_result.php?selecteval=' . $evalobj->get_id() .'"><img src="../img/works.gif" alt="' . get_lang('EditResult') . '" align="absmiddle" /> ' . get_lang('EditResult') . '</a></td>';
$header .= '<td><a href="' . api_get_self() . '?&selecteval=' . $evalobj->get_id() . '&deleteall=" onclick="return confirmationall();"><img src="../img/delete.gif" border="0" alt="" />' . ' ' . get_lang('DeleteResult') . '</a></td>';
$header .= '<a href="' . api_get_self() . '?&selecteval=' . $evalobj->get_id() . '&export="><img src="../img/calendar_up.gif" border="0" alt="" />' . ' ' . get_lang('ExportResult') . '</a>';
$header .= '<a href="gradebook_edit_result.php?selecteval=' . $evalobj->get_id() .'"><img src="../img/works.gif" alt="' . get_lang('EditResult') . '" align="absmiddle" /> ' . get_lang('EditResult') . '</a>';
$header .= '<a href="' . api_get_self() . '?&selecteval=' . $evalobj->get_id() . '&deleteall=" onclick="return confirmationall();"><img src="../img/delete.gif" border="0" alt="" />' . ' ' . get_lang('DeleteResult') . '</a>';
}
$header .= '<td><a href="' . api_get_self() . '?print=&selecteval=' . $evalobj->get_id() . '" target="_blank"><img src="../img/printmgr.gif" alt="' . get_lang('Print') . '" /> ' . get_lang('Print') . '</a>';
$header .= '</td></tr></table>';
$header .= '<a href="' . api_get_self() . '?print=&selecteval=' . $evalobj->get_id() . '" target="_blank"><img src="../img/printmgr.gif" alt="' . get_lang('Print') . '" /> ' . get_lang('Print') . '</a>';
$header .= '</div>';
}
if ($evalobj->is_visible() == '1') {
$visible= get_lang('Yes');

2
main/gradebook/lib/fe/linkaddeditform.class.php
Unescape View File

@ -75,7 +75,7 @@ class LinkAddEditForm extends FormValidator
} else {
$select = $this->addElement('select',
'select_link',
get_lang('ChooseExercise'));
get_lang('ChooseItem'));
foreach ($link->get_all_links() as $newlink)
$select->addoption($newlink[1],$newlink[0]);
}

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

@ -155,7 +155,7 @@ class FlatViewDataGenerator
$score = $item->calc_score($user[0]);
$divide=( ($score[1])==0 ) ? 1 : $score[1];
$item_value+=round($score[0]/$divide*$item->get_weight(),2);
$item_total+=$item->get_weight();
$item_total+=$item->get_weight();
$row[] = $scoredisplay->display_score($score,SCORE_DIV_PERCENT);
}
$total_score=array($item_value,$item_total);

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

@ -229,8 +229,9 @@ class ScoreDisplay
elseif ($what == SCORE_ONLY_CUSTOM) {
$display = $this->display_custom ($my_score);
} else {
$display = $this->display_default ($my_score, $type2)
.' ('.$this->display_custom ($my_score).')';
$display = $this->display_default ($my_score, $type2);
if ($this->display_custom ($my_score)!='')
$display.= ' ('.$this->display_custom ($my_score).')';
}
} else {

29
main/gradebook/user_info.php
Unescape View File

@ -25,20 +25,30 @@
$language_file = 'gradebook';
//$cidReset = true;
require_once ('../inc/global.inc.php');
require_once ('lib/be.inc.php');
require_once ('lib/gradebook_functions.inc.php');
require_once ('lib/fe/userform.class.php');
require_once (api_get_path(LIBRARY_PATH) . 'fileManage.lib.php');
require_once (api_get_path(LIBRARY_PATH) . 'export.lib.inc.php');
require_once (api_get_path(LIBRARY_PATH) . 'import.lib.php');
require_once (api_get_path(LIBRARY_PATH). 'usermanager.lib.php');
api_block_anonymous_users();
if (isset($_GET['userid'])) {
$user_id = Security::remove_XSS($_GET['userid']);
$user = Usermanager::get_user_info_by_id($user_id);
if (!$user) {
api_not_allowed();
}
} else {
api_not_allowed();
}
require_once ('lib/be.inc.php');
require_once ('lib/gradebook_functions.inc.php');
require_once ('lib/fe/userform.class.php');
block_students();
$user = get_user_info_from_id($_GET['userid']);
$form = new UserForm(UserForm :: TYPE_USER_INFO, $user, 'user_info_form', null, api_get_self() . '?userid=' . $_GET['userid'] . '&selectcat=' . $_GET['selectcat']);
$form = new UserForm(UserForm :: TYPE_USER_INFO, $user, 'user_info_form', null, api_get_self() . '?userid=' . $user_id . '&selectcat=' . $_GET['selectcat']);
if ($form->validate()) {
header('Location: user_stats.php?selectcat=' . Security::remove_XSS($_GET['selectcat']).'&userid=' .Security::remove_XSS($_GET['userid']));
header('Location: user_stats.php?selectcat=' . Security::remove_XSS($_GET['selectcat']).'&userid=' .$user_id);
exit;
}
@ -49,20 +59,21 @@ $interbreadcrumb[] = array (
Display :: display_header(get_lang('UserInfo'));
//User picture size is calculated from SYSTEM path
$image_syspath = UserManager::get_user_picture_path_by_id($userid,'system',false,true);
$image_syspath = UserManager::get_user_picture_path_by_id($user_id,'system',false,true);
$image_size = getimagesize($image_syspath['dir'].$image_syspath['file']);
//Web path
$image_path = UserManager::get_user_picture_path_by_id($_user['user_id'],'web',false,true);
$image_path = UserManager::get_user_picture_path_by_id($user_id,'web',false,true);
$image_file = $image_path['dir'].$image_path['file'];
$img_attributes = 'src="'.$image_file.'?rand='.time().'" '
.'alt="'.$user_data['lastname'].' '.$user_data['firstname'].'" '
.'style="float:'.($text_dir == 'rtl' ? 'left' : 'right').'; padding:5px;" ';
.'style="float:left; padding:5px;" ';
if ($image_size[0] > 300) {
//limit display width to 300px
$img_attributes .= 'width="300" ';
}
//@todo need a "makeup"
echo '<img '.$img_attributes.'/>';
$form->display();
Display :: display_footer();

16
main/gradebook/user_stats.php
Unescape View File

@ -94,12 +94,11 @@ if (isset ($_GET['exportpdf'])) {
$pdf->ezStream();
exit;
}
$actions = '<div class="actions">';
if (isset ($_GET['selectcat'])) {
$interbreadcrumb[]= array (
'url' => 'gradebook_flatview.php?selectcat=' . Security::remove_XSS($_GET['selectcat']),
'name' => get_lang('FlatView'
));
$backto= '<a href=gradebook_flatview.php?selectcat=' .Security::remove_XSS($_GET['selectcat']) . '><img src=../img/lp_leftarrow.gif alt=' . get_lang('BackToOverview') . ' align=absmiddle/> ' . get_lang('BackToOverview') . '</a>&nbsp&nbsp';
$interbreadcrumb[]= array ('url' => 'gradebook_flatview.php?selectcat=' . Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('FlatView'));
$actions.= '<a href=gradebook_flatview.php?selectcat=' .Security::remove_XSS($_GET['selectcat']) . '> &#60;&#60; ' . get_lang('BackToOverview') . '</a>&nbsp&nbsp';
}
if (isset ($_GET['selecteval'])) {
@ -107,11 +106,12 @@ if (isset ($_GET['selecteval'])) {
'url' => 'gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']),
'name' => get_lang('ViewResult'
));
$backto= '<a href=gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']) . '><img src=../img/lp_leftarrow.gif alt=' . get_lang('BackToEvaluation') . ' align=absmiddle/> ' . get_lang('BackToEvaluation') . '</a>&nbsp&nbsp';
$actions.= '<a href=gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']) . '><img src=../img/lp_leftarrow.gif alt=' . get_lang('BackToEvaluation') . ' align=absmiddle/> ' . get_lang('BackToEvaluation') . '</a>&nbsp&nbsp';
}
$backto .= '<a href="' . api_get_self() . '?exportpdf=&userid='.Security::remove_XSS($_GET['userid']).'&selectcat=' . $category[0]->get_id() . '" target="_blank"><img src=../img/calendar_up.gif alt=' . get_lang('ExportPDF') . '/> ' . get_lang('ExportPDF') . '</a>';
$actions.= '<a href="' . api_get_self() . '?exportpdf=&userid='.Security::remove_XSS($_GET['userid']).'&selectcat=' . $category[0]->get_id() . '" target="_blank"><img src=../img/calendar_up.gif alt=' . get_lang('ExportPDF') . '/> ' . get_lang('ExportPDF') . '</a>';
$actions.='</div>';
Display :: display_header(get_lang('ResultsPerUser'));
DisplayGradebook :: display_header_user($_GET['userid']);
echo $backto;
echo $actions;
$user_table->display();
Write Preview
Loading…
Cancel
Save