From 3e49140b7083c986e83fdf03161f6c2c81734fbf Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 20 Jul 2020 09:41:29 +0200 Subject: [PATCH] Minor - fix format --- main/gradebook/index.php | 6 +---- main/gradebook/lib/be/category.class.php | 4 +-- main/gradebook/lib/be/exerciselink.class.php | 21 +++++++-------- .../gradebook/lib/fe/gradebooktable.class.php | 26 +++++++++---------- 4 files changed, 24 insertions(+), 33 deletions(-) diff --git a/main/gradebook/index.php b/main/gradebook/index.php index 8737a38d5b..6ff074c29b 100755 --- a/main/gradebook/index.php +++ b/main/gradebook/index.php @@ -1,9 +1,6 @@ '; } else { - // Tool introduction Display::display_introduction_section( TOOL_GRADEBOOK, ['ToolbarSet' => 'AssessmentsIntroduction'] diff --git a/main/gradebook/lib/be/category.class.php b/main/gradebook/lib/be/category.class.php index ae1d6d06df..2736e0b375 100755 --- a/main/gradebook/lib/be/category.class.php +++ b/main/gradebook/lib/be/category.class.php @@ -796,9 +796,9 @@ class Category implements GradebookItem $option = Database::fetch_array($res, 'ASSOC'); if ($option['num'] >= 1) { return '  ( '.get_lang('ResourceDeleted').' )'; - } else { - return false; } + + return false; } /** diff --git a/main/gradebook/lib/be/exerciselink.class.php b/main/gradebook/lib/be/exerciselink.class.php index 55840aac67..a39fea3a7d 100755 --- a/main/gradebook/lib/be/exerciselink.class.php +++ b/main/gradebook/lib/be/exerciselink.class.php @@ -1,4 +1,5 @@ $path, @@ -453,8 +454,6 @@ class ExerciseLink extends AbstractLink 'type' => $this->get_type(), ] ); - - return $url; } /** @@ -477,9 +476,7 @@ class ExerciseLink extends AbstractLink } } - $title = strip_tags(Exercise::get_formated_title_variable($data['title'])); - - return $title; + return strip_tags(Exercise::get_formated_title_variable($data['title'])); } /** @@ -595,9 +592,9 @@ class ExerciseLink extends AbstractLink } else { // Try with iid $sql = 'SELECT * FROM '.$table.' - WHERE - c_id = '.$this->course_id.' AND - iid = '.$exerciseId; + WHERE + c_id = '.$this->course_id.' AND + iid = '.$exerciseId; $result = Database::query($sql); $rows = Database::num_rows($result); @@ -606,9 +603,9 @@ class ExerciseLink extends AbstractLink } else { // Try wit id $sql = 'SELECT * FROM '.$table.' - WHERE - c_id = '.$this->course_id.' AND - id = '.$exerciseId; + WHERE + c_id = '.$this->course_id.' AND + id = '.$exerciseId; $result = Database::query($sql); $this->exercise_data = Database::fetch_array($result); } diff --git a/main/gradebook/lib/fe/gradebooktable.class.php b/main/gradebook/lib/fe/gradebooktable.class.php index 4a46990578..42c0b0a972 100755 --- a/main/gradebook/lib/fe/gradebooktable.class.php +++ b/main/gradebook/lib/fe/gradebooktable.class.php @@ -1,4 +1,5 @@ direction) { + if ('DESC' === $this->direction) { $sorting |= GradebookDataGenerator::GDG_SORT_DESC; } else { $sorting |= GradebookDataGenerator::GDG_SORT_ASC; @@ -1164,24 +1165,24 @@ class GradebookTable extends SortableTable $view = isset($_GET['view']) ? Security::remove_XSS($_GET['view']) : null; $categoryId = $item->getCategory()->get_id(); + $cat = new Category(); + switch ($item->get_item_type()) { - // category case 'C': + // Category $prms_uri = '?selectcat='.$item->get_id().'&view='.$view; $isStudentView = api_is_student_view_active(); if (isset($is_student) || $isStudentView) { $prms_uri = $prms_uri.'&isStudentView=studentview'; } - $cat = new Category(); $show_message = $cat->show_message_resource_delete($item->get_course_code()); return ' ' .$item->get_name() .'' .($item->is_course() ? '  ['.$item->get_course_code().']'.$show_message : ''); - // evaluation case 'E': - $cat = new Category(); + // Evaluation $course_id = CourseManager::get_course_by_category($categoryId); $show_message = $cat->show_message_resource_delete($course_id); @@ -1194,7 +1195,7 @@ class GradebookTable extends SortableTable .''; } else { $extra = Display::label(get_lang('Evaluation')); - if ($type == 'simple') { + if ($type === 'simple') { $extra = ''; } @@ -1219,13 +1220,11 @@ class GradebookTable extends SortableTable } // no break because of return case 'L': - // link - $cat = new Category(); + // Link $course_id = CourseManager::get_course_by_category($categoryId); $show_message = $cat->show_message_resource_delete($course_id); $url = $item->get_link(); - $text = $item->get_name(); if (isset($url) && false === $show_message) { $text = ' ' @@ -1234,11 +1233,10 @@ class GradebookTable extends SortableTable } $extra = Display::label($item->get_type_name(), 'info'); - if ('simple' == $type) { + if ('simple' === $type) { $extra = ''; } $extra .= $item->getSkillsFromItem(); - $text .= " ".$extra.$show_message; $cc = $this->currentcat->get_course_code(); if (empty($cc)) { @@ -1257,14 +1255,14 @@ class GradebookTable extends SortableTable private function build_edit_column($item) { switch ($item->get_item_type()) { - // category case 'C': + // Category return GradebookUtils::build_edit_icons_cat($item, $this->currentcat); - // evaluation case 'E': + // Evaluation return GradebookUtils::build_edit_icons_eval($item, $this->currentcat->get_id()); - // link case 'L': + // Link return GradebookUtils::build_edit_icons_link($item, $this->currentcat->get_id()); } }