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, update docs

Browse Source
pull/2487/head
jmontoyaa 8 years ago
parent 4af8524c05
commit 14194fde53
6 changed files with 315 additions and 283 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. 112
      main/gradebook/lib/be/category.class.php
  2. 22
      main/gradebook/lib/fe/gradebooktable.class.php
  3. 2
      main/work/edit.php
  4. 2
      main/work/upload_corrections.php
  5. 4
      main/work/view.php

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

@ -365,6 +365,8 @@ class Category implements GradebookItem
* @param int $session_id (in case we are in a session)
* @param bool $order_by Whether to show all "session"
* categories (true) or hide them (false) in case there is no session id
*
* @return array
*/
public static function load(
$id = null,
@ -730,8 +732,8 @@ class Category implements GradebookItem
*/
public function update_category_delete($course_id)
{
$tbl_grade_categories = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
$sql = 'UPDATE '.$tbl_grade_categories.' SET
$table = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
$sql = 'UPDATE '.$table.' SET
visible = 3
WHERE course_code ="'.Database::escape_string($course_id).'"';
Database::query($sql);
@ -778,8 +780,10 @@ class Category implements GradebookItem
/**
* Check if a category name (with the same parent category) already exists
* @param $name name to check (if not given, the name property of this object will be checked)
* @param $parent parent category
* @param string $name name to check (if not given, the name property of this object will be checked)
* @param int $parent parent category
*
* @return bool
*/
public function does_name_exist($name, $parent)
{
@ -788,9 +792,9 @@ class Category implements GradebookItem
$parent = $this->parent;
}
$tbl_grade_categories = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
$sql = 'SELECT count(id) AS number'
.' FROM '.$tbl_grade_categories
." WHERE name = '".Database::escape_string($name)."'";
$sql = "SELECT count(id) AS number
FROM $tbl_grade_categories
WHERE name = '".Database::escape_string($name)."'";
if (api_is_allowed_to_edit()) {
$parent = self::load($parent);
@ -818,7 +822,8 @@ class Category implements GradebookItem
$result = Database::query($sql);
$number = Database::fetch_row($result);
return ($number[0] != 0);
return $number[0] != 0;
}
/**
@ -1108,8 +1113,22 @@ class Category implements GradebookItem
public function delete_all()
{
$cats = self::load(null, null, $this->course_code, $this->id, null);
$evals = Evaluation::load(null, null, $this->course_code, $this->id, null);
$links = LinkFactory::load(null, null, null, null, $this->course_code, $this->id, null);
$evals = Evaluation::load(
null,
null,
$this->course_code,
$this->id,
null
);
$links = LinkFactory::load(
null,
null,
null,
null,
$this->course_code,
$this->id,
null
);
if (!empty($cats)) {
foreach ($cats as $cat) {
$cat->delete_all();
@ -1131,12 +1150,11 @@ class Category implements GradebookItem
/**
* Return array of Category objects where a student is subscribed to.
* @param int student id
* @param string Course code
* @param int Session id
*
* @param integer $stud_id
* @param string $course_code
* @param integer $session_id
* @return array
*/
public function get_root_categories_for_student($stud_id, $course_code = null, $session_id = null)
{
@ -1218,17 +1236,16 @@ class Category implements GradebookItem
/**
* Return array of Category objects where a teacher is admin for.
* @param int user id (to return everything, use 'null' here)
* @param string course code (optional)
* @param int session id (optional)
* @param integer $user_id
* @param string $course_code
* @param integer $session_id
*
* @param integer $user_id (to return everything, use 'null' here)
* @param string $course_code (optional)
* @param integer $session_id (optional)
* @return array
*/
public function get_root_categories_for_teacher($user_id, $course_code = null, $session_id = null)
{
if ($user_id == null) {
return self::load(null,null,$course_code,0,null,$session_id);
return self::load(null, null, $course_code, 0, null, $session_id);
}
$courseTable = Database::get_main_table(TABLE_MAIN_COURSE);
@ -1236,7 +1253,7 @@ class Category implements GradebookItem
$tbl_grade_categories = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
$sql = 'SELECT * FROM '.$tbl_grade_categories.'
WHERE parent_id = 0';
WHERE parent_id = 0 ';
if (!empty($course_code)) {
$sql .= " AND course_code = '".Database::escape_string($course_code)."' ";
if (!empty($session_id)) {
@ -1273,10 +1290,11 @@ class Category implements GradebookItem
/**
* Can this category be moved to somewhere else ?
* The root and courses cannot be moved.
* @return bool
*/
public function is_movable()
{
return (!(!isset ($this->id) || $this->id == 0 || $this->is_course()));
return !(!isset($this->id) || $this->id == 0 || $this->is_course());
}
/**
@ -1291,7 +1309,6 @@ class Category implements GradebookItem
if (!$this->is_movable()) {
return null;
} else {
// otherwise:
// - course independent category
// -> movable to root or other independent categories
@ -1306,7 +1323,7 @@ class Category implements GradebookItem
$targets[] = $root;
if (isset($this->course_code) && !empty($this->course_code)) {
$crscats = self::load(null,null,$this->course_code,0);
$crscats = self::load(null, null, $this->course_code, 0);
foreach ($crscats as $cat) {
if ($this->can_be_moved_to_cat($cat)) {
$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
@ -1315,7 +1332,7 @@ class Category implements GradebookItem
}
}
$indcats = self::load(null,$user,0,0);
$indcats = self::load(null, $user, 0, 0);
foreach ($indcats as $cat) {
if ($this->can_be_moved_to_cat($cat)) {
$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
@ -1329,11 +1346,15 @@ class Category implements GradebookItem
/**
* Internal function used by get_target_categories()
* @param array $targets
* @param integer $level
* @param int $catid
*
* @return array
*/
private function add_target_subcategories($targets, $level, $catid)
{
$subcats = self::load(null,null,null,$catid);
$subcats = self::load(null, null, null, $catid);
foreach ($subcats as $cat) {
if ($this->can_be_moved_to_cat($cat)) {
$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
@ -1350,7 +1371,7 @@ class Category implements GradebookItem
* Impossible when origin and target are the same... children won't be processed
* either. (a category can't be moved to one of its own children)
*/
private function can_be_moved_to_cat ($cat)
private function can_be_moved_to_cat($cat)
{
return $cat->get_id() != $this->get_id();
}
@ -1432,7 +1453,7 @@ class Category implements GradebookItem
* @param integer $level
* @param null|integer $visible
*/
private function add_subtree ($targets, $level, $catid, $visible)
private function add_subtree($targets, $level, $catid, $visible)
{
$subcats = self::load(null,null,null,$catid,$visible);
@ -1458,9 +1479,10 @@ class Category implements GradebookItem
$tbl_grade_categories = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
$sql = 'SELECT DISTINCT(code), title
FROM '.$tbl_main_courses.' cc, '.$tbl_main_course_user.' cu'
.' WHERE cc.id = cu.c_id '
.' AND cu.status = '.COURSEMANAGER;
FROM '.$tbl_main_courses.' cc, '.$tbl_main_course_user.' cu
WHERE
cc.id = cu.c_id AND
cu.status = '.COURSEMANAGER;
if (!api_is_platform_admin()) {
$sql .= ' AND cu.user_id = '.$user_id;
}
@ -1473,9 +1495,9 @@ class Category implements GradebookItem
)';
$result = Database::query($sql);
$cats=array();
while ($data=Database::fetch_array($result)) {
$cats[] = array ($data['code'], $data['title']);
$cats = array();
while ($data = Database::fetch_array($result)) {
$cats[] = array($data['code'], $data['title']);
}
return $cats;
@ -1566,7 +1588,8 @@ class Category implements GradebookItem
* that should be visible to a student.
* @param integer $cat_id parent category
* @param $stud_id student id
* @param $cats optional: if defined, the categories will be added to this array
* @param array $cats optional: if defined, the categories will be added to this array
* @return array
*/
public function get_independent_categories_with_result_for_student($cat_id, $stud_id, $cats = array())
{
@ -1587,6 +1610,7 @@ class Category implements GradebookItem
}
}
}
return $cats;
}
@ -1868,16 +1892,16 @@ class Category implements GradebookItem
* @param string $name_mask search string
* @return array category objects matching the search criterium
*/
public function find_category($name_mask,$allcat)
public function find_category($name_mask, $allcat)
{
$foundcats = array();
$categories = array();
foreach ($allcat as $search_cat) {
if (!(strpos(strtolower($search_cat->get_name()), strtolower($name_mask)) === false)) {
$foundcats[] = $search_cat;
$categories[] = $search_cat;
}
}
return $foundcats;
return $categories;
}
/**
@ -1902,9 +1926,7 @@ class Category implements GradebookItem
{
if (api_get_setting('gradebook_locking_enabled') == 'true') {
$this->lock($locked);
$evals_to_lock = $this->get_evaluations();
if (!empty($evals_to_lock)) {
foreach ($evals_to_lock as $item) {
$item->lock($locked);
@ -2158,8 +2180,11 @@ class Category implements GradebookItem
{
$certificate_list = GradebookUtils::get_list_users_certificates($catId);
if (!empty($certificate_list)) {
foreach ($certificate_list as $index=>$value) {
$list_certificate = GradebookUtils::get_list_gradebook_certificates_by_user_id($value['user_id'], $catId);
foreach ($certificate_list as $index => $value) {
$list_certificate = GradebookUtils::get_list_gradebook_certificates_by_user_id(
$value['user_id'],
$catId
);
foreach ($list_certificate as $value_certificate) {
$certificate_obj = new Certificate($value_certificate['id']);
$certificate_obj->delete(true);
@ -2287,7 +2312,6 @@ class Category implements GradebookItem
}
$category = $cats_course[0];
$courseEvaluations = $category->get_evaluations($userId, true);
$courseLinks = $category->get_links($userId, true);
$evaluationsAndLinks = array_merge($courseEvaluations, $courseLinks);

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

@ -18,20 +18,24 @@ class GradebookTable extends SortableTable
private $currentcat;
private $datagen;
private $evals_links;
public $cats;
private $dataForGraph;
public $cats;
public $exportToPdf;
public $teacherView;
public $userId;
public $studentList;
/**
* Constructor
* GradebookTable constructor.
* @param Category $currentcat
* @param array $cats
* @param array $evals
* @param array $links
* @param null $addparams
* @param bool $exportToPdf
* @param null $showTeacherView
* @param int $userId
* @param array $studentList
*/
public function __construct(
$currentcat,
@ -370,8 +374,12 @@ class GradebookTable extends SortableTable
// Student result
$row[] = $value_data;
$totalResultAverageValue = strip_tags($scoredisplay->display_score($totalResult,
SCORE_AVERAGE));
$totalResultAverageValue = strip_tags(
$scoredisplay->display_score(
$totalResult,
SCORE_AVERAGE
)
);
$this->dataForGraph['my_result'][] = floatval($totalResultAverageValue);
$totalAverageValue = strip_tags($scoredisplay->display_score($totalAverage, SCORE_AVERAGE));
$this->dataForGraph['average'][] = floatval($totalAverageValue);
@ -456,8 +464,8 @@ class GradebookTable extends SortableTable
$row[] = $this->build_type_column($item, array('style' => 'padding-left:5px'));
// Name.
$row[] = $invisibility_span_open."    ".$this->build_name_link($item,
$type).$invisibility_span_close;
$row[] = $invisibility_span_open."    ".
$this->build_name_link($item, $type).$invisibility_span_close;
// Description.
if ($this->exportToPdf == false) {
@ -1045,7 +1053,7 @@ class GradebookTable extends SortableTable
}
/**
* @param $item
* @param AbstractLink $item
* @return null|string
*/
private function build_edit_column($item)

2
main/work/edit.php
Unescape View File

@ -13,7 +13,7 @@ $this_section = SECTION_COURSES;
$work_id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : null;
$item_id = isset($_REQUEST['item_id']) ? intval($_REQUEST['item_id']) : null;
$work_table = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
$work_table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
$is_allowed_to_edit = api_is_allowed_to_edit();
$course_id = api_get_course_int_id();

2
main/work/upload_corrections.php
Unescape View File

@ -138,7 +138,7 @@ if ($form->validate()) {
$finder = new Finder();
$finder->files()->in($destinationDir);
$table = Database:: get_course_table(TABLE_STUDENT_PUBLICATION);
$table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
//var_dump($finalResult);
/** @var SplFileInfo $file */
foreach ($finder as $file) {

4
main/work/view.php
Unescape View File

@ -86,7 +86,7 @@ if ((user_is_author($id) || $isDrhOfCourse || (api_is_allowed_to_edit() || api_i
);
if (api_is_allowed_to_edit()) {
$work_table = Database:: get_course_table(TABLE_STUDENT_PUBLICATION);
$work_table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
$sql = "UPDATE $work_table
SET
qualificator_id = '".api_get_user_id()."',
@ -104,7 +104,7 @@ if ((user_is_author($id) || $isDrhOfCourse || (api_is_allowed_to_edit() || api_i
$work
);
if ($resultUpload) {
$work_table = Database:: get_course_table(
$work_table = Database::get_course_table(
TABLE_STUDENT_PUBLICATION
);

Write Preview
Loading…
Cancel
Save