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

standardize variable QualificationNumeric in forum, task and gradebook

Browse Source
skala
Carlos Vargas 15 years ago
parent d9bf61a818
commit b9b4288c94
6 changed files with 11 additions and 11 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. 4
      main/forum/forumfunction.inc.php
  2. 2
      main/gradebook/gradebook_view_result.php
  3. 6
      main/gradebook/lib/fe/evalform.class.php
  4. 4
      main/gradebook/lib/fe/linkaddeditform.class.php
  5. 2
      main/work/work.lib.php
  6. 4
      main/work/work.php

4
main/forum/forumfunction.inc.php
Unescape View File

@ -1950,7 +1950,7 @@ function show_add_post_form($action='', $id='', $form_values='') {
$form->applyFilter('numeric_calification', 'html_filter'); $form->applyFilter('numeric_calification', 'html_filter');
$form->addElement('checkbox', 'thread_qualify_gradebook', '', get_lang('QualifyThreadGradebook'),'onclick="javascript:if(this.checked==true){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}"'); $form->addElement('checkbox', 'thread_qualify_gradebook', '', get_lang('QualifyThreadGradebook'),'onclick="javascript:if(this.checked==true){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}"');
$form -> addElement('html','<div id="options_field" style="display:none">'); $form -> addElement('html','<div id="options_field" style="display:none">');
$form->addElement('text', 'numeric_calification', get_lang('QualifyNumeric'),'Style="width:40px"'); $form->addElement('text', 'numeric_calification', get_lang('QualificationNumeric'),'Style="width:40px"');
$form->addElement('text', 'calification_notebook_title', get_lang('TitleColumnGradebook')); $form->addElement('text', 'calification_notebook_title', get_lang('TitleColumnGradebook'));
$form->applyFilter('calification_notebook_title', 'html_filter'); $form->applyFilter('calification_notebook_title', 'html_filter');
$form->addElement('text', 'weight_calification', get_lang('QualifyWeight'),'value="0.00" Style="width:40px" onfocus="this.select();"'); $form->addElement('text', 'weight_calification', get_lang('QualifyWeight'),'value="0.00" Style="width:40px" onfocus="this.select();"');
@ -2384,7 +2384,7 @@ function show_edit_post_form($current_post, $current_thread, $current_forum, $fo
} else { } else {
$form -> addElement('html','<div id="options_field" style="display:none">'); $form -> addElement('html','<div id="options_field" style="display:none">');
} }
$form->addElement('text', 'numeric_calification', get_lang('QualifyNumeric'),'value="'.$current_thread['thread_qualify_max'].'" Style="width:40px"'); $form->addElement('text', 'numeric_calification', get_lang('QualificationNumeric'),'value="'.$current_thread['thread_qualify_max'].'" Style="width:40px"');
$form->addElement('text', 'calification_notebook_title', get_lang('TitleColumnGradebook'),'value="'.$current_thread['thread_title_qualify'].'"'); $form->addElement('text', 'calification_notebook_title', get_lang('TitleColumnGradebook'),'value="'.$current_thread['thread_title_qualify'].'"');
$form->applyFilter('calification_notebook_title', 'html_filter'); $form->applyFilter('calification_notebook_title', 'html_filter');
$form->addElement('text', 'weight_calification', get_lang('QualifyWeight'),'value="'.$current_thread['thread_weight'].'" Style="width:40px"'); $form->addElement('text', 'weight_calification', get_lang('QualifyWeight'),'value="'.$current_thread['thread_weight'].'" Style="width:40px"');

2
main/gradebook/gradebook_view_result.php
Unescape View File

@ -217,7 +217,7 @@ if ($export_result_form->validate()) {
$pdf->ezText(get_lang('Weight') . ' : ' . $eval[0]->get_weight(), 12, array ( $pdf->ezText(get_lang('Weight') . ' : ' . $eval[0]->get_weight(), 12, array (
'justification' => 'left' 'justification' => 'left'
)); ));
$pdf->ezText(get_lang('Max') . ' : ' . $eval[0]->get_max(), 12, array ( $pdf->ezText(get_lang('QualificationNumeric') . ' : ' . $eval[0]->get_max(), 12, array (
'justification' => 'left' 'justification' => 'left'
)); ));
$pdf->ezText($average, 12, array ( $pdf->ezText($average, 12, array (

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

@ -312,12 +312,12 @@ class EvalForm extends FormValidator
)); ));
if ($edit) { if ($edit) {
if (!$this->evaluation_object->has_results()) { if (!$this->evaluation_object->has_results()) {
$this->add_textfield('max', get_lang('Max'), true, array ( $this->add_textfield('max', get_lang('QualificationNumeric'), true, array (
'size' => '4', 'size' => '4',
'maxlength' => '4' 'maxlength' => '4'
)); ));
} else { } else {
$this->add_textfield('max', get_lang('Max'), false, array ( $this->add_textfield('max', get_lang('QualificationNumeric'), false, array (
'size' => '4', 'size' => '4',
'maxlength' => '4', 'maxlength' => '4',
'disabled' => 'disabled' 'disabled' => 'disabled'
@ -325,7 +325,7 @@ class EvalForm extends FormValidator
$this->addElement('static','label','','<small>'.get_lang('CannotChangeTheMaxNote').'</small>'); $this->addElement('static','label','','<small>'.get_lang('CannotChangeTheMaxNote').'</small>');
} }
} else { } else {
$this->add_textfield('max', get_lang('Max'), true, array ( $this->add_textfield('max', get_lang('QualificationNumeric'), true, array (
'size' => '4', 'size' => '4',
'maxlength' => '4' 'maxlength' => '4'
)); ));

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

@ -80,9 +80,9 @@ class LinkAddEditForm extends FormValidator
// ELEMENT: max // ELEMENT: max
if ($link->needs_max()) { if ($link->needs_max()) {
if ($form_type == self :: TYPE_EDIT && $link->has_results()) { if ($form_type == self :: TYPE_EDIT && $link->has_results()) {
$this->add_textfield('max', get_lang('Max'), false, array ('size' => '4','maxlength' => '4', 'disabled' => 'disabled')); $this->add_textfield('max', get_lang('QualificationNumeric'), false, array ('size' => '4','maxlength' => '4', 'disabled' => 'disabled'));
} else { } else {
$this->add_textfield('max', get_lang('Max'), true, array ('size' => '4','maxlength' => '4')); $this->add_textfield('max', get_lang('QualificationNumeric'), true, array ('size' => '4','maxlength' => '4'));
$this->addRule('max', get_lang('OnlyNumbers'), 'numeric'); $this->addRule('max', get_lang('OnlyNumbers'), 'numeric');
$this->addRule(array ('max', 'zero'), get_lang('NegativeValue'), 'compare', '>='); $this->addRule(array ('max', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
} }

2
main/work/work.lib.php
Unescape View File

@ -461,7 +461,7 @@ function display_student_publications_list($work_dir, $sub_course_dir, $currentC
$form_folder->add_html_editor('description', get_lang('Description'), false, false, array('ToolbarSet' => 'profile', 'Width' => '100%', 'Height' => '200')); $form_folder->add_html_editor('description', get_lang('Description'), false, false, array('ToolbarSet' => 'profile', 'Width' => '100%', 'Height' => '200'));
$qualification_input[] = FormValidator :: createElement('text','qualification'); $qualification_input[] = FormValidator :: createElement('text','qualification');
$form_folder -> addGroup($qualification_input, 'qualification', get_lang('QualificationNumberOver'), 'size="10"'); $form_folder -> addGroup($qualification_input, 'qualification', get_lang('QualificationNumeric'), 'size="10"');
if ($row['weight'] > 0) { if ($row['weight'] > 0) {
$weight_input[] = FormValidator :: createElement('text', 'weight'); $weight_input[] = FormValidator :: createElement('text', 'weight');

4
main/work/work.php
Unescape View File

@ -1247,7 +1247,7 @@ if ($is_course_member) {
$row = Database::fetch_array($result); $row = Database::fetch_array($result);
$qualification_over = $row['qualification']; $qualification_over = $row['qualification'];
$form->addElement('text', 'qualification', get_lang('Qualification'), 'size="10"'); $form->addElement('text', 'qualification', get_lang('Qualification'), 'size="10"');
$form->addElement('html', '<div style="margin-left:20%">'.get_lang('QualificationOver').'&nbsp;:&nbsp;'.$qualification_over.'</div>'); $form->addElement('html', '<div style="margin-left:20%">'.get_lang('QualificationNumeric').'&nbsp;:&nbsp;'.$qualification_over.'</div>');
$form->addElement('hidden', 'qualification_over', $qualification_over); $form->addElement('hidden', 'qualification_over', $qualification_over);
} }
@ -1332,7 +1332,7 @@ if ($is_course_member) {
$addtext .= '<div style="padding:10px">'; $addtext .= '<div style="padding:10px">';
$addtext .= '<b>'.get_lang('QualificationOfAssignment').'</b>'; $addtext .= '<b>'.get_lang('QualificationOfAssignment').'</b>';
$addtext .= '<table cellspacing="0" cellpading="0" border="0"><tr>'; $addtext .= '<table cellspacing="0" cellpading="0" border="0"><tr>';
$addtext .= '<td colspan="2">&nbsp;&nbsp;'.get_lang('QualificationNumberOver').'&nbsp;'; $addtext .= '<td colspan="2">&nbsp;&nbsp;'.get_lang('QualificationNumeric').'&nbsp;';
$addtext .= '<input type="text" name="qualification_value" value="" size="5"/></td><tr><td colspan="2">'; $addtext .= '<input type="text" name="qualification_value" value="" size="5"/></td><tr><td colspan="2">';
$addtext .= '<input type="checkbox" value="1" name="make_calification" onclick="if(this.checked==true){document.getElementById(\'option1\').style.display=\'block\';}else{document.getElementById(\'option1\').style.display=\'none\';}"/>'.get_lang('MakeQualifiable').'</td></tr><tr>'; $addtext .= '<input type="checkbox" value="1" name="make_calification" onclick="if(this.checked==true){document.getElementById(\'option1\').style.display=\'block\';}else{document.getElementById(\'option1\').style.display=\'none\';}"/>'.get_lang('MakeQualifiable').'</td></tr><tr>';
$addtext .= '<td colspan="2"><div id="option1" style="display:none">'; $addtext .= '<td colspan="2"><div id="option1" style="display:none">';

Write Preview
Loading…
Cancel
Save