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 - Format code - refs BT#18221

Browse Source
pull/3886/head
Angel Fernando Quiroz Campos 4 years ago
parent 2be2792347
commit 9bf9508e5c
3 changed files with 106 additions and 151 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. 165
      main/exercise/exercise.class.php
  2. 86
      main/exercise/exercise.php
  3. 6
      main/lp/lp_controller.php

165
main/exercise/exercise.class.php
Unescape View File

@ -9661,7 +9661,8 @@ class Exercise
[
'href' => '#!',
'onclick' => 'showUserToSendNotificacion(this)',
'data-link' => 'exercise.php?'.api_get_cidreq().'&choice=send_reminder&sec_token='.$token.'&exerciseId='.$row['id'],
'data-link' => 'exercise.php?'.api_get_cidreq()
.'&choice=send_reminder&sec_token='.$token.'&exerciseId='.$row['id'],
]
);
}
@ -10967,81 +10968,69 @@ class Exercise
$toUsers = [],
$withSelectAll = true
) {
$data = [];
$sessionId = empty($sessionId) ? api_get_session_id() : (int) $sessionId;
$courseId = empty($courseId) ? api_get_course_id() : (int) $courseId;
$exerciseId = (int) $exerciseId;
if ((0 == $sessionId && 0 == $courseId) || 0 == $exerciseId) {
return $data;
return [];
}
$tblCourse = Database::get_main_table(TABLE_MAIN_COURSE);
$tblCourseRelUser = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$tblSessionRelUser = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$data = [];
$tblQuiz = Database::get_course_table(TABLE_QUIZ_TEST);
$countSelect = " count(*) as total";
$countSelect = " COUNT(*) AS total ";
$sqlToUsers = '';
if (0 == $sessionId) {
// Courses
if (false === $count) {
$countSelect = "
cq.title as quiz_title,
cq.iid as quiz_id,
cru.c_id as course_id,
cru.user_id as user_id,
c.title as title,
c.`code` as 'code',
cq.active as active,
cq.session_id as session_id
";
}
$sql = "
SELECT
$countSelect
FROM
$tblCourseRelUser as cru
INNER JOIN $tblCourse as c ON ( cru.c_id = c.id )
INNER JOIN $tblQuiz as cq ON ( cq.c_id = c.id )
WHERE
cru.is_tutor is null
AND ( cq.session_id = 0 or cq.session_id is null)
AND cq.active > 0
AND cq.c_id = $courseId
AND cq.iid = $exerciseId
";
$countSelect = " cq.title AS quiz_title,
cq.iid AS quiz_id,
cru.c_id AS course_id,
cru.user_id AS user_id,
c.title AS title,
c.code AS 'code',
cq.active AS active,
cq.session_id AS session_id ";
}
$sql = "SELECT $countSelect
FROM $tblCourseRelUser AS cru
INNER JOIN $tblCourse AS c ON ( cru.c_id = c.id )
INNER JOIN $tblQuiz AS cq ON ( cq.c_id = c.id )
WHERE cru.is_tutor IS NULL
AND ( cq.session_id = 0 OR cq.session_id IS NULL)
AND cq.active > 0
AND cq.c_id = $courseId
AND cq.iid = $exerciseId ";
if (!empty($toUsers)) {
$sqlToUsers = ' AND cru.user_id IN ('.implode(',', $toUsers).') ';
}
} else {
//Sessions
if (false === $count) {
$countSelect = "
cq.title as quiz_title,
cq.iid as quiz_id,
sru.user_id as user_id,
cq.c_id as course_id,
sru.session_id as session_id,
c.title as title,
c.`code` as 'code',
cq.active as active
";
$countSelect = " cq.title AS quiz_title,
cq.iid AS quiz_id,
sru.user_id AS user_id,
cq.c_id AS course_id,
sru.session_id AS session_id,
c.title AS title,
c.code AS 'code',
cq.active AS active ";
}
if (!empty($toUsers)) {
$sqlToUsers = ' AND sru.user_id IN ('.implode(',', $toUsers).') ';
}
$sql = "
SELECT
$countSelect
FROM
$tblSessionRelUser AS sru
INNER JOIN $tblQuiz AS cq ON ( sru.session_id = sru.session_id )
INNER JOIN $tblCourse AS c ON ( c.id = cq.c_id )
WHERE
cq.active > 0
AND cq.c_id = $courseId
AND sru.session_id = $sessionId
AND cq.iid = $exerciseId
";
$sql = " SELECT $countSelect
FROM $tblSessionRelUser AS sru
INNER JOIN $tblQuiz AS cq ON ( sru.session_id = sru.session_id )
INNER JOIN $tblCourse AS c ON ( c.id = cq.c_id )
WHERE cq.active > 0
AND cq.c_id = $courseId
AND sru.session_id = $sessionId
AND cq.iid = $exerciseId ";
}
$sql .= " $sqlToUsers ORDER BY cq.c_id ";
@ -11133,14 +11122,9 @@ class Exercise
$teachersName = [];
$teachersPrint = [];
if (0 == $sessionId) {
$sql = "
SELECT
course_user.user_id as user_id
FROM
$tblCourseUser as course_user
WHERE
course_user.status='1' AND
course_user.c_id ='".$courseId."'";
$sql = "SELECT course_user.user_id AS user_id
FROM $tblCourseUser AS course_user
WHERE course_user.status = 1 AND course_user.c_id ='".$courseId."'";
$result = Database::query($sql);
$data = Database::store_result($result);
Database::free_result($result);
@ -11154,14 +11138,9 @@ class Exercise
}
} else {
// general tutor
$sql = "
SELECT
sesion.id_coach AS user_id
FROM
`$tblSession` AS sesion
WHERE
sesion.id = $sessionId
";
$sql = "SELECT sesion.id_coach AS user_id
FROM $tblSession AS sesion
WHERE sesion.id = $sessionId";
$result = Database::query($sql);
$data = Database::store_result($result);
Database::free_result($result);
@ -11174,16 +11153,11 @@ class Exercise
$teachersPrint[] = $teacherData['complete_name'];
}
// Teacher into sessions course
$sql = "
SELECT
session_rel_course_rel_user.user_id
FROM
$tblSessionUserRelCourse AS session_rel_course_rel_user
WHERE
session_rel_course_rel_user.session_id = $sessionId AND
session_rel_course_rel_user.c_id = $courseId AND
session_rel_course_rel_user.status = 2
";
$sql = "SELECT session_rel_course_rel_user.user_id
FROM $tblSessionUserRelCourse AS session_rel_course_rel_user
WHERE session_rel_course_rel_user.session_id = $sessionId AND
session_rel_course_rel_user.c_id = $courseId AND
session_rel_course_rel_user.status = 2";
$result = Database::query($sql);
$data = Database::store_result($result);
Database::free_result($result);
@ -11202,7 +11176,8 @@ class Exercise
foreach ($usersArray as $userId => $userData) {
$studentName = $userData['complete_name'];
$title = sprintf(get_lang('QuizRemindSubject'), $teacherName);
$content = sprintf(get_lang('QuizFirstRemindBody'),
$content = sprintf(
get_lang('QuizFirstRemindBody'),
$studentName,
$quizTitle,
$courseTitle,
@ -11210,25 +11185,20 @@ class Exercise
$quizTitle
);
if (!empty($minutes)) {
$content .= sprintf(get_lang('QuizRemindDuration'),
$minutes
);
$content .= sprintf(get_lang('QuizRemindDuration'), $minutes);
}
if (!empty($start)) {
// api_get_utc_datetime
$start = api_format_date(($start), $formatDate);
$content .= sprintf(get_lang('QuizRemindStartDate'),
$start
);
$content .= sprintf(get_lang('QuizRemindStartDate'), $start);
}
if (!empty($end)) {
$end = api_format_date(($end), $formatDate);
$content .= sprintf(get_lang('QuizRemindEndDate'),
$end
);
$content .= sprintf(get_lang('QuizRemindEndDate'), $end);
}
$content .= sprintf(get_lang('QuizLastRemindBody'),
$content .= sprintf(
get_lang('QuizLastRemindBody'),
$link,
$link,
$teacherName
@ -11238,7 +11208,8 @@ class Exercise
foreach ($drhList as $drhUser) {
$drhUserData = api_get_user_info($drhUser['id']);
$drhName = $drhUserData['complete_name'];
$contentDHR = sprintf(get_lang('QuizDhrRemindBody'),
$contentDHR = sprintf(
get_lang('QuizDhrRemindBody'),
$drhName,
$studentName,
$quizTitle,
@ -11248,23 +11219,17 @@ class Exercise
$quizTitle
);
if (!empty($minutes)) {
$contentDHR .= sprintf(get_lang('QuizRemindDuration'),
$minutes
);
$contentDHR .= sprintf(get_lang('QuizRemindDuration'), $minutes);
}
if (!empty($start)) {
// api_get_utc_datetime
$start = api_format_date(($start), $formatDate);
$contentDHR .= sprintf(get_lang('QuizRemindStartDate'),
$start
);
$contentDHR .= sprintf(get_lang('QuizRemindStartDate'), $start);
}
if (!empty($end)) {
$end = api_format_date(($end), $formatDate);
$contentDHR .= sprintf(get_lang('QuizRemindEndDate'),
$end
);
$contentDHR .= sprintf(get_lang('QuizRemindEndDate'), $end);
}
MessageManager::send_message(
$drhUser['id'],

86
main/exercise/exercise.php
Unescape View File

@ -19,47 +19,40 @@ $this_section = SECTION_COURSES;
$htmlHeadXtra[] = api_get_asset('qtip2/jquery.qtip.min.js');
$htmlHeadXtra[] = api_get_css_asset('qtip2/jquery.qtip.min.css');
$htmlHeadXtra[] = "
<div class=\"modal fade\" id=\"NotificarUsuarios\" tabindex=\"-1\" role=\"dialog\" aria-labelledby=\"myModalLabel\">
<div class=\"modal-dialog\" role=\"document\">
<div class=\"modal-content\">
<div class=\"modal-header\">
<button type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-label=\"Close\">
<span aria-hidden=\"true\">&times;</span></button>
<h4 class=\"modal-title\" id=\"myModalLabel\">
</h4>
$htmlHeadXtra[] = '
<div class="modal fade" id="NotificarUsuarios" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="'.get_lang('Close').'">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class=\"modal-body\">
<form action=\"#\" class=\"form-horizontal\">
<div class='col-md-6'>
".get_lang('EmailNotifySubscription')."
<div class="modal-body">
<form action="#" class="form-horizontal">
<div class="row">
<div class="col-md-6" id="myModalLabel">'.get_lang('EmailNotifySubscription').'</div>
<div class="col-md-6">
<select class="selectpicker form-control" multiple="multiple" id="toUsers" name="toUsers">
<option value="">-</option>
</select>
</div>
</div>
<div class='col-md-6'>
<select
class=\"selectpicker form-control\"
multiple=\"multiple\"
id=\"toUsers\"
name=\"toUsers\"
>
<option value=\"\">-</option>
</select>
</div>
<input class='hidden' id='urlTo' type='hidden'>
<input class="hidden" id="urlTo" type="hidden">
</form>
<div class='clearfix clear-fix'></div>
<div class="clearfix clear-fix"></div>
</div>
<div class=\"modal-footer\">
<button type=\"button\" class=\"btn btn-default\" onclick='sendNotificationToUsers()' data-dismiss=\"modal\">".get_lang('SendMailToUsers')."
</button>
<button type=\"button\" class=\"btn btn-default\" data-dismiss=\"modal\">".get_lang('Close')."
</button>
<div class="modal-footer">
<button type="button" class="btn btn-default" onclick="sendNotificationToUsers()" data-dismiss="modal">'
.get_lang('SendMailToUsers').'
</button>
<button type="button" class="btn btn-default" data-dismiss="modal">'.get_lang('Close').'</button>
</div>
</div>
</div>
</div>";
</div>';
$htmlHeadXtra[] = '<script>
function sendNotificationToUsers(){
function sendNotificationToUsers() {
var sendTo = $("#toUsers").val().join(",");
var url = $("#urlTo").val() + sendTo;
$("#toUsers").find("option").remove().end().selectpicker("refresh");
@ -73,7 +66,7 @@ function sendNotificationToUsers(){
$("#urlTo").val("");
});
}
function showUserToSendNotificacion(element){
function showUserToSendNotificacion(element) {
var url = $(element).data("link");
$("#toUsers").find("option").remove().end().selectpicker("refresh");
$("#urlTo").val("");
@ -487,13 +480,10 @@ if ($is_allowedToEdit) {
));
break;
case 'send_reminder_to':
$toUsers = isset($_GET['users']) ? $_GET['users'] : null;
if (
!empty($toUsers) &&
!empty($exerciseId)
) {
$toUsers = $_GET['users'] ?? null;
if (!empty($toUsers) && !empty($exerciseId)) {
$sessionId = isset($_GET['id_session']) ? (int) $_GET['id_session'] : 0;
$courseCode = isset($_GET['cidReq']) ? $_GET['cidReq'] : null;
$courseCode = $_GET['cidReq'] ?? null;
$courseId = api_get_course_int_id($courseCode);
$temo = [];
if (is_int(strpos($toUsers, 'X'))) {
@ -519,15 +509,15 @@ if ($is_allowedToEdit) {
$sessionId,
$toUsers
);
echo json_encode([
'message' => Display::return_message(
get_lang('AnnounceSentByEmail'),
'confirmation'
),
]);
echo json_encode(
[
'message' => Display::return_message(
get_lang('AnnounceSentByEmail'), 'confirmation'
),
]
);
}
exit();
break;
case 'send_reminder':
$users = Exercise::getUsersInExercise(
$objExerciseTmp->id,
@ -536,8 +526,6 @@ if ($is_allowedToEdit) {
);
echo json_encode($users);
exit();
break;
}
header('Location: '.$currentUrl);
exit;

6
main/lp/lp_controller.php
Unescape View File

@ -499,7 +499,8 @@ function SendReminderLp($toUser, $fromUser, $courseName, $lpName, $link)
false,
false,
false,
false);
false
);
$subjectLayout = $subjectTemplate->get_template(
'mail/learning_path_reminder_subject.tpl'
);
@ -509,7 +510,8 @@ function SendReminderLp($toUser, $fromUser, $courseName, $lpName, $link)
false,
false,
false,
false);
false
);
$bodyTemplate->assign('courseName', $courseName);
$bodyTemplate->assign('lpName', $lpName);
$bodyTemplate->assign('link', $link);

Write Preview
Loading…
Cancel
Save