chamilo / chamilo-lms

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

Indentation +63 added lines, -63 removed lines

@@ -9,71 +9,71 @@
  */
 class UserForm extends FormValidator
 {
-	const TYPE_USER_INFO= 1;
-	const TYPE_SIMPLE_SEARCH = 3;
-	/**
-	 * Builds a form containing form items based on a given parameter
-	 * @param int form_type 1 = user_info
-	 * @param user array
-	 * @param string form name
-	 * @param method
-	 * @param action
-	 */
-	public function UserForm($form_type, $user, $form_name, $method= 'post', $action= null)
-	{
-		parent :: __construct($form_name, $method, $action);
-		$this->form_type= $form_type;
-		if (isset ($user)) {
-			$this->user_info= $user;
-		}
-		if (isset ($result_object)) {
-			$this->result_object= $result_object;
-		}
-		if ($this->form_type == self :: TYPE_USER_INFO) {
-			$this->build_user_info_form();
-		}
-		elseif ($this->form_type == self :: TYPE_SIMPLE_SEARCH) {
-			$this->build_simple_search();
-		}
-		$this->setDefaults();
-	}
+    const TYPE_USER_INFO= 1;
+    const TYPE_SIMPLE_SEARCH = 3;
+    /**
+     * Builds a form containing form items based on a given parameter
+     * @param int form_type 1 = user_info
+     * @param user array
+     * @param string form name
+     * @param method
+     * @param action
+     */
+    public function UserForm($form_type, $user, $form_name, $method= 'post', $action= null)
+    {
+        parent :: __construct($form_name, $method, $action);
+        $this->form_type= $form_type;
+        if (isset ($user)) {
+            $this->user_info= $user;
+        }
+        if (isset ($result_object)) {
+            $this->result_object= $result_object;
+        }
+        if ($this->form_type == self :: TYPE_USER_INFO) {
+            $this->build_user_info_form();
+        }
+        elseif ($this->form_type == self :: TYPE_SIMPLE_SEARCH) {
+            $this->build_simple_search();
+        }
+        $this->setDefaults();
+    }
 
-	protected function build_simple_search()
-	{
-		if (isset($_GET['search']) && (!empty($_GET['search']))) {
-			$this->setDefaults(array(
-				'keyword' => Security::remove_XSS($_GET['search'])
-			));
-		}
-		$renderer =& $this->defaultRenderer();
-		$renderer->setCustomElementTemplate('<span>{element}</span> ');
-		$this->addElement('text','keyword','');
-		$this->addButtonSearch(get_lang('Search'), 'submit');
-	}
+    protected function build_simple_search()
+    {
+        if (isset($_GET['search']) && (!empty($_GET['search']))) {
+            $this->setDefaults(array(
+                'keyword' => Security::remove_XSS($_GET['search'])
+            ));
+        }
+        $renderer =& $this->defaultRenderer();
+        $renderer->setCustomElementTemplate('<span>{element}</span> ');
+        $this->addElement('text','keyword','');
+        $this->addButtonSearch(get_lang('Search'), 'submit');
+    }
 
-	protected function build_user_info_form()
-	{
-		if (api_is_western_name_order()) {
-			$this->addElement('static', 'fname', get_lang('FirstName'), $this->user_info['firstname']);
-			$this->addElement('static', 'lname', get_lang('LastName'), $this->user_info['lastname']);
-		} else {
-			$this->addElement('static', 'lname', get_lang('LastName'), $this->user_info['lastname']);
-			$this->addElement('static', 'fname', get_lang('FirstName'), $this->user_info['firstname']);
-		}
-		$this->addElement('static', 'uname', get_lang('UserName'), $this->user_info['username']);
-		$this->addElement('static', 'email', get_lang('Email'), '<a href="mailto:' . $this->user_info['email'] . '">' . $this->user_info['email'] . '</a>');
-		$this->addElement('static', 'ofcode', get_lang('OfficialCode'), $this->user_info['official_code']);
-		$this->addElement('static', 'phone', get_lang('Phone'), $this->user_info['phone']);
-		$this->addButtonSave(get_lang('Back'), 'submit');
-	}
+    protected function build_user_info_form()
+    {
+        if (api_is_western_name_order()) {
+            $this->addElement('static', 'fname', get_lang('FirstName'), $this->user_info['firstname']);
+            $this->addElement('static', 'lname', get_lang('LastName'), $this->user_info['lastname']);
+        } else {
+            $this->addElement('static', 'lname', get_lang('LastName'), $this->user_info['lastname']);
+            $this->addElement('static', 'fname', get_lang('FirstName'), $this->user_info['firstname']);
+        }
+        $this->addElement('static', 'uname', get_lang('UserName'), $this->user_info['username']);
+        $this->addElement('static', 'email', get_lang('Email'), '<a href="mailto:' . $this->user_info['email'] . '">' . $this->user_info['email'] . '</a>');
+        $this->addElement('static', 'ofcode', get_lang('OfficialCode'), $this->user_info['official_code']);
+        $this->addElement('static', 'phone', get_lang('Phone'), $this->user_info['phone']);
+        $this->addButtonSave(get_lang('Back'), 'submit');
+    }
 
-	function display()
-	{
-		parent :: display();
-	}
+    function display()
+    {
+        parent :: display();
+    }
 
-	function setDefaults($defaults= array(), $filter = null)
-	{
-		parent :: setDefaults($defaults, $filter);
-	}
+    function setDefaults($defaults= array(), $filter = null)
+    {
+        parent :: setDefaults($defaults, $filter);
+    }
 }

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/linkform.class.php

Indentation +117 added lines, -117 removed lines

@@ -10,133 +10,133 @@
  */
 class LinkForm extends FormValidator
 {
-	const TYPE_CREATE = 1;
-	const TYPE_MOVE = 2;
-	/** @var Category */
-	private $category_object;
-	private $link_object;
-	private $extra;
+    const TYPE_CREATE = 1;
+    const TYPE_MOVE = 2;
+    /** @var Category */
+    private $category_object;
+    private $link_object;
+    private $extra;
 
-	/**
-	 * Builds a form containing form items based on a given parameter
-	 * @param int form_type 1=choose link
-	 * @param obj cat_obj the category object
-	 * @param string form name
-	 * @param method
-	 * @param action
-	 */
-	public function LinkForm(
-		$form_type,
-		$category_object,
-		$link_object,
-		$form_name,
-		$method = 'post',
-		$action = null,
-		$extra = null
-	) {
-		parent :: __construct($form_name, $method, $action);
+    /**
+     * Builds a form containing form items based on a given parameter
+     * @param int form_type 1=choose link
+     * @param obj cat_obj the category object
+     * @param string form name
+     * @param method
+     * @param action
+     */
+    public function LinkForm(
+        $form_type,
+        $category_object,
+        $link_object,
+        $form_name,
+        $method = 'post',
+        $action = null,
+        $extra = null
+    ) {
+        parent :: __construct($form_name, $method, $action);
 
-		if (isset ($category_object)) {
-			$this->category_object = $category_object;
-		} else {
-			if (isset($link_object)) {
-				$this->link_object = $link_object;
-			}
-		}
+        if (isset ($category_object)) {
+            $this->category_object = $category_object;
+        } else {
+            if (isset($link_object)) {
+                $this->link_object = $link_object;
+            }
+        }
 
-		if (isset ($extra)) {
-			$this->extra = $extra;
-		}
-		if ($form_type == self :: TYPE_CREATE) {
-			$this->build_create();
-		} elseif ($form_type == self :: TYPE_MOVE) {
-			$this->build_move();
-		}
-	}
+        if (isset ($extra)) {
+            $this->extra = $extra;
+        }
+        if ($form_type == self :: TYPE_CREATE) {
+            $this->build_create();
+        } elseif ($form_type == self :: TYPE_MOVE) {
+            $this->build_move();
+        }
+    }
 
-	protected function build_move()
-	{
-		$renderer =& $this->defaultRenderer();
-		$renderer->setCustomElementTemplate('<span>{element}</span> ');
-		$this->addElement('static',null,null,'"'.$this->link_object->get_name().'" ');
-		$this->addElement('static',null,null,get_lang('MoveTo').' : ');
-		$select = $this->addElement('select','move_cat',null,null);
-		$line = '';
-		foreach ($this->link_object->get_target_categories() as $cat) {
-			for ($i=0;$i<$cat[2];$i++) {
-				$line .= '&mdash;';
-			}
-			$select->addoption($line.' '.$cat[1],$cat[0]);
-			$line = '';
-		}
-		$this->addElement('submit', null, get_lang('Ok'));
-	}
+    protected function build_move()
+    {
+        $renderer =& $this->defaultRenderer();
+        $renderer->setCustomElementTemplate('<span>{element}</span> ');
+        $this->addElement('static',null,null,'"'.$this->link_object->get_name().'" ');
+        $this->addElement('static',null,null,get_lang('MoveTo').' : ');
+        $select = $this->addElement('select','move_cat',null,null);
+        $line = '';
+        foreach ($this->link_object->get_target_categories() as $cat) {
+            for ($i=0;$i<$cat[2];$i++) {
+                $line .= '&mdash;';
+            }
+            $select->addoption($line.' '.$cat[1],$cat[0]);
+            $line = '';
+        }
+        $this->addElement('submit', null, get_lang('Ok'));
+    }
 
-	/**
-	 * Builds the form
-	 */
-	protected function build_create()
-	{
-		$this->addElement('header', get_lang('MakeLink'));
-		$select = $this->addElement(
-			'select',
-			'select_link',
-			get_lang('ChooseLink'),
-			null,
-			array('onchange' => 'document.create_link.submit()')
-		);
+    /**
+     * Builds the form
+     */
+    protected function build_create()
+    {
+        $this->addElement('header', get_lang('MakeLink'));
+        $select = $this->addElement(
+            'select',
+            'select_link',
+            get_lang('ChooseLink'),
+            null,
+            array('onchange' => 'document.create_link.submit()')
+        );
 
-		$linkTypes = LinkFactory::get_all_types();
+        $linkTypes = LinkFactory::get_all_types();
 
-		$select->addoption('['.get_lang('ChooseLink').']', 0);
+        $select->addoption('['.get_lang('ChooseLink').']', 0);
 
-		$courseCode = $this->category_object->get_course_code();
+        $courseCode = $this->category_object->get_course_code();
 
-		foreach ($linkTypes as $linkType) {
-			// The hot potatoe link will be added "inside" the exercise option.
-			if ($linkType == LINK_HOTPOTATOES) {
-				continue;
-			}
-			$link = $this->createLink($linkType, $courseCode);
-			// disable this element if the link works with a dropdownlist
-			// and if there are no links left
-			if (!$link->needs_name_and_description() && count($link->get_all_links()) == '0') {
-				$select->addoption($link->get_type_name(), $linkType, 'disabled');
-			} else {
-				if ($link->get_type() == LINK_EXERCISE) {
-					// Adding exercise
-					$select->addoption($link->get_type_name(), $linkType);
-					// Adding hot potatoes
-					$linkHot = $this->createLink(LINK_HOTPOTATOES, $courseCode);
-					$select->addoption(
-						'&nbsp;&nbsp;&nbsp;'.$linkHot->get_type_name(),
-						LINK_HOTPOTATOES
-					);
-				} else {
-					$select->addoption($link->get_type_name(), $linkType);
-				}
-			}
-		}
+        foreach ($linkTypes as $linkType) {
+            // The hot potatoe link will be added "inside" the exercise option.
+            if ($linkType == LINK_HOTPOTATOES) {
+                continue;
+            }
+            $link = $this->createLink($linkType, $courseCode);
+            // disable this element if the link works with a dropdownlist
+            // and if there are no links left
+            if (!$link->needs_name_and_description() && count($link->get_all_links()) == '0') {
+                $select->addoption($link->get_type_name(), $linkType, 'disabled');
+            } else {
+                if ($link->get_type() == LINK_EXERCISE) {
+                    // Adding exercise
+                    $select->addoption($link->get_type_name(), $linkType);
+                    // Adding hot potatoes
+                    $linkHot = $this->createLink(LINK_HOTPOTATOES, $courseCode);
+                    $select->addoption(
+                        '&nbsp;&nbsp;&nbsp;'.$linkHot->get_type_name(),
+                        LINK_HOTPOTATOES
+                    );
+                } else {
+                    $select->addoption($link->get_type_name(), $linkType);
+                }
+            }
+        }
 
-		if (isset($this->extra)) {
-			$this->setDefaults(array('select_link' => $this->extra));
-		}
-	}
+        if (isset($this->extra)) {
+            $this->setDefaults(array('select_link' => $this->extra));
+        }
+    }
 
-	/**
-	 * @param $link
-	 * @param $courseCode
-	 * @return AttendanceLink|DropboxLink|ExerciseLink|ForumThreadLink|LearnpathLink|null|StudentPublicationLink|SurveyLink
-	 */
-	private function createLink($link, $courseCode)
-	{
-		$link = LinkFactory::create($link);
-		if (!empty($courseCode)) {
-			$link->set_course_code($courseCode);
-		} elseif(!empty($_GET['course_code'])) {
-			$link->set_course_code(Database::escape_string($_GET['course_code'], null, false));
-		}
+    /**
+     * @param $link
+     * @param $courseCode
+     * @return AttendanceLink|DropboxLink|ExerciseLink|ForumThreadLink|LearnpathLink|null|StudentPublicationLink|SurveyLink
+     */
+    private function createLink($link, $courseCode)
+    {
+        $link = LinkFactory::create($link);
+        if (!empty($courseCode)) {
+            $link->set_course_code($courseCode);
+        } elseif(!empty($_GET['course_code'])) {
+            $link->set_course_code(Database::escape_string($_GET['course_code'], null, false));
+        }
 
-		return $link;
-	}
+        return $link;
+    }
 }

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);
 }