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 - Improve code

Browse Source
pull/2487/head
jmontoyaa 10 years ago
parent eb9f5c407b
commit b0e46fde2b
1 changed files with 25 additions and 20 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. 45
      main/work/work.lib.php

45
main/work/work.lib.php
Unescape View File

@ -3083,7 +3083,7 @@ function getLastWorkStudentFromParentByUser(
$sessionCondition = api_get_session_condition($sessionId);
$sql = "SELECT *
FROM $work
FROM $work
WHERE
user_id = $userId
$sessionCondition AND
@ -3231,9 +3231,9 @@ function addWorkComment($courseInfo, $userId, $parentWork, $work, $data)
$content = sprintf(get_lang('ThereIsANewWorkFeedbackInWorkXHere'), $work['title'], $url);
if (!empty($userIdListToSend)) {
foreach ($userIdListToSend as $userId) {
foreach ($userIdListToSend as $userIdToSend) {
MessageManager::send_message_simple(
$userId,
$userIdToSend,
$subject,
$content
);
@ -3297,7 +3297,6 @@ function getWorkDateValidationStatus($homework)
$has_ended = false;
if (!empty($homework)) {
if (!empty($homework['expires_on']) || !empty($homework['ends_on'])) {
$time_now = time();
@ -4201,9 +4200,9 @@ function getFormWork($form, $defaults = array())
$form->addButtonAdvancedSettings('advanced_params', get_lang('AdvancedParameters'));
if (!empty($defaults) && (isset($defaults['enableEndDate']) || isset($defaults['enableExpiryDate']))) {
$form->addElement('html', '<div id="advanced_params_options" style="display:block">');
$form->addHtml('<div id="advanced_params_options" style="display:block">');
} else {
$form->addElement('html', '<div id="advanced_params_options" style="display:none">');
$form->addHtml('<div id="advanced_params_options" style="display:none">');
}
// QualificationOfAssignment
@ -4226,22 +4225,22 @@ function getFormWork($form, $defaults = array())
}
if (!empty($defaults) && isset($defaults['category_id'])) {
$form->addElement('html', '<div id=\'option1\' style="display:block">');
$form->addHtml('<div id=\'option1\' style="display:block">');
} else {
$form->addElement('html', '<div id=\'option1\' style="display:none">');
$form->addHtml('<div id=\'option1\' style="display:none">');
}
// Loading Gradebook select
GradebookUtils::load_gradebook_select_in_tool($form);
$form->addElement('text', 'weight', get_lang('WeightInTheGradebook'));
$form->addElement('html', '</div>');
$form->addHtml('</div>');
$form->addElement('checkbox', 'enableExpiryDate', null, get_lang('EnableExpiryDate'), 'id="expiry_date"');
if (isset($defaults['enableExpiryDate']) && $defaults['enableExpiryDate']) {
$form->addElement('html', '<div id="option2" style="display: block;">');
$form->addHtml('<div id="option2" style="display: block;">');
} else {
$form->addElement('html', '<div id="option2" style="display: none;">');
$form->addHtml('<div id="option2" style="display: none;">');
}
$currentDate = substr(api_get_local_time(), 0, 10);
@ -4251,8 +4250,7 @@ function getFormWork($form, $defaults = array())
}
$form->addElement('date_time_picker', 'expires_on', get_lang('ExpiresAt'));
$form->addElement('html', '</div>');
$form->addHtml('</div>');
$form->addElement('checkbox', 'enableEndDate', null, get_lang('EnableEndDate'), 'id="end_date"');
if (!isset($defaults['ends_on'])) {
@ -4260,18 +4258,18 @@ function getFormWork($form, $defaults = array())
$defaults['ends_on'] = $date.' 23:59';
}
if (isset($defaults['enableEndDate']) && $defaults['enableEndDate']) {
$form->addElement('html', '<div id="option3" style="display: block;">');
$form->addHtml('<div id="option3" style="display: block;">');
} else {
$form->addElement('html', '<div id="option3" style="display: none;">');
$form->addHtml('<div id="option3" style="display: none;">');
}
$form->addElement('date_time_picker', 'ends_on', get_lang('EndsAt'));
$form->addElement('html', '</div>');
$form->addHtml('</div>');
$form->addElement('checkbox', 'add_to_calendar', null, get_lang('AddToCalendar'));
$form->addElement('select', 'allow_text_assignment', get_lang('DocumentType'), getUploadDocumentType());
$form->addElement('html', '</div>');
$form->addHtml('</div>');
if (isset($defaults['enableExpiryDate']) && isset($defaults['enableEndDate'])) {
$form->addRule(array('expires_on', 'ends_on'), get_lang('DateExpiredNotBeLessDeadLine'), 'comparedate');
@ -4307,7 +4305,12 @@ function updateSettings($courseInfo, $showScore, $studentDeleteOwnPublication)
$main_course_table = Database :: get_main_table(TABLE_MAIN_COURSE);
$table_course_setting = Database :: get_course_table(TOOL_COURSE_SETTING);
$query = "UPDATE ".$main_course_table." SET show_score = '".$showScore."'
if (empty($courseId)) {
return false;
}
$query = "UPDATE $main_course_table
SET show_score = '$showScore'
WHERE id = $courseId";
Database::query($query);
@ -4321,8 +4324,10 @@ function updateSettings($courseInfo, $showScore, $studentDeleteOwnPublication)
// changing the tool setting: is a student allowed to delete his/her own document
// counting the number of occurrences of this setting (if 0 => add, if 1 => update)
$query = "SELECT * FROM " . $table_course_setting . "
WHERE c_id = $courseId AND variable = 'student_delete_own_publication'";
$query = "SELECT * FROM $table_course_setting
WHERE
c_id = $courseId AND
variable = 'student_delete_own_publication'";
$result = Database::query($query);
$number_of_setting = Database::num_rows($result);

Write Preview
Loading…
Cancel
Save