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

Minor - format code

Browse Source
pull/2487/head
jmontoyaa 9 years ago
parent c55d0e6ce1
commit 089901ad0d
8 changed files with 154 additions and 127 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. 38
      main/gradebook/lib/fe/evalform.class.php
  2. 14
      main/gradebook/lib/fe/linkaddeditform.class.php
  3. 2
      main/gradebook/lib/fe/linkform.class.php
  4. 4
      main/gradebook/lib/fe/resulttable.class.php
  5. 200
      main/gradebook/lib/fe/scoredisplayform.class.php
  6. 2
      main/gradebook/lib/fe/userform.class.php
  7. 11
      main/gradebook/lib/flatview_data_generator.class.php
  8. 10
      main/gradebook/lib/gradebook_data_generator.class.php

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

@ -84,9 +84,15 @@ class EvalForm extends FormValidator
protected function build_add_user_to_eval()
{
$this->addElement('header', get_lang('ChooseUser'));
$select = $this->addElement('select', 'firstLetterUser', get_lang('FirstLetter'), null, array(
'onchange' => 'document.add_users_to_evaluation.submit()'
));
$select = $this->addElement(
'select',
'firstLetterUser',
get_lang('FirstLetter'),
null,
array(
'onchange' => 'document.add_users_to_evaluation.submit()',
)
);
$select->addOption('', '');
for ($i = 65; $i <= 90; $i ++) {
$letter = chr($i);
@ -169,9 +175,7 @@ class EvalForm extends FormValidator
$results_and_users[] = array('result' => $result, 'user' => $user);
}
usort($results_and_users, array('EvalForm', 'sort_by_user'));
$defaults = array();
foreach ($results_and_users as $result_and_user) {
$user = $result_and_user['user'];
$result = $result_and_user['result'];
@ -298,7 +302,6 @@ class EvalForm extends FormValidator
$firstUser = true;
foreach ($tblusers as $user) {
$element_name = 'score[' . $user[0] . ']';
$scoreColumnProperties = array('maxlength' => 5);
if ($firstUser) {
@ -418,9 +421,14 @@ class EvalForm extends FormValidator
*/
protected function build_add_form()
{
$this->setDefaults(array('hid_user_id' => $this->evaluation_object->get_user_id(),
'hid_category_id' => $this->evaluation_object->get_category_id(),
'hid_course_code' => $this->evaluation_object->get_course_code(), 'created_at' => api_get_utc_datetime()));
$this->setDefaults(
array(
'hid_user_id' => $this->evaluation_object->get_user_id(),
'hid_category_id' => $this->evaluation_object->get_category_id(),
'hid_course_code' => $this->evaluation_object->get_course_code(),
'created_at' => api_get_utc_datetime(),
)
);
$this->build_basic_form(0);
if ($this->evaluation_object->get_course_code() == null) {
$this->addElement('checkbox', 'adduser', null, get_lang('AddUserToEval'));
@ -488,7 +496,15 @@ class EvalForm extends FormValidator
$session_id = api_get_session_id();
$course_code = api_get_course_id();
$all_categories = Category :: load(null, null, $course_code, null, null, $session_id, false);
$all_categories = Category:: load(
null,
null,
$course_code,
null,
null,
$session_id,
false
);
if (count($all_categories) == 1) {
$this->addElement('hidden', 'hid_category_id', $cat_id);
@ -547,7 +563,6 @@ class EvalForm extends FormValidator
'class' => 'span1'
)); */
if ($edit) {
if (!$this->evaluation_object->has_results()) {
$this->addText(
@ -638,5 +653,4 @@ class EvalForm extends FormValidator
}
return $result;
}
}

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

@ -9,8 +9,8 @@
*/
class LinkAddEditForm extends FormValidator
{
const TYPE_ADD = 1;
const TYPE_EDIT = 2;
const TYPE_ADD = 1;
const TYPE_EDIT = 2;
/**
* Constructor
@ -52,11 +52,11 @@ class LinkAddEditForm extends FormValidator
} else {
$select = $this->addElement('select', 'select_link', get_lang('ChooseItem'));
foreach ($link->get_all_links() as $newlink) {
$select->addoption($newlink[1],$newlink[0]);
$select->addoption($newlink[1], $newlink[0]);
}
}
} else {
$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'));
}
@ -78,7 +78,7 @@ class LinkAddEditForm extends FormValidator
if ($my_cat->get_course_code() == api_get_course_id()) {
$grade_model_id = $my_cat->get_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();
$select_gradebook->addoption(get_lang('Default'), $my_cat->get_id());
} else {
@ -117,7 +117,7 @@ class LinkAddEditForm extends FormValidator
'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', '>=');
if ($form_type == self :: TYPE_EDIT) {
$parent_cat = Category :: load($link->get_category_id());
@ -188,5 +188,5 @@ class LinkAddEditForm extends FormValidator
// set default values
$this->setDefaults($defaults);
}
}
}

2
main/gradebook/lib/fe/linkform.class.php
Unescape View File

@ -44,7 +44,7 @@ class LinkForm extends FormValidator
}
}
if (isset ($extra)) {
if (isset($extra)) {
$this->extra = $extra;
}
if ($form_type == self :: TYPE_CREATE) {

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

@ -33,7 +33,7 @@ class ResultTable extends SortableTable
$this->iscourse = $iscourse;
$this->forprint = $forprint;
if (isset ($addparams)) {
if (isset($addparams)) {
$this->set_additional_parameters($addparams);
}
$scoredisplay = ScoreDisplay :: instance();
@ -56,7 +56,7 @@ class ResultTable extends SortableTable
$this->set_header($column++, get_lang('Display'));
}
if (!$this->forprint) {
$this->set_header($column++, get_lang('Modify'),false);
$this->set_header($column++, get_lang('Modify'), false);
}
}

200
main/gradebook/lib/fe/scoredisplayform.class.php
Unescape View File

@ -29,29 +29,34 @@ class ScoreDisplayForm extends FormValidator
$this->addElement('hidden', 'minvalue', '0');
$counter= 1;
//setting the default values
if(is_array($customdisplays)) {
foreach ($customdisplays as $customdisplay) {
$this->setDefaults(array (
'endscore[' . $counter . ']' => $customdisplay['score'],
'displaytext[' . $counter . ']' => $customdisplay['display']
));
$counter++;
}
}
$scorecol = array();
//setting the default values
if (is_array($customdisplays)) {
foreach ($customdisplays as $customdisplay) {
$this->setDefaults(array (
'endscore[' . $counter . ']' => $customdisplay['score'],
'displaytext[' . $counter . ']' => $customdisplay['display']
));
$counter++;
}
}
$scorecol = array();
//settings for the colored score
$this->addElement('header', get_lang('ScoreEdit'));
$this->addElement('header', get_lang('ScoreEdit'));
if ($displayscore->is_coloring_enabled()) {
$this->addElement('html', '<b>' . get_lang('ScoreColor') . '</b>');
$this->addElement('text', 'scorecolpercent', array(get_lang('Below'), get_lang('WillColorRed'), '%'), array(
'size' => 5,
'maxlength' => 5,
'input-size' => 2
));
$this->addElement('html', '<b>'.get_lang('ScoreColor') . '</b>');
$this->addElement(
'text',
'scorecolpercent',
array(get_lang('Below'), get_lang('WillColorRed'), '%'),
array(
'size' => 5,
'maxlength' => 5,
'input-size' => 2,
)
);
if (api_get_setting('teachers_can_change_score_settings') != 'true') {
$this->freeze('scorecolpercent');
@ -64,90 +69,95 @@ class ScoreDisplayForm extends FormValidator
//Settings for the scoring system
if ($displayscore->is_custom()) {
if ($displayscore->is_custom()) {
$this->addElement('html', '<br /><b>' . get_lang('ScoringSystem') . '</b>');
$this->addElement('static', null, null, get_lang('ScoreInfo'));
$this->setDefaults(array(
'beginscore' => '0'
));
$this->addElement('text', 'beginscore', array(get_lang('Between'), null, '%'), array(
'size' => 5,
'maxlength' => 5,
'disabled' => 'disabled',
'input-size' => 2
));
for ($counter= 1; $counter <= 20; $counter++) {
$renderer =& $this->defaultRenderer();
$elementTemplateTwoLabel =
'<div id=' . $counter . ' style="display: '.(($counter<=$nr_items)?'inline':'none').';">
<!-- BEGIN required --><span class="form_required">*</span> <!-- END required -->
$this->addElement('static', null, null, get_lang('ScoreInfo'));
$this->setDefaults(array(
'beginscore' => '0'
));
$this->addElement('text', 'beginscore', array(get_lang('Between'), null, '%'), array(
'size' => 5,
'maxlength' => 5,
'disabled' => 'disabled',
'input-size' => 2
));
for ($counter= 1; $counter <= 20; $counter++) {
$renderer =& $this->defaultRenderer();
$elementTemplateTwoLabel =
'<div id=' . $counter . ' style="display: '.(($counter<=$nr_items)?'inline':'none').';">
<!-- BEGIN required --><span class="form_required">*</span> <!-- END required -->
<label class="control-label">{label}</label>
<div class="form-group">
<label class="col-sm-2 control-label">
<div class="form-group">
<label class="col-sm-2 control-label">
</label>
<div class="col-sm-1">
<!-- BEGIN error --><span class="form_error">{error}</span><br />
<!-- END error -->&nbsp<b>'.get_lang('And').'</b>
</div>
<div class="col-sm-2">
{element}
</div>
<div class="col-sm-1">
=
</div>
';
$elementTemplateTwoLabel2 ='
<div class="col-sm-2">
<!-- BEGIN error --><span class="form_error">{error}</span>
<!-- END error -->
{element}
</div>
<div class="col-sm-1">
<div class="col-sm-1">
<!-- BEGIN error --><span class="form_error">{error}</span><br />
<!-- END error -->&nbsp<b>'.get_lang('And').'</b>
</div>
<div class="col-sm-2">
{element}
</div>
<div class="col-sm-1">
=
</div>
';
$elementTemplateTwoLabel2 ='
<div class="col-sm-2">
<!-- BEGIN error --><span class="form_error">{error}</span>
<!-- END error -->
{element}
</div>
<div class="col-sm-1">
<a href="javascript:plusItem(' . ($counter+1) . ')">
<img style="display: '.(($counter>=$nr_items)?'inline':'none').';" id="plus-' . ($counter+1) . '" src="'.Display::returnIconPath('add.png').'" alt="'.get_lang('Add').'" title="'.get_lang('Add').'"></a>
<a href="javascript:minItem(' . ($counter) . ')">
<img style="display: '.(($counter>=$nr_items && $counter!=1)?'inline':'none').';" id="min-' . $counter . '" src="'.Display::returnIconPath('delete.png').'" alt="'.get_lang('Delete').'" title="'.get_lang('Delete').'"></a>
</div>
</div>
</div>';
$scorebetw = array();
$this->addElement('text', 'endscore[' . $counter . ']', null, array (
'size' => 5,
'maxlength' => 5,
'id' => 'txta-'.$counter,
'input-size' => 2
));
$this->addElement('text', 'displaytext[' . $counter . ']', null,array (
'size' => 40,
'maxlength' => 40,
'id' => 'txtb-'.$counter
));
$renderer->setElementTemplate($elementTemplateTwoLabel, 'endscore[' . $counter . ']');
$renderer->setElementTemplate($elementTemplateTwoLabel2, 'displaytext[' . $counter . ']');
$this->addRule('endscore[' . $counter . ']', get_lang('OnlyNumbers'), 'numeric');
$this->addRule(array ('endscore[' . $counter . ']', 'maxvalue'), get_lang('Over100'), 'compare', '<=');
$this->addRule(array ('endscore[' . $counter . ']', 'minvalue'), get_lang('UnderMin'), 'compare', '>');
}
}
<a href="javascript:minItem(' . ($counter) . ')">
<img style="display: '.(($counter>=$nr_items && $counter!=1)?'inline':'none').';" id="min-' . $counter . '" src="'.Display::returnIconPath('delete.png').'" alt="'.get_lang('Delete').'" title="'.get_lang('Delete').'"></a>
</div>
</div>
</div>';
$scorebetw = array();
$this->addElement('text', 'endscore[' . $counter . ']', null, array (
'size' => 5,
'maxlength' => 5,
'id' => 'txta-'.$counter,
'input-size' => 2
));
$this->addElement(
'text',
'displaytext['.$counter.']',
null,
array(
'size' => 40,
'maxlength' => 40,
'id' => 'txtb-'.$counter,
)
);
$renderer->setElementTemplate($elementTemplateTwoLabel, 'endscore[' . $counter . ']');
$renderer->setElementTemplate($elementTemplateTwoLabel2, 'displaytext[' . $counter . ']');
$this->addRule('endscore[' . $counter . ']', get_lang('OnlyNumbers'), 'numeric');
$this->addRule(array ('endscore[' . $counter . ']', 'maxvalue'), get_lang('Over100'), 'compare', '<=');
$this->addRule(array ('endscore[' . $counter . ']', 'minvalue'), get_lang('UnderMin'), 'compare', '>');
}
}
if ($displayscore->is_custom()) {
$this->addButtonSave(get_lang('Ok'));
}
}
$this->addButtonSave(get_lang('Ok'));
}
}
public function validate()
public function validate()
{
return parent :: validate();
}
return parent :: validate();
}
}

2
main/gradebook/lib/fe/userform.class.php
Unescape View File

@ -48,7 +48,7 @@ class UserForm extends FormValidator
}
$renderer =& $this->defaultRenderer();
$renderer->setCustomElementTemplate('<span>{element}</span> ');
$this->addElement('text','keyword','');
$this->addElement('text', 'keyword', '');
$this->addButtonSearch(get_lang('Search'), 'submit');
}

11
main/gradebook/lib/flatview_data_generator.class.php
Unescape View File

@ -83,7 +83,6 @@ class FlatViewDataGenerator
public function get_header_names($items_start = 0, $items_count = null, $show_detail = false)
{
$headers = array();
if (isset($this->params['show_official_code']) && $this->params['show_official_code']) {
$headers[] = get_lang('OfficialCode');
}
@ -174,7 +173,6 @@ class FlatViewDataGenerator
).$add_weight;
if (api_get_setting('gradebook_detailed_admin_view') === 'true') {
$links = $sub_cat->get_links();
$evaluations = $sub_cat->get_evaluations();
@ -526,7 +524,7 @@ class FlatViewDataGenerator
if ($convert_using_the_global_weight) {
//$item_total = $main_weight;
}
} else {
} else {
// All evaluations
$result = $this->parseEvaluations(
$user_id,
@ -669,7 +667,9 @@ class FlatViewDataGenerator
(isset($this->params['only_total_category']) && $this->params['only_total_category'] == false)
) {
if (!$show_all) {
if (in_array($item->get_type(), array(
if (in_array(
$item->get_type(),
array(
LINK_EXERCISE,
LINK_DROPBOX,
LINK_STUDENTPUBLICATION,
@ -677,7 +677,8 @@ class FlatViewDataGenerator
LINK_FORUM_THREAD,
LINK_ATTENDANCE,
LINK_SURVEY,
LINK_HOTPOTATOES)
LINK_HOTPOTATOES,
)
)
) {
if (!empty($score[0])) {

10
main/gradebook/lib/gradebook_data_generator.class.php
Unescape View File

@ -285,7 +285,6 @@ class GradebookDataGenerator
$forceSimpleResult = false
) {
$scoredisplay = ScoreDisplay::instance();
$score = $item->calc_score($userId);
if (!empty($score)) {
@ -328,11 +327,14 @@ class GradebookDataGenerator
];
//}
$display = $scoredisplay->display_score($score, SCORE_DIV_PERCENT_WITH_CUSTOM);
$display = $scoredisplay->display_score(
$score,
SCORE_DIV_PERCENT_WITH_CUSTOM
);
$type = $item->get_item_type();
if ($type == 'L' && get_class($item) == 'ExerciseLink') {
$display = ExerciseLib::show_score($score[0], $score[1], false);
$display = ExerciseLib::show_score($score[0], $score[1], false);
}
return array(
@ -441,7 +443,7 @@ class GradebookDataGenerator
public function sort_by_weight($item1, $item2)
{
if ($item1->get_weight() == $item2->get_weight()) {
return $this->sort_by_name($item1,$item2);
return $this->sort_by_name($item1, $item2);
} else {
return ($item1->get_weight() < $item2->get_weight() ? -1 : 1);
}

Write Preview
Loading…
Cancel
Save