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

Fixing gradebook in sessions behaviour see #5962

Browse Source
1.9.x
Julio Montoya 11 years ago
parent e9eeddad4e
commit c5655c984e
3 changed files with 40 additions and 54 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. 53
      main/gradebook/index.php
  2. 31
      main/gradebook/lib/be/category.class.php
  3. 10
      main/gradebook/lib/fe/gradebooktable.class.php

53
main/gradebook/index.php
Unescape View File

@ -38,19 +38,16 @@ require_once 'lib/fe/displaygradebook.php';
require_once 'lib/fe/userform.class.php';
require_once api_get_path(LIBRARY_PATH).'ezpdf/class.ezpdf.php';
require_once api_get_path(LIBRARY_PATH).'gradebook.lib.php';
/*
$htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/jqplot/jquery.jqplot.min.css');
$htmlHeadXtra[] = api_get_js('jqplot/jquery.jqplot.min.js');
$htmlHeadXtra[] = api_get_js('jqplot/plugins/jqplot.donutRenderer.min.js');*/
$htmlHeadXtra[] = '<script>
var show_icon = "../img/view_more_stats.gif";
var hide_icon = "../img/view_less_stats.gif";
$(document).ready(function() {
$(".view_children").live("click", function() {
var id = $(this).attr("data-cat-id");
$(".hidden_"+id).removeClass("hidden");
@ -66,10 +63,6 @@ $(document).ready(function() {
$(this).addClass("view_children");
$(this).find("img").attr("src", show_icon);
});
/*
var s1 = [["a",25]];
var s2 = [["a", 0], ["a", 10], ["a", 10], ["a", 5]];
@ -118,21 +111,15 @@ $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
$filter_confirm_msg = true;
$filter_warning_msg = true;
///direct access to one evaluation
$catsResult = array();
if (api_get_session_id() != 0) {
$session_id = api_get_session_id();
$cats = Category :: load_session_categories(null, $session_id); //already init
$catsResult = $cats;
} else {
$cats = Category :: load(null, null, $course_code, null, null, null, false);
}
$cats = Category :: load(null, null, $course_code, null, null, $session_id, false);
$first_time = null;
if (empty($cats)) {
$cats = Category :: load(0, null, $course_code, null, null, $session_id, false);//first time
//first time
$cats = Category :: load(0, null, $course_code, null, null, $session_id, false);
$first_time = 1;
}
$_GET['selectcat'] = $cats[0]->get_id();
if (isset($_GET['isStudentView'])) {
@ -143,23 +130,20 @@ if (isset($_GET['isStudentView'])) {
if ((isset($_GET['selectcat']) && $_GET['selectcat']>0) && (isset($_SESSION['studentview']) && $_SESSION['studentview']=='studentview')) {
Display :: display_header();
//Introduction tool: student view
Display::display_introduction_section(TOOL_GRADEBOOK, array('ToolbarSet' => 'AssessmentsIntroduction'));
$category= $_GET['selectcat'];
$category = $_GET['selectcat'];
$cats = Category :: load ($category, 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);
$addparams=array();
$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);
$addparams = array();
$gradebooktable= new GradebookTable($cats[0], $allcat, $alleval,$alllink, $addparams);
$gradebooktable->display();
Display :: display_footer();
exit;
} else {
if ( !isset($_GET['selectcat']) && ($_SESSION['studentview']=='studentview') || (isset($_GET['isStudentView']) && $_GET['isStudentView']=='true') ) {
if (!isset($_GET['selectcat']) && ($_SESSION['studentview']=='studentview') || (isset($_GET['isStudentView']) && $_GET['isStudentView']=='true') ) {
// if ( !isset($_GET['selectcat']) && ($_SESSION['studentview']=='studentview') && ($status<>1 && !api_is_platform_admin()) || (isset($_GET['isStudentView']) && $_GET['isStudentView']=='true' && $status<>1 && !api_is_platform_admin()) ) {
Display :: display_header(get_lang('Gradebook'));
@ -183,7 +167,6 @@ if (isset ($_GET['createallcategories'])) {
block_students();
$coursecat= Category :: get_not_created_course_categories($stud_id);
if (!count($coursecat) == 0) {
foreach ($coursecat as $row) {
$cat= new Category();
$cat->set_name($row[1]);
@ -554,7 +537,6 @@ if (isset ($_POST['submit']) && isset ($_POST['keyword'])) {
exit;
}
// DISPLAY HEADERS AND MESSAGES
if (!isset($_GET['exportpdf'])) {
if (isset ($_GET['studentoverview'])) {
@ -831,20 +813,11 @@ if (isset($first_time) && $first_time==1 && api_is_allowed_to_edit(null,true)) {
$i = 0;
$allcat = array();
/** @var Category $cat */
foreach ($cats as $cat) {
if ($session_id != 0) {
$allcatSession = $catsResult;
foreach ($allcatSession as $catSession) {
if ($catSession->get_parent_id() == 0) {
continue;
}
$allcat[] = $catSession;
}
} else {
$allcat = $cat->get_subcategories($stud_id, $course_code, $session_id);
}
$allcat = $cat->get_subcategories($stud_id, $course_code, $session_id);
$alleval = $cat->get_evaluations($stud_id);
$alllink = $cat->get_links($stud_id,true);
$alllink = $cat->get_links($stud_id, true);
if ($cat->get_parent_id() != 0) {
$i++;

31
main/gradebook/lib/be/category.class.php
Unescape View File

@ -210,9 +210,9 @@ class Category implements GradebookItem
if ($data_session['course_code'] == $courseCode) {
$cat = Category::load($parent_id);
$cats = Category::load(null,null,null,$parent_id,null,null,null);
//$cat = array_merge($cat,$cats);
}
}
return array_merge($cat,$cats);
}
}
@ -228,11 +228,18 @@ class Category implements GradebookItem
* @param int session id (in case we are in a session)
* @param bool Whether to show all "session" categories (true) or hide them (false) in case there is no session id
*/
public static function load($id = null, $user_id = null, $course_code = null, $parent_id = null, $visible = null, $session_id = null, $order_by = null)
{
public static function load(
$id = null,
$user_id = null,
$course_code = null,
$parent_id = null,
$visible = null,
$session_id = null,
$order_by = null
) {
//if the category given is explicitly 0 (not null), then create
// a root category object (in memory)
if ( isset($id) && (int)$id === 0 ) {
if (isset($id) && (int)$id === 0 ) {
$cats = array();
$cats[] = Category::create_root_category();
return $cats;
@ -1233,21 +1240,23 @@ class Category implements GradebookItem
* @param int $stud_id student id (default: all students)
* @param string Course code (optional)
* @param int Session ID (optional)
* @return array Array of subcategories
*
* @return array Array of subcategories
*/
public function get_subcategories($stud_id = null, $course_code = null, $session_id = null, $order = null)
{
if (!empty ($session_id)) {
$tbl_grade_categories = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
$sql_session = 'SELECT id FROM '.$tbl_grade_categories. ' WHERE session_id = '.$session_id;
$result_session = Database::query($sql_session);
if (!empty($session_id)) {
/*$tbl_grade_categories = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
$sql = 'SELECT id FROM '.$tbl_grade_categories. ' WHERE session_id = '.$session_id;
$result_session = Database::query($sql);
if (Database::num_rows($result_session) > 0) {
$data_session = Database::fetch_array($result_session);
$parent_id = $data_session['id'];
return Category::load(null, null, null, $parent_id, null, null, $order);
}
}*/
}
// 1 student
// 1 student
if (isset($stud_id)) {
// special case: this is the root
if ($this->id == 0) {

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

@ -348,7 +348,10 @@ class GradebookTable extends SortableTable
$label = null;
$total = score_badges(array($total_weight.' / '.$category_weight, '100'));
} else {
$label = Display::return_icon('warning.png', sprintf(get_lang('TotalWeightMustBeX'), $category_weight) );
$label = Display::return_icon(
'warning.png',
sprintf(get_lang('TotalWeightMustBeX'), $category_weight)
);
$total = Display::badge($total_weight.' / '.$category_weight, 'warning');
}
$row = array(
@ -386,9 +389,10 @@ class GradebookTable extends SortableTable
if (isset($_GET['selectcat']) && $_GET['selectcat'] > 0 && $view <> 'presence') {
$id_cat = intval($_GET['selectcat']);
$category = Category :: load($id_cat);
$category = Category::load($id_cat);
$weight_category = intval($this->build_weight($category[0]));
$course_code = $this->build_course_code($category[0]);
$weight_total_links = round($weight_total_links);
@ -399,7 +403,7 @@ class GradebookTable extends SortableTable
$warning_message = sprintf(get_lang('TotalWeightMustBeX'), $weight_category);
$modify_icons = '<a class="right_link" href="gradebook_edit_cat.php?editcat='.$id_cat.'&cidReq='.$course_code.'">'.Display::return_icon('edit.png', $warning_message, array(), ICON_SIZE_SMALL).'</a>';
$warning_message .= $modify_icons;
Display::display_warning_message($warning_message,false);
Display::display_warning_message($warning_message, false);
}
$content_html = DocumentManager::replace_user_info_into_html(api_get_user_id(), $course_code);

Write Preview
Loading…
Cancel
Save