Showing agenda_js for testing purposes

skala
Julio Montoya 14 years ago
parent 27309bc705
commit 2beb165860
  1. 1
      main/css/base.css
  2. 2
      main/inc/lib/banner.lib.php
  3. 8
      main/inc/lib/course.lib.php
  4. 2
      main/template/default/agenda/month.tpl
  5. 2
      main/template/default/layout/header.tpl

@ -3767,6 +3767,7 @@ form div.error input, form div.error textarea {
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
width:120px;
}
.label_tag.personal_event {

@ -44,7 +44,7 @@ function get_tabs() {
$navigation['myprofile']['title'] = get_lang('ModifyProfile');
// Link to my agenda
$navigation['myagenda']['url'] = api_get_path(WEB_CODE_PATH).'calendar/myagenda.php?view=month&'.(!empty($_course['path']) ? 'coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '' );
$navigation['myagenda']['url'] = api_get_path(WEB_CODE_PATH).'calendar/agenda_js.php?type=personal';
$navigation['myagenda']['title'] = get_lang('MyAgenda');
// Gradebook

@ -1949,7 +1949,7 @@ class CourseManager {
$tbl_user_course_category = Database::get_user_personal_table(TABLE_USER_COURSE_CATEGORY);
$special_course_list = self::get_special_course_list();
$special_course_list = self::get_special_course_list();
$with_special_courses = $without_special_courses = '';
if (!empty($special_course_list)) {
@ -1959,7 +1959,7 @@ class CourseManager {
}
if (!empty($with_special_courses)) {
$sql = "SELECT DISTINCT(course.code), course.db_name db_name, course.title , course.id as course_id
$sql = "SELECT DISTINCT(course.code), course.db_name db_name, course.title , course.id as course_id, course.id as real_id
FROM ".$tbl_course_user." course_rel_user
LEFT JOIN ".$tbl_course." course
ON course.code = course_rel_user.course_code
@ -1980,7 +1980,7 @@ class CourseManager {
// get course list not auto-register. Use Distinct to avoid multiple
// entries when a course is assigned to a HRD (DRH) as watcher
$sql = "SELECT DISTINCT(course.code),course.db_name,course.title , course.id as course_id
$sql = "SELECT DISTINCT(course.code),course.db_name,course.title , course.id as course_id, course.id as real_id
FROM $tbl_course course
INNER JOIN $tbl_course_user cru
ON course.code=cru.course_code
@ -1996,7 +1996,7 @@ class CourseManager {
}
if ($include_sessions === true) {
$r = Database::query("SELECT DISTINCT(c.code), c.db_name, c.title, c.id as course_id
$r = Database::query("SELECT DISTINCT(c.code), c.db_name, c.title, c.id as course_id, c.id as real_id
FROM ".Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER)." s, ".Database::get_main_table(TABLE_MAIN_COURSE)." c
WHERE id_user = $user_id AND s.course_code=c.code");
while ($row = Database::fetch_array($r, 'ASSOC')) {

@ -182,7 +182,7 @@ $(document).ready(function() {
<label for="date">{"Agenda"|get_lang}</label>
</div>
<div class="formw">
<div id="color_calendar" style="width:100px;"></div>
<div id="color_calendar"></div>
</div>
</div>
<div class="row">

@ -43,7 +43,7 @@
<a class="dropdown-toggle" href="#">{$_u.complete_name}</a>
<ul class="dropdown-menu">
<li><a href="{'WEB_CODE_PATH'|get_path}social/home.php">{"Profile"|get_lang}</a></li>
<li><a href="{'WEB_CODE_PATH'|get_path}calendar/myagenda.php?view=month">{"MyAgenda"|get_lang}</a></li>
<li><a href="{'WEB_CODE_PATH'|get_path}calendar/agenda_js.php?type=personal">{"MyAgenda"|get_lang}</a></li>
<li><a href="{'WEB_CODE_PATH'|get_path}messages/inbox.php">{"Messages"|get_lang}</a></li>
<li><a href="{'WEB_CODE_PATH'|get_path}auth/my_progress.php">{"MyReporting"|get_lang}</a></li>
<li class="divider"></li>

Loading…
Cancel
Save