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 11 years ago
parent 601f44fe75
commit 88c210e41e
3 changed files with 247 additions and 211 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. 387
      main/gradebook/lib/be/studentpublicationlink.class.php
  2. 32
      main/gradebook/lib/fe/flatviewtable.class.php
  3. 39
      main/gradebook/lib/flatview_data_generator.class.php

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

@ -1,88 +1,89 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Gradebook link to student publication item
* @author Bert Steppé
* @package chamilo.gradebook
*/
/**
* Class
* @package chamilo.gradebook
*/
class StudentPublicationLink extends AbstractLink
{
private $studpub_table = null;
private $itemprop_table = null;
// INTERNAL VARIABLES
private $studpub_table = null;
private $itemprop_table = null;
// CONSTRUCTORS
public function __construct() {
parent::__construct();
$this->set_type(LINK_STUDENTPUBLICATION);
}
/**
*
* Returns the URL of a document
* This funcion is loaded when using a gradebook as a tab (gradebook = -1), see issue #2705
*
*/
/**
* Constructor
*/
public function __construct()
{
parent::__construct();
$this->set_type(LINK_STUDENTPUBLICATION);
}
public function get_view_url ($stud_id) {
/**
*
* Returns the URL of a document
* This function is loaded when using a gradebook as a tab (gradebook = -1)
* see issue #2705
*
*/
public function get_view_url($stud_id)
{
// find a file uploaded by the given student,
// with the same title as the evaluation name
$eval = $this->get_evaluation();
$stud_id = intval($stud_id);
$eval = $this->get_evaluation();
$stud_id = intval($stud_id);
$sql = 'SELECT pub.url FROM '.$this->get_itemprop_table().' prop, '.$this->get_studpub_table().' pub'
." WHERE
$sql = 'SELECT pub.url
FROM '.$this->get_itemprop_table().' prop, '.$this->get_studpub_table().' pub'
." WHERE
prop.c_id = ".$this->course_id." AND
pub.c_id = ".$this->course_id." AND
pub.c_id = ".$this->course_id." AND
prop.tool = 'work'"
.' AND prop.insert_user_id = '.$stud_id
.' AND prop.ref = pub.id'
." AND pub.title = '".Database::escape_string($eval->get_name())."' AND pub.session_id=".api_get_session_id()."";
.' AND prop.insert_user_id = '.$stud_id
.' AND prop.ref = pub.id'
." AND pub.title = '".Database::escape_string($eval->get_name())."' AND pub.session_id=".api_get_session_id()."";
$result = Database::query($sql);
if ($fileurl = Database::fetch_row($result)) {
$course_info = Database :: get_course_info($this->get_course_code());
$course_info = Database :: get_course_info($this->get_course_code());
//$url = api_get_path(WEB_PATH).'main/gradebook/open_document.php?file='.$course_info['directory'].'/'.$fileurl[0];
//return $url;
return null;
} else {
return null;
} else {
return null;
}
}
public function get_type_name() {
return get_lang('Works');
}
public function get_type_name()
{
return get_lang('Works');
}
public function is_allowed_to_change_name() {
public function is_allowed_to_change_name()
{
return false;
}
// FUNCTIONS IMPLEMENTING ABSTRACTLINK
/**
* Generate an array of exercises that a teacher hasn't created a link for.
* @return array 2-dimensional array - every element contains 2 subelements (id, name)
*/
public function get_not_created_links() {
return false;
if (empty($this->course_code)) {
die('Error in get_not_created_links() : course code not set');
}
$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
public function get_not_created_links()
{
return false;
if (empty($this->course_code)) {
die('Error in get_not_created_links() : course code not set');
}
$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
$sql = 'SELECT id, url from '.$this->get_studpub_table()
.' pup WHERE c_id = '.$this->course_id.' AND has_properties != '."''".' AND id NOT IN'
.' (SELECT ref_id FROM '.$tbl_grade_links
.' WHERE type = '.LINK_STUDENTPUBLICATION
." AND course_code = '".Database::escape_string($this->get_course_code())."'"
.') AND pub.session_id='.api_get_session_id().'';
.' pup WHERE c_id = '.$this->course_id.' AND has_properties != '."''".' AND id NOT IN'
.' (SELECT ref_id FROM '.$tbl_grade_links
.' WHERE type = '.LINK_STUDENTPUBLICATION
." AND course_code = '".Database::escape_string($this->get_course_code())."'"
.') AND pub.session_id='.api_get_session_id().'';
$result = Database::query($sql);
@ -91,97 +92,112 @@ class StudentPublicationLink extends AbstractLink
$cats[] = array ($data['id'], $data['url']);
}
return $cats;
}
}
/**
* Generate an array of all exercises available.
* @return array 2-dimensional array - every element contains 2 subelements (id, name)
*/
public function get_all_links() {
if (empty($this->course_code)) {
die('Error in get_not_created_links() : course code not set');
}
$tbl_grade_links = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
$session_id = api_get_session_id();
/*
public function get_all_links()
{
if (empty($this->course_code)) {
die('Error in get_not_created_links() : course code not set');
}
$tbl_grade_links = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
$session_id = api_get_session_id();
/*
if (empty($session_id)) {
$session_condition = api_get_session_condition(0, true);
} else {
$session_condition = api_get_session_condition($session_id, true, true);
}
$sql = "SELECT id, url, title FROM $tbl_grade_links
WHERE c_id = {$this->course_id} AND filetype='folder' AND active = 1 $session_condition ";*/
//Only show works from the session
//AND has_properties != ''
$sql = "SELECT id, url, title FROM $tbl_grade_links
WHERE c_id = {$this->course_id} AND active = 1 AND filetype='folder' AND session_id = ".api_get_session_id()."";
}
$sql = "SELECT id, url, title FROM $tbl_grade_links
WHERE c_id = {$this->course_id} AND filetype='folder' AND active = 1 $session_condition ";*/
//Only show works from the session
//AND has_properties != ''
$sql = "SELECT id, url, title FROM $tbl_grade_links
WHERE
c_id = {$this->course_id} AND
active = 1 AND
filetype='folder' AND
session_id = ".api_get_session_id()."";
$result = Database::query($sql);
while ($data = Database::fetch_array($result)) {
$work_name = $data['title'];
if (empty($work_name)) {
$work_name = basename($data['url']);
}
$work_name = $data['title'];
if (empty($work_name)) {
$work_name = basename($data['url']);
}
$cats[] = array ($data['id'], $work_name);
}
$cats=isset($cats) ? $cats : array();
return $cats;
}
/**
* Has anyone done this exercise yet ?
*/
public function has_results() {
$tbl_grade_links = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
$sql = 'SELECT count(*) AS number FROM '.$tbl_grade_links."
WHERE c_id = {$this->course_id} AND
parent_id = '".intval($this->get_ref_id())."' AND
}
/**
* Has anyone done this exercise yet ?
*/
public function has_results()
{
$tbl_grade_links = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
$sql = 'SELECT count(*) AS number FROM '.$tbl_grade_links."
WHERE c_id = {$this->course_id} AND
parent_id = '".intval($this->get_ref_id())."' AND
session_id =".api_get_session_id()."";
$result = Database::query($sql);
$result = Database::query($sql);
$number = Database::fetch_row($result);
return ($number[0] != 0);
}
public function calc_score($stud_id = null) {
$stud_id = intval($stud_id);
$tbl_stats = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
$sql = 'SELECT * FROM '.$tbl_stats."
WHERE c_id = {$this->course_id} AND
id = '".intval($this->get_ref_id())."' AND
session_id = ".api_get_session_id()."";
}
/**
* @param null $stud_id
* @return array|null
*/
public function calc_score($stud_id = null)
{
$stud_id = intval($stud_id);
$tbl_stats = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
$sql = 'SELECT * FROM '.$tbl_stats."
WHERE
c_id = {$this->course_id} AND
id = '".intval($this->get_ref_id())."' AND
session_id = ".api_get_session_id()."";
$query = Database::query($sql);
$assignment = Database::fetch_array($query);
if (count($assignment)==0) {
$v_assigment_id ='0';
} else {
$v_assigment_id = $assignment['id'];
}
$sql = 'SELECT * FROM '.$tbl_stats.'
WHERE c_id = '.$this->course_id.' AND active = 1 AND parent_id ="'.$v_assigment_id.'" AND session_id='.api_get_session_id().'';
if (!empty($stud_id)) {
$sql .= " AND user_id = $stud_id ";
}
// order by id, that way the student's first attempt is accessed first
if (count($assignment)==0) {
$v_assigment_id ='0';
} else {
$v_assigment_id = $assignment['id'];
}
$sql = 'SELECT * FROM '.$tbl_stats.'
WHERE
c_id = '.$this->course_id.' AND
active = 1 AND
parent_id ="'.$v_assigment_id.'" AND
session_id='.api_get_session_id().'';
if (!empty($stud_id)) {
$sql .= " AND user_id = $stud_id ";
}
// order by id, that way the student's first attempt is accessed first
$sql .= ' ORDER BY id';
$scores = Database::query($sql);
$scores = Database::query($sql);
// for 1 student
if (!empty($stud_id)) {
if ($data = Database::fetch_array($scores)) {
return array($data['qualification'], $assignment['qualification']);
} else {
return '';
}
} else {
$students = array(); // user list, needed to make sure we only
// take first attempts into account
if (!empty($stud_id)) {
if ($data = Database::fetch_array($scores)) {
return array($data['qualification'], $assignment['qualification']);
} else {
return '';
}
} else {
$students = array(); // user list, needed to make sure we only
// take first attempts into account
$rescount = 0;
$sum = 0;
while ($data = Database::fetch_array($scores)) {
@ -199,101 +215,116 @@ class StudentPublicationLink extends AbstractLink
} else {
return array ($sum , $rescount);
}
}
}
// INTERNAL FUNCTIONS
}
}
/**
* Lazy load function to get the database table of the student publications
*/
private function get_studpub_table() {
/**
* Lazy load function to get the database table of the student publications
*/
private function get_studpub_table()
{
return $this->studpub_table = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
}
}
/**
* Lazy load function to get the database table of the item properties
*/
private function get_itemprop_table () {
return $this->itemprop_table = Database :: get_course_table(TABLE_ITEM_PROPERTY);
}
/**
* Lazy load function to get the database table of the item properties
*/
private function get_itemprop_table()
{
return $this->itemprop_table = Database :: get_course_table(TABLE_ITEM_PROPERTY);
}
public function needs_name_and_description() {
public function needs_name_and_description()
{
return false;
}
public function get_name() {
$this->get_exercise_data();
return (isset($this->exercise_data['title']) && !empty($this->exercise_data['title'])) ? $this->exercise_data['title'] : get_lang('Untitled');
}
public function get_name()
{
$this->get_exercise_data();
return (isset($this->exercise_data['title']) && !empty($this->exercise_data['title'])) ? $this->exercise_data['title'] : get_lang('Untitled');
}
public function get_description() {
$this->get_exercise_data();
return isset($this->exercise_data['description']) ? $this->exercise_data['description'] : null;
}
public function get_description()
{
$this->get_exercise_data();
return isset($this->exercise_data['description']) ? $this->exercise_data['description'] : null;
}
public function get_test_id() {
return 'DEBUG:ID';
}
public function get_test_id()
{
return 'DEBUG:ID';
}
public function get_link() {
$session_id = api_get_session_id();
$url = api_get_path(WEB_PATH).'main/work/work.php?session_id='.$session_id.'&cidReq='.$this->get_course_code().'&id='.$this->exercise_data['id'].'&gradebook=view';
public function get_link()
{
$session_id = api_get_session_id();
$url = api_get_path(WEB_PATH).'main/work/work.php?session_id='.$session_id.'&cidReq='.$this->get_course_code().'&id='.$this->exercise_data['id'].'&gradebook=view';
return $url;
}
private function get_exercise_data() {
private function get_exercise_data()
{
$tbl_name = $this->get_studpub_table();
$course_info = Database :: get_course_info($this->get_course_code());
if ($tbl_name=='') {
return false;
} elseif (!isset($this->exercise_data)) {
$sql = 'SELECT * FROM '.$this->get_studpub_table()." WHERE c_id ='".$course_info['real_id']."' AND id = '".intval($this->get_ref_id())."' ";
$sql = 'SELECT * FROM '.$this->get_studpub_table()."
WHERE
c_id ='".$course_info['real_id']."' AND
id = '".intval($this->get_ref_id())."' ";
$query = Database::query($sql);
$this->exercise_data = Database::fetch_array($query);
}
return $this->exercise_data;
}
}
return $this->exercise_data;
}
public function needs_max() {
public function needs_max()
{
return false;
}
public function needs_results() {
public function needs_results()
{
return false;
}
public function is_valid_link() {
$sql = 'SELECT count(id) FROM '.$this->get_studpub_table().'
public function is_valid_link()
{
$sql = 'SELECT count(id) FROM '.$this->get_studpub_table().'
WHERE c_id = "'.$this->course_id.'" AND id = '.intval($this->get_ref_id()).'';
$result = Database::query($sql);
$number = Database::fetch_row($result);
return ($number[0] != 0);
}
}
public function get_icon_name() {
public function get_icon_name()
{
return 'studentpublication';
}
function save_linked_data() {
$weight = (float)$this->get_weight();
$ref_id = $this->get_ref_id();
if (!empty($ref_id)) {
//Cleans works
$sql = 'UPDATE '.$this->get_studpub_table().' SET weight= '.$weight.'
public function save_linked_data()
{
$weight = (float)$this->get_weight();
$ref_id = $this->get_ref_id();
if (!empty($ref_id)) {
//Cleans works
$sql = 'UPDATE '.$this->get_studpub_table().' SET weight= '.$weight.'
WHERE c_id = '.$this->course_id.' AND id ='.$ref_id;
Database::query($sql);
}
}
function delete_linked_data() {
$ref_id = $this->get_ref_id();
if (!empty($ref_id)) {
//Cleans works
$sql = 'UPDATE '.$this->get_studpub_table().' SET weight=0
Database::query($sql);
}
}
public function delete_linked_data()
{
$ref_id = $this->get_ref_id();
if (!empty($ref_id)) {
//Cleans works
$sql = 'UPDATE '.$this->get_studpub_table().' SET weight=0
WHERE c_id = '.$this->course_id.' AND id ='.$ref_id;
Database::query($sql);
}
}
}
Database::query($sql);
}
}
}

32
main/gradebook/lib/fe/flatviewtable.class.php
Unescape View File

@ -69,7 +69,7 @@ class FlatViewTable extends SortableTable
*/
public function setLimitEnabled($value)
{
$this->limit_enabled = (bool) $value;
$this->limit_enabled = (bool) $value;
}
/**
@ -81,8 +81,8 @@ class FlatViewTable extends SortableTable
}
/**
* Display the graph of the total results of all students
* */
* Display the graph of the total results of all students
* */
public function display_graph()
{
include_once api_get_path(LIBRARY_PATH) . 'pchart/pData.class.php';
@ -505,33 +505,33 @@ class FlatViewTable extends SortableTable
$header = null;
if ($this->limit_enabled && $totalitems > LIMIT) {
$header .= '<table style="width: 100%; text-align: right; margin-left: auto; margin-right: auto;" border="0" cellpadding="2">'
. '<tbody>'
. '<tr>';
. '<tbody>'
. '<tr>';
// previous X
$header .= '<td style="width:100%;">';
if ($this->offset >= LIMIT) {
$header .= '<a href="' . api_get_self()
. '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
. '&offset=' . (($this->offset) - LIMIT)
. (isset($_GET['search']) ? '&search=' . Security::remove_XSS($_GET['search']) : '') . '">'
. Display::return_icon('action_prev.png', get_lang('PreviousPage'), array(), 32)
. '</a>';
. '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
. '&offset=' . (($this->offset) - LIMIT)
. (isset($_GET['search']) ? '&search=' . Security::remove_XSS($_GET['search']) : '') . '">'
. Display::return_icon('action_prev.png', get_lang('PreviousPage'), array(), 32)
. '</a>';
} else {
$header .= Display::return_icon('action_prev_na.png', get_lang('PreviousPage'), array(), 32);
}
$header .= ' ';
// next X
$calcnext = (($this->offset + (2 * LIMIT)) > $totalitems) ?
($totalitems - (LIMIT + $this->offset)) : LIMIT;
($totalitems - (LIMIT + $this->offset)) : LIMIT;
if ($calcnext > 0) {
$header .= '<a href="' . api_get_self()
. '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
. '&offset=' . ($this->offset + LIMIT)
. (isset($_GET['search']) ? '&search=' . Security::remove_XSS($_GET['search']) : '') . '">'
. Display::return_icon('action_next.png', get_lang('NextPage'), array(), 32)
. '</a>';
. '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
. '&offset=' . ($this->offset + LIMIT)
. (isset($_GET['search']) ? '&search=' . Security::remove_XSS($_GET['search']) : '') . '">'
. Display::return_icon('action_next.png', get_lang('NextPage'), array(), 32)
. '</a>';
} else {
$header .= Display::return_icon('action_next_na.png', get_lang('NextPage'), array(), 32);
}

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

@ -26,7 +26,11 @@ class FlatViewDataGenerator
private $mainCourseCategory;
/**
* Constructor
* @param array $users
* @param array $evals
* @param array $links
* @param array $params
* @param null $mainCourseCategory
*/
public function FlatViewDataGenerator(
$users = array(),
@ -50,6 +54,7 @@ class FlatViewDataGenerator
{
return $this->mainCourseCategory;
}
/**
* Get total number of users (rows)
*/
@ -59,8 +64,8 @@ class FlatViewDataGenerator
}
/**
* Get total number of evaluations/links (columns) (the 2 users columns not included)
*/
* Get total number of evaluations/links (columns) (the 2 users columns not included)
*/
public function get_total_items_count()
{
return count($this->evals_links);
@ -160,14 +165,14 @@ class FlatViewDataGenerator
$add_weight = null;
}*/
$headers[] = Display::url(
$sub_cat->get_name(),
api_get_self().'?selectcat='.$sub_cat->get_id()
).$add_weight;
$sub_cat->get_name(),
api_get_self().'?selectcat='.$sub_cat->get_id()
).$add_weight;
}
} else {
if (!isset($this->params['only_total_category']) ||
(isset($this->params['only_total_category']) &&
$this->params['only_total_category'] == false)
$this->params['only_total_category'] == false)
) {
for ($count=0; ($count < $items_count ) && ($items_start + $count < count($this->evals_links)); $count++) {
/** @var AbstractLink $item */
@ -401,14 +406,14 @@ class FlatViewDataGenerator
$percentage = $sub_cat->get_weight()/($sub_cat_percentage) * $sub_cat_percentage/$this->category->get_weight();
$item_value = $percentage*$item_value;
$item_total += $sub_cat->get_weight();
/*
if ($convert_using_the_global_weight) {
$score[0] = $score[0]/$main_weight*$sub_cat->get_weight();
$score[1] = $main_weight ;
}
*/
/*
if ($convert_using_the_global_weight) {
$score[0] = $score[0]/$main_weight*$sub_cat->get_weight();
$score[1] = $main_weight ;
}
*/
if (api_get_setting('gradebook_show_percentage_in_reports') == 'false') {
//if (true)
//if (true)
$real_score = $scoredisplay->display_score($real_score, SCORE_SIMPLE);
$temp_score = $scoredisplay->display_score($score, SCORE_DIV_SIMPLE_WITH_CUSTOM);
$temp_score = Display::tip($real_score, $temp_score);
@ -420,12 +425,12 @@ class FlatViewDataGenerator
if (!isset($this->params['only_total_category']) ||
(isset($this->params['only_total_category']) &&
$this->params['only_total_category'] == false)
$this->params['only_total_category'] == false)
) {
if (!$show_all) {
$row[] = $temp_score.' ';
$row[] = $temp_score.' ';
} else {
$row[] = $temp_score;
$row[] = $temp_score;
}
}
$item_value_total +=$item_value;

Write Preview
Loading…
Cancel
Save