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

Fixing weight update.

Browse Source
1.9.x
Julio Montoya 12 years ago
parent c5655c984e
commit ac1f53e4ac
2 changed files with 51 additions and 46 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. 30
      main/gradebook/lib/fe/evalform.class.php
  2. 67
      main/gradebook/lib/fe/linkaddeditform.class.php

30
main/gradebook/lib/fe/evalform.class.php
Unescape View File

@ -137,33 +137,33 @@ class EvalForm extends FormValidator
// set new form template // set new form template
$form_template = '<form{attributes}> $form_template = '<form{attributes}>
<table class="data_table" border="0" cellpadding="5" cellspacing="5">{content} <table class="data_table" border="0" cellpadding="5" cellspacing="5">{content}
</table> </table>
</form>'; </form>';
$renderer->setFormTemplate($form_template); $renderer->setFormTemplate($form_template);
if (api_is_western_name_order()) { if (api_is_western_name_order()) {
$renderer->setHeaderTemplate( $renderer->setHeaderTemplate(
'<tr> '<tr>
<th>' . get_lang('OfficialCode') . '</th> <th>' . get_lang('OfficialCode') . '</th>
<th>' . get_lang('UserName') . '</th> <th>' . get_lang('UserName') . '</th>
<th>' . get_lang('FirstName') . '</th> <th>' . get_lang('FirstName') . '</th>
<th>' . get_lang('LastName') . '</th> <th>' . get_lang('LastName') . '</th>
<th>' . get_lang('Qualify') . '</th> <th>' . get_lang('Qualify') . '</th>
</tr>' </tr>'
); );
} else { } else {
$renderer->setHeaderTemplate( $renderer->setHeaderTemplate(
'<tr> '<tr>
<th>' . get_lang('OfficialCode') . '</th> <th>' . get_lang('OfficialCode') . '</th>
<th>' . get_lang('UserName') . '</th> <th>' . get_lang('UserName') . '</th>
<th>' . get_lang('LastName') . '</th> <th>' . get_lang('LastName') . '</th>
<th>' . get_lang('FirstName') . '</th> <th>' . get_lang('FirstName') . '</th>
<th>' . get_lang('Qualify') . '</th> <th>' . get_lang('Qualify') . '</th>
</tr>' </tr>'
); );
} }
$template_submit = '<tr> $template_submit = '<tr>
<td colspan="4" ></td> <td colspan="4" ></td>
<td > <td >
{element} {element}
<!-- BEGIN error --><br /><span style="color: #ff0000;font-size:10px">{error}</span><!-- END error --> <!-- BEGIN error --><br /><span style="color: #ff0000;font-size:10px">{error}</span><!-- END error -->
@ -204,7 +204,7 @@ class EvalForm extends FormValidator
$template = '<tr> $template = '<tr>
<td align="left" >' . $user['official_code'] . '</td> <td align="left" >' . $user['official_code'] . '</td>
<td align="left" >' . $user['username'] . '</td> <td align="left" >' . $user['username'] . '</td>
' . $user_info . ' ' . $user_info . '
<td align="left">{element} / ' . $this->evaluation_object->get_max() . ' <td align="left">{element} / ' . $this->evaluation_object->get_max() . '
<!-- BEGIN error --><br /><span style="color: #ff0000;font-size:10px">{error}</span><!-- END error --> <!-- BEGIN error --><br /><span style="color: #ff0000;font-size:10px">{error}</span><!-- END error -->
@ -248,7 +248,7 @@ class EvalForm extends FormValidator
'<form{attributes}> '<form{attributes}>
<table class="data_table"> <table class="data_table">
{content} {content}
</table> </table>
</form>' </form>'
); );
@ -262,20 +262,20 @@ class EvalForm extends FormValidator
if (api_is_western_name_order()) { if (api_is_western_name_order()) {
$renderer->setHeaderTemplate( $renderer->setHeaderTemplate(
'<tr> '<tr>
<th>' . get_lang('OfficialCode') . '</th> <th>' . get_lang('OfficialCode') . '</th>
<th>' . get_lang('UserName') . '</th> <th>' . get_lang('UserName') . '</th>
<th>' . get_lang('FirstName') . '</th> <th>' . get_lang('FirstName') . '</th>
<th>' . get_lang('LastName') . '</th> <th>' . get_lang('LastName') . '</th>
<th>' . get_lang('Qualify') . '</th> <th>' . get_lang('Qualify') . '</th>
</tr>' </tr>'
); );
} else { } else {
$renderer->setHeaderTemplate( $renderer->setHeaderTemplate(
'<tr> '<tr>
<th>' . get_lang('OfficialCode') . '</th> <th>' . get_lang('OfficialCode') . '</th>
<th>' . get_lang('UserName') . '</th> <th>' . get_lang('UserName') . '</th>
<th>' . get_lang('LastName') . '</th> <th>' . get_lang('LastName') . '</th>
<th>' . get_lang('FirstName') . '</th> <th>' . get_lang('FirstName') . '</th>
<th>' . get_lang('Qualify') . '</th> <th>' . get_lang('Qualify') . '</th>
</tr>' </tr>'
); );
@ -316,7 +316,7 @@ class EvalForm extends FormValidator
$this->addElement('style_submit_button', 'submit', get_lang('AddResult'), 'class="save"'); $this->addElement('style_submit_button', 'submit', get_lang('AddResult'), 'class="save"');
$template_submit = '<tr> $template_submit = '<tr>
<td colspan="4" ></td> <td colspan="4" ></td>
<td > <td >
{element} {element}
<!-- BEGIN error --><br /><span style="color: #ff0000;font-size:10px">{error}</span><!-- END error --> <!-- BEGIN error --><br /><span style="color: #ff0000;font-size:10px">{error}</span><!-- END error -->
@ -475,7 +475,7 @@ class EvalForm extends FormValidator
} }
} }
$this->add_textfield('weight_mask', array(get_lang('Weight'), null, ' [0 .. ' . $all_categories[0]->get_weight() . '] '), true, array( $this->add_textfield('weight_mask', array(get_lang('Weight'), null, ' [0 .. <span id="max_weight">' . $all_categories[0]->get_weight() . '</span>] '), true, array(
'size' => '4', 'size' => '4',
'maxlength' => '5', 'maxlength' => '5',
'class' => 'span1' 'class' => 'span1'

67
main/gradebook/lib/fe/linkaddeditform.class.php
Unescape View File

@ -52,7 +52,7 @@ class LinkAddEditForm extends FormValidator
if ($link->needs_name_and_description()) { if ($link->needs_name_and_description()) {
$this->add_textfield('name', get_lang('Name'), true, array('size'=>'40', 'maxlength'=>'40')); $this->add_textfield('name', get_lang('Name'), true, array('size'=>'40', 'maxlength'=>'40'));
} else { } else {
$select = $this->addElement('select', 'select_link', get_lang('ChooseItem')); $select = $this->addElement('select', 'select_link', get_lang('ChooseItem'));
foreach ($link->get_all_links() as $newlink) { foreach ($link->get_all_links() as $newlink) {
$select->addoption($newlink[1],$newlink[0]); $select->addoption($newlink[1],$newlink[0]);
} }
@ -61,20 +61,20 @@ class LinkAddEditForm extends FormValidator
$this->addElement('label',get_lang('Name'), '<span class="freeze">'.$link->get_name().' ['.$link->get_type_name().']</span>'); $this->addElement('label',get_lang('Name'), '<span class="freeze">'.$link->get_name().' ['.$link->get_type_name().']</span>');
$this->addElement('hidden','name_link',$link->get_name(),array('id'=>'name_link')); $this->addElement('hidden','name_link',$link->get_name(),array('id'=>'name_link'));
} }
if (count($category_object) == 1) { if (count($category_object) == 1) {
$this->addElement('hidden', 'select_gradebook', $category_object[0]->get_id()); $this->addElement('hidden', 'select_gradebook', $category_object[0]->get_id());
} else { } else {
$select_gradebook = $this->addElement('select', 'select_gradebook', get_lang('SelectGradebook'), array(), array('id' => 'hide_category_id')); $select_gradebook = $this->addElement('select', 'select_gradebook', get_lang('SelectGradebook'), array(), array('id' => 'hide_category_id'));
$this->addRule('select_gradebook', get_lang('ThisFieldIsRequired'), 'nonzero'); $this->addRule('select_gradebook', get_lang('ThisFieldIsRequired'), 'nonzero');
$default_weight = 0; $default_weight = 0;
if (!empty($category_object)) { if (!empty($category_object)) {
foreach ($category_object as $my_cat) { foreach ($category_object as $my_cat) {
if ($my_cat->get_course_code() == api_get_course_id()) { if ($my_cat->get_course_code() == api_get_course_id()) {
$grade_model_id = $my_cat->get_grade_model_id(); $grade_model_id = $my_cat->get_grade_model_id();
if (empty($grade_model_id)) { if (empty($grade_model_id)) {
if ($my_cat->get_parent_id() == 0 ) { if ($my_cat->get_parent_id() == 0 ) {
$default_weight = $my_cat->get_weight(); $default_weight = $my_cat->get_weight();
$select_gradebook->addoption(get_lang('Default'), $my_cat->get_id()); $select_gradebook->addoption(get_lang('Default'), $my_cat->get_id());
@ -85,37 +85,42 @@ class LinkAddEditForm extends FormValidator
$select_gradebook->addoption(get_lang('Select'), 0); $select_gradebook->addoption(get_lang('Select'), 0);
} }
if ($link->get_category_id() == $my_cat->get_id()) { if ($link->get_category_id() == $my_cat->get_id()) {
$default_weight = $my_cat->get_weight(); $default_weight = $my_cat->get_weight();
} }
} }
} }
} }
} }
$this->add_textfield('weight_mask', array(get_lang('Weight'), null, ' [0 .. '.$category_object[0]->get_weight().'] '), true, array ( $this->add_textfield(
'size' => '4', 'weight_mask',
'maxlength' => '5', array(get_lang('Weight'), null, ' [0 .. <span id="max_weight">'.$category_object[0]->get_weight().'</span>] '),
'class' => 'span1' true,
)); array(
'size' => '4',
$this->addElement('hidden', 'weight'); 'maxlength' => '5',
'class' => 'span1'
)
);
$this->addElement('hidden', 'weight');
/* /*
// ELEMENT: weight // ELEMENT: weight
$this->add_textfield('weight', array(get_lang('Weight'), null, '/ <span id="max_weight">'.$default_weight.'</span>'), true, array ( $this->add_textfield('weight', array(get_lang('Weight'), null, '/ <span id="max_weight">'.$default_weight.'</span>'), true, array (
'size' => '4', 'size' => '4',
'maxlength' => '5', 'maxlength' => '5',
'class' => 'span1' 'class' => 'span1'
));*/ ));*/
$this->addRule('weight_mask',get_lang('OnlyNumbers'),'numeric'); $this->addRule('weight_mask',get_lang('OnlyNumbers'),'numeric');
$this->addRule(array ('weight_mask', 'zero'), get_lang('NegativeValue'), 'compare', '>='); $this->addRule(array ('weight_mask', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
if ($form_type == self :: TYPE_EDIT) { if ($form_type == self :: TYPE_EDIT) {
$parent_cat = Category :: load($link->get_category_id()); $parent_cat = Category :: load($link->get_category_id());
if ($parent_cat[0]->get_parent_id() == 0) { if ($parent_cat[0]->get_parent_id() == 0) {
$values['weight'] = $link->get_weight(); $values['weight'] = $link->get_weight();
} else { } else {
$cat = Category :: load($parent_cat[0]->get_parent_id()); $cat = Category :: load($parent_cat[0]->get_parent_id());
//$global_weight = $cat[0]->get_weight(); //$global_weight = $cat[0]->get_weight();
@ -123,11 +128,11 @@ class LinkAddEditForm extends FormValidator
//var_dump($global_weight, $link->get_weight(), $parent_cat[0]->get_weight()); //var_dump($global_weight, $link->get_weight(), $parent_cat[0]->get_weight());
//$weight = $parent_cat[0]->get_weight()* $link->get_weight() / $global_weight; //$weight = $parent_cat[0]->get_weight()* $link->get_weight() / $global_weight;
//$values['weight'] = $weight; //$values['weight'] = $weight;
$values['weight'] = $link->get_weight() ; $values['weight'] = $link->get_weight() ;
} }
$defaults['weight_mask'] = $values['weight'] ; $defaults['weight_mask'] = $values['weight'] ;
$defaults['select_gradebook'] = $link->get_category_id(); $defaults['select_gradebook'] = $link->get_category_id();
} }
// ELEMENT: max // ELEMENT: max
if ($link->needs_max()) { if ($link->needs_max()) {
@ -161,7 +166,7 @@ class LinkAddEditForm extends FormValidator
if ($form_type == self :: TYPE_EDIT) { if ($form_type == self :: TYPE_EDIT) {
$defaults['visible'] = $link->is_visible(); $defaults['visible'] = $link->is_visible();
} }
// ELEMENT: add results // ELEMENT: add results
if ($form_type == self :: TYPE_ADD && $link->needs_results()) { if ($form_type == self :: TYPE_ADD && $link->needs_results()) {
$this->addElement('checkbox', 'addresult', get_lang('AddResult')); $this->addElement('checkbox', 'addresult', get_lang('AddResult'));
@ -172,13 +177,13 @@ class LinkAddEditForm extends FormValidator
} else { } else {
$this->addElement('style_submit_button', 'submit', get_lang('LinkMod'),'class="save"'); $this->addElement('style_submit_button', 'submit', get_lang('LinkMod'),'class="save"');
} }
if ($form_type == self :: TYPE_ADD) { if ($form_type == self :: TYPE_ADD) {
$setting = api_get_setting('tool_visible_by_default_at_creation'); $setting = api_get_setting('tool_visible_by_default_at_creation');
$visibility_default = 1; $visibility_default = 1;
if (isset($setting['gradebook']) && $setting['gradebook'] == 'false') { if (isset($setting['gradebook']) && $setting['gradebook'] == 'false') {
$visibility_default = 0; $visibility_default = 0;
} }
$defaults['visible'] = $visibility_default; $defaults['visible'] = $visibility_default;
} }

Write Preview
Loading…
Cancel
Save