Changeset e309f6 in indico

Timestamp:

04/19/10 14:11:41 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 4287315ec967a3da168d83963c14001db8487d53

Children:

4f0fe6

Parents:

44947c

git-author:

Leszek Syroka <leszek.marek.syroka@…> (03/25/10 13:59:36)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (04/19/10 14:11:41)

Message:

[FIX] Room names in conference overview

• room names in break, session and contribution were chaged to following foramt buidling-floor-room - roomName
• class RHConferenceOtherViews inherits from RoomBookingDBMixin to establish DB connection
• fix#347

Location:

indico/MaKaC

Files:

• common/output.py (modified) (6 diffs)
• webinterface/rh/conferenceDisplay.py (modified) (1 diff)

indico/MaKaC/common/output.py

@@ -274 +274 @@
                     roomFromDB = CrossLocationQueries.getRooms( roomName = roomName, location = loc.getName() )
                     # if there's a room with such name
-                    if roomFromDB:
+                    if roomFromDB != []:
                         # use the full name instead
-                        roomName = roomFromDB.getFullName()
+                        roomName = roomFromDB[0].getFullName()
 
                 out.writeTag("room", roomName)
@@ -420 +420 @@
                 out.writeTag("address",l.getAddress())
             if session.getRoom():
-                out.writeTag("room",session.getRoom().getName())
+                # get the name that is saved
+                roomName = session.getRoom().getName()
+
+                # if there is a connection to the room booking DB
+                if CrossLocationDB.isConnected() and l:
+                    # get the room info
+                    roomFromDB = CrossLocationQueries.getRooms( roomName = roomName, location = l.getName() )
+                    # if there's a room with such name
+                    if roomFromDB != []:
+                        # use the full name instead
+                        roomName = roomFromDB[0].getFullName()
+                out.writeTag("room", roomName)
                 url=RoomLinker().getURL(session.getRoom(), l)
                 if url != "":
@@ -516 +527 @@
                 out.writeTag("address",l.getAddress())
             if room:
-                out.writeTag("room",room.getName())
+                # get the name that is saved
+                roomName = room.getName()
+                # if there is a connection to the room booking DB
+                if CrossLocationDB.isConnected() and l:
+                    # get the room info
+                    roomFromDB = CrossLocationQueries.getRooms( roomName = roomName, location = l.getName() )
+                    # if there's a room with such name
+                    if roomFromDB != []:
+                        # use the full name instead
+                        roomName = roomFromDB[0].getFullName()
+                out.writeTag("room", roomName)
                 url=RoomLinker().getURL(room, l)
                 if url != "":
@@ -615 +636 @@
                 out.writeTag("address",l.getAddress())
             if cont.getRoom():
-                out.writeTag("room",cont.getRoom().getName())
+                roomName = cont.getRoom().getName()
+                # if there is a connection to the room booking DB
+                if CrossLocationDB.isConnected() and l:
+                    # get the room info
+                    roomFromDB = CrossLocationQueries.getRooms( roomName = roomName, location = l.getName() )
+                    # if there's a room with such name
+                    if roomFromDB != []:
+                        # use the full name instead
+                        roomName = roomFromDB[0].getFullName()
+                out.writeTag("room", roomName)
                 url=RoomLinker().getURL(cont.getRoom(), l)
                 if url != "":
@@ -826 +856 @@
                 out.writeTag("address",l.getAddress())
             if br.getRoom():
-                out.writeTag("room",br.getRoom().getName())
+                roomName = br.getRoom().getName()
+                # if there is a connection to the room booking DB
+                if CrossLocationDB.isConnected() and l:
+                    # get the room info
+                    roomFromDB = CrossLocationQueries.getRooms( roomName = roomName, location = l.getName() )
+                    # if there's a room with such name
+                    if roomFromDB != []:
+                        # use the full name instead
+                        roomName = roomFromDB[0].getFullName()
+                out.writeTag("room", roomName)
                 url=RoomLinker().getURL(br.getRoom(), l)
                 if url != "":
@@ -903 +942 @@
 
             if conf.getRoom():
-                loc = loc + ", "+conf.getRoom().getName()
+                roomName = conf.getRoom().getName()
+                # if there is a connection to the room booking DB
+                if CrossLocationDB.isConnected() and l:
+                    # get the room info
+                    roomFromDB = CrossLocationQueries.getRooms( roomName = roomName, location = l.getName() )
+                    # if there's a room with such name
+                    if roomFromDB != []:
+                        # use the full name instead
+                        roomName = roomFromDB[0].getFullName()
+                loc = loc + ", " + roomName
 
             if l.getName() != "":

indico/MaKaC/webinterface/rh/conferenceDisplay.py

@@ -458 +458 @@
 
 
-class RHConferenceOtherViews( RHConferenceBaseDisplay ):
+class RHConferenceOtherViews( RoomBookingDBMixin, RHConferenceBaseDisplay ):
     """this class is for the conference type objects only
     it is an alternative to the standard TimeTable view"""