Change room availble query and start confirmation

Author: abkruse

members/templates/members/user_confirm_booking.html

@@ -0,0 +1,8 @@
+{% extends 'members/u_base.html' %}
+
+{% block sub-title %}Confirm Booking | {% endblock %}
+
+{% block content %}
+
+
+{% endblock %}

members/templates/members/user_create_booking.html

@@ -69,15 +69,16 @@ <h5>{{ room.name }}</h5>
           </thead>
           <tr>
             {% for hour in hours %}
-              <td class='cal-box' id='hour-{{ hour }}'>
+              <td class='cal-box available' id='hour-{{ hour }}'>
               </td>
             {% endfor %}
           </tr>
         </table>
       </div>
-      <div class='col s1 book-room'>
-        <button class='book-btn btn'>Book</button>
-      </div>
+      <form class='col s1 book-room' action='.' method='POST'>
+        <button type='submit' name='room' value='{{ room.name }}' class='book-btn btn'>Book</button>
+        {% csrf_token %}
+      </form>
     </div>
     <div class='row dropdown-room slider closed' id='dropdown-{{ room.id }}'>
       <img class='col s3' src='{{ room.image.url }}'/>

members/views.py

@@ -555,6 +555,8 @@ def create_booking(request):
     end_dt = datetime.datetime.strptime(date + " " + end, "%Y-%m-%d %H:%M")
     end_ts = timezone.make_aware(end_dt, timezone.get_current_timezone())
 
+    #Make auto date for start and end if not otherwise given
+
     room_dict = {}
     rooms = Room.objects.available(start=start_ts, end=end_ts, has_av=has_av, has_phone=has_phone, floor=floor, seats=seats)
 
@@ -567,6 +569,11 @@ def create_booking(request):
         room_events = room.event_set.filter(room=room, start_ts__gte=target_date, end_ts__lte=end_date)
         room_dict[room] = room_events
 
+    if request.method == 'POST':
+        room = request.POST.get('room')
+        print room
+        # return HttpRespondeRedirect(reverse('member_confirm_booking'), {})
+
     return render_to_response('members/user_create_booking.html', {'rooms': rooms, 'hours':hours, 'room_dict': room_dict}, context_instance=RequestContext(request))
 
 @login_required

nadine/models/resource.py

@@ -3,6 +3,7 @@
 from django.db import models
 from django.conf import settings
 from django.utils import timezone
+from django.db.models import Q
 from django.contrib.auth.models import User
 
 from PIL import Image
@@ -23,7 +24,7 @@ def room_img_upload_to(instance, filename):
 
 class RoomManager(models.Manager):
 
-    def available(self, start=None, end=None, has_av=None, has_phone=None, floor=None, seats=None):
+    def available(self, start, end, has_av=None, has_phone=None, floor=None, seats=None):
         rooms = self.all()
         if has_av != None:
             rooms = rooms.filter(has_av=has_av)
@@ -33,14 +34,10 @@ def available(self, start=None, end=None, has_av=None, has_phone=None, floor=Non
             rooms = rooms.filter(floor=floor)
         if seats != None:
             rooms = rooms.filter(seats__gte=seats)
-        if start != None:
-            rooms = rooms.exclude(event__start_ts__lt=start)
-            # The three ways to filter out overlapping times
-            #  event__start_ts__lte=start and event__end_ts__gt=start
-            #  event__start_ts__gte=start and event__start_ts__lte=end
-            #  event__start_ts__lte=start and event__end_ts__gte=end)
-        if end != None:
-            rooms = rooms.exclude(event__end_ts__gt=end)
+        straddling = Q(event__start_ts__lte=start, event__end_ts__gt=start)
+        sandwich = Q(event__start_ts__gte=start, event__start_ts__lte=end)
+        overlap = Q(event__start_ts__lte=start, event__end_ts__gte=end)
+        rooms = rooms.exclude(straddling | sandwich | overlap)
         return rooms
 
 

nadine/tests/test_room.py

@@ -22,7 +22,8 @@ def setUp(self):
 
     def test_available_start(self):
         start = timezone.now() - timedelta(hours=3)
-        rooms = Room.objects.available(start=start)
+        end = timezone.now() - timedelta(hours=2)
+        rooms = Room.objects.available(start=start, end=end)
         self.assertTrue(len(rooms) > 0)
         self.assertFalse(rooms[0] == self.room1)
         self.assertTrue(rooms[0] == self.room2)