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. 23
      main/gradebook/gradebook_add_link.php
  2. 18
      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. 8
      plugin/ims_lti/gradebook/OutcomeForm.php

23
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);
$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) {
$all_categories = Category::load(
@ -31,7 +31,7 @@ if (0 == $session_id) {
} else {
$all_categories = Category::loadSessionCategories(null, $session_id);
}
$category = Category :: load($selectCat);
$category = Category::load($selectCat);
$url = api_get_self().'?selectcat='.$selectCat.'&newtypeselected='.$typeSelected.'&course_code='.api_get_course_id().'&'.api_get_cidreq();
$typeform = new LinkForm(
LinkForm::TYPE_CREATE,
@ -99,16 +99,16 @@ if (isset($typeSelected) && '0' != $typeSelected) {
(isset($addvalues['select_link']) && "" != $addvalues['select_link'])
) {
$sql1 = 'SELECT thread_title from '.$tbl_forum_thread.'
WHERE
c_id = '.$course_info['real_id'].' AND
WHERE
c_id = '.$course_info['real_id'].' AND
thread_id = '.$addvalues['select_link'];
$res1 = Database::query($sql1);
$rowtit = Database::fetch_row($res1);
$course_id = api_get_course_id();
$sql_l = 'SELECT count(*) FROM '.$tbl_link.'
WHERE
ref_id='.$addvalues['select_link'].' AND
course_code="'.$course_id.'" AND
WHERE
ref_id='.$addvalues['select_link'].' AND
course_code="'.$course_id.'" AND
type = 5;';
$res_l = Database::query($sql_l);
$row = Database::fetch_row($res_l);
@ -118,19 +118,16 @@ if (isset($typeSelected) && '0' != $typeSelected) {
thread_qualify_max= "'.api_float_val($addvalues['weight']).'",
thread_weight= "'.api_float_val($addvalues['weight']).'",
thread_title_qualify = "'.$rowtit[0].'"
WHERE
thread_id='.$addvalues['select_link'].' AND
WHERE
thread_id='.$addvalues['select_link'].' AND
c_id = '.$course_info['real_id'].' ';
Database::query($sql);
}
}
$link->add();
$logInfo = [
'tool' => TOOL_GRADEBOOK,
'tool_id' => 0,
'tool_id_detail' => 0,
'action' => 'new-link',
'action_details' => 'selectcat='.$selectCat,
];
@ -156,8 +153,6 @@ if (isset($_GET['selectcat'])) {
$logInfo = [
'tool' => TOOL_GRADEBOOK,
'tool_id' => 0,
'tool_id_detail' => 0,
'action' => 'add-link',
'action_details' => 'selectcat='.$selectCat,
];

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

@ -903,7 +903,7 @@ class GradebookUtils
$session_id = api_get_session_id();
$t = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
$sql = "SELECT * FROM $t
$sql = "SELECT * FROM $t
WHERE course_code = '".Database::escape_string($course_code)."' ";
if (!empty($session_id)) {
$sql .= " AND session_id = ".$session_id;
@ -981,14 +981,14 @@ class GradebookUtils
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());
$select_gradebook->addOption(get_lang('Default'), $my_cat->get_id());
$cats_added[] = $my_cat->get_id();
} 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();
}
} else {
$select_gradebook->addoption(get_lang('Select'), 0);
$select_gradebook->addOption(get_lang('Select'), 0);
}
}
}
@ -1182,10 +1182,10 @@ class GradebookUtils
if (!empty($current_session)) {
$sql = "SELECT user.user_id, user.username, lastname, firstname, official_code
FROM $tbl_session_course_user as scru
FROM $tbl_session_course_user as scru
INNER JOIN $tbl_user as user
ON (scru.user_id = user.user_id)
WHERE
WHERE
scru.status = 0 AND
scru.c_id='$courseId' AND
session_id ='$current_session'
@ -1354,7 +1354,7 @@ class GradebookUtils
$tbl_forum_thread = Database::get_course_table(TABLE_FORUM_THREAD);
$tbl_attendance = Database::get_course_table(TABLE_ATTENDANCE);
$sql = 'UPDATE '.$table_link.'
$sql = 'UPDATE '.$table_link.'
SET weight = '."'".Database::escape_string($weight)."'".'
WHERE id = '.$linkId;
@ -1367,13 +1367,13 @@ class GradebookUtils
$rs_attendance = Database::query($sql);
if (Database::num_rows($rs_attendance) > 0) {
$row_attendance = Database::fetch_array($rs_attendance);
$sql = 'UPDATE '.$tbl_attendance.' SET
$sql = 'UPDATE '.$tbl_attendance.' SET
attendance_weight ='.api_float_val($weight).'
WHERE c_id = '.$course_id.' AND id = '.intval($row_attendance['ref_id']);
Database::query($sql);
}
// Update weight into forum thread
$sql = 'UPDATE '.$tbl_forum_thread.' SET
$sql = 'UPDATE '.$tbl_forum_thread.' SET
thread_weight = '.api_float_val($weight).'
WHERE
c_id = '.$course_id.' AND

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

@ -78,9 +78,9 @@ class CatForm extends FormValidator
$line .= '--';
}
if ($cat[0] != $this->category_object->get_parent_id()) {
$select->addoption($line.' '.$cat[1], $cat[0]);
$select->addOption($line.' '.$cat[1], $cat[0]);
} else {
$select->addoption($line.' '.$cat[1], $cat[0], 'disabled');
$select->addOption($line.' '.$cat[1], $cat[0], 'disabled');
}
$line = '';
}
@ -198,7 +198,7 @@ class CatForm extends FormValidator
$courses = Category::get_all_courses(api_get_user_id());
//only return courses that are not yet created by the teacher
foreach ($courses as $row) {
$select->addoption($row[1], $row[0]);
$select->addOption($row[1], $row[0]);
}
$this->setDefaults([
'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) {
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');
@ -295,7 +295,7 @@ class EvalForm extends FormValidator
for ($i = 0; $i < $cat[2]; $i++) {
$line .= '&mdash;';
}
$select->addoption($line.' '.$cat[1], $cat[0]);
$select->addOption($line.' '.$cat[1], $cat[0]);
$line = '';
}
$this->addButtonSave(get_lang('Ok'), 'submit');
@ -571,14 +571,14 @@ class EvalForm extends FormValidator
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());
$select_gradebook->addOption(get_lang('Default'), $my_cat->get_id());
$cats_added[] = $my_cat->get_id();
} 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();
}
} 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()) {
$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'));
foreach ($link->get_all_links() as $newlink) {
$name = strip_tags(Exercise::get_formated_title_variable($newlink[1]));
$select->addoption($name, $newlink[0]);
$select->addOption($name, $newlink[0]);
}
}
} else {
@ -89,12 +89,12 @@ class LinkAddEditForm extends FormValidator
if (empty($grade_model_id)) {
if (0 == $my_cat->get_parent_id()) {
$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 {
$select_gradebook->addoption($my_cat->get_name(), $my_cat->get_id());
$select_gradebook->addOption($my_cat->get_name(), $my_cat->get_id());
}
} else {
$select_gradebook->addoption(get_lang('Select'), 0);
$select_gradebook->addOption(get_lang('Select'), 0);
}
if ($link->get_category_id() == $my_cat->get_id()) {
$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.
*
* @param int form_type 1=choose link
* @param obj cat_obj the category object
* @param string form name
* @param method
* @param action
* @param obj $link_object the category object
* @param string $form_name name
* @param string $method
* @param string $action
*/
public function __construct(
$form_type,
@ -72,7 +72,7 @@ class LinkForm extends FormValidator
for ($i = 0; $i < $cat[2]; $i++) {
$line .= '&mdash;';
}
$select->addoption($line.' '.$cat[1], $cat[0]);
$select->addOption($line.' '.$cat[1], $cat[0]);
$line = '';
}
$this->addElement('submit', null, get_lang('Ok'));
@ -83,7 +83,7 @@ class LinkForm extends FormValidator
*/
protected function build_create()
{
$this->addElement('header', get_lang('MakeLink'));
$this->addHeader(get_lang('MakeLink'));
$select = $this->addElement(
'select',
'select_link',
@ -92,12 +92,10 @@ class LinkForm extends FormValidator
['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();
$linkTypes = LinkFactory::get_all_types();
foreach ($linkTypes as $linkType) {
// The hot potatoe link will be added "inside" the exercise option.
if ($linkType == LINK_HOTPOTATOES) {
@ -109,9 +107,9 @@ class LinkForm extends FormValidator
// 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');
$select->addOption($link->get_type_name(), $linkType, 'disabled');
} else {
$select->addoption($link->get_type_name(), $linkType);
$select->addOption($link->get_type_name(), $linkType);
}
if ($link->get_type() == LINK_EXERCISE) {
@ -119,12 +117,12 @@ class LinkForm extends FormValidator
$linkHot = $this->createLink(LINK_HOTPOTATOES, $courseCode);
$linkHot->setHp(true);
if ($linkHot->get_all_links(true)) {
$select->addoption(
$select->addOption(
'&nbsp;&nbsp;&nbsp;'.$linkHot->get_type_name(),
LINK_HOTPOTATOES
);
} else {
$select->addoption(
$select->addOption(
'&nbsp;&nbsp;&nbsp;'.$linkHot->get_type_name(),
LINK_HOTPOTATOES,
'disabled'

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

@ -85,14 +85,14 @@ class OutcomeForm extends EvalForm
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());
$select_gradebook->addOption(get_lang('Default'), $my_cat->get_id());
$cats_added[] = $my_cat->get_id();
} 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();
}
} 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()) {
$default_weight = $my_cat->get_weight();
@ -190,4 +190,4 @@ class OutcomeForm extends EvalForm
$this->addButtonCreate(get_lang('AddAssessment'), 'submit');
}
}
}

Write Preview
Loading…
Cancel
Save