chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - Fix function name addoption to addOption + format code

Browse Source
pull/3356/head
Julio Montoya 5 years ago
parent 8955889a6d
commit d95be45cba
7 changed files with 46 additions and 53 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      main/gradebook/gradebook_add_link.php
  2. 6
      main/gradebook/lib/GradebookUtils.php
  3. 6
      main/gradebook/lib/fe/catform.class.php
  4. 10
      main/gradebook/lib/fe/evalform.class.php
  5. 8
      main/gradebook/lib/fe/linkaddeditform.class.php
  6. 26
      main/gradebook/lib/fe/linkform.class.php
  7. 6
      plugin/ims_lti/gradebook/OutcomeForm.php

7
main/gradebook/gradebook_add_link.php
Unescape View File

@ -17,7 +17,7 @@ $tbl_forum_thread = Database::get_course_table(TABLE_FORUM_THREAD);
$tbl_link = Database::get_main_table(TABLE_MAIN_GRADEBOOK_LINK); $tbl_link = Database::get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
$session_id = api_get_session_id(); $session_id = api_get_session_id();
$typeSelected = isset($_GET['typeselected']) ? intval($_GET['typeselected']) : null; $typeSelected = isset($_GET['typeselected']) ? (int) $_GET['typeselected'] : null;
if (0 == $session_id) { if (0 == $session_id) {
$all_categories = Category::load( $all_categories = Category::load(
@ -126,11 +126,8 @@ if (isset($typeSelected) && '0' != $typeSelected) {
} }
$link->add(); $link->add();
$logInfo = [ $logInfo = [
'tool' => TOOL_GRADEBOOK, 'tool' => TOOL_GRADEBOOK,
'tool_id' => 0,
'tool_id_detail' => 0,
'action' => 'new-link', 'action' => 'new-link',
'action_details' => 'selectcat='.$selectCat, 'action_details' => 'selectcat='.$selectCat,
]; ];
@ -156,8 +153,6 @@ if (isset($_GET['selectcat'])) {
$logInfo = [ $logInfo = [
'tool' => TOOL_GRADEBOOK, 'tool' => TOOL_GRADEBOOK,
'tool_id' => 0,
'tool_id_detail' => 0,
'action' => 'add-link', 'action' => 'add-link',
'action_details' => 'selectcat='.$selectCat, 'action_details' => 'selectcat='.$selectCat,
]; ];

6
main/gradebook/lib/GradebookUtils.php
Unescape View File

@ -981,14 +981,14 @@ class GradebookUtils
if (empty($grade_model_id)) { if (empty($grade_model_id)) {
if ($my_cat->get_parent_id() == 0) { if ($my_cat->get_parent_id() == 0) {
//$default_weight = $my_cat->get_weight(); //$default_weight = $my_cat->get_weight();
$select_gradebook->addoption(get_lang('Default'), $my_cat->get_id()); $select_gradebook->addOption(get_lang('Default'), $my_cat->get_id());
$cats_added[] = $my_cat->get_id(); $cats_added[] = $my_cat->get_id();
} else { } else {
$select_gradebook->addoption($my_cat->get_name(), $my_cat->get_id()); $select_gradebook->addOption($my_cat->get_name(), $my_cat->get_id());
$cats_added[] = $my_cat->get_id(); $cats_added[] = $my_cat->get_id();
} }
} else { } else {
$select_gradebook->addoption(get_lang('Select'), 0); $select_gradebook->addOption(get_lang('Select'), 0);
} }
} }
} }

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

@ -78,9 +78,9 @@ class CatForm extends FormValidator
$line .= '--'; $line .= '--';
} }
if ($cat[0] != $this->category_object->get_parent_id()) { if ($cat[0] != $this->category_object->get_parent_id()) {
$select->addoption($line.' '.$cat[1], $cat[0]); $select->addOption($line.' '.$cat[1], $cat[0]);
} else { } else {
$select->addoption($line.' '.$cat[1], $cat[0], 'disabled'); $select->addOption($line.' '.$cat[1], $cat[0], 'disabled');
} }
$line = ''; $line = '';
} }
@ -198,7 +198,7 @@ class CatForm extends FormValidator
$courses = Category::get_all_courses(api_get_user_id()); $courses = Category::get_all_courses(api_get_user_id());
//only return courses that are not yet created by the teacher //only return courses that are not yet created by the teacher
foreach ($courses as $row) { foreach ($courses as $row) {
$select->addoption($row[1], $row[0]); $select->addOption($row[1], $row[0]);
} }
$this->setDefaults([ $this->setDefaults([
'hid_user_id' => $this->category_object->get_user_id(), 'hid_user_id' => $this->category_object->get_user_id(),

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

@ -147,7 +147,7 @@ class EvalForm extends FormValidator
foreach ($this->evaluation_object->get_not_subscribed_students() as $user) { foreach ($this->evaluation_object->get_not_subscribed_students() as $user) {
if ((!isset($this->extra)) || empty($this->extra) || api_strtoupper(api_substr($user[1], 0, 1)) == $this->extra if ((!isset($this->extra)) || empty($this->extra) || api_strtoupper(api_substr($user[1], 0, 1)) == $this->extra
) { ) {
$select->addoption($user[1].' '.$user[2].' ('.$user[3].')', $user[0]); $select->addOption($user[1].' '.$user[2].' ('.$user[3].')', $user[0]);
} }
} }
$this->addButtonCreate(get_lang('AddUserToEval'), 'submit_button'); $this->addButtonCreate(get_lang('AddUserToEval'), 'submit_button');
@ -295,7 +295,7 @@ class EvalForm extends FormValidator
for ($i = 0; $i < $cat[2]; $i++) { for ($i = 0; $i < $cat[2]; $i++) {
$line .= '&mdash;'; $line .= '&mdash;';
} }
$select->addoption($line.' '.$cat[1], $cat[0]); $select->addOption($line.' '.$cat[1], $cat[0]);
$line = ''; $line = '';
} }
$this->addButtonSave(get_lang('Ok'), 'submit'); $this->addButtonSave(get_lang('Ok'), 'submit');
@ -571,14 +571,14 @@ class EvalForm extends FormValidator
if (empty($grade_model_id)) { if (empty($grade_model_id)) {
if ($my_cat->get_parent_id() == 0) { if ($my_cat->get_parent_id() == 0) {
$default_weight = $my_cat->get_weight(); $default_weight = $my_cat->get_weight();
$select_gradebook->addoption(get_lang('Default'), $my_cat->get_id()); $select_gradebook->addOption(get_lang('Default'), $my_cat->get_id());
$cats_added[] = $my_cat->get_id(); $cats_added[] = $my_cat->get_id();
} else { } else {
$select_gradebook->addoption($my_cat->get_name(), $my_cat->get_id()); $select_gradebook->addOption($my_cat->get_name(), $my_cat->get_id());
$cats_added[] = $my_cat->get_id(); $cats_added[] = $my_cat->get_id();
} }
} else { } else {
$select_gradebook->addoption(get_lang('Select'), 0); $select_gradebook->addOption(get_lang('Select'), 0);
} }
if ($this->evaluation_object->get_category_id() == $my_cat->get_id()) { if ($this->evaluation_object->get_category_id() == $my_cat->get_id()) {
$default_weight = $my_cat->get_weight(); $default_weight = $my_cat->get_weight();

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

@ -52,7 +52,7 @@ class LinkAddEditForm extends FormValidator
$select = $this->addElement('select', 'select_link', get_lang('ChooseItem')); $select = $this->addElement('select', 'select_link', get_lang('ChooseItem'));
foreach ($link->get_all_links() as $newlink) { foreach ($link->get_all_links() as $newlink) {
$name = strip_tags(Exercise::get_formated_title_variable($newlink[1])); $name = strip_tags(Exercise::get_formated_title_variable($newlink[1]));
$select->addoption($name, $newlink[0]); $select->addOption($name, $newlink[0]);
} }
} }
} else { } else {
@ -89,12 +89,12 @@ class LinkAddEditForm extends FormValidator
if (empty($grade_model_id)) { if (empty($grade_model_id)) {
if (0 == $my_cat->get_parent_id()) { if (0 == $my_cat->get_parent_id()) {
$default_weight = $my_cat->get_weight(); $default_weight = $my_cat->get_weight();
$select_gradebook->addoption(get_lang('Default'), $my_cat->get_id()); $select_gradebook->addOption(get_lang('Default'), $my_cat->get_id());
} else { } else {
$select_gradebook->addoption($my_cat->get_name(), $my_cat->get_id()); $select_gradebook->addOption($my_cat->get_name(), $my_cat->get_id());
} }
} else { } else {
$select_gradebook->addoption(get_lang('Select'), 0); $select_gradebook->addOption(get_lang('Select'), 0);
} }
if ($link->get_category_id() == $my_cat->get_id()) { if ($link->get_category_id() == $my_cat->get_id()) {
$default_weight = $my_cat->get_weight(); $default_weight = $my_cat->get_weight();

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

@ -21,10 +21,10 @@ class LinkForm extends FormValidator
* Builds a form containing form items based on a given parameter. * Builds a form containing form items based on a given parameter.
* *
* @param int form_type 1=choose link * @param int form_type 1=choose link
* @param obj cat_obj the category object * @param obj $link_object the category object
* @param string form name * @param string $form_name name
* @param method * @param string $method
* @param action * @param string $action
*/ */
public function __construct( public function __construct(
$form_type, $form_type,
@ -72,7 +72,7 @@ class LinkForm extends FormValidator
for ($i = 0; $i < $cat[2]; $i++) { for ($i = 0; $i < $cat[2]; $i++) {
$line .= '&mdash;'; $line .= '&mdash;';
} }
$select->addoption($line.' '.$cat[1], $cat[0]); $select->addOption($line.' '.$cat[1], $cat[0]);
$line = ''; $line = '';
} }
$this->addElement('submit', null, get_lang('Ok')); $this->addElement('submit', null, get_lang('Ok'));
@ -83,7 +83,7 @@ class LinkForm extends FormValidator
*/ */
protected function build_create() protected function build_create()
{ {
$this->addElement('header', get_lang('MakeLink')); $this->addHeader(get_lang('MakeLink'));
$select = $this->addElement( $select = $this->addElement(
'select', 'select',
'select_link', 'select_link',
@ -92,12 +92,10 @@ class LinkForm extends FormValidator
['onchange' => 'document.create_link.submit()'] ['onchange' => 'document.create_link.submit()']
); );
$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();
$linkTypes = LinkFactory::get_all_types();
foreach ($linkTypes as $linkType) { foreach ($linkTypes as $linkType) {
// The hot potatoe link will be added "inside" the exercise option. // The hot potatoe link will be added "inside" the exercise option.
if ($linkType == LINK_HOTPOTATOES) { if ($linkType == LINK_HOTPOTATOES) {
@ -109,9 +107,9 @@ class LinkForm extends FormValidator
// disable this element if the link works with a dropdownlist // disable this element if the link works with a dropdownlist
// and if there are no links left // and if there are no links left
if (!$link->needs_name_and_description() && count($link->get_all_links()) == '0') { if (!$link->needs_name_and_description() && count($link->get_all_links()) == '0') {
$select->addoption($link->get_type_name(), $linkType, 'disabled'); $select->addOption($link->get_type_name(), $linkType, 'disabled');
} else { } else {
$select->addoption($link->get_type_name(), $linkType); $select->addOption($link->get_type_name(), $linkType);
} }
if ($link->get_type() == LINK_EXERCISE) { if ($link->get_type() == LINK_EXERCISE) {
@ -119,12 +117,12 @@ class LinkForm extends FormValidator
$linkHot = $this->createLink(LINK_HOTPOTATOES, $courseCode); $linkHot = $this->createLink(LINK_HOTPOTATOES, $courseCode);
$linkHot->setHp(true); $linkHot->setHp(true);
if ($linkHot->get_all_links(true)) { if ($linkHot->get_all_links(true)) {
$select->addoption( $select->addOption(
'&nbsp;&nbsp;&nbsp;'.$linkHot->get_type_name(), '&nbsp;&nbsp;&nbsp;'.$linkHot->get_type_name(),
LINK_HOTPOTATOES LINK_HOTPOTATOES
); );
} else { } else {
$select->addoption( $select->addOption(
'&nbsp;&nbsp;&nbsp;'.$linkHot->get_type_name(), '&nbsp;&nbsp;&nbsp;'.$linkHot->get_type_name(),
LINK_HOTPOTATOES, LINK_HOTPOTATOES,
'disabled' 'disabled'

6
plugin/ims_lti/gradebook/OutcomeForm.php
Unescape View File

@ -85,14 +85,14 @@ class OutcomeForm extends EvalForm
if (empty($grade_model_id)) { if (empty($grade_model_id)) {
if ($my_cat->get_parent_id() == 0) { if ($my_cat->get_parent_id() == 0) {
$default_weight = $my_cat->get_weight(); $default_weight = $my_cat->get_weight();
$select_gradebook->addoption(get_lang('Default'), $my_cat->get_id()); $select_gradebook->addOption(get_lang('Default'), $my_cat->get_id());
$cats_added[] = $my_cat->get_id(); $cats_added[] = $my_cat->get_id();
} else { } else {
$select_gradebook->addoption($my_cat->get_name(), $my_cat->get_id()); $select_gradebook->addOption($my_cat->get_name(), $my_cat->get_id());
$cats_added[] = $my_cat->get_id(); $cats_added[] = $my_cat->get_id();
} }
} else { } else {
$select_gradebook->addoption(get_lang('Select'), 0); $select_gradebook->addOption(get_lang('Select'), 0);
} }
if ($this->evaluation_object->get_category_id() == $my_cat->get_id()) { if ($this->evaluation_object->get_category_id() == $my_cat->get_id()) {
$default_weight = $my_cat->get_weight(); $default_weight = $my_cat->get_weight();

Write Preview
Loading…
Cancel
Save