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 r17076] changes in logic - I added the sight of student - see(FS#3302)

Browse Source
skala
Isaac Flores 17 years ago
parent b4d8351ee7
commit da8cfa8952
4 changed files with 49 additions and 20 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_flatview.php
  2. 8
      main/gradebook/gradebook_scoring_system.php
  3. 30
      main/gradebook/index.php
  4. 25
      main/gradebook/lib/fe/gradebooktable.class.php

6
main/gradebook/gradebook_flatview.php
Unescape View File

@ -158,8 +158,10 @@ if (isset($_GET['exportpdf'])) {
} else { } else {
Display :: display_header(get_lang('FlatView')); Display :: display_header(get_lang('FlatView'));
} }
DisplayGradebook :: display_header_reduce_flatview($cat[0], $showeval, $showlink, $simple_search_form); if ( !isset($_GET['selectcat']) && ($_SESSION['studentview']=='studentview') || (isset($_GET['isStudentView']) && $_GET['isStudentView']=='true') ) {
$flatviewtable->display(); DisplayGradebook :: display_header_reduce_flatview($cat[0], $showeval, $showlink, $simple_search_form);
$flatviewtable->display();
}
Display :: display_footer(); Display :: display_footer();
function get_printable_data($users,$alleval, $alllinks) { function get_printable_data($users,$alleval, $alllinks) {

8
main/gradebook/gradebook_scoring_system.php
Unescape View File

@ -122,9 +122,10 @@ if ($scoreform->validate()) {
} }
Display :: display_header(get_lang('ScoreEdit')); Display :: display_header(get_lang('ScoreEdit'));
if (isset ($_GET['scoringupdated'])) { if (!isset($_GET['selectcat']) && ($_SESSION['studentview']=='studentview') || (isset($_GET['isStudentView']) && $_GET['isStudentView']=='true')) {
Display :: display_confirmation_message(get_lang('ScoringUpdated'),false); if (isset ($_GET['scoringupdated'])) {
} Display :: display_confirmation_message(get_lang('ScoringUpdated'),false);
}
if (isset ($_GET['nouniqueranges'])) { if (isset ($_GET['nouniqueranges'])) {
Display :: display_error_message(get_lang('NoUniqueScoreRanges'),false); Display :: display_error_message(get_lang('NoUniqueScoreRanges'),false);
@ -133,4 +134,5 @@ if (isset ($_GET['nouniqueranges'])) {
echo '<div class="maincontent">'; echo '<div class="maincontent">';
$scoreform->display(); $scoreform->display();
echo '</div>'; echo '</div>';
}
Display :: display_footer(); Display :: display_footer();

30
main/gradebook/index.php
Unescape View File

@ -59,6 +59,21 @@ $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
$filter_confirm_msg = true; $filter_confirm_msg = true;
$filter_warning_msg = true; $filter_warning_msg = true;
if ( !isset($_GET['selectcat']) && ($_SESSION['studentview']=='studentview') || (isset($_GET['isStudentView']) && $_GET['isStudentView']=='true') ) {
Display :: display_header(get_lang('Gradebook'));
$cats = Category :: load (0, null, null, null, null, null, false);
$allcat= $cats[0]->get_subcategories($stud_id, $course_code, $session_id);
$alleval= $cats[0]->get_evaluations($stud_id);
$alllink= $cats[0]->get_links($stud_id);
$gradebooktable= new GradebookTable($cats[0], $allcat, $alleval,$alllink, $addparams);
$gradebooktable->display();
Display :: display_footer();
exit;
}
// -------------------------------------------------------------------------------- // --------------------------------------------------------------------------------
// - ACTIONS - // - ACTIONS -
// -------------------------------------------------------------------------------- // --------------------------------------------------------------------------------
@ -412,6 +427,16 @@ if (!isset($_GET['exportpdf']) and !isset($_GET['export_certificate'])) {
Display :: display_header(''); Display :: display_header('');
} else { } else {
Display :: display_header(get_lang('Gradebook')); Display :: display_header(get_lang('Gradebook'));
/*if ( ($_SESSION['studentview']=='studentview') || (isset($_GET['isStudentView']) && $_GET['isStudentView']=='true') ) {
$cats = Category :: load (0, null, null, null, null, null, false);
$allcat= $cats[0]->get_subcategories($stud_id, $course_code, $session_id);
$alleval= $cats[0]->get_evaluations($stud_id);
$alllink= $cats[0]->get_links($stud_id);
$gradebooktable= new GradebookTable($cats[0], $allcat, $alleval,$alllink, $addparams);
$gradebooktable->display();
Display :: display_footer();
exit;
}*/
} }
} }
@ -524,6 +549,7 @@ if (isset ($_GET['studentoverview'])) {
if (!api_is_allowed_to_edit(true,true)) { if (!api_is_allowed_to_edit(true,true)) {
$user_id = api_get_user_id(); $user_id = api_get_user_id();
} }
$category = Category :: load ($_GET['cat']); $category = Category :: load ($_GET['cat']);
if ($category[0]->is_certificate_available($user_id)) { if ($category[0]->is_certificate_available($user_id)) {
$user= get_user_info_from_id($user_id); $user= get_user_info_from_id($user_id);
@ -570,7 +596,6 @@ if (isset ($_GET['studentoverview'])) {
// we have to show the root category and show its subcategories that // we have to show the root category and show its subcategories that
// are inside this course. This is done at the time of calling // are inside this course. This is done at the time of calling
// $cats[0]->get_subcategories(), not at the time of doing Category::load() // $cats[0]->get_subcategories(), not at the time of doing Category::load()
// $category comes from GET['selectcat'] // $category comes from GET['selectcat']
$course_code = api_get_course_id(); $course_code = api_get_course_id();
$session_id = api_get_session_id(); $session_id = api_get_session_id();
@ -582,7 +607,6 @@ if (isset ($_GET['studentoverview'])) {
// When *inside* a course, we want to make sure there is one (and only // When *inside* a course, we want to make sure there is one (and only
// one) category for this course or for this session. // one) category for this course or for this session.
$cats = Category :: load(null, null, $course_code, null, null, $session_id, false); $cats = Category :: load(null, null, $course_code, null, null, $session_id, false);
if (empty($cats)) { if (empty($cats)) {
// There is no category for this course+session, so create one // There is no category for this course+session, so create one
$cat= new Category(); $cat= new Category();
@ -663,7 +687,7 @@ if (api_is_platform_admin() || api_is_allowed_to_create_course()) {
if ( (isset ($_GET['selectcat']) && $_GET['selectcat']<>0) ) { if ( (isset ($_GET['selectcat']) && $_GET['selectcat']<>0) ) {
// //
} else { } else {
if ( ((isset ($_GET['selectcat']) && $_GET['selectcat']==0) || ((isset($_GET['cidReq']) && $_GET['cidReq']!==''))) ) { if ( ((isset ($_GET['selectcat']) && $_GET['selectcat']==0) || ((isset($_GET['cidReq']) && $_GET['cidReq']!==''))) || isset($_GET['isStudentView']) && $_GET['isStudentView']=='false') {
$cats = Category :: load(null, null, $course_code, null, null, $session_id, false); $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); DisplayGradebook :: display_reduce_header_gradebook($cats[0],$is_course_admin, $is_platform_admin, $simple_search_form, false, false);
} }

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

@ -49,27 +49,28 @@ class GradebookTable extends SortableTable
$this->set_additional_parameters($addparams); $this->set_additional_parameters($addparams);
} }
$column= 0; $column= 0;
if (api_is_allowed_to_create_course()) { if (api_is_allowed_to_create_course() && ($_SESSION['studentview']<>'studentview') || (isset($_GET['isStudentView']) && $_GET['isStudentView']=='false')) {
$this->set_header($column++, '', false); $this->set_header($column++, '', false);
} }
$this->set_header($column++, get_lang('Type')); $this->set_header($column++, get_lang('Type'));
$this->set_header($column++, get_lang('Name')); $this->set_header($column++, get_lang('Name'));
$this->set_header($column++, get_lang('Description')); $this->set_header($column++, get_lang('Description'));
if (api_is_allowed_to_create_course()) { if (api_is_allowed_to_create_course() && $_SESSION['studentview']<>'studentview' || (isset($_GET['isStudentView']) && $_GET['isStudentView']=='false')) {
$this->set_header($column++, get_lang('Weight')); $this->set_header($column++, get_lang('Weight'));
} else { } else {
if (!isset($_GET['selectcat'])) { if (!isset($_GET['selectcat']) || ($_SESSION['studentview']=='studentview' || (isset($_GET['isStudentView']) && $_GET['isStudentView']=='true')) || !api_is_allowed_to_create_course()) {
$this->set_header($column++, get_lang('Evaluation')); $this->set_header($column++, get_lang('Evaluation'));
} }
else { else {
$this->set_header($column++, get_lang('Weight')); $this->set_header($column++, get_lang('Weight'));
} }
} }
$this->set_header($column++, get_lang('Date'),true, 'width="100"'); $this->set_header($column++, get_lang('Date'),true, 'width="100"');
//admins get an edit column //admins get an edit column
if (api_is_allowed_to_create_course()) { if (api_is_allowed_to_create_course() && $_SESSION['studentview']<>'studentview' || (isset($_GET['isStudentView']) && $_GET['isStudentView']=='false')) {
$this->set_header($column++, get_lang('Modify'), false, 'width="100"'); $this->set_header($column++, get_lang('Modify'), false, 'width="100"');
//actions on multiple selected documents //actions on multiple selected documents
$this->set_form_actions(array ( $this->set_form_actions(array (
@ -81,8 +82,8 @@ class GradebookTable extends SortableTable
if(count($evals_links)>0) { if(count($evals_links)>0) {
$this->set_header($column++, get_lang('Results'), false); $this->set_header($column++, get_lang('Results'), false);
} }
if (!isset($_GET['selectcat'])) { if (!isset($_GET['selectcat']) ||(isset($_GET['isStudentView']) && $_GET['isStudentView']=='true') || !api_is_allowed_to_create_course()) {
$this->set_header($column++, get_lang('Certificates'),false); $this->set_header($column++, get_lang('Certificates'),false);
} }
} }
} }
@ -141,7 +142,7 @@ class GradebookTable extends SortableTable
$invisibility_span_close = (api_is_allowed_to_create_course() && $item->is_visible() == '0') ? '</span>' : ''; $invisibility_span_close = (api_is_allowed_to_create_course() && $item->is_visible() == '0') ? '</span>' : '';
if (api_is_allowed_to_create_course()) { if (api_is_allowed_to_create_course() && ($_SESSION['studentview']<>'studentview') || (isset($_GET['isStudentView']) && $_GET['isStudentView']=='false')) {
$row[] = $this->build_id_column ($item); $row[] = $this->build_id_column ($item);
} }
$row[] = $this->build_type_column ($item); $row[] = $this->build_type_column ($item);
@ -152,7 +153,7 @@ class GradebookTable extends SortableTable
$row[] = $invisibility_span_open . $data[3] . $invisibility_span_close; $row[] = $invisibility_span_open . $data[3] . $invisibility_span_close;
} else { } else {
if (!isset($_GET['selectcat'])) { if (!isset($_GET['selectcat']) && isset($certificate_min_score)) {
// generating the total score for a course // generating the total score for a course
$stud_id= api_get_user_id(); $stud_id= api_get_user_id();
@ -180,14 +181,14 @@ class GradebookTable extends SortableTable
$row[] = $invisibility_span_open . str_replace(' ','&nbsp;',$data[4]) . $invisibility_span_close; $row[] = $invisibility_span_open . str_replace(' ','&nbsp;',$data[4]) . $invisibility_span_close;
//admins get an edit column //admins get an edit column
if (api_is_allowed_to_create_course()) { if (api_is_allowed_to_create_course() && ($_SESSION['studentview']<>'studentview' || (isset($_GET['isStudentView']) && $_GET['isStudentView']=='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
if (count($this->evals_links)>0) { if (count($this->evals_links)>0) {
$row[] = $data[5]; $row[] = $data[5];
} }
if (!isset($_GET['selectcat'])) { if (!isset($_GET['selectcat']) && isset($certificate_min_score) && !api_is_allowed_to_create_course) {
if ((int)$item_value >= (int)$certificate_min_score) { if ((int)$item_value >= (int)$certificate_min_score) {
$certificates = '<a href="'.api_get_path(WEB_CODE_PATH) .'gradebook/index.php?export_certificate=yes"><img src="'.api_get_path(WEB_CODE_PATH) . 'img/dokeos.gif" /></a>&nbsp;'.$scoretotal_display; $certificates = '<a href="'.api_get_path(WEB_CODE_PATH) .'gradebook/index.php?export_certificate=yes"><img src="'.api_get_path(WEB_CODE_PATH) . 'img/dokeos.gif" /></a>&nbsp;'.$scoretotal_display;
} else { } else {

Write Preview
Loading…
Cancel
Save