chamilo / chamilo-lms

main/gradebook/lib/fe/displaygradebook.php

Indentation +1 added lines, -1 removed lines

@@ -558,7 +558,7 @@
                     $my_api_cidreq = 'cidReq=' . $my_category['course_code'];
                 }
                 if ($show_add_link && !$message_resource) {
-                   $actionsLeft .= '<a href="gradebook_add_eval.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '" >' .
+                    $actionsLeft .= '<a href="gradebook_add_eval.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '" >' .
                         Display::return_icon('new_evaluation.png', get_lang('NewEvaluation'), '', ICON_SIZE_MEDIUM) . '</a>';
                     $cats = Category :: load($selectcat);
 

main/gradebook/lib/fe/linkaddeditform.class.php

Indentation +174 added lines, -174 removed lines

@@ -9,108 +9,108 @@ 
  */
 class LinkAddEditForm extends FormValidator
 {
-	const TYPE_ADD  = 1;
-	const TYPE_EDIT = 2;
-
-	/**
-	 * Constructor
-	 * To add link, define category_object and link_type
-	 * To edit link, define link_object
-	 */
-	public function LinkAddEditForm(
-		$form_type,
-		$category_object,
-		$link_type,
-		$link_object,
-		$form_name,
-		$action = null
-	) {
-		parent :: __construct($form_name, 'post', $action);
-
-		// set or create link object
-		if (isset($link_object)) {
-			$link = $link_object;
-		} elseif (isset($link_type) && isset($category_object)) {
-			$link = LinkFactory :: create ($link_type);
-			$link->set_course_code(api_get_course_id());
-			$link->set_category_id($category_object[0]->get_id());
-		} else {
-			die ('LinkAddEditForm error: define link_type/category_object or link_object');
-		}
-
-		$defaults = array();
-		$this->addElement('hidden', 'zero', 0);
-
-		if (!empty($_GET['editlink'])) {
-			$this->addElement('header', '', get_lang('EditLink'));
-		}
-
-		// ELEMENT: name
-		if ($form_type == self :: TYPE_ADD || $link->is_allowed_to_change_name()) {
-			if ($link->needs_name_and_description()) {
-				$this->addText('name', get_lang('Name'), true, array('size'=>'40', 'maxlength'=>'40'));
-			} else {
-				$select = $this->addElement('select', 'select_link', get_lang('ChooseItem'));
-				foreach ($link->get_all_links() as $newlink) {
-					$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('hidden','name_link',$link->get_name(),array('id'=>'name_link'));
-		}
-
-		if (count($category_object) == 1) {
-			$this->addElement('hidden', 'select_gradebook', $category_object[0]->get_id());
-		} else {
-			$select_gradebook = $this->addElement(
-				'select',
-				'select_gradebook',
-				get_lang('SelectGradebook'),
-				array(),
-				array('id' => 'hide_category_id')
-			);
-			$this->addRule('select_gradebook', get_lang('ThisFieldIsRequired'), 'nonzero');
-
-			$default_weight = 0;
-			if (!empty($category_object)) {
-				foreach ($category_object as $my_cat) {
-
-					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 ) {
-								$default_weight = $my_cat->get_weight();
-								$select_gradebook->addoption(get_lang('Default'), $my_cat->get_id());
-							} else {
-								$select_gradebook->addoption($my_cat->get_name(), $my_cat->get_id());
-							}
-						} else {
-							$select_gradebook->addoption(get_lang('Select'), 0);
-						}
-						if ($link->get_category_id() == $my_cat->get_id()) {
-							$default_weight = $my_cat->get_weight();
-						}
-					}
-				}
-			}
-		}
-
-		$this->addText(
-			'weight_mask',
-			array(get_lang('Weight'), null, ' [0 .. <span id="max_weight">'.$category_object[0]->get_weight().'</span>] '),
-			true,
-			array(
-				'size' => '4',
-				'maxlength' => '5',
-				'class' => 'span1'
-			)
-		);
-
-		$this->addElement('hidden', 'weight');
-
-		/*
+    const TYPE_ADD  = 1;
+    const TYPE_EDIT = 2;
+
+    /**
+     * Constructor
+     * To add link, define category_object and link_type
+     * To edit link, define link_object
+     */
+    public function LinkAddEditForm(
+        $form_type,
+        $category_object,
+        $link_type,
+        $link_object,
+        $form_name,
+        $action = null
+    ) {
+        parent :: __construct($form_name, 'post', $action);
+
+        // set or create link object
+        if (isset($link_object)) {
+            $link = $link_object;
+        } elseif (isset($link_type) && isset($category_object)) {
+            $link = LinkFactory :: create ($link_type);
+            $link->set_course_code(api_get_course_id());
+            $link->set_category_id($category_object[0]->get_id());
+        } else {
+            die ('LinkAddEditForm error: define link_type/category_object or link_object');
+        }
+
+        $defaults = array();
+        $this->addElement('hidden', 'zero', 0);
+
+        if (!empty($_GET['editlink'])) {
+            $this->addElement('header', '', get_lang('EditLink'));
+        }
+
+        // ELEMENT: name
+        if ($form_type == self :: TYPE_ADD || $link->is_allowed_to_change_name()) {
+            if ($link->needs_name_and_description()) {
+                $this->addText('name', get_lang('Name'), true, array('size'=>'40', 'maxlength'=>'40'));
+            } else {
+                $select = $this->addElement('select', 'select_link', get_lang('ChooseItem'));
+                foreach ($link->get_all_links() as $newlink) {
+                    $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('hidden','name_link',$link->get_name(),array('id'=>'name_link'));
+        }
+
+        if (count($category_object) == 1) {
+            $this->addElement('hidden', 'select_gradebook', $category_object[0]->get_id());
+        } else {
+            $select_gradebook = $this->addElement(
+                'select',
+                'select_gradebook',
+                get_lang('SelectGradebook'),
+                array(),
+                array('id' => 'hide_category_id')
+            );
+            $this->addRule('select_gradebook', get_lang('ThisFieldIsRequired'), 'nonzero');
+
+            $default_weight = 0;
+            if (!empty($category_object)) {
+                foreach ($category_object as $my_cat) {
+
+                    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 ) {
+                                $default_weight = $my_cat->get_weight();
+                                $select_gradebook->addoption(get_lang('Default'), $my_cat->get_id());
+                            } else {
+                                $select_gradebook->addoption($my_cat->get_name(), $my_cat->get_id());
+                            }
+                        } else {
+                            $select_gradebook->addoption(get_lang('Select'), 0);
+                        }
+                        if ($link->get_category_id() == $my_cat->get_id()) {
+                            $default_weight = $my_cat->get_weight();
+                        }
+                    }
+                }
+            }
+        }
+
+        $this->addText(
+            'weight_mask',
+            array(get_lang('Weight'), null, ' [0 .. <span id="max_weight">'.$category_object[0]->get_weight().'</span>] '),
+            true,
+            array(
+                'size' => '4',
+                'maxlength' => '5',
+                'class' => 'span1'
+            )
+        );
+
+        $this->addElement('hidden', 'weight');
+
+        /*
 
         // ELEMENT: weight
         $this->addText('weight', array(get_lang('Weight'), null, '/ <span id="max_weight">'.$default_weight.'</span>'), true, array (
@@ -119,76 +119,76 @@ 
             'class' => 'span1'
         ));*/
 
-		$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());
-
-			if ($parent_cat[0]->get_parent_id() == 0) {
-				$values['weight'] = $link->get_weight();
-			} else {
-				$cat = Category :: load($parent_cat[0]->get_parent_id());
-				//$global_weight = $cat[0]->get_weight();
-				//$values['weight'] = $link->get_weight()/$parent_cat[0]->get_weight()*$global_weight;
-				//var_dump($global_weight, $link->get_weight(), $parent_cat[0]->get_weight());
-				//$weight = $parent_cat[0]->get_weight()* $link->get_weight() / $global_weight;
-				//$values['weight'] = $weight;
-				$values['weight'] = $link->get_weight() ;
-			}
-			$defaults['weight_mask'] = $values['weight'] ;
-			$defaults['select_gradebook'] = $link->get_category_id();
-
-		}
-		// ELEMENT: max
-		if ($link->needs_max()) {
-			if ($form_type == self :: TYPE_EDIT && $link->has_results()) {
-				$this->addText('max', get_lang('QualificationNumeric'), false, array ('size' => '4','maxlength' => '5', 'disabled' => 'disabled'));
-			} else {
-				$this->addText('max', get_lang('QualificationNumeric'), true, array ('size' => '4','maxlength' => '5'));
-				$this->addRule('max', get_lang('OnlyNumbers'), 'numeric');
-				$this->addRule(array ('max', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
-			}
-			if ($form_type == self :: TYPE_EDIT) {
-				$defaults['max'] = $link->get_max();
-			}
-		}
-
-		// ELEMENT: description
-		if ($link->needs_name_and_description()) {
-			$this->addElement('textarea', 'description', get_lang('Description'), array ('rows' => '3','cols' => '34'));
-			if ($form_type == self :: TYPE_EDIT) {
-				$defaults['description'] = $link->get_description();
-			}
-		}
-
-		// ELEMENT: visible
-		$visible = ($form_type == self :: TYPE_EDIT && $link->is_visible()) ? '1' : '0';
-		$this->addElement('checkbox', 'visible', null, get_lang('Visible'), $visible);
-		if ($form_type == self :: TYPE_EDIT) {
-			$defaults['visible'] = $link->is_visible();
-		}
-
-		// ELEMENT: add results
-		if ($form_type == self :: TYPE_ADD && $link->needs_results()) {
-			$this->addElement('checkbox', 'addresult', get_lang('AddResult'));
-		}
-		// submit button
-		if ($form_type == self :: TYPE_ADD) {
-			$this->addButtonCreate(get_lang('CreateLink'));
-		} else {
-			$this->addButtonUpdate(get_lang('LinkMod'));
-		}
-
-		if ($form_type == self :: TYPE_ADD) {
-			$setting = api_get_setting('tool_visible_by_default_at_creation');
-			$visibility_default = 1;
-			if (isset($setting['gradebook']) && $setting['gradebook'] == 'false') {
-				$visibility_default = 0;
-			}
-			$defaults['visible']  = $visibility_default;
-		}
-
-		// set default values
-		$this->setDefaults($defaults);
-	}
+        $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());
+
+            if ($parent_cat[0]->get_parent_id() == 0) {
+                $values['weight'] = $link->get_weight();
+            } else {
+                $cat = Category :: load($parent_cat[0]->get_parent_id());
+                //$global_weight = $cat[0]->get_weight();
+                //$values['weight'] = $link->get_weight()/$parent_cat[0]->get_weight()*$global_weight;
+                //var_dump($global_weight, $link->get_weight(), $parent_cat[0]->get_weight());
+                //$weight = $parent_cat[0]->get_weight()* $link->get_weight() / $global_weight;
+                //$values['weight'] = $weight;
+                $values['weight'] = $link->get_weight() ;
+            }
+            $defaults['weight_mask'] = $values['weight'] ;
+            $defaults['select_gradebook'] = $link->get_category_id();
+
+        }
+        // ELEMENT: max
+        if ($link->needs_max()) {
+            if ($form_type == self :: TYPE_EDIT && $link->has_results()) {
+                $this->addText('max', get_lang('QualificationNumeric'), false, array ('size' => '4','maxlength' => '5', 'disabled' => 'disabled'));
+            } else {
+                $this->addText('max', get_lang('QualificationNumeric'), true, array ('size' => '4','maxlength' => '5'));
+                $this->addRule('max', get_lang('OnlyNumbers'), 'numeric');
+                $this->addRule(array ('max', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
+            }
+            if ($form_type == self :: TYPE_EDIT) {
+                $defaults['max'] = $link->get_max();
+            }
+        }
+
+        // ELEMENT: description
+        if ($link->needs_name_and_description()) {
+            $this->addElement('textarea', 'description', get_lang('Description'), array ('rows' => '3','cols' => '34'));
+            if ($form_type == self :: TYPE_EDIT) {
+                $defaults['description'] = $link->get_description();
+            }
+        }
+
+        // ELEMENT: visible
+        $visible = ($form_type == self :: TYPE_EDIT && $link->is_visible()) ? '1' : '0';
+        $this->addElement('checkbox', 'visible', null, get_lang('Visible'), $visible);
+        if ($form_type == self :: TYPE_EDIT) {
+            $defaults['visible'] = $link->is_visible();
+        }
+
+        // ELEMENT: add results
+        if ($form_type == self :: TYPE_ADD && $link->needs_results()) {
+            $this->addElement('checkbox', 'addresult', get_lang('AddResult'));
+        }
+        // submit button
+        if ($form_type == self :: TYPE_ADD) {
+            $this->addButtonCreate(get_lang('CreateLink'));
+        } else {
+            $this->addButtonUpdate(get_lang('LinkMod'));
+        }
+
+        if ($form_type == self :: TYPE_ADD) {
+            $setting = api_get_setting('tool_visible_by_default_at_creation');
+            $visibility_default = 1;
+            if (isset($setting['gradebook']) && $setting['gradebook'] == 'false') {
+                $visibility_default = 0;
+            }
+            $defaults['visible']  = $visibility_default;
+        }
+
+        // set default values
+        $this->setDefaults($defaults);
+    }
 }

main/gradebook/lib/fe/dataform.class.php

Indentation +91 added lines, -91 removed lines

@@ -8,102 +8,102 @@
  */
 class DataForm extends FormValidator
 {
-	const TYPE_IMPORT = 1;
-	const TYPE_EXPORT = 2;
-	const TYPE_EXPORT_PDF = 3;
+    const TYPE_IMPORT = 1;
+    const TYPE_EXPORT = 2;
+    const TYPE_EXPORT_PDF = 3;
 
-	/**
-	 * Builds a form containing form items based on a given parameter
-	 * @param int form_type 1=import, 2=export
-	 * @param obj cat_obj the category object
-	 * @param obj res_obj the result object
-	 * @param string form name
-	 * @param method
-	 * @param action
-	 */
-	public function DataForm($form_type, $form_name, $method = 'post', $action = null, $target='', $locked_status)
-	{
-		parent :: __construct($form_name, $method, $action,$target);
-		$this->form_type = $form_type;
-		if ($this->form_type == self :: TYPE_IMPORT) {
-			$this->build_import_form();
-		} elseif ($this->form_type == self :: TYPE_EXPORT) {
-			if ($locked_status == 0) {
-				$this->build_export_form_option(false);
-			} else {
-				$this->build_export_form();
-			}
-		} elseif ($this->form_type == self :: TYPE_EXPORT_PDF) {
-			$this->build_pdf_export_form();
-		}
-		$this->setDefaults();
-	}
+    /**
+     * Builds a form containing form items based on a given parameter
+     * @param int form_type 1=import, 2=export
+     * @param obj cat_obj the category object
+     * @param obj res_obj the result object
+     * @param string form name
+     * @param method
+     * @param action
+     */
+    public function DataForm($form_type, $form_name, $method = 'post', $action = null, $target='', $locked_status)
+    {
+        parent :: __construct($form_name, $method, $action,$target);
+        $this->form_type = $form_type;
+        if ($this->form_type == self :: TYPE_IMPORT) {
+            $this->build_import_form();
+        } elseif ($this->form_type == self :: TYPE_EXPORT) {
+            if ($locked_status == 0) {
+                $this->build_export_form_option(false);
+            } else {
+                $this->build_export_form();
+            }
+        } elseif ($this->form_type == self :: TYPE_EXPORT_PDF) {
+            $this->build_pdf_export_form();
+        }
+        $this->setDefaults();
+    }
 
-	protected function build_pdf_export_form()
-	{
-		$renderer =& $this->defaultRenderer();
-		$renderer->setCustomElementTemplate('<span>{element}</span>');
-		$this->addElement('header', get_lang('ChooseOrientation'));
-		$this->addElement('radio', 'orientation', null, get_lang('Portrait'), 'portrait');
-		$this->addElement('radio', 'orientation', null, get_lang('Landscape'), 'landscape');
-		$this->addButtonExport(get_lang('Export'));
-		$this->setDefaults(array (
-			'orientation' => 'portrait'
-		));
-	}
+    protected function build_pdf_export_form()
+    {
+        $renderer =& $this->defaultRenderer();
+        $renderer->setCustomElementTemplate('<span>{element}</span>');
+        $this->addElement('header', get_lang('ChooseOrientation'));
+        $this->addElement('radio', 'orientation', null, get_lang('Portrait'), 'portrait');
+        $this->addElement('radio', 'orientation', null, get_lang('Landscape'), 'landscape');
+        $this->addButtonExport(get_lang('Export'));
+        $this->setDefaults(array (
+            'orientation' => 'portrait'
+        ));
+    }
 
-	protected function build_export_form()
-	{
-		$this->addElement('header', get_lang('ChooseFormat'));
-		$this->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV (Comma-Separated Values)', 'csv');
-		$this->addElement('radio', 'file_type', null, 'XML (Extensible Markup Language)', 'xml');
-		$this->addElement('radio', 'file_type', null, 'PDF (Portable Document Format)', 'pdf');
-		$this->addButtonExport(get_lang('Export'));
-		$this->setDefaults(array (
-			'file_type' => 'csv'
-		));
-	}
+    protected function build_export_form()
+    {
+        $this->addElement('header', get_lang('ChooseFormat'));
+        $this->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV (Comma-Separated Values)', 'csv');
+        $this->addElement('radio', 'file_type', null, 'XML (Extensible Markup Language)', 'xml');
+        $this->addElement('radio', 'file_type', null, 'PDF (Portable Document Format)', 'pdf');
+        $this->addButtonExport(get_lang('Export'));
+        $this->setDefaults(array (
+            'file_type' => 'csv'
+        ));
+    }
 
-	protected function build_export_form_option($show_pdf=true)
-	{
-		$this->addElement('header', get_lang('ChooseFormat'));
-		$this->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV (Comma-Separated Values)', 'csv');
-		$this->addElement('radio', 'file_type', null, 'XML (Extensible Markup Language)', 'xml');
-		$this->addElement('radio', 'file_type', Display::return_icon('info3.gif',get_lang('ToExportMustLockEvaluation')), 'PDF (Portable Document Format)', 'pdf', array('disabled'));
-		$this->addButtonExport(get_lang('Export'));
-		$this->setDefaults(array (
-			'file_type' => 'csv'
-		));
-	}
+    protected function build_export_form_option($show_pdf=true)
+    {
+        $this->addElement('header', get_lang('ChooseFormat'));
+        $this->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV (Comma-Separated Values)', 'csv');
+        $this->addElement('radio', 'file_type', null, 'XML (Extensible Markup Language)', 'xml');
+        $this->addElement('radio', 'file_type', Display::return_icon('info3.gif',get_lang('ToExportMustLockEvaluation')), 'PDF (Portable Document Format)', 'pdf', array('disabled'));
+        $this->addButtonExport(get_lang('Export'));
+        $this->setDefaults(array (
+            'file_type' => 'csv'
+        ));
+    }
 
-	protected function build_import_form()
-	{
-		$this->addElement('hidden', 'formSent');
-		$this->addElement('header', get_lang('ImportFileLocation'));
-		$this->addElement('file', 'import_file',get_lang('Location'));
-		$allowed_file_types = array (
-			'xml',
-			'csv'
-		);
-		//$this->addRule('file', get_lang('InvalidExtension') . ' (' . implode(',', $allowed_file_types) . ')', 'filetype', $allowed_file_types);
-		$this->addElement('radio', 'file_type', get_lang('FileType'), 'CSV (<a href="docs/example_csv.html" target="_blank">' . get_lang('ExampleCSVFile') . '</a>)', 'csv');
-		$this->addElement('radio', 'file_type', null, 'XML (<a href="docs/example_xml.html" target="_blank">' . get_lang('ExampleXMLFile') . '</a>)', 'xml');
-		$this->addElement('checkbox','overwrite', null,get_lang('OverwriteScores'));
-		$this->addElement('checkbox','ignoreerrors',null,get_lang('IgnoreErrors'));
-		$this->addButtonImport(get_lang('Ok'));
-		$this->setDefaults(array(
-			'formSent' => '1',
-			'file_type' => 'csv'
-		));
-	}
+    protected function build_import_form()
+    {
+        $this->addElement('hidden', 'formSent');
+        $this->addElement('header', get_lang('ImportFileLocation'));
+        $this->addElement('file', 'import_file',get_lang('Location'));
+        $allowed_file_types = array (
+            'xml',
+            'csv'
+        );
+        //$this->addRule('file', get_lang('InvalidExtension') . ' (' . implode(',', $allowed_file_types) . ')', 'filetype', $allowed_file_types);
+        $this->addElement('radio', 'file_type', get_lang('FileType'), 'CSV (<a href="docs/example_csv.html" target="_blank">' . get_lang('ExampleCSVFile') . '</a>)', 'csv');
+        $this->addElement('radio', 'file_type', null, 'XML (<a href="docs/example_xml.html" target="_blank">' . get_lang('ExampleXMLFile') . '</a>)', 'xml');
+        $this->addElement('checkbox','overwrite', null,get_lang('OverwriteScores'));
+        $this->addElement('checkbox','ignoreerrors',null,get_lang('IgnoreErrors'));
+        $this->addButtonImport(get_lang('Ok'));
+        $this->setDefaults(array(
+            'formSent' => '1',
+            'file_type' => 'csv'
+        ));
+    }
 
-	public function display()
-	{
-		parent :: display();
-	}
+    public function display()
+    {
+        parent :: display();
+    }
 
-	public function setDefaults($defaults = array(), $filter = null)
-	{
-		parent :: setDefaults($defaults, $filter);
-	}
+    public function setDefaults($defaults = array(), $filter = null)
+    {
+        parent :: setDefaults($defaults, $filter);
+    }
 }

main/gradebook/lib/fe/usertable.class.php

Indentation +116 added lines, -116 removed lines

@@ -10,128 +10,128 @@
  */
 class UserTable extends SortableTable
 {
-	private $userid;
-	private $datagen;
+    private $userid;
+    private $datagen;
 
-	/**
-	 * Constructor
-	 */
-	public function UserTable($userid, $evals = array(), $links = array(), $addparams = null)
-	{
-		parent :: __construct ('userlist', null, null, 0);
-		$this->userid = $userid;
-		$this->datagen = new UserDataGenerator($userid, $evals, $links);
-		if (isset($addparams)) {
-			$this->set_additional_parameters($addparams);
-		}
-		$column = 0;
-		$this->set_header($column++, get_lang('Type'));
-		$this->set_header($column++, get_lang('Evaluation'));
-		$this->set_header($column++, get_lang('Course'));
-		$this->set_header($column++, get_lang('Category'));
-		$this->set_header($column++, get_lang('EvaluationAverage'));
-		$this->set_header($column++, get_lang('Result'));
+    /**
+     * Constructor
+     */
+    public function UserTable($userid, $evals = array(), $links = array(), $addparams = null)
+    {
+        parent :: __construct ('userlist', null, null, 0);
+        $this->userid = $userid;
+        $this->datagen = new UserDataGenerator($userid, $evals, $links);
+        if (isset($addparams)) {
+            $this->set_additional_parameters($addparams);
+        }
+        $column = 0;
+        $this->set_header($column++, get_lang('Type'));
+        $this->set_header($column++, get_lang('Evaluation'));
+        $this->set_header($column++, get_lang('Course'));
+        $this->set_header($column++, get_lang('Category'));
+        $this->set_header($column++, get_lang('EvaluationAverage'));
+        $this->set_header($column++, get_lang('Result'));
 
-		$scoredisplay = ScoreDisplay :: instance();
-		if ($scoredisplay->is_custom()) {
-			$this->set_header($column++, get_lang('Display'));
-		}
-	}
+        $scoredisplay = ScoreDisplay :: instance();
+        if ($scoredisplay->is_custom()) {
+            $this->set_header($column++, get_lang('Display'));
+        }
+    }
 
-	/**
-	 * Function used by SortableTable to get total number of items in the table
-	 */
-	function get_total_number_of_items()
-	{
-		return $this->datagen->get_total_items_count();
-	}
+    /**
+     * Function used by SortableTable to get total number of items in the table
+     */
+    function get_total_number_of_items()
+    {
+        return $this->datagen->get_total_items_count();
+    }
 
-	/**
-	 * Function used by SortableTable to generate the data to display
-	 */
-	public function get_table_data($from = 1, $per_page = null, $column = null, $direction = null, $sort = null)
-	{
-		$scoredisplay = ScoreDisplay :: instance();
+    /**
+     * Function used by SortableTable to generate the data to display
+     */
+    public function get_table_data($from = 1, $per_page = null, $column = null, $direction = null, $sort = null)
+    {
+        $scoredisplay = ScoreDisplay :: instance();
 
-		// determine sorting type
-		switch ($this->column) {
-			// Type
-			case 0:
-				$sorting = UserDataGenerator :: UDG_SORT_TYPE;
-				break;
-			case 1:
-				$sorting = UserDataGenerator :: UDG_SORT_NAME;
-				break;
-			case 2:
-				$sorting = UserDataGenerator :: UDG_SORT_COURSE;
-				break;
-			case 3:
-				$sorting = UserDataGenerator :: UDG_SORT_CATEGORY;
-				break;
-			case 4:
-				$sorting = UserDataGenerator :: UDG_SORT_AVERAGE;
-				break;
-			case 5:
-				$sorting = UserDataGenerator :: UDG_SORT_SCORE;
-				break;
-			case 6:
-				$sorting = UserDataGenerator :: UDG_SORT_MASK;
-				break;
-		}
-		if ($this->direction == 'DESC') {
-			$sorting |= UserDataGenerator :: UDG_SORT_DESC;
-		} else {
-			$sorting |= UserDataGenerator :: UDG_SORT_ASC;
-		}
-		$data_array = $this->datagen->get_data($sorting, $from, $this->per_page);
-		// generate the data to display
-		$sortable_data = array();
-		foreach ($data_array as $data) {
-			if ($data[2]!="") {//filter by course removed
-				$row = array ();
-				$row[] = $this->build_type_column($data[0]);
-				$row[] = $this->build_name_link($data[0]);
-				$row[] = $data[2];
-				$row[] = $data[3];
-				$row[] = $data[4];
-				$row[] = $data[5];
-				if ($scoredisplay->is_custom())
-					$row[] = $data[6];
-				$sortable_data[] = $row;
-			}
-		}
+        // determine sorting type
+        switch ($this->column) {
+            // Type
+            case 0:
+                $sorting = UserDataGenerator :: UDG_SORT_TYPE;
+                break;
+            case 1:
+                $sorting = UserDataGenerator :: UDG_SORT_NAME;
+                break;
+            case 2:
+                $sorting = UserDataGenerator :: UDG_SORT_COURSE;
+                break;
+            case 3:
+                $sorting = UserDataGenerator :: UDG_SORT_CATEGORY;
+                break;
+            case 4:
+                $sorting = UserDataGenerator :: UDG_SORT_AVERAGE;
+                break;
+            case 5:
+                $sorting = UserDataGenerator :: UDG_SORT_SCORE;
+                break;
+            case 6:
+                $sorting = UserDataGenerator :: UDG_SORT_MASK;
+                break;
+        }
+        if ($this->direction == 'DESC') {
+            $sorting |= UserDataGenerator :: UDG_SORT_DESC;
+        } else {
+            $sorting |= UserDataGenerator :: UDG_SORT_ASC;
+        }
+        $data_array = $this->datagen->get_data($sorting, $from, $this->per_page);
+        // generate the data to display
+        $sortable_data = array();
+        foreach ($data_array as $data) {
+            if ($data[2]!="") {//filter by course removed
+                $row = array ();
+                $row[] = $this->build_type_column($data[0]);
+                $row[] = $this->build_name_link($data[0]);
+                $row[] = $data[2];
+                $row[] = $data[3];
+                $row[] = $data[4];
+                $row[] = $data[5];
+                if ($scoredisplay->is_custom())
+                    $row[] = $data[6];
+                $sortable_data[] = $row;
+            }
+        }
 
-		return $sortable_data;
-	}
+        return $sortable_data;
+    }
 
-	/**
-	 * @param $item
-	 * @return string
-	 */
-	private function build_type_column($item)
-	{
-		return GradebookUtils::build_type_icon_tag($item->get_icon_name());
-	}
+    /**
+     * @param $item
+     * @return string
+     */
+    private function build_type_column($item)
+    {
+        return GradebookUtils::build_type_icon_tag($item->get_icon_name());
+    }
 
-	/**
-	 * @param $item
-	 * @return string
-	 */
-	private function build_name_link($item)
-	{
-		switch ($item->get_item_type()) {
-			// evaluation
-			case 'E' :
-				return ' '
-				. '<a href="gradebook_view_result.php?selecteval=' . $item->get_id() . '">'
-				. $item->get_name()
-				. '</a>';
-			// link
-			case 'L' :
-				return '&nbsp;<a href="' . $item->get_link() . '">'
-				. $item->get_name()
-				. '</a>'
-				. '&nbsp;[' . $item->get_type_name() . ']';
-		}
-	}
+    /**
+     * @param $item
+     * @return string
+     */
+    private function build_name_link($item)
+    {
+        switch ($item->get_item_type()) {
+            // evaluation
+            case 'E' :
+                return '&nbsp;'
+                . '<a href="gradebook_view_result.php?selecteval=' . $item->get_id() . '">'
+                . $item->get_name()
+                . '</a>';
+            // link
+            case 'L' :
+                return '&nbsp;<a href="' . $item->get_link() . '">'
+                . $item->get_name()
+                . '</a>'
+                . '&nbsp;[' . $item->get_type_name() . ']';
+        }
+    }
 }

main/gradebook/lib/fe/scoredisplayform.class.php

Indentation +74 added lines, -74 removed lines

@@ -10,47 +10,47 @@ 
  */
 class ScoreDisplayForm extends FormValidator
 {
-	/**
-	 * @param $form_name
-	 * @param null $action
-	 */
-	public function ScoreDisplayForm($form_name, $action= null)
-	{
-		parent :: __construct($form_name, 'post', $action);
-		$displayscore = ScoreDisplay :: instance();
-		$customdisplays = $displayscore->get_custom_score_display_settings();
-
-		$nr_items = (count($customdisplays)!='0') ? count($customdisplays) : '1';
-		$this->setDefaults(array (
+    /**
+     * @param $form_name
+     * @param null $action
+     */
+    public function ScoreDisplayForm($form_name, $action= null)
+    {
+        parent :: __construct($form_name, 'post', $action);
+        $displayscore = ScoreDisplay :: instance();
+        $customdisplays = $displayscore->get_custom_score_display_settings();
+
+        $nr_items = (count($customdisplays)!='0') ? count($customdisplays) : '1';
+        $this->setDefaults(array (
             'scorecolpercent' => $displayscore->get_color_split_value()
-		));
+        ));
 
-		$this->addElement('hidden', 'maxvalue', '100');
-		$this->addElement('hidden', 'minvalue', '0');
-		$counter= 1;
+        $this->addElement('hidden', 'maxvalue', '100');
+        $this->addElement('hidden', 'minvalue', '0');
+        $counter= 1;
 
-		//setting the default values
+        //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();
+        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'));
+        //settings for the colored score
+        $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
+                'input-size' => 2
             ));
 
             if (api_get_setting('teachers_can_change_score_settings') != 'true') {
@@ -62,25 +62,25 @@ 
             $this->addRule(array('scorecolpercent','minvalue'), get_lang('UnderMin'), 'compare', '>');
         }
 
-		//Settings for the scoring system
+        //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').';">
+            $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 -->
 
@@ -105,7 +105,7 @@ 
 
 				';
 
-				$elementTemplateTwoLabel2 ='
+                $elementTemplateTwoLabel2 ='
 				<div class="col-sm-2">
 					<!-- BEGIN error --><span class="form_error">{error}</span>
 					<!-- END error -->
@@ -118,33 +118,33 @@ 
 				</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', '>');
-			}
-		}
+                $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'));
+        }
+    }
 
-	function validate() {
-		return parent :: validate();
-	}
+    function validate() {
+        return parent :: validate();
+    }
 }

main/gradebook/lib/be/exerciselink.class.php

Indentation +13 added lines, -13 removed lines

@@ -194,13 +194,13 @@ 
         in exercice/exercice.php, look for note-query-exe-results marker*/
         $session_id = api_get_session_id();
         $courseId = $this->getCourseId();
-	    $exercise = new Exercise($courseId);
+        $exercise = new Exercise($courseId);
         $exercise->read($this->get_ref_id());
 
         if (!$this->is_hp) {
 
-		if ($exercise->exercise_was_added_in_lp == false) {
-			$sql = "SELECT * FROM $tblStats
+        if ($exercise->exercise_was_added_in_lp == false) {
+            $sql = "SELECT * FROM $tblStats
 			        WHERE
 			            exe_exo_id = ".intval($this->get_ref_id())." AND
 			            orig_lp_id = 0 AND
@@ -209,15 +209,15 @@ 
 			            session_id = $session_id AND
                                     c_id = $courseId 
                                 ";
-		    } else {
-		        $lpId = null;
-		        if (!empty($exercise->lpList)) {
-		            // Taking only the first LP
-		            $lpId = current($exercise->lpList);
-		            $lpId = $lpId['lp_id'];
-		        }
-
-		        $sql = "SELECT * FROM $tblStats
+            } else {
+                $lpId = null;
+                if (!empty($exercise->lpList)) {
+                    // Taking only the first LP
+                    $lpId = current($exercise->lpList);
+                    $lpId = $lpId['lp_id'];
+                }
+
+                $sql = "SELECT * FROM $tblStats
 		                WHERE
 		                    exe_exo_id = ".intval($this->get_ref_id())." AND
 		                    orig_lp_id = $lpId AND
@@ -225,7 +225,7 @@ 
 		                    session_id = $session_id AND
                                     c_id = $courseId 
                                 ";
-		    }
+            }
 
             if (!empty($stud_id) && $type != 'ranking') {
                 $sql .= " AND exe_user_id = $stud_id ";

main/gradebook/lib/be/gradebookitem.class.php

Indentation +12 added lines, -12 removed lines

@@ -8,16 +8,16 @@
  */
 interface GradebookItem
 {
-	public function get_item_type();
-	public function get_id();
-	public function get_name();
-	public function get_description();
-	public function get_course_code();
-	public function get_weight();
-	public function get_date();
-	public function is_visible();
-	public function get_icon_name();
-	public function getStudentList();
-	public function setStudentList($list);
-	public function calc_score($stud_id = null, $type = null);
+    public function get_item_type();
+    public function get_id();
+    public function get_name();
+    public function get_description();
+    public function get_course_code();
+    public function get_weight();
+    public function get_date();
+    public function is_visible();
+    public function get_icon_name();
+    public function getStudentList();
+    public function setStudentList($list);
+    public function calc_score($stud_id = null, $type = null);
 }

main/gradebook/lib/be/category.class.php

Indentation -2 removed lines

@@ -1571,7 +1571,6 @@ 
      * @param string $course_code Course code (optional)
      * @param int    $session_id Session ID (optional)
      * @param bool   $order
-
      * @return array Array of subcategories
      */
     public function get_subcategories($stud_id = null, $course_code = null, $session_id = null, $order = null)
@@ -1850,7 +1849,6 @@ 
      * This function, locks a category , only one who can unlock it is
      * the platform administrator.
      * @param int locked 1 or unlocked 0
-
      * @return bool
      * */
     public function lock($locked)

main/gradebook/lib/be/attendancelink.class.php

Indentation +202 added lines, -202 removed lines

@@ -8,48 +8,48 @@ 
  */
 class AttendanceLink extends AbstractLink
 {
-	private $attendance_table = null;
-	private $itemprop_table = null;
+    private $attendance_table = null;
+    private $itemprop_table = null;
 
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->set_type(LINK_ATTENDANCE);
-	}
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->set_type(LINK_ATTENDANCE);
+    }
 
-	/**
-	 * @return string
-	 */
-	public function get_type_name()
-	{
-		return get_lang('Attendance');
-	}
+    /**
+     * @return string
+     */
+    public function get_type_name()
+    {
+        return get_lang('Attendance');
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function is_allowed_to_change_name()
-	{
-		return false;
-	}
+    /**
+     * @return bool
+     */
+    public function is_allowed_to_change_name()
+    {
+        return false;
+    }
 
-	/**
-	 * Generate an array of attendances that a teacher hasn't created a link for.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 * @todo seems to be depracated
-	 */
-	public function get_not_created_links()
-	{
-		return false;
-		if (empty($this->course_code)) {
-			die('Error in get_not_created_links() : course code not set');
-		}
-		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
+    /**
+     * Generate an array of attendances that a teacher hasn't created a link for.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     * @todo seems to be depracated
+     */
+    public function get_not_created_links()
+    {
+        return false;
+        if (empty($this->course_code)) {
+            die('Error in get_not_created_links() : course code not set');
+        }
+        $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
 
-		$sql = 'SELECT att.id, att.name, att.attendance_qualify_title
+        $sql = 'SELECT att.id, att.name, att.attendance_qualify_title
 				FROM '.$this->get_attendance_table().' att
 				WHERE
 					att.c_id = '.$this->course_id.' AND
@@ -60,7 +60,7 @@ 
 							course_code = "'.Database::escape_string($this->get_course_code()).'"
 					)
 				AND att.session_id='.api_get_session_id().'';
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
         $cats = array();
         while ($data = Database::fetch_array($result)) {
@@ -71,13 +71,13 @@ 
             }
         }
 
-		return $cats;
-	}
+        return $cats;
+    }
 
-	/**
-	 * Generate an array of all attendances available.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
+    /**
+     * Generate an array of all attendances available.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
     public function get_all_links()
     {
         if (empty($this->course_code)) {
@@ -104,55 +104,55 @@ 
         $my_cats = isset($cats) ? $cats : null;
 
         return $my_cats;
-	}
+    }
 
-	/**
-	 * Has anyone done this exercise yet ?
-	 */
-	public function has_results()
-	{
-		$tbl_attendance_result = Database :: get_course_table(TABLE_ATTENDANCE_RESULT);
-		$session_id = api_get_session_id();
-		$sql = 'SELECT count(*) AS number FROM '.$tbl_attendance_result."
+    /**
+     * Has anyone done this exercise yet ?
+     */
+    public function has_results()
+    {
+        $tbl_attendance_result = Database :: get_course_table(TABLE_ATTENDANCE_RESULT);
+        $session_id = api_get_session_id();
+        $sql = 'SELECT count(*) AS number FROM '.$tbl_attendance_result."
 				WHERE
 					session_id = $session_id AND
 					c_id = '.$this->course_id.' AND
 					attendance_id = '".intval($this->get_ref_id())."'";
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result);
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result);
 
-		return $number[0] != 0;
-	}
+        return $number[0] != 0;
+    }
 
-	/**
-	 * @param int $stud_id
-	 * @return array|null
-	 */
-	public function calc_score($stud_id = null, $type = null)
-	{
-		$tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
-		$session_id = api_get_session_id();
+    /**
+     * @param int $stud_id
+     * @return array|null
+     */
+    public function calc_score($stud_id = null, $type = null)
+    {
+        $tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
+        $session_id = api_get_session_id();
 
-		// get attendance qualify max
-		$sql = 'SELECT att.attendance_qualify_max
+        // get attendance qualify max
+        $sql = 'SELECT att.attendance_qualify_max
 		        FROM '.$this->get_attendance_table().' att
   				WHERE
   					att.c_id = '.$this->course_id.' AND
   					att.id = '.intval($this->get_ref_id()).' AND
   					att.session_id='.intval($session_id).'';
-		$query = Database::query($sql);
-		$attendance = Database::fetch_array($query, 'ASSOC');
+        $query = Database::query($sql);
+        $attendance = Database::fetch_array($query, 'ASSOC');
 
-		// Get results
-		$sql = 'SELECT *
+        // Get results
+        $sql = 'SELECT *
 		        FROM '.$tbl_attendance_result.'
   	    		WHERE c_id = '.$this->course_id.' AND attendance_id = '.intval($this->get_ref_id());
-		if (isset($stud_id)) {
-			$sql .= ' AND user_id = '.intval($stud_id);
-		}
-		$scores = Database::query($sql);
-		// for 1 student
-		if (isset($stud_id)) {
+        if (isset($stud_id)) {
+            $sql .= ' AND user_id = '.intval($stud_id);
+        }
+        $scores = Database::query($sql);
+        // for 1 student
+        if (isset($stud_id)) {
             if ($data = Database::fetch_array($scores, 'ASSOC')) {
                 return array(
                     $data['score'],
@@ -162,7 +162,7 @@ 
                 //We sent the 0/attendance_qualify_max instead of null for correct calculations
                 return array(0, $attendance['attendance_qualify_max']);
             }
-		} else {
+        } else {
             // all students -> get average
             $students = array();  // user list, needed to make sure we only
             // take first attempts into account
@@ -171,144 +171,144 @@ 
             $sumResult = 0;
             $bestResult = 0;
 
-			while ($data = Database::fetch_array($scores)) {
-				if (!(array_key_exists($data['user_id'], $students))) {
-					if ($attendance['attendance_qualify_max'] != 0) {
-						$students[$data['user_id']] = $data['score'];
-						$rescount++;
-						$sum += $data['score'] / $attendance['attendance_qualify_max'];
-						$sumResult += $data['score'];
-						if ($data['score'] > $bestResult) {
-							$bestResult = $data['score'];
-						}
-						$weight = $attendance['attendance_qualify_max'];
-					}
-				}
-			}
+            while ($data = Database::fetch_array($scores)) {
+                if (!(array_key_exists($data['user_id'], $students))) {
+                    if ($attendance['attendance_qualify_max'] != 0) {
+                        $students[$data['user_id']] = $data['score'];
+                        $rescount++;
+                        $sum += $data['score'] / $attendance['attendance_qualify_max'];
+                        $sumResult += $data['score'];
+                        if ($data['score'] > $bestResult) {
+                            $bestResult = $data['score'];
+                        }
+                        $weight = $attendance['attendance_qualify_max'];
+                    }
+                }
+            }
 
-			if ($rescount == 0) {
-				return null;
-			} else {
-				switch ($type) {
-					case 'best':
-						return array($bestResult, $weight);
-						break;
-					case 'average':
-						return array($sumResult / $rescount, $weight);
-						break;
-					case 'ranking':
-						return AbstractLink::getCurrentUserRanking($stud_id, $students);
-						break;
-					default:
-						return array($sum, $rescount);
-						break;
-				}
-			}
-		}
-	}
+            if ($rescount == 0) {
+                return null;
+            } else {
+                switch ($type) {
+                    case 'best':
+                        return array($bestResult, $weight);
+                        break;
+                    case 'average':
+                        return array($sumResult / $rescount, $weight);
+                        break;
+                    case 'ranking':
+                        return AbstractLink::getCurrentUserRanking($stud_id, $students);
+                        break;
+                    default:
+                        return array($sum, $rescount);
+                        break;
+                }
+            }
+        }
+    }
 
-	/**
-	 * Lazy load function to get the database table of the student publications
-	 */
-	private function get_attendance_table()
-	{
-		$this->attendance_table = Database::get_course_table(TABLE_ATTENDANCE);
-		return $this->attendance_table;
-	}
+    /**
+     * Lazy load function to get the database table of the student publications
+     */
+    private function get_attendance_table()
+    {
+        $this->attendance_table = Database::get_course_table(TABLE_ATTENDANCE);
+        return $this->attendance_table;
+    }
 
-	public function needs_name_and_description()
-	{
-		return false;
-	}
+    public function needs_name_and_description()
+    {
+        return false;
+    }
 
-	public function needs_max()
-	{
-		return false;
-	}
+    public function needs_max()
+    {
+        return false;
+    }
 
-	public function needs_results()
-	{
-		return false;
-	}
+    public function needs_results()
+    {
+        return false;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function get_name()
-	{
-		$this->get_attendance_data();
-		$attendance_title = isset($this->attendance_data['name']) ? $this->attendance_data['name'] : '';
-		$attendance_qualify_title = isset($this->attendance_data['attendance_qualify_title']) ? $this->attendance_data['attendance_qualify_title'] : '';
-		if ( isset($attendance_qualify_title) && $attendance_qualify_title != '') {
-			return $this->attendance_data['attendance_qualify_title'];
-		} else {
-			return $attendance_title;
-		}
-	}
+    /**
+     * @return string
+     */
+    public function get_name()
+    {
+        $this->get_attendance_data();
+        $attendance_title = isset($this->attendance_data['name']) ? $this->attendance_data['name'] : '';
+        $attendance_qualify_title = isset($this->attendance_data['attendance_qualify_title']) ? $this->attendance_data['attendance_qualify_title'] : '';
+        if ( isset($attendance_qualify_title) && $attendance_qualify_title != '') {
+            return $this->attendance_data['attendance_qualify_title'];
+        } else {
+            return $attendance_title;
+        }
+    }
 
-	/**
-	 * @return string
-	 */
-	public function get_description()
-	{
-		return '';
-	}
+    /**
+     * @return string
+     */
+    public function get_description()
+    {
+        return '';
+    }
 
-	/**
-	 * Check if this still links to an exercise
-	 */
-	public function is_valid_link()
-	{
-		$session_id = api_get_session_id();
-		$sql = 'SELECT count(att.id) FROM '.$this->get_attendance_table().' att
+    /**
+     * Check if this still links to an exercise
+     */
+    public function is_valid_link()
+    {
+        $session_id = api_get_session_id();
+        $sql = 'SELECT count(att.id) FROM '.$this->get_attendance_table().' att
         		 WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result);
-		return ($number[0] != 0);
-	}
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result);
+        return ($number[0] != 0);
+    }
 
-	public function get_test_id()
-	{
-		return 'DEBUG:ID';
-	}
+    public function get_test_id()
+    {
+        return 'DEBUG:ID';
+    }
 
-	public function get_link()
-	{
-		//it was extracts the attendance id
-		$session_id = api_get_session_id();
-		$sql = 'SELECT * FROM '.$this->get_attendance_table().' att
+    public function get_link()
+    {
+        //it was extracts the attendance id
+        $session_id = api_get_session_id();
+        $sql = 'SELECT * FROM '.$this->get_attendance_table().' att
     			WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
-		$result = Database::query($sql);
-		$row = Database::fetch_array($result,'ASSOC');
-		$attendance_id = $row['id'];
-		$url = api_get_path(WEB_PATH).'main/attendance/index.php?action=attendance_sheet_list&gradebook=view&attendance_id='.$attendance_id.'&session_id='.$session_id.'&cidReq='.$this->get_course_code();
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result,'ASSOC');
+        $attendance_id = $row['id'];
+        $url = api_get_path(WEB_PATH).'main/attendance/index.php?action=attendance_sheet_list&gradebook=view&attendance_id='.$attendance_id.'&session_id='.$session_id.'&cidReq='.$this->get_course_code();
 
-		return $url;
-	}
+        return $url;
+    }
 
-	/**
-	 * @return array|bool
-	 */
-	private function get_attendance_data()
-	{
-		$tbl_name = $this->get_attendance_table();
-		$session_id = api_get_session_id();
-		if ($tbl_name == '') {
-			return false;
-		} elseif (!isset($this->attendance_data)) {
-			$sql = 'SELECT * FROM '.$this->get_attendance_table().' att
+    /**
+     * @return array|bool
+     */
+    private function get_attendance_data()
+    {
+        $tbl_name = $this->get_attendance_table();
+        $session_id = api_get_session_id();
+        if ($tbl_name == '') {
+            return false;
+        } elseif (!isset($this->attendance_data)) {
+            $sql = 'SELECT * FROM '.$this->get_attendance_table().' att
 					WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
-			$query = Database::query($sql);
-			$this->attendance_data = Database::fetch_array($query);
-		}
-		return $this->attendance_data;
-	}
+            $query = Database::query($sql);
+            $this->attendance_data = Database::fetch_array($query);
+        }
+        return $this->attendance_data;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function get_icon_name()
-	{
-		return 'attendance';
-	}
+    /**
+     * @return string
+     */
+    public function get_icon_name()
+    {
+        return 'attendance';
+    }
 }