Merge pull request #894 from jloguercio/forums

Parcial fix to Agenda(personal and courses)

Author: ywarnier

main/inc/lib/agenda.lib.php

@@ -975,7 +975,7 @@ public function getEvents(
                     );
                     $my_course_list = CourseManager::get_courses_list_by_user_id(
                         api_get_user_id(),
-                        true
+                        false
                     );
                 }
 
@@ -1035,7 +1035,7 @@ public function getEvents(
                             $start,
                             $end,
                             $my_session_id,
-                            api_get_user_id(),
+                            $user_id,
                             $this->eventOtherSessionColor
                         );
                     }
@@ -1467,6 +1467,22 @@ public function getCourseEvents(
             } else {
                 $where_condition = "( ip.to_user_id = $user_id OR (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".implode(", ", $group_memberships).")) ) ";
             }
+            
+            if (empty($session_id)) {
+                $sessionCondition =  "
+                (
+                    agenda.session_id = 0 AND
+                    ip.session_id IS NULL
+                ) ";
+            } else {
+                $sessionCondition =  "
+                (
+                    agenda.session_id = $session_id AND
+                    ip.session_id = $session_id
+                ) ";                
+            }
+            
+            
 
             $sql = "SELECT DISTINCT
                         agenda.*,
@@ -1483,10 +1499,10 @@ public function getCourseEvents(
                         $where_condition AND
                         ip.visibility = '1' AND
                         agenda.c_id = $course_id AND
-                        ip.c_id = $course_id
+                        ip.c_id = agenda.c_id $sessionCondition
                     ";
         } else {
-            $visibilityCondition = " ip.visibility='1' AND";
+            $visibilityCondition = " ip.visibility='1' AND ";
 
             if (api_is_allowed_to_edit()) {
                 if ($user_id == 0) {
@@ -1496,18 +1512,21 @@ public function getCourseEvents(
                 }
                 $visibilityCondition = " (ip.visibility IN ('1', '0')) AND ";
             } else {
-                $where_condition = " ( ip.to_user_id = ".api_get_user_id()." AND (ip.to_group_id='0' OR ip.to_group_id IS NULL)) OR ";
+                $where_condition = " ( (ip.to_user_id = ".api_get_user_id()." OR ip.to_user_id IS NULL) AND ip.to_group_id IS NULL) AND ";
             }
 
-            $sessionCondition =  " agenda.session_id = $session_id AND
-                                   ip.session_id = $session_id ";
-
             if (empty($session_id)) {
                 $sessionCondition =  "
                 (
-                    (agenda.session_id = 0 OR agenda.session_id IS NULL) AND
-                    (ip.session_id = 0 OR ip.session_id IS NULL)
+                    agenda.session_id = 0 AND
+                    ip.session_id IS NULL
                 ) ";
+            } else {
+                $sessionCondition =  "
+                (
+                    agenda.session_id = $session_id AND
+                    ip.session_id = $session_id
+                ) ";                
             }
 
             $sql = "SELECT DISTINCT
@@ -1525,7 +1544,6 @@ public function getCourseEvents(
                         $where_condition
                         $visibilityCondition
                         agenda.c_id = $course_id AND
-                        ip.c_id = $course_id AND
                         $sessionCondition
                     ";
         }
@@ -1545,7 +1563,6 @@ public function getCourseEvents(
         }
 
         $sql .= $dateCondition;
-
         $result = Database::query($sql);
 
         $coachCanEdit = false;

main/template/default/agenda/month.tpl

@@ -11,8 +11,8 @@ function checkLength( o, n, min, max ) {
 }
 function clean_user_select() {
     //Cleans the selected attr
-    $("#users_to_send_id").val('').trigger("chosen:updated");
-    /*$('#users_to_send_id')
+    $("#users_to_send").val('').trigger("chosen:updated");
+    /*$('#users_to_send')
         .find('option')
         .removeAttr('selected')
         .end();*/
@@ -115,10 +115,10 @@ $(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 option').eq(0).attr('selected', 'selected');
 
 			// Update chz-select
-			//$("#users_to_send_id").trigger("chosen:updated");
+			//$("#users_to_send").trigger("chosen:updated");
 
 			if ({{ can_add_events }} == 1) {
 				var url = '{{ web_agenda_ajax_url }}&a=add_event&start='+start.format('YYYY-MM-DD 00:00:00')+'&end='+end.format('YYYY-MM-DD 00:00:00')+'&all_day='+allDay+'&view='+view.name;
@@ -164,7 +164,7 @@ $(document).ready(function() {
 							$.ajax({
 								url: url+'&'+params,
 								success:function(data) {
-									var user = $('#users_to_send_id').val();
+									var user = $('#users_to_send').val();
                                     if (user) {
                                         if (user.length > 1) {
                                             user = 0;