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

Minor - format code.

Browse Source
1.9.x
Julio Montoya 10 years ago
parent 87d1a21af7
commit baab75ff25
5 changed files with 41 additions and 21 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/index.php
  2. 20
      main/gradebook/lib/be/category.class.php
  3. 7
      main/gradebook/lib/be/studentpublicationlink.class.php
  4. 14
      main/gradebook/lib/fe/displaygradebook.php
  5. 15
      main/gradebook/lib/gradebook_functions.inc.php

6
main/gradebook/index.php
Unescape View File

@ -1,5 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Gradebook controller
* @package chamilo.gradebook
@ -126,7 +127,9 @@ if (isset($_GET['isStudentView'])) {
}
}
if ((isset($_GET['selectcat']) && $_GET['selectcat']>0) && (isset($_SESSION['studentview']) && $_SESSION['studentview']=='studentview')) {
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'));
@ -735,6 +738,7 @@ $no_qualification = false;
// Show certificate link.
$certificate = array();
if ($category != '0') {
$cat = new Category();
$category_id = intval($_GET['selectcat']);

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

@ -786,14 +786,14 @@ class Category implements GradebookItem
foreach ($links as $link) {
$linkres = $link->calc_score($stud_id);
if (isset($linkres) && $link->get_weight() != 0) {
$linkweight = $link->get_weight();
$link_res_denom = ($linkres[1] == 0) ? 1 : $linkres[1];
if (!empty($linkres) && $link->get_weight() != 0) {
$linkweight = $link->get_weight();
$link_res_denom = $linkres[1] == 0 ? 1 : $linkres[1];
$rescount++;
$weightsum += $linkweight;
$ressum += (($linkres[0] / $link_res_denom) * $linkweight);
$ressum += ($linkres[0] / $link_res_denom) * $linkweight;
} else {
// Ddding if result does not exists
// Adding if result does not exists
if ($link->get_weight() != 0) {
$linkweight = $link->get_weight();
$weightsum += $linkweight;
@ -1589,13 +1589,15 @@ class Category implements GradebookItem
$main_weight = $cats_course[0]->get_weight();
$item_total_value = 0;
$item_value = 0;
for ($count=0; $count < count($evals_links); $count++) {
/** @var AbstractLink $item */
$item = $evals_links[$count];
$score = $item->calc_score($user_id);
$divide = ( ($score[1])==0 ) ? 1 : $score[1];
$item_value = $score[0]/$divide*$item->get_weight();
$item_value = 0;
if (!empty($score)) {
$divide = $score[1] == 0 ? 1 : $score[1];
$item_value = $score[0] / $divide * $item->get_weight();
}
$item_total_value += $item_value;
}

7
main/gradebook/lib/be/studentpublicationlink.class.php
Unescape View File

@ -202,7 +202,10 @@ class StudentPublicationLink extends AbstractLink
// for 1 student
if (!empty($stud_id)) {
if ($data = Database::fetch_array($scores)) {
return array($data['qualification'], $assignment['qualification']);
return array(
$data['qualification'],
$assignment['qualification']
);
} else {
return '';
}
@ -224,7 +227,7 @@ class StudentPublicationLink extends AbstractLink
if ($rescount == 0) {
return null;
} else {
return array ($sum , $rescount);
return array($sum, $rescount);
}
}
}

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

@ -439,12 +439,14 @@ class DisplayGradebook
for ($count = 0; $count < count($allEvalsLinks); $count++) {
$item = $allEvalsLinks[$count];
$score = $item->calc_score($user_id);
$divide = ( ($score[1]) == 0 ) ? 1 : $score[1];
//$sub_cat_percentage = $sum_categories_weight_array[$item->get_category_id()];
//$item_value = $score[0] / $divide * $item->get_weight() / $sub_cat_percentage * $sub_cat_percentage / $main_weight * $main_weight;
$item_value = $score[0] / $divide * $item->get_weight();
//var_dump($score[0], $divide, $item->get_weight(), $sub_cat_percentage, $main_weight, $item_value);
$item_value_total += $item_value;
if (!empty($score)) {
$divide = $score[1] == 0 ? 1 : $score[1];
//$sub_cat_percentage = $sum_categories_weight_array[$item->get_category_id()];
//$item_value = $score[0] / $divide * $item->get_weight() / $sub_cat_percentage * $sub_cat_percentage / $main_weight * $main_weight;
$item_value = $score[0] / $divide * $item->get_weight();
//var_dump($score[0], $divide, $item->get_weight(), $sub_cat_percentage, $main_weight, $item_value);
$item_value_total += $item_value;
}
}
$item_total = $main_weight;

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

@ -5,6 +5,7 @@
* Script
* @package chamilo.gradebook
*/
/**
* These are functions used in gradebook
*
@ -110,6 +111,7 @@ function remove_resource_from_course_gradebook($link_id)
$l = Database::get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
$sql = "DELETE FROM $l WHERE id = ".(int)$link_id;
Database::query($sql);
return true;
}
@ -127,7 +129,9 @@ function block_students()
function get_course_name_from_code($code)
{
$tbl_main_categories = Database :: get_main_table(TABLE_MAIN_COURSE);
$sql = 'SELECT title, code FROM ' . $tbl_main_categories . 'WHERE code = "' . Database::escape_string($code) . '"';
$sql = 'SELECT title, code
FROM ' . $tbl_main_categories . '
WHERE code = "' . Database::escape_string($code) . '"';
$result = Database::query($sql);
if ($col = Database::fetch_array($result)) {
return $col['title'];
@ -194,6 +198,7 @@ function get_icon_file_name($type)
$icon = 'link.gif';
break;
}
return $icon;
}
@ -400,7 +405,10 @@ function is_resource_in_course_gradebook($course_code, $resource_type, $resource
$l = Database::get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
$course_code = Database::escape_string($course_code);
$sql = "SELECT * FROM $l l
WHERE course_code = '$course_code' AND type = ".(int)$resource_type . " AND ref_id = " . (int)$resource_id;
WHERE
course_code = '$course_code' AND
type = ".(int)$resource_type . " AND
ref_id = " . (int)$resource_id;
$res = Database::query($sql);
if (Database::num_rows($res) < 1) {
@ -649,7 +657,8 @@ function get_list_users_certificates($cat_id = null, $userList = array())
$table_user = Database::get_main_table(TABLE_MAIN_USER);
$sql = 'SELECT DISTINCT u.user_id, u.lastname, u.firstname, u.username
FROM ' . $table_user . ' u
INNER JOIN ' . $table_certificate . ' gc ON u.user_id=gc.user_id ';
INNER JOIN ' . $table_certificate . ' gc
ON u.user_id=gc.user_id ';
if (!is_null($cat_id) && $cat_id > 0) {
$sql.=' WHERE cat_id=' . intval($cat_id);
}

Write Preview
Loading…
Cancel
Save