From 87e75add7cc51e2b2140c958bdb62d102cc1c872 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 6 Mar 2015 16:05:15 +0100 Subject: [PATCH] Gradebook UI changes, --- main/gradebook/gradebook_edit_cat.php | 8 ++++- main/gradebook/index.php | 10 ++++--- main/gradebook/lib/fe/catform.class.php | 30 ++++++++----------- main/gradebook/lib/fe/evalform.class.php | 5 +--- main/gradebook/lib/scoredisplay.class.php | 1 - main/mySpace/myStudents.php | 4 +-- .../block_student/block_student.class.php | 2 +- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/main/gradebook/gradebook_edit_cat.php b/main/gradebook/gradebook_edit_cat.php index 085411e6bb..101b0505f9 100755 --- a/main/gradebook/gradebook_edit_cat.php +++ b/main/gradebook/gradebook_edit_cat.php @@ -77,7 +77,13 @@ function check_skills() { '; $catedit = Category::load($edit_cat); -$form = new CatForm(CatForm::TYPE_EDIT, $catedit[0], 'edit_cat_form'); +$form = new CatForm( + CatForm::TYPE_EDIT, + $catedit[0], + 'edit_cat_form', + 'post', + api_get_self().'?'.api_get_cidreq().'&editcat='.$edit_cat +); if ($form->validate()) { $values = $form->getSubmitValues(); diff --git a/main/gradebook/index.php b/main/gradebook/index.php index 73ab2137d5..380a554fe4 100755 --- a/main/gradebook/index.php +++ b/main/gradebook/index.php @@ -36,7 +36,7 @@ var show_icon = "../img/view_more_stats.gif"; var hide_icon = "../img/view_less_stats.gif"; $(document).ready(function() { - $(".view_children").live("click", function() { + $("body").on("click", ".view_children", function() { var id = $(this).attr("data-cat-id"); $(".hidden_"+id).removeClass("hidden"); $(this).removeClass("view_children"); @@ -44,7 +44,7 @@ $(document).ready(function() { $(this).attr("class", "hide_children"); }); - $(".hide_children").live("click", function(event) { + $("body").on("click", ".hide_children", function(event) { var id = $(this).attr("data-cat-id"); $(".hidden_"+id).addClass("hidden"); $(this).removeClass("hide_children"); @@ -132,8 +132,10 @@ if ((isset($_GET['selectcat']) && $_GET['selectcat']>0) && Display :: display_footer(); exit; } else { - if (!isset($_GET['selectcat']) && ($_SESSION['studentview']=='studentview') || (isset($_GET['isStudentView']) && $_GET['isStudentView']=='true') ) { - // if ( !isset($_GET['selectcat']) && ($_SESSION['studentview']=='studentview') && ($status<>1 && !api_is_platform_admin()) || (isset($_GET['isStudentView']) && $_GET['isStudentView']=='true' && $status<>1 && !api_is_platform_admin()) ) { + if (!isset($_GET['selectcat']) && + ($_SESSION['studentview']=='studentview') || + (isset($_GET['isStudentView']) && $_GET['isStudentView']=='true') + ) { Display :: display_header(get_lang('Gradebook')); //Introduction tool: student view diff --git a/main/gradebook/lib/fe/catform.class.php b/main/gradebook/lib/fe/catform.class.php index a243ae806f..b24e59d865 100755 --- a/main/gradebook/lib/fe/catform.class.php +++ b/main/gradebook/lib/fe/catform.class.php @@ -216,7 +216,14 @@ class CatForm extends FormValidator } else { $value = 100; } - $this->addText('weight', array(get_lang('TotalWeight'), get_lang('TotalSumOfWeights')), true, array('value'=>$value, 'class'=>'span1','maxlength'=>'5')); + $this->addText('weight', + array( + get_lang('TotalWeight'), + get_lang('TotalSumOfWeights') + ), + true, + array('value' => $value, 'class' => 'span1', 'maxlength' => '5') + ); $this->addRule('weight', get_lang('ThisFieldIsRequired'), 'required'); if (api_is_platform_admin() || api_is_drh()) { @@ -267,8 +274,8 @@ class CatForm extends FormValidator } } - if (isset($this->category_object) && $this->category_object->get_parent_id( - ) == 0 + if (isset($this->category_object) && + $this->category_object->get_parent_id() == 0 ) { $this->addText( 'certif_min_score', @@ -301,8 +308,7 @@ class CatForm extends FormValidator $this->addElement( 'textarea', 'description', - get_lang('Description'), - array('class' => 'span3', 'cols' => '34') + get_lang('Description') ); if (isset($this->category_object) && @@ -365,20 +371,10 @@ class CatForm extends FormValidator } if ($this->form_type == self :: TYPE_ADD) { - $this->addElement( - 'style_submit_button', - null, - get_lang('AddCategory'), - 'class="save"' - ); + $this->addButtonCreate(get_lang('AddCategory')); } else { $this->addElement('hidden', 'editcat', intval($_GET['editcat'])); - $this->addElement( - 'style_submit_button', - null, - get_lang('EditCategory'), - 'class="save"' - ); + $this->addButtonUpdate(get_lang('EditCategory')); } //if (!empty($grading_contents)) { diff --git a/main/gradebook/lib/fe/evalform.class.php b/main/gradebook/lib/fe/evalform.class.php index 71d078ca8e..ff36148c2a 100755 --- a/main/gradebook/lib/fe/evalform.class.php +++ b/main/gradebook/lib/fe/evalform.class.php @@ -507,10 +507,7 @@ class EvalForm extends FormValidator $this->setDefaults($defaults); } - $this->addElement('textarea', 'description', get_lang('Description'), array( - 'rows' => '3', - 'class' => 'span3', - )); + $this->addElement('textarea', 'description', get_lang('Description')); $this->addRule('hid_category_id', get_lang('ThisFieldIsRequired'), 'required'); $this->addElement('checkbox', 'visible', null, get_lang('Visible')); diff --git a/main/gradebook/lib/scoredisplay.class.php b/main/gradebook/lib/scoredisplay.class.php index 64d13946c6..061890176c 100755 --- a/main/gradebook/lib/scoredisplay.class.php +++ b/main/gradebook/lib/scoredisplay.class.php @@ -309,7 +309,6 @@ class ScoreDisplay $my_score_denom = ($score[1]==0)?1:$score[1]; if (($score[0] / $my_score_denom) < ($this->color_split_value / 100)) { $display = Display::tag('font', $display, array('color'=>'red')); - //$display = Display::label($display, 'important'); } } return $display; diff --git a/main/mySpace/myStudents.php b/main/mySpace/myStudents.php index 4708f4ca5d..386fade171 100755 --- a/main/mySpace/myStudents.php +++ b/main/mySpace/myStudents.php @@ -693,9 +693,9 @@ if (!empty($student_id)) { $scoretotal = array(); if (isset($cats) && isset($cats[0])) { if (!empty($session_id)) { - $scoretotal= $cats[0]->calc_score($student_id, $course_code, $session_id); + $scoretotal= $cats[0]->calc_score($student_id, null, $course_code, $session_id); } else { - $scoretotal= $cats[0]->calc_score($student_id, $course_code); + $scoretotal= $cats[0]->calc_score($student_id, null, $course_code); } } diff --git a/plugin/dashboard/block_student/block_student.class.php b/plugin/dashboard/block_student/block_student.class.php index 5be5cf8598..2a9874ac74 100755 --- a/plugin/dashboard/block_student/block_student.class.php +++ b/plugin/dashboard/block_student/block_student.class.php @@ -187,7 +187,7 @@ class BlockStudent extends Block $cats = Category::load(null, null, $course_code, null, null, null, false); $scoretotal = array(); if (isset($cats) && isset($cats[0])) { - $scoretotal= $cats[0]->calc_score($student_id, $course_code); + $scoretotal= $cats[0]->calc_score($student_id, null, $course_code); } if (!empty($scoretotal)) {