Browse Source

Minor agenda changes

Julio Montoya 13 years ago
parent
commit
19cd6c9284

+ 6 - 5
main/calendar/agenda.lib.php

@@ -475,17 +475,18 @@ class Agenda {
         $html = '<select id="users_to_send_id" name="users_to_send[]" size="5" multiple="multiple" style="width:250px" class="chzn-select">';
     
         // adding the groups to the select form
-    
-        if (isset($to_already_selected) && $to_already_selected==='everyone') {
-            $html .=  '<option value="everyone" selected="selected">'.get_lang('Everyone').'</option>';
+        
+        if (isset($to_already_selected) && $to_already_selected==='everyone') {            
         }
         
+        $html .=  '<option value="everyone">'.get_lang('Everyone').'</option>';
+        
         if (is_array($group_list)) {
             $html .= '<optgroup label="'.get_lang('Groups').'">';
             foreach($group_list as $this_group) {
                 //api_display_normal_message("group " . $thisGroup[id] . $thisGroup[name]);
-                if (!is_array($to_already_selected) || !in_array("GROUP:".$this_group['id'],$to_already_selected)) // $to_already_selected is the array containing the groups (and users) that are already selected
-                    {
+                if (!is_array($to_already_selected) || !in_array("GROUP:".$this_group['id'],$to_already_selected)) {
+                    // $to_already_selected is the array containing the groups (and users) that are already selected
                     $html .=     "<option value=\"GROUP:".$this_group['id']."\">".
                         $this_group['name']." &ndash; " . $this_group['userNb'] . " " . get_lang('Users') .
                         "</option>";

+ 3 - 2
main/calendar/agenda_js.php

@@ -83,13 +83,14 @@ $tpl->assign('web_agenda_ajax_url', $agenda_ajax_url);
 
 $course_code  = api_get_course_id();
 
-if (api_is_allowed_to_edit() && $course_code != '-1') {
+
+if (api_is_allowed_to_edit() && $course_code != '-1' && $type == 'course') {
     
     $user_list  = CourseManager::get_user_list_from_course_code(api_get_course_id());
     $group_list = CourseManager::get_group_list_of_course(api_get_course_id(), api_get_session_id());
 
     $agenda = new Agenda();
-    $select = $agenda->construct_not_selected_select_form($group_list, $user_list, 'everyone');
+    $select = $agenda->construct_not_selected_select_form($group_list, $user_list);
     $tpl->assign('visible_to', $select);
 }
 

+ 2 - 2
main/calendar/print.php

@@ -22,10 +22,10 @@ if(strstr($id,',')) {
 // setting the global file that gets the general configuration, the databases, the languages, ...
 require_once '../inc/global.inc.php';
 
-
+$course_id = api_get_course_int_id();
 
 $TABLEAGENDA 	= Database::get_course_table(TABLE_AGENDA);
-$sql 			= "SELECT * FROM $TABLEAGENDA WHERE id IN($id) ORDER BY start_date DESC";
+$sql 			= "SELECT * FROM $TABLEAGENDA WHERE c_id = $course_id AND id IN($id) ORDER BY start_date DESC";
 $result			= Database::query($sql);
 ?>
 

+ 34 - 11
main/template/default/agenda/month.tpl

@@ -36,20 +36,44 @@ $(document).ready(function() {
 	content = $( "#content" ),	
 	allFields = $( [] ).add( title ).add( content ), tips = $(".validateTips");	
 
-	$('#users_to_send_id').bind('change', function() {	     
-	    //alert($("#users_to_send_id option[value='everyone']").attr('selected'));
-	    if ($("#users_to_send_id option[value='everyone']").attr('selected') == 'selected') {
+	$('#users_to_send_id').bind('change', function() {
+	    
+	    var selected_counts = $("#users_to_send_id option:selected").size();
+	    
+	    //alert(selected_counts);        
+       /* if (selected_counts >= 1 && $("#users_to_send_id option[value='everyone']").attr('selected') == 'selected') {        
             clean_user_select();
+            
             $('#users_to_send_id option').eq(0).attr('selected', 'selected');
-            $("#users_to_send_id").trigger("liszt:updated");            
+            //deleting the everyone
+            $("#users_to_send_id").trigger("liszt:updated");
+            deleted_items = true;
+            
+        }*/
+        $("#users_to_send_id").trigger("liszt:updated");    
+     /*
+	    if (selected_counts >= 1) {	        	                
+	        $('#users_to_send_id option').eq(0).removeAttr('selected');            
+            
+            
+	    }
+	    
+	   */ 
+	    //clean_user_select();
+	    //$("#users_to_send_id").trigger("liszt:updated");
+	    //alert($("#users_to_send_id option[value='everyone']").attr('selected'));
+	    if ($("#users_to_send_id option[value='everyone']").attr('selected') == 'selected') {
+            //clean_user_select();
+            //$('#users_to_send_id option').eq(0).attr('selected', 'selected');
+            //$("#users_to_send_id").trigger("liszt:updated");            
         }
     });
 	
 	var calendar = $('#calendar').fullCalendar({
 		header: {
-			left: '',
+			left: 'today prev,next',
 			center: 'title',
-			right: 'today prev,next month,agendaWeek,agendaDay',	
+			right: 'month,agendaWeek,agendaDay',	
 		},	
 		buttonText: 	{$button_text}, 
 		monthNames: 	{$month_names},
@@ -70,7 +94,7 @@ $(document).ready(function() {
 		    clean_user_select();
                 
             //Sets the 1st item selected by default
-            $('#users_to_send_id option').eq(0).attr('selected', 'selected');
+            //$('#users_to_send_id option').eq(0).attr('selected', 'selected');
 			
 			//Update chz-select
 			$("#users_to_send_id").trigger("liszt:updated");
@@ -234,12 +258,11 @@ $(document).ready(function() {
 
 <div id="dialog-form" style="display:none;">
 	<div style="width:500px">
-	<form id="add_event_form" name="form">
-	    
+	<form id="add_event_form" name="form">	    
 	    {if !empty($visible_to)} 
     	    <div id="visible_to_input" class="row">      
                 <div class="label">
-                    <label for="date">{"SentTo"|get_lang}</label>
+                    <label for="date">{"To"|get_lang}</label>
                 </div>
                 <div class="formw">
                     {$visible_to}
@@ -282,5 +305,5 @@ $(document).ready(function() {
 	</form>
 	</div>
 </div>
-<div id='loading' style='position:absolute; display:none'>{"Loading"|get_lang}...</div>
+<div id='loading' style='left:140px;position:absolute; display:none'>{"Loading"|get_lang}...</div>
 <div id='calendar'></div>