|
@@ -45,7 +45,15 @@ class GradebookTable extends SortableTable
|
|
$this->userId = is_null($userId) ? api_get_user_id() : $userId;
|
|
$this->userId = is_null($userId) ? api_get_user_id() : $userId;
|
|
$this->exportToPdf = $exportToPdf;
|
|
$this->exportToPdf = $exportToPdf;
|
|
|
|
|
|
- parent::__construct('gradebooklist', null, null, api_is_allowed_to_edit() ? 1 : 0, 20, 'ASC', 'gradebook_list');
|
|
|
|
|
|
+ parent::__construct(
|
|
|
|
+ 'gradebooklist',
|
|
|
|
+ null,
|
|
|
|
+ null,
|
|
|
|
+ api_is_allowed_to_edit() ? 1 : 0,
|
|
|
|
+ 20,
|
|
|
|
+ 'ASC',
|
|
|
|
+ 'gradebook_list'
|
|
|
|
+ );
|
|
$this->evals_links = array_merge($evals, $links);
|
|
$this->evals_links = array_merge($evals, $links);
|
|
$this->currentcat = $currentcat;
|
|
$this->currentcat = $currentcat;
|
|
$this->cats = $cats;
|
|
$this->cats = $cats;
|
|
@@ -210,7 +218,15 @@ class GradebookTable extends SortableTable
|
|
$sortable_data = array();
|
|
$sortable_data = array();
|
|
$weight_total_links = 0;
|
|
$weight_total_links = 0;
|
|
$main_categories = array();
|
|
$main_categories = array();
|
|
- $main_cat = Category::load(null, null, $course_code, null, null, $session_id, false);
|
|
|
|
|
|
+ $main_cat = Category::load(
|
|
|
|
+ null,
|
|
|
|
+ null,
|
|
|
|
+ $course_code,
|
|
|
|
+ null,
|
|
|
|
+ null,
|
|
|
|
+ $session_id,
|
|
|
|
+ false
|
|
|
|
+ );
|
|
$total_categories_weight = 0;
|
|
$total_categories_weight = 0;
|
|
$scoredisplay = ScoreDisplay :: instance();
|
|
$scoredisplay = ScoreDisplay :: instance();
|
|
|
|
|
|
@@ -240,7 +256,6 @@ class GradebookTable extends SortableTable
|
|
// Type.
|
|
// Type.
|
|
$row[] = $this->build_type_column($item);
|
|
$row[] = $this->build_type_column($item);
|
|
|
|
|
|
-
|
|
|
|
// Name.
|
|
// Name.
|
|
if (get_class($item) == 'Category') {
|
|
if (get_class($item) == 'Category') {
|
|
$row[] = $invisibility_span_open.'<h3>'.$item->get_name().'</h3>'.$invisibility_span_close;
|
|
$row[] = $invisibility_span_open.'<h3>'.$item->get_name().'</h3>'.$invisibility_span_close;
|
|
@@ -367,7 +382,14 @@ class GradebookTable extends SortableTable
|
|
$course_code = api_get_course_id();
|
|
$course_code = api_get_course_id();
|
|
$session_id = api_get_session_id();
|
|
$session_id = api_get_session_id();
|
|
$parent_id = $item->get_id();
|
|
$parent_id = $item->get_id();
|
|
- $cats = Category::load($parent_id, null, null, null, null, null);
|
|
|
|
|
|
+ $cats = Category::load(
|
|
|
|
+ $parent_id,
|
|
|
|
+ null,
|
|
|
|
+ null,
|
|
|
|
+ null,
|
|
|
|
+ null,
|
|
|
|
+ null
|
|
|
|
+ );
|
|
|
|
|
|
if (isset($cats[0])) {
|
|
if (isset($cats[0])) {
|
|
$allcat = $cats[0]->get_subcategories($this->userId, $course_code, $session_id);
|
|
$allcat = $cats[0]->get_subcategories($this->userId, $course_code, $session_id);
|
|
@@ -427,7 +449,7 @@ class GradebookTable extends SortableTable
|
|
$cat = new Category();
|
|
$cat = new Category();
|
|
$show_message = $cat->show_message_resource_delete($item->get_course_code());
|
|
$show_message = $cat->show_message_resource_delete($item->get_course_code());
|
|
if ($show_message === false) {
|
|
if ($show_message === false) {
|
|
- if ($this->exportToPdf) {
|
|
|
|
|
|
+ if ($this->exportToPdf == false) {
|
|
$row[] = $this->build_edit_column($item);
|
|
$row[] = $this->build_edit_column($item);
|
|
}
|
|
}
|
|
}
|
|
}
|