Fixing gradebook link edition

main/gradebook/gradebook_edit_eval.php

@@ -44,6 +44,28 @@ $interbreadcrumb[] = array (
 	'url' => $_SESSION['gradebook_dest'].'?selectcat='.$selectcat_inter,
 	'name' => get_lang('Gradebook'
 ));
+
+$htmlHeadXtra[] = '<script type="text/javascript">
+$(document).ready( function() {
+
+    $("#hid_category_id").change(function(){
+        
+       $("#hid_category_id option:selected").each(function () {
+           var cat_id = $(this).val();
+            $.ajax({ 
+                url: "'.api_get_path(WEB_AJAX_PATH).'gradebook.ajax.php?a=get_gradebook_weight", 
+                data: "cat_id="+cat_id,
+                success: function(return_value) {
+                    if (return_value != 0 ) {
+                        $("#max_weight").html(return_value);                                             
+                    }                    
+                },            
+            });    
+       });
+    });
+});
+</script>';
+
 Display :: display_header(get_lang('EditEvaluation'));
 $form->display();
 Display :: display_footer();

main/gradebook/gradebook_edit_link.php

@@ -14,6 +14,7 @@ require_once 'lib/be.inc.php';
 require_once 'lib/gradebook_functions.inc.php';
 require_once 'lib/fe/linkform.class.php';
 require_once 'lib/fe/linkaddeditform.class.php';
+
 api_block_anonymous_users();
 block_students();
 $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
@@ -33,6 +34,10 @@ $form = new LinkAddEditForm(LinkAddEditForm :: TYPE_EDIT, $cats, null, $link, 'e
 if ($form->validate()) {
 	$values = $form->exportValues();
 	$link->set_weight($values['weight']);
+    
+    if (!empty($values['select_gradebook'])) {
+        $link->set_category_id($values['select_gradebook']);
+    }
 	$link->set_visible(empty ($values['visible']) ? 0 : 1);
 	$link->save();
 
@@ -60,8 +65,6 @@ if ($form->validate()) {
 }
 
 $interbreadcrumb[] = array ('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$linkcat,'name' => get_lang('Gradebook'));
-
-
 $htmlHeadXtra[] = '<script type="text/javascript">
 $(document).ready( function() {
 

main/gradebook/lib/be/category.class.php

@@ -155,7 +155,7 @@ class Category implements GradebookItem
      * @param int      session id (in case we are in a session)
      * @param bool     Whether to show all "session" categories (true) or hide them (false) in case there is no session id
 	 */
-	public function load ($id = null, $user_id = null, $course_code = null, $parent_id = null, $visible = null, $session = null, $show_session_categories = true) {
+	public function load ($id = null, $user_id = null, $course_code = null, $parent_id = null, $visible = null, $session_id = null, $show_session_categories = true) {
         //if the category given is explicitly 0 (not null), then create
         // a root category object (in memory)
 		if ( isset($id) && (int)$id === 0 ) {
@@ -187,8 +187,9 @@ class Category implements GradebookItem
 			else { $sql .= ' WHERE'; }
 			if ($course_code == '0') { $sql .= ' course_code is null '; }
 			else { $sql .= " course_code = '".Database::escape_string($course_code)."'"; }
-            if (!empty($session)) {
-            	$sql .= ' AND session_id = '.(int) $session.' ';
+            
+            if (!empty($session_id)) {
+            	$sql .= ' AND session_id = '.(int) $session_id.' ';
             } else {
             	// a query on the course should show all
                 // the categories inside sessions for this course
@@ -219,7 +220,7 @@ class Category implements GradebookItem
 			$sql .= ' visible = '.intval($visible);
 			$paramcount ++;
 		}
-		
+		//var_dump($sql);
 		$result = Database::query($sql);
         $allcat = array();		
 		if (Database::num_rows($result) > 0) {

main/gradebook/lib/fe/evalform.class.php

@@ -416,33 +416,43 @@ class EvalForm extends FormValidator
 			'id' => 'evaluation_title'
 		));
         
+        $this->evaluation_object->get_category_id();
+        
         $select_gradebook = $this->addElement('select', 'hid_category_id', get_lang('SelectGradebook'), array(), array('id' => 'hid_category_id'));
         
-        $all_categories = Category :: load();
+        $session_id  = api_get_session_id();
+        
+        $course_code = api_get_course_id();
+        
+        //$all_categories = Category :: load();        
+        $all_categories = Category :: load(null, null, $course_code, null, null, $session_id, false);                
+        // load ($id = null, $user_id = null, $course_code = null, $parent_id = null, $visible = null, $session = null, $show_session_categories = true) {
         
         $default_weight = 0;
         
-        if (!empty($all_categories)) {
-            foreach($all_categories as $my_cat) {
-                if ($my_cat->get_course_code() == api_get_course_id()) {
+        if (!empty($all_categories)) {            
+            foreach ($all_categories as $my_cat) {
+                if ($my_cat->get_course_code() == api_get_course_id()) {                    
                     if ($my_cat->get_parent_id() == 0 ) {
                         $default_weight = $my_cat->get_weight();
                         $select_gradebook->addoption(get_lang('Default'), $my_cat->get_id());
+                        $cats_added[] = $my_cat->get_id();
                     } else {
                         $select_gradebook->addoption($my_cat->get_name(), $my_cat->get_id());
+                        $cats_added[] = $my_cat->get_id();
                     }
-                    
                     if ($this->evaluation_object->get_category_id() == $my_cat->get_id()) {
                         $default_weight = $my_cat->get_weight();                        
-                    }
-                    
+                    }                                        
                 }           
             }
         }
+        
 
 		$this->add_textfield('weight', array(get_lang('Weight'), null, '/ <span id="max_weight">'.$default_weight.'</span>'), true, array (
 			'size' => '4',
-			'maxlength' => '5'
+			'maxlength' => '5',
+            'class' => 'span1'
 		));
         
 		if ($edit) {

main/gradebook/lib/fe/linkaddeditform.class.php

@@ -95,7 +95,8 @@ class LinkAddEditForm extends FormValidator
         
         $this->add_textfield('weight', array(get_lang('Weight'), null, '/ <span id="max_weight">'.$default_weight.'</span>'), true, array (
             'size' => '4',
-            'maxlength' => '5'
+            'maxlength' => '5',
+            'class' => 'span1'
         ));
         
 		$this->addRule('weight',get_lang('OnlyNumbers'),'numeric');