Changeset 769dfd in indico

Timestamp:

05/10/10 17:12:01 (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, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

3fa943

Parents:

90be8b

git-author:

Leszek Syroka <leszek.marek.syroka@…> (04/19/10 11:39:14)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (05/10/10 17:12:01)

Message:

[OPT] Calendar optimization

• eq method in roomCERN corrected
• bug in RoomBookingManyRoomsCalendar? corrected
• places where RoomBookingListItem?.tpl were used are now corrected
• ReservationBase?.splitToPeriods() method gets new parameter indicating from which date reservation has to be splitted to periods
• fix#371

Location:

indico/MaKaC

Files:

• plugins/RoomBooking/CERN/roomCERN.py (modified) (1 diff)
• rb_reservation.py (modified) (3 diffs)
• webinterface/tpls/RoomBookingList.tpl (modified) (3 diffs)
• webinterface/tpls/RoomBookingListItem.tpl (modified) (2 diffs)
• webinterface/tpls/RoomBookingManyRoomsCalendar.tpl (modified) (2 diffs)
• webinterface/wcomponents.py (modified) (1 diff)

indico/MaKaC/plugins/RoomBooking/CERN/roomCERN.py

@@ -41 +41 @@
     def __eq__( self, other ):
         try:
-            return self.id == other.id
-        except:
+            if self.id != None  and  other.id != None:
+                return self.id == other.id
+            else:
+                return self.name == other.name and self.building == other.building \
+                    and self.floor == other.floor and self.locationName == other.locationName
+
+        except AttributeError:
             if self is None and other is None:
                 return True

indico/MaKaC/rb_reservation.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 ##
+## $Id: rb_reservation.py,v 1.14 2009/05/14 18:05:51 jose Exp $
 ##
 ## This file is part of CDS Indico.
@@ -1213 +1214 @@
 
 
-    def splitToPeriods( self, endDT = None ):
+    def splitToPeriods( self, endDT = None, startDT = None ):
         """
         Returns the list of Periods that represent this reservation.
@@ -1220 +1221 @@
         For repeating ones, the list will include all repeatings.
         """
-        lastDT = self.startDT - timedelta( 1 )   # One day before the beginning
+        if startDT is None:
+            lastDT = self.startDT - timedelta( 1 )   # One day before the beginning
+        else:
+            lastDT = startDT - timedelta( 1 )
+
         periods = []
 

indico/MaKaC/webinterface/tpls/RoomBookingList.tpl

@@ -1 +1 @@
 <script type="text/javascript">
     isOver = false
-    function handleMouseOverResv( id ) { 
+    function handleMouseOverResv( id ) {
             if ( isOver ) return
             isOver = true
@@ -31 +31 @@
                                           <td class="dataCaptionFormat"><%= _("Reason")%> /<br /><%= _("For whom")%></td>
                           <td class="dataCaptionFormat">
-                            <%= _("Next")%> / <%= _("Period")%> 
+                            <%= _("Next")%> / <%= _("Period")%>
                             <% inlineContextHelp( _("First line shows date of the <b>next repetition</b>.<br /><br /> Next lines show booking period, or just booking date for non-repeating bookings.") ) %>
                           </td>
@@ -40 +40 @@
                                                 <td class="titleCellTD" colspan="10" style="height: 0px">&nbsp;</td>
                                         </tr>
-                                        <% for r in reservations: %>
-                                        <%     includeTpl( 'RoomBookingListItem', reservation = r, occurrence = r, withPhoto = True ) %>
-                                        <% end %>
+                                        <%     includeTpl( 'RoomBookingListItem', unrolledReservations = reservations, withPhoto = True ) %>
                                         <tr>
                                                 <td class="titleCellTD" colspan="10" style="height: 0px">&nbsp;</td>

indico/MaKaC/webinterface/tpls/RoomBookingListItem.tpl

@@ -17 +17 @@
 <% for collision in unrolledReservations: %>
     <%
-    reservation = collision.withReservation
+    if hasattr(collision, 'withReservation'):
+        reservation = collision.withReservation
+    else:
+        reservation = collision
+
     occurrence = collision
     myDetails = bookingDetailsUH.getURL( reservation )
@@ -41 +45 @@
 
     %>
+    <% end %>
+    <% end %>
     <% end %>
     <% end %>

indico/MaKaC/webinterface/tpls/RoomBookingManyRoomsCalendar.tpl

@@ -48 +48 @@
                 <% for roomBars in bars[dayD]: %>
                     <% room = roomBars.room %>
-                    <% bars = roomBars.bars %>
                     <tr>
                         <!-- Room Column -->
@@ -67 +66 @@
 
                                 <!-- Render each bar... -->
-                                <% for bar in bars: %>
+                                <% for bar in roomBars.bars: %>
                                     <% r = bar.forReservation %>
                                     <% left = int( 1.0 * ( (bar.startDT.hour-START_H) * 60 + bar.startDT.minute ) / (24*60) * DAY_WIDTH_PX  ) %>

indico/MaKaC/webinterface/wcomponents.py

@@ -6249 +6249 @@
 
             for r in rh._resvs:
-                for p in r.splitToPeriods(endDT=calendarEndDT):
+                for p in r.splitToPeriods(endDT=calendarEndDT, startDT=calendarStartDT):
                     if p.startDT >= calendarStartDT and p.endDT <= calendarEndDT:
                         collisionsOfResvs.append( Collision( ( p.startDT, p.endDT ), r ) )