Kaynağa Gözat

Adding course link in personal agenda

Julio Montoya 14 yıl önce
ebeveyn
işleme
ec83da398a

+ 2 - 6
main/calendar/agenda.inc.php

@@ -433,6 +433,7 @@ function display_monthcalendar($month, $year) {
 							$dayheader = Display::div($curday, array('class'=>'agenda_day'));
 							$some_content = false;
 							foreach ($agenda_item as $key=>$value) {
+							    
 
 								$month_start_date = (int)substr($value['start_date'],5,2);
 								$start_time = api_convert_and_format_date($value['start_date']);
@@ -459,12 +460,7 @@ function display_monthcalendar($month, $year) {
 									    case 'course':
                                             $bg_color = '#CAFFAA'; 
                                             $subtitle = get_lang('Course');                                            
-                                            break;
-                                        /*case 'work':
-                                            $bg_color = '#FDAC3D';
-                                            $subtitle = get_lang('Work');
-                                            $time = '<i>'.$start_time.'</i>&nbsp;-&nbsp;<i>'.$end_time.'&nbsp;</i>';
-                                            break;*/      
+                                            break;              
 									    default:
 									        //$time = '<i>'.$start_time.'</i>&nbsp;-&nbsp;<i>'.$end_time.'&nbsp;</i>';
 									        break;				            

+ 11 - 6
main/calendar/myagenda.inc.php

@@ -105,8 +105,14 @@ function get_myagendaitems($courses_dbs, $month, $year) {
 		
 		while ($item = Database::fetch_array($result, 'ASSOC')) {
 			$agendaday = date("j",strtotime($item['start_date']));
+			
+			$url  = api_get_path(WEB_CODE_PATH)."calendar/agenda.php?cidReq=".urlencode($array_course_info["code"])."&day=$agendaday&month=$month&year=$year#$agendaday";
+		    $url  = Display::url($array_course_info["title"], $url);
+			
+			$item['url'] = $url;			
 			$item['calendar_type'] = 'course';
 			$my_list[$agendaday][] = $item;
+			/*
 			
 			if(!isset($items[$agendaday])) {
 				$items[$agendaday]=array();
@@ -116,7 +122,7 @@ function get_myagendaitems($courses_dbs, $month, $year) {
 			if ($item['end_date'] != '0000-00-00 00:00:00') {
                 $end_time = '&nbsp;-&nbsp;<i>'.api_convert_and_format_date($item['end_date'], DATE_TIME_FORMAT_LONG).'</i>';
 			}
-			$URL      = api_get_path(WEB_CODE_PATH)."calendar/agenda.php?cidReq=".urlencode($array_course_info["code"])."&amp;day=$agendaday&amp;month=$month&amp;year=$year#$agendaday";
+			
 			if ($setting_agenda_link == 'coursecode') {
 				$title=$array_course_info['title'];
 				$agenda_link = api_substr($title, 0, 14);
@@ -129,7 +135,7 @@ function get_myagendaitems($courses_dbs, $month, $year) {
 			$items[$agendaday][$item['start_date']] .= "<i>$time</i> $end_time &nbsp;";
 			$item['title'] = '<strong>'.$item['title'].'</strong>';
 			$items[$agendaday][$item['start_date']] .= '<br />'."<a href=\"$URL\" title=\"".Security::remove_XSS($array_course_info['title'])."\">".$agenda_link."</a>  ".Security::remove_XSS($item['title'])."<br /> ";
-			$items[$agendaday][$item['start_date']] .= '<br/>';					
+			$items[$agendaday][$item['start_date']] .= '<br/>';*/					
 		}
 	}
 
@@ -146,7 +152,7 @@ function get_myagendaitems($courses_dbs, $month, $year) {
 	}	
 	//var_dump($agendaitems, $my_list);
 	return $my_list;
-	return $agendaitems;
+	//return $agendaitems;
 }
 /**
  * Show the monthcalender of the given month
@@ -207,8 +213,7 @@ function display_mymonthcalendar($agendaitems, $month, $year, $weekdaynames=arra
                         if (!empty($value['end_date']) && $value['end_date'] != '0000-00-00 00:00:00') {
                            $end_time    = '-&nbsp;<i>'.api_convert_and_format_date($value['end_date'], DATE_TIME_FORMAT_LONG);
                         }       
-                        $time = '<i>'.$start_time.'</i>&nbsp;'.$end_time;
-                        
+                        $time = '<i>'.$start_time.'</i>&nbsp;'.$end_time;                        
                         switch($value['calendar_type']) {
                             case 'personal':
                                 $bg_color = '#D0E7F4';
@@ -220,7 +225,7 @@ function display_mymonthcalendar($agendaitems, $month, $year, $weekdaynames=arra
                                 break;
                             case 'course':
                                 $bg_color = '#CAFFAA';
-                                $subtitle = get_lang('Course');                                
+                                $subtitle = get_lang('Course').' '.$value['url'];                                
                                 break;
                             default:
                                 //$time = '<i>'.$start_time.'</i>&nbsp;-&nbsp;<i>'.$end_time.'&nbsp;</i>';

+ 1 - 2
main/calendar/myagenda.php

@@ -152,8 +152,7 @@ if (isset($_user['user_id'])) {
 	echo "<a href=\"".api_get_self()."?action=view&amp;view=month\">".Display::return_icon('month.png', get_lang('MonthView'),'','32')."</a>";
 	echo "<a href=\"".api_get_self()."?action=view&amp;view=week\">".Display::return_icon('7days.png', get_lang('WeekView'),'','32')."</a> ";
 	echo "<a href=\"".api_get_self()."?action=view&amp;view=day\">".Display::return_icon('1day.png', get_lang('DayView'),'','32')."</a> ";
-	if (api_get_setting('allow_personal_agenda') == 'true')
-	{
+	if (api_get_setting('allow_personal_agenda') == 'true') {
 		echo "<a href=\"".api_get_self()."?action=add_personal_agenda_item\">".Display::return_icon('new_user_event.png', get_lang('AddPersonalItem'),'','32')."</a> ";
 		echo "<a href=\"".api_get_self()."?action=view&amp;view=personal\">".Display::return_icon('personal_calendar.png', get_lang('ViewPersonalItem'),'','32')."</a> ";
 	}