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

Adding course int id see #3910

Browse Source
skala
Julio Montoya 14 years ago
parent 2a2671dac2
commit 33e153c8a8
2 changed files with 22 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. 7
      main/inc/lib/usermanager.lib.php
  2. 27
      main/inc/lib/userportal.lib.php

7
main/inc/lib/usermanager.lib.php
Unescape View File

@ -1868,7 +1868,8 @@ class UserManager {
$tbl_user_course_category = Database :: get_user_personal_table(TABLE_USER_COURSE_CATEGORY); $tbl_user_course_category = Database :: get_user_personal_table(TABLE_USER_COURSE_CATEGORY);
$personal_course_list_sql = "SELECT course.code k, course.directory d, course.visual_code c, course.db_name db, course.title i, course.tutor_name t, $personal_course_list_sql = "SELECT course.code k, course.directory d, course.visual_code c, course.db_name db, course.title i, course.tutor_name t,
course.course_language l, course_rel_user.status s, course_rel_user.sort sort, course_rel_user.user_course_cat user_course_cat course.course_language l, course_rel_user.status s, course_rel_user.sort sort, course_rel_user.user_course_cat user_course_cat,
course.id as course_id
FROM ".$tbl_course_user." course_rel_user FROM ".$tbl_course_user." course_rel_user
LEFT JOIN ".$tbl_course." course LEFT JOIN ".$tbl_course." course
ON course.code = course_rel_user.course_code ON course.code = course_rel_user.course_code
@ -1947,7 +1948,7 @@ class UserManager {
$id_session = $enreg['id']; $id_session = $enreg['id'];
$personal_course_list_sql = "SELECT DISTINCT course.code k, course.directory d, course.visual_code c, course.db_name db, course.title i, $personal_course_list_sql = "SELECT DISTINCT course.code k, course.directory d, course.visual_code c, course.db_name db, course.title i,
".(api_is_western_name_order() ? "CONCAT(user.firstname,' ',user.lastname)" : "CONCAT(user.lastname,' ',user.firstname)")." t, email, course.course_language l, 1 sort, ".(api_is_western_name_order() ? "CONCAT(user.firstname,' ',user.lastname)" : "CONCAT(user.lastname,' ',user.firstname)")." t, email, course.course_language l, 1 sort,
category_code user_course_cat, date_start, date_end, session.id as id_session, session.name as session_name category_code user_course_cat, date_start, date_end, session.id as id_session, session.name as session_name, course.id as course_id
FROM $tbl_session_course_user as session_course_user FROM $tbl_session_course_user as session_course_user
INNER JOIN $tbl_course AS course INNER JOIN $tbl_course AS course
ON course.code = session_course_user.course_code ON course.code = session_course_user.course_code
@ -1971,7 +1972,7 @@ class UserManager {
foreach ($sessions as $enreg) { foreach ($sessions as $enreg) {
$id_session = $enreg['id']; $id_session = $enreg['id'];
// this query is very similar to the above query, but it will check the session_rel_course_user table if there are courses registered to our user or not // this query is very similar to the above query, but it will check the session_rel_course_user table if there are courses registered to our user or not
$personal_course_list_sql = "SELECT distinct course.code k, course.directory d, course.visual_code c, course.db_name db, course.title i, CONCAT(user.lastname,' ',user.firstname) t, email, $personal_course_list_sql = "SELECT DISTINCT course.id as course_id, course.code k, course.directory d, course.visual_code c, course.db_name db, course.title i, CONCAT(user.lastname,' ',user.firstname) t, email,
course.course_language l, 1 sort, category_code user_course_cat, date_start, date_end, session.id as id_session, session.name as session_name, " . course.course_language l, 1 sort, category_code user_course_cat, date_start, date_end, session.id as id_session, session.name as session_name, " .
"IF((session_course_user.id_user = 3 AND session_course_user.status=2),'2', '5') "IF((session_course_user.id_user = 3 AND session_course_user.status=2),'2', '5')
FROM $tbl_session_course_user as session_course_user FROM $tbl_session_course_user as session_course_user

27
main/inc/lib/userportal.lib.php
Unescape View File

@ -1120,26 +1120,28 @@ class IndexManager {
/* Announcements */ /* Announcements */
$course_database = $my_course['db']; $course_id = $my_course['course_id'];
$course_tool_table = Database::get_course_table(TABLE_TOOL_LIST, $course_database);
$query = "SELECT visibility FROM $course_tool_table WHERE link = 'announcements/announcements.php' AND visibility = 1"; $course_tool_table = Database::get_course_table(TABLE_TOOL_LIST);
$query = "SELECT visibility FROM $course_tool_table WHERE c_id = $course_id AND link = 'announcements/announcements.php' AND visibility = 1";
$result = Database::query($query); $result = Database::query($query);
// Collect from announcements, but only if tool is visible for the course. // Collect from announcements, but only if tool is visible for the course.
if ($result && $maxValvas > 0 && Database::num_rows($result) > 0) { if ($result && $maxValvas > 0 && Database::num_rows($result) > 0) {
// Search announcements table. // Search announcements table.
// Take the entries listed at the top of advalvas/announcements tool. // Take the entries listed at the top of advalvas/announcements tool.
$course_announcement_table = Database::get_course_table(TABLE_ANNOUNCEMENT); $course_announcement_table = Database::get_course_table(TABLE_ANNOUNCEMENT);
$sqlGetLastAnnouncements = "SELECT end_date publicationDate, content $sqlGetLastAnnouncements = "SELECT end_date publicationDate, content
FROM ".$course_announcement_table; FROM ".$course_announcement_table." WHERE c_id = $course_id ";
switch (CONFVAL_limitPreviewTo) { switch (CONFVAL_limitPreviewTo) {
case SCRIPTVAL_NewEntriesOfTheDay : case SCRIPTVAL_NewEntriesOfTheDay :
$sqlGetLastAnnouncements .= "WHERE DATE_FORMAT(end_date,'%Y %m %d') >= '".date('Y m d')."'"; $sqlGetLastAnnouncements .= " AND DATE_FORMAT(end_date,'%Y %m %d') >= '".date('Y m d')."'";
break; break;
case SCRIPTVAL_NoTimeLimit : case SCRIPTVAL_NoTimeLimit :
break; break;
case SCRIPTVAL_NewEntriesOfTheDayOfLastLogin : case SCRIPTVAL_NewEntriesOfTheDayOfLastLogin :
// take care mysql -> DATE_FORMAT(time,format) php -> date(format,date) // take care mysql -> DATE_FORMAT(time,format) php -> date(format,date)
$sqlGetLastAnnouncements .= "WHERE DATE_FORMAT(end_date,'%Y %m %d') >= '".date('Y m d', $_user['lastLogin'])."'"; $sqlGetLastAnnouncements .= " AND DATE_FORMAT(end_date,'%Y %m %d') >= '".date('Y m d', $_user['lastLogin'])."'";
} }
$sqlGetLastAnnouncements .= "ORDER BY end_date DESC LIMIT ".$maxValvas; $sqlGetLastAnnouncements .= "ORDER BY end_date DESC LIMIT ".$maxValvas;
$resGetLastAnnouncements = Database::query($sqlGetLastAnnouncements); $resGetLastAnnouncements = Database::query($sqlGetLastAnnouncements);
@ -1155,10 +1157,8 @@ class IndexManager {
} }
/* Agenda */ /* Agenda */
$course_tool_table = Database :: get_course_table(TABLE_TOOL_LIST);
$course_database = $my_course['db']; $query = "SELECT visibility FROM $course_tool_table WHERE c_id = $course_id AND link = 'calendar/agenda.php' AND visibility = 1";
$course_tool_table = Database :: get_course_table(TABLE_TOOL_LIST, $course_database);
$query = "SELECT visibility FROM $course_tool_table WHERE link = 'calendar/agenda.php' AND visibility = 1";
$result = Database::query($query); $result = Database::query($query);
$thisAgenda = $maxCourse - $nbDigestEntries; // New max entries for agenda. $thisAgenda = $maxCourse - $nbDigestEntries; // New max entries for agenda.
if ($maxAgenda < $thisAgenda) { if ($maxAgenda < $thisAgenda) {
@ -1166,10 +1166,11 @@ class IndexManager {
} }
// Collect from agenda, but only if tool is visible for the course. // Collect from agenda, but only if tool is visible for the course.
if ($result && $thisAgenda > 0 && Database::num_rows($result) > 0) { if ($result && $thisAgenda > 0 && Database::num_rows($result) > 0) {
$tableCal = $courseTablePrefix.$thisCourseDbName.$_configuration['db_glue'].'calendar_event'; //$tableCal = $courseTablePrefix.$thisCourseDbName.$_configuration['db_glue'].'calendar_event';
$course_table_agenda = Database::get_course_table(TABLE_AGENDA);
$sqlGetNextAgendaEvent = "SELECT start_date, title content, start_time $sqlGetNextAgendaEvent = "SELECT start_date, title content, start_time
FROM $tableCal FROM $course_table_agenda
WHERE start_date >= CURDATE() WHERE c_id = $course_id AND start_date >= CURDATE()
ORDER BY start_date, start_time ORDER BY start_date, start_time
LIMIT $maxAgenda"; LIMIT $maxAgenda";
$resGetNextAgendaEvent = Database::query($sqlGetNextAgendaEvent); $resGetNextAgendaEvent = Database::query($sqlGetNextAgendaEvent);

Write Preview
Loading…
Cancel
Save