Changeset 75eb781 in indico

Timestamp:

03/28/11 16:32:29 (2 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

ce4589

Parents:

55c97c

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (03/22/11 14:12:44)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (03/28/11 16:32:29)

Message:

[IMP] Preserve info when booking from map

• Preserve the dates/times and repeatability when booking from calendar after filtering by those fields.

Location:

indico

Files:

• MaKaC/webinterface/rh/roomBooking.py (modified) (2 diffs)
• htdocs/js/indico/RoomBooking/MapOfRooms.js (modified) (1 diff)

indico/MaKaC/webinterface/rh/roomBooking.py

@@ -515 +515 @@
         monthM = params.get("month")
         yearY = params.get("year")
+        dayEnd = params.get("dayEnd")
+        monthEnd = params.get("monthEnd")
+        yearEnd = params.get("yearEnd")
+
+        hourStart = params.get("hour")
+        minuteStart = params.get("minute")
+        hourEnd = params.get("hourEnd")
+        minuteEnd = params.get("minuteEnd")
+        repeatability = params.get("repeatability")
+
+        if hourStart and minuteStart and hourStart.isdigit() and minuteStart.isdigit():
+            hourStart = int(hourStart)
+            minuteStart = int(minuteStart)
+        else:
+            hourStart = 8
+            minuteStart = 30
+
+        if hourEnd and minuteEnd and hourEnd.isdigit() and minuteEnd.isdigit():
+            hourEnd = int(hourEnd)
+            minuteEnd = int(minuteEnd)
+        else:
+            hourEnd = 17
+            minuteEnd = 30
 
         if dayD != None and dayD.isdigit() and \
            monthM != None and monthM.isdigit() and \
            yearY != None and yearY.isdigit():
-            candResv.startDT = datetime(int(yearY), int(monthM), int(dayD), 8, 30)
-            candResv.endDT = datetime(int(yearY), int(monthM), int(dayD), 17, 30)
+            candResv.startDT = datetime(int(yearY), int(monthM), int(dayD), hourStart, minuteStart)
+            if dayEnd != None and dayEnd.isdigit() and \
+               monthEnd != None and monthEnd.isdigit() and \
+               yearEnd!= None and yearEnd.isdigit():
+                candResv.endDT = datetime(int(yearEnd), int(monthEnd), int(dayEnd), hourEnd, minuteEnd)
+                if candResv.endDT.date() != candResv.startDT.date() and candResv.repeatability is None:
+                    candResv.repeatability = RepeatabilityEnum.daily
+            else:
+                candResv.endDT = datetime(int(yearY), int(monthM), int(dayD), hourEnd, minuteEnd)
         else:
             if candResv.startDT == None:
-                candResv.startDT = datetime( now.year, now.month, now.day, 8, 30 )
+                candResv.startDT = datetime( now.year, now.month, now.day, hourStart, minuteStart )
             if candResv.endDT == None:
-                candResv.endDT = datetime( now.year, now.month, now.day, 17, 30 )
+                candResv.endDT = datetime( now.year, now.month, now.day, hourEnd, minuteEnd )
+        if repeatability is not None:
+            if repeatability == 'None':
+                candResv.repeatability = None
+            else:
+                candResv.repeatability = int(repeatability)
         if self._getUser():
             if candResv.bookedForName == None:
@@ -542 +577 @@
             candResv.needsAVCSupport = False
 
-        if not ws.getVar( "dontAssign" ):
+        if not ws.getVar( "dontAssign" ) and not params.get("ignoreSession"):
             if ws.getVar( "defaultStartDT" ):
                 candResv.startDT = ws.getVar( "defaultStartDT" )

indico/htdocs/js/indico/RoomBooking/MapOfRooms.js

@@ -197 +197 @@
 
             // "Book" link
-            var book = Html.a({href:room.bookingUrl, target:'_parent', className:'mapBookRoomLink'}, $T("Book"));
+            var bookingUrl = room.bookingUrl;
+            if($E('isAvailable').dom.checked) {
+                bookingUrl += '&ignoreSession=on';
+                each({
+                    sDay: 'day',
+                    sMonth: 'month',
+                    sYear: 'year',
+                    eDay: 'dayEnd',
+                    eMonth: 'monthEnd',
+                    eYear: 'yearEnd',
+                    repeatability: 'repeatability'
+                }, function(param, field) {
+                    bookingUrl += '&' + param + '=' + encodeURIComponent($E(field).dom.value);
+                });
+
+                var sTime = $E('sTime').dom.value.split(':');
+                var eTime = $E('eTime').dom.value.split(':');
+                if(sTime.length == 2 && eTime.length == 2) {
+                    bookingUrl += '&hour=' + parseInt(sTime[0], 10);
+                    bookingUrl += '&minute=' + parseInt(sTime[1], 10);
+                    bookingUrl += '&hourEnd=' + parseInt(eTime[0], 10);
+                    bookingUrl += '&minuteEnd=' + parseInt(eTime[1], 10);
+                }
+            }
+            var book = Html.a({href:bookingUrl, target:'_parent', className:'mapBookRoomLink'}, $T("Book"));
 
             // "More" link - for room details