Changeset 042bea in indico

Timestamp:

10/21/10 10:39:16 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

new-webex

Children:

5d34ab

Parents:

a238e2

git-author:

Kevin Flannery <flannery@…> (08/04/10 22:10:24)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (10/21/10 10:39:16)

Message:

Added ability to display session specific video bookings on the meetings and lectures display pages

Location:

indico/MaKaC

Files:

• common/output.py (modified) (1 diff)
• plugins/Collaboration/WebEx/collaboration.py (modified) (1 diff)
• plugins/Collaboration/WebEx/pages.py (modified) (1 diff)
• plugins/Collaboration/base.py (modified) (3 diffs)
• plugins/Collaboration/collaborationTools.py (modified) (2 diffs)
• webinterface/stylesheets/include/indico.xsl (modified) (1 diff)

indico/MaKaC/common/output.py

@@ -661 +661 @@
         out.writeTag("ID",session.getId())
 
-        if PluginsHolder().getPluginType("Collaboration").hasPlugin("WebEx") and PluginsHolder().getPluginType("Collaboration").getPlugin("WebEx").isActive():
-            Logger.get('RecMan').info("WebEx is active. Printing out list of WebEx bookings")
-            csbm = conf.getCSBookingManager()
-            bookings = csbm.getBookingList(filterByType = "WebEx", notify = False, onlyPublic = True)
-            bookings.sort(key = lambda b: b.getStartDate() or minDatetime())
-            for b in bookings:
-                Logger.get('WebEx').info("Session for booking %s, session id: %s " % ( str(b._getTitle()), str(b.getSessionId()) ) )
-                if session.getId() == b.getSessionId():
-                    Logger.get('WebEx').info("Found matching session for video booking!, session id: %s " % ( b.getSessionId() ) )
-                    out.openTag("videoBooking")
-                    out.writeTag("videoBookingTitle",b._getTitle())
-                    out.writeTag("videoBookingUrl",b.getURL())
-                    out.closeTag("videoBooking")
+        # The following code prints out the video bookings associated with a particular session
+        csbm = conf.getCSBookingManager()
+        pluginsWithSessionBookings = csbm.getEventSessionDisplayPlugins()
+        for pluginName in pluginsWithSessionBookings:
+            if PluginsHolder().hasPluginType("Collaboration") and PluginsHolder().getPluginType("Collaboration").hasPlugin(pluginName) and PluginsHolder().getPluginType("Collaboration").getPlugin(pluginName).isActive():
+                Logger.get('output.py-Printing Sessions').info("%s is active. Printing out list of bookings" % pluginName)
+                bookings = csbm.getBookingList(filterByType = "WebEx", notify = False, onlyPublic = True)
+                bookings.sort(key = lambda b: b.getStartDate() or minDatetime())
+                for b in bookings:
+                    #Logger.get('WebEx').info("Session for booking %s, session id: %s " % ( str(b._getTitle()), str(b.getSessionId()) ) )
+                    if session.getId() == b.getSessionId():
+                        #Logger.get('WebEx').info("Found matching session for video booking!, session id: %s " % ( b.getSessionId() ) )
+                        out.openTag("videoBooking")
+                        out.writeTag("videoBookingTitle",b._getTitle())
+                        out.writeTag("videoBookingUrl",b.getURL())
+                        out.writeTag("videoBookingType",pluginName)
+                        out.closeTag("videoBooking")
 
 

indico/MaKaC/plugins/Collaboration/WebEx/collaboration.py

@@ -72 +72 @@
 
     _hasEventDisplay = True
+    _hasEventSessionDisplay = True
 
     _commonIndexes = ["All Videoconference"]

indico/MaKaC/plugins/Collaboration/WebEx/pages.py

@@ -136 +136 @@
             out.closeTag("section")
         out.openTag("section")
+        out.writeTag("title", _('Title:'))
+        out.writeTag("line", booking._bookingParams["meetingTitle"])
+        out.closeTag("section")
+
+        out.openTag("section")
         out.writeTag("title", _('Agenda:'))
         out.writeTag("line", booking._bookingParams["meetingDescription"])

indico/MaKaC/plugins/Collaboration/base.py

@@ -627 +627 @@
 
 
+    def getEventSessionDisplayPlugins(self, sorted = False):
+        """ Returns a list of names (strings) of plugins which have been configured
+            as showing bookings in the event display page under a specific session, and which have bookings
+            already (or previously) created in the event.
+            (does not check if the bookings are hidden or not)
+        """
+
+        pluginsWithEventSessionDisplay = CollaborationTools.pluginsWithEventSessionDisplay()
+        l = []
+        for pluginName in self._bookingsByType:
+            if pluginName in pluginsWithEventSessionDisplay:
+                l.append(pluginName)
+        if sorted:
+            l.sort()
+        return l
+
     def getEventDisplayPlugins(self, sorted = False):
         """ Returns a list of names (strings) of plugins which have been configured
@@ -717 +733 @@
     _hasStartDate = True
     _hasEventDisplay = False
+    _hasEventSessionDisplay = False
     _hasTitle = False
     _adminOnly = False
@@ -1367 +1384 @@
         return self._hasEventDisplay
 
+    def hasEventSessionDisplay(self):
+        """ Returns if the type of this booking should display something on
+            an event display page
+        """
+        return self._hasEventSessionDisplay
+
     def isAdminOnly(self):
         """ Returns if this booking / this booking's plugin pages should only be displayed

indico/MaKaC/plugins/Collaboration/collaborationTools.py

@@ -30 +30 @@
 from MaKaC.fossils.conference import IConferenceFossil
 
+from MaKaC.common.logger import Logger
+
 class CollaborationTools(object):
     """ Class with utility classmethods for the Collaboration plugins core and plugins
@@ -282 +284 @@
             if cls.getCSBookingClass(pluginName)._hasEventDisplay:
                 l.append(pluginName)
+        return l
+
+    @classmethod
+    def pluginsWithEventSessionDisplay(cls):
+        """ Utility function that returns a list of strings with the names of the
+            collaboration plugins that want to display something in event display pages
+        """
+        l = []
+        for pluginName in cls.getCollaborationPluginType().getPlugins():
+            Logger.get('Found plugins').info("pluginName = %s" % ( pluginName ) )
+            try:
+                if cls.getCSBookingClass(pluginName)._hasEventSessionDisplay:
+                    Logger.get('Found plugins').info("%s has session display" % ( pluginName ) )
+                    l.append(pluginName)
+            except AttributeError, err:
+                Logger.get('Found plugins').info("AttributeError on pluginName = %s" % ( pluginName ) )
+                pass
         return l
 

indico/MaKaC/webinterface/stylesheets/include/indico.xsl

@@ -158 +158 @@
             <tr>
               <td class="leftCol">
-                Video Booking
+                <xsl:value-of select="./videoBookingType"/>:
               </td>
               <td>