Removing gradebook_ranking attributes now we use a table grade_model and grade_components

main/admin/grade_models.php

@@ -6,7 +6,7 @@
  */
 
 // Language files that need to be included.
-$language_file = array('admin');
+$language_file = array('admin', 'gradebook');
 
 $cidReset = true;
 require_once '../inc/global.inc.php';

main/admin/settings.lib.php

@@ -1230,7 +1230,7 @@ function generate_settings_form($settings, $settings_by_access_list) {
                 $form->addElement('select', $row['variable'], array(get_lang($row['title']), get_lang($row['comment'])), call_user_func('select_'.$row['variable']), $hideme);
                 $default_values[$row['variable']] = $row['selected_value'];
                 break;
-            case 'gradebook_ranking':
+            /*case 'gradebook_ranking':
                 $value = explode('::', $row['selected_value']);
                 
                 $form->addElement('text', 'gradebook_display['.$row['variable'].'][text]',  array(get_lang($row['title']), get_lang($row['comment'])), array('class' => 'span1', 'value' => $value[0]), $hideme);
@@ -1239,7 +1239,7 @@ function generate_settings_form($settings, $settings_by_access_list) {
                 $renderer = $form -> defaultRenderer();
                 $renderer->setElementTemplate(' {label}<div class="controls"> {element} %= ', 'gradebook_display['.$row['variable'].'][text]');
                 $renderer->setElementTemplate(' {element}</div><br />', 'gradebook_display['.$row['variable'].'][score]');                
-                break;
+                break;*/
             case 'custom':            	
             	break;            
         }        

main/admin/settings.php

@@ -180,13 +180,13 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
         foreach ($values as $key => $value) {
             if (in_array($key, $settings_to_avoid)) { continue; }
                                 	                                         
-            //Gradebook fix
+            /*//Gradebook fix
             if ($key == 'gradebook_display') {
                 foreach ($value as $new_key => $item) {                    
                     $final_value = $item['text'].'::'.$item['score'];
                     $result = api_set_setting($new_key, $final_value, 'ranking', null, $_configuration['access_url']);	
                 } 
-            }
+            }*/
             //
             // Treat gradebook values in separate function.
             //if (strpos($key, 'gradebook_score_display_custom_values') === false) {

main/gradebook/index.php

@@ -820,14 +820,19 @@ if (isset($first_time) && $first_time==1 && api_is_allowed_to_edit(null,true)) {
             $obj = new GradeModel();
             $grade_models = $obj->get_all();                
             $options = array('-1' => get_lang('none'));
+            
+            if (!empty($grade_models)) {
                 foreach ($grade_models as $item) {
                     $options[$item['id']] = $item['name'];
                 }                
+            }
 
             $grade_model_id = $cats[0]->get_grade_model_id();        
             
             //No children
             if (count($cats) == 1 && empty($grade_model_id)) {
+                if (!empty($grade_models)) {
+                
                     $form = new FormValidator('grade_model_settings');
                     $form->addElement('select', 'grade_model', get_lang('SelectGradeModel'), $options);                
                     $form->addElement('style_submit_button', 'submit', get_lang('Save'), 'class="save"');                
@@ -863,6 +868,7 @@ if (isset($first_time) && $first_time==1 && api_is_allowed_to_edit(null,true)) {
                         $form->display();   
                     }      
                 }
+            }
         }
         
 		$i = 0;