Browse Source

Add visibility parameter

jmontoyaa 8 years ago
parent
commit
2503ccf8c8
2 changed files with 8 additions and 4 deletions
  1. 2 1
      main/cron/import_csv.php
  2. 6 3
      main/inc/lib/AnnouncementManager.php

+ 2 - 1
main/cron/import_csv.php

@@ -1058,7 +1058,8 @@ class ImportCsv
                     $announcementsWithTitleList = AnnouncementManager::getAnnouncementsByTitle(
                         $subject,
                         $courseInfo['real_id'],
-                        $event['session_id']
+                        $event['session_id'],
+                        1
                     );
 
                     if (count($announcementsWithTitleList) == 0) {

+ 6 - 3
main/inc/lib/AnnouncementManager.php

@@ -194,10 +194,11 @@ class AnnouncementManager
      * @param string $title
      * @param int $courseId
      * @param int $sessionId
+     * @param int $visibility 1 or 0
      *
      * @return mixed
      */
-    public static function getAnnouncementsByTitle($title, $courseId, $sessionId = 0)
+    public static function getAnnouncementsByTitle($title, $courseId, $sessionId = 0, $visibility = 1)
     {
         $dql = "SELECT a
                 FROM ChamiloCourseBundle:CAnnouncement a 
@@ -207,7 +208,8 @@ class AnnouncementManager
                     ip.tool = 'announcement' AND                        
                     a.cId = :course AND
                     a.sessionId = :session AND
-                    a.title like :title                    
+                    a.title like :title AND
+                    ip.visibility = :visibility
                 ORDER BY a.displayOrder DESC";
 
         $qb = Database::getManager()->createQuery($dql);
@@ -215,7 +217,8 @@ class AnnouncementManager
             [
                 'course' => $courseId,
                 'session' => $sessionId,
-                'title' => "%$title%"
+                'visibility' => $visibility,
+                'title' => "%$title%",
             ]
         );