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

hidden courses manager and fixed subscribe courses and session for human resources manager - partial CT#603

Browse Source
skala
Cristian Fasanando 16 years ago
parent c2413c3f89
commit 6d41d66812
4 changed files with 55 additions and 52 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. 21
      index.php
  2. 4
      main/inc/lib/course.lib.php
  3. 59
      main/inc/lib/sessionmanager.lib.php
  4. 23
      user_portal.php

21
index.php
Unescape View File

@ -361,14 +361,27 @@ function category_has_open_courses($category) {
return false;
}
/**
* Display create course link
*/
function display_create_course_link() {
echo "<li><a href=\"main/create_course/add_course.php\">".get_lang("CourseCreate")."</a></li>";
}
/**
* Display edit course list links
*/
function display_edit_course_list_links() {
echo "<li><a href=\"main/auth/courses.php\">".get_lang("CourseManagement")."</a></li>";
}
/**
* Display dashboard link
*/
function display_dashboard_link() {
echo "<li><a href=\"main/dashboard/index.php\">".get_lang('Dashboard')."</a></li>";
}
/**
* Displays the right-hand menu for anonymous users:
* login form, useful links, help section
@ -442,8 +455,12 @@ function display_anonymous_right_menu() {
if ($show_create_link) {
display_create_course_link();
}
if ($show_course_link) {
display_edit_course_list_links();
if ($show_course_link) {
if (!api_is_drh()) {
display_edit_course_list_links();
} else {
display_dashboard_link();
}
}
echo "</ul>";
echo "</div>";

4
main/inc/lib/course.lib.php
Unescape View File

@ -2203,11 +2203,11 @@ class CourseManager {
$affected_rows = 0;
//Deleting assigned courses to hrm_id
$sql = "SELECT course_code FROM $tbl_course_rel_user WHERE user_id = $hr_manager_id AND status = ".DRH." AND relation_type = '".COURSE_RELATION_TYPE_RRHH."' ";
$sql = "SELECT course_code FROM $tbl_course_rel_user WHERE user_id = $hr_manager_id ";
$result = Database::query($sql);
if (Database::num_rows($result) > 0) {
$sql = "DELETE FROM $tbl_course_rel_user WHERE user_id = $hr_manager_id AND status = ".DRH." AND relation_type = '".COURSE_RELATION_TYPE_RRHH."' ";
$sql = "DELETE FROM $tbl_course_rel_user WHERE user_id = $hr_manager_id ";
Database::query($sql);
}

59
main/inc/lib/sessionmanager.lib.php
Unescape View File

@ -424,7 +424,7 @@ class SessionManager {
}
}
// count users in this session-course relation
$sql = "SELECT COUNT(id_user) as nbUsers FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND course_code='$enreg_course'";
$sql = "SELECT COUNT(id_user) as nbUsers FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND course_code='$enreg_course' AND status<>2";
$rs = Database::query($sql);
list($nbr_users) = Database::fetch_array($rs);
// update the session-course relation to add the users total
@ -443,50 +443,13 @@ class SessionManager {
$insert_sql = "INSERT IGNORE INTO $tbl_session_rel_user(id_session, id_user) VALUES('$id_session','$enreg_user')";
Database::query($insert_sql);
}
// update number of users in the session
$nbr_users = count($user_list);
$update_sql = "UPDATE $tbl_session SET nbr_users= $nbr_users WHERE id='$id_session' ";
Database::query($update_sql);
}
/**
* Subscribes sessions to user (Dashboard feature)
* @param int User id
* @param int Session id
* @param int Relation type
**/
public static function suscribe_sessions_to_user($user_id,$session_list, $relation_stype) {
if ($user_id!= strval(intval($user_id))) return false;
foreach($session_list as $session_id){
if ($session_id!= strval(intval($session_id))) return false;
}
$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
$sql = "SELECT id_session FROM $tbl_session_rel_user WHERE id_user = $user_id AND relation_type = 1 ";
$result = Database::query($sql);
$existing_sessions = array();
while($row = Database::fetch_array($result)){
$existing_sessions[] = $row['id_session'];
}
//Deleting existing session_rel_user
foreach ($existing_sessions as $existing_session) {
$sql = "DELETE FROM $tbl_session_rel_user WHERE id_session=$existing_session AND id_user = $user_id AND relation_type = 1 ";
Database::query($sql);
}
foreach ($session_list as $session_id) {
// for each session
$enreg_user = Database::escape_string($enreg_user);
$insert_sql = "INSERT IGNORE INTO $tbl_session_rel_user(id_session,id_user,relation_type) VALUES('$session_id','$user_id','1')";
Database::query($insert_sql);
}
}
/** Subscribes courses to the given session and optionally (default) unsubscribes previous users
* @author Carlos Vargas <carlos.vargas@dokeos.com>,from existing code
* @param int Session ID
@ -1036,21 +999,31 @@ class SessionManager {
public static function suscribe_sessions_to_hr_manager($hr_manager_id,$sessions_list) {
// Database Table Definitions
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
$tbl_session_rel_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$hr_manager_id = intval($hr_manager_id);
$affected_rows = 0;
//Deleting assigned sessions to hrm_id
$sql = "SELECT id_session FROM $tbl_session_rel_user WHERE id_user = $hr_manager_id AND relation_type = '".SESSION_RELATION_TYPE_RRHH."' ";
$sql = "SELECT id_session FROM $tbl_session_rel_user WHERE id_user = $hr_manager_id ";
$result = Database::query($sql);
if (Database::num_rows($result) > 0) {
$sql = "DELETE FROM $tbl_session_rel_user WHERE id_user = $hr_manager_id AND relation_type = '".SESSION_RELATION_TYPE_RRHH."' ";
$sql = "DELETE FROM $tbl_session_rel_user WHERE id_user = $hr_manager_id ";
Database::query($sql);
}
//Deleting assigned courses in sessions to hrm_id
$sql = "SELECT * FROM $tbl_session_rel_course_user WHERE id_user = $hr_manager_id ";
$result = Database::query($sql);
if (Database::num_rows($result) > 0) {
$sql = "DELETE FROM $tbl_session_rel_course_user WHERE id_user = $hr_manager_id ";
Database::query($sql);
}
// inserting new sessions list
if (is_array($sessions_list)) {
foreach ($sessions_list as $session_id) {

23
user_portal.php
Unescape View File

@ -572,15 +572,24 @@ function display_admin_links() {
}
/**
* Enter description here...
* Display create course link
*
*/
function display_create_course_link() {
echo "<li><a href=\"main/create_course/add_course.php\">".get_lang('CourseCreate')."</a></li>";
}
/**
* Display dashboard link
*
*/
function display_dashboard_link() {
echo "<li><a href=\"main/dashboard/index.php\">".get_lang('Dashboard')."</a></li>";
}
/**
* Enter description here...
* Display edit course list links
*
*/
function display_edit_course_list_links() {
@ -1609,9 +1618,13 @@ if ($show_menu) {
if ($show_create_link) {
display_create_course_link();
}
if ($show_course_link) {
display_edit_course_list_links();
display_history_course_session();
if ($show_course_link) {
if (!api_is_drh()) {
display_edit_course_list_links();
display_history_course_session();
} else {
display_dashboard_link();
}
}
if ($show_digest_link) {
display_digest($toolsList, $digest, $orderKey, $courses);

Write Preview
Loading…
Cancel
Save