chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removing gradebook_ranking attributes now we use a table grade_model and grade_components

Browse Source
skala
Julio Montoya 14 years ago
parent f62ffc909f
commit 1e6d64a08c
4 changed files with 47 additions and 41 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      main/admin/grade_models.php
  2. 4
      main/admin/settings.lib.php
  3. 4
      main/admin/settings.php
  4. 78
      main/gradebook/index.php

2
main/admin/grade_models.php
Unescape View File

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

4
main/admin/settings.lib.php
Unescape View File

@ -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); $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']; $default_values[$row['variable']] = $row['selected_value'];
break; break;
case 'gradebook_ranking': /*case 'gradebook_ranking':
$value = explode('::', $row['selected_value']); $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); $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 = $form -> defaultRenderer();
$renderer->setElementTemplate(' {label}<div class="controls"> {element} %= ', 'gradebook_display['.$row['variable'].'][text]'); $renderer->setElementTemplate(' {label}<div class="controls"> {element} %= ', 'gradebook_display['.$row['variable'].'][text]');
$renderer->setElementTemplate(' {element}</div><br />', 'gradebook_display['.$row['variable'].'][score]'); $renderer->setElementTemplate(' {element}</div><br />', 'gradebook_display['.$row['variable'].'][score]');
break; break;*/
case 'custom': case 'custom':
break; break;
} }

4
main/admin/settings.php
Unescape View File

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

78
main/gradebook/index.php
Unescape View File

@ -820,48 +820,54 @@ if (isset($first_time) && $first_time==1 && api_is_allowed_to_edit(null,true)) {
$obj = new GradeModel(); $obj = new GradeModel();
$grade_models = $obj->get_all(); $grade_models = $obj->get_all();
$options = array('-1' => get_lang('none')); $options = array('-1' => get_lang('none'));
foreach ($grade_models as $item) {
$options[$item['id']] = $item['name']; if (!empty($grade_models)) {
} foreach ($grade_models as $item) {
$options[$item['id']] = $item['name'];
}
}
$grade_model_id = $cats[0]->get_grade_model_id(); $grade_model_id = $cats[0]->get_grade_model_id();
//No children //No children
if (count($cats) == 1 && empty($grade_model_id)) { if (count($cats) == 1 && empty($grade_model_id)) {
$form = new FormValidator('grade_model_settings'); if (!empty($grade_models)) {
$form->addElement('select', 'grade_model', get_lang('SelectGradeModel'), $options);
$form->addElement('style_submit_button', 'submit', get_lang('Save'), 'class="save"');
if ($form->validate()) { $form = new FormValidator('grade_model_settings');
$value = $form->exportValue('grade_model'); $form->addElement('select', 'grade_model', get_lang('SelectGradeModel'), $options);
$gradebook = new Gradebook(); $form->addElement('style_submit_button', 'submit', get_lang('Save'), 'class="save"');
$gradebook->update(array('id'=> $cats[0]->get_id(), 'grade_model_id' => $value), true);
if ($form->validate()) {
//do something $value = $form->exportValue('grade_model');
$obj = new GradeModel(); $gradebook = new Gradebook();
$components = $obj->get_components($value); $gradebook->update(array('id'=> $cats[0]->get_id(), 'grade_model_id' => $value), true);
foreach ($components as $component) { //do something
$gradebook = new Gradebook(); $obj = new GradeModel();
$params = array(); $components = $obj->get_components($value);
$params['name'] = $component['acronym']; foreach ($components as $component) {
$params['description'] = $component['title']; $gradebook = new Gradebook();
$params['user_id'] = api_get_user_id(); $params = array();
$params['parent_id'] = $cats[0]->get_id();
$params['weight'] = $component['percentage']; $params['name'] = $component['acronym'];
$params['session_id'] = api_get_session_id(); $params['description'] = $component['title'];
$params['course_code'] = api_get_course_id(); $params['user_id'] = api_get_user_id();
$params['grade_model_id'] = api_get_session_id(); $params['parent_id'] = $cats[0]->get_id();
$params['weight'] = $component['percentage'];
$gradebook->save($params); $params['session_id'] = api_get_session_id();
} $params['course_code'] = api_get_course_id();
$params['grade_model_id'] = api_get_session_id();
//Reloading cats
$cats = Category :: load(null, null, $course_code, null, null, $session_id, false); //already init $gradebook->save($params);
} else { }
$form->display();
} //Reloading cats
$cats = Category :: load(null, null, $course_code, null, null, $session_id, false); //already init
} else {
$form->display();
}
}
} }
} }

Write Preview
Loading…
Cancel
Save