Fixing bug when adding links and eval see #5168

main/gradebook/gradebook_add_eval.php

@@ -49,7 +49,9 @@ if ($form->validate()) {
     
     $parent_cat = Category :: load($values['hid_category_id']);            
     $global_weight = $cat[0]->get_weight();
-    $values['weight'] = $values['weight_mask']/$global_weight*$parent_cat[0]->get_weight();    
+    //$values['weight'] = $values['weight_mask']/$global_weight*$parent_cat[0]->get_weight();    
+    $values['weight'] = $values['weight_mask'];
+    
     
 	$eval->set_weight($values['weight']);	
 	$eval->set_max($values['max']);

main/gradebook/gradebook_add_link.php

@@ -72,9 +72,9 @@ if (isset($_GET['typeselected']) && $_GET['typeselected'] != '0') {
         $parent_cat = Category :: load($addvalues['select_gradebook']);            
         $global_weight = $category[0]->get_weight();
         
-        $addvalues['weight'] = $addvalues['weight_mask']/$global_weight*$parent_cat[0]->get_weight();    
+        //$addvalues['weight'] = $addvalues['weight_mask']/$global_weight*$parent_cat[0]->get_weight();    
         
-		$link->set_weight($addvalues['weight']);
+		$link->set_weight($addvalues['weight_mask']);
 
 		if ($link->needs_max()) {
 			$link->set_max($addvalues['max']);

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

@@ -423,8 +423,8 @@ class EvalForm extends FormValidator
 		$this->addElement('header', $form_title);
 		$this->addElement('hidden', 'zero', 0);
 		$this->addElement('hidden', 'hid_user_id');		
-		
 		$this->addElement('hidden', 'hid_course_code');
+        
 		$this->add_textfield('name', get_lang('EvaluationName'), true, array (
 			'class'         => 'span3',
 			'maxlength'     => '50',

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

@@ -53,7 +53,10 @@ class GradebookTable extends SortableTable {
 		} else {
 			$this->set_header($column++, get_lang('Weight'), false);
 			$this->set_header($column++, get_lang('Result'), false);
+                        
+            if (!empty($cats)) {
                 $this->set_header($column++, get_lang('Actions'), false);
+            }            
 		}
 		
 		/*if (api_is_allowed_to_edit(null, true)) {
@@ -238,9 +241,11 @@ class GradebookTable extends SortableTable {
                     $score = $scoredisplay->display_score(array($score, null), SCORE_SIMPLE);
                     
                     $row[] = Display::tip($score, $complete_score);
+                    if (!empty($cats)) {
                         $row[] = $this->build_edit_column($item);
                     }
                 }
+			}
             
             //Category added
 			$sortable_data[] = $row;
@@ -332,8 +337,10 @@ class GradebookTable extends SortableTable {
                                 $row[] = $data[4];
 							}
 						}
+                        if (!empty($cats)) {
                             $row[] = null;
                         }
+					}
                     $row['child_of'] = $parent_id;
                     
 					$sortable_data[] = $row;