Fix advance slot booking issue

3 files changed, 6 insertions, 7 deletions

diff --git a/sbhs/models.py b/sbhs/models.py
index 95d5b62..2cdbb90 100644
--- a/sbhs/models.py
+++ b/sbhs/models.py
@@ -101,12 +101,12 @@ class Profile(models.Model):
 class SlotManager(models.Manager):
 
     def get_user_slots(self, user):
-        now = timezone.localtime()
+        now = timezone.now()
         slots = self.filter(user=user, start_time__lte=now, end_time__gt=now)
         return slots
 
     def get_all_active_slots(self):
-        now = timezone.localtime()
+        now = timezone.now()
         slots = self.filter(start_time__lte=now, end_time__gt=now)
         return slots
 
@@ -116,7 +116,7 @@ class SlotManager(models.Manager):
                            user__in=users
                            ).count() == 0
     def get_active_slot_for_board(self, mid):
-        now = timezone.localtime()
+        now = timezone.now()
         users = [userboard.user.id for userboard in
                  UserBoard.objects.filter(board__mid=mid)
                  ]
@@ -125,7 +125,7 @@ class SlotManager(models.Manager):
         return slots
 
     def board_all_booked_slots(self,mid):
-        now = timezone.localtime()
+        now = timezone.now()
         users = [userboard.user.id for userboard in UserBoard.objects.filter(
                  board__mid=mid)
                 ]
diff --git a/sbhs/views.py b/sbhs/views.py
index c4bb1d8..58a3f24 100644
--- a/sbhs/views.py
+++ b/sbhs/views.py
@@ -309,9 +309,8 @@ def slot_new(request):
                 new_slot_date = new_slot.start_time.date()
                 new_slot_time = new_slot.start_time.time()
                 new_slot_date_slots = slot_history.filter(
-                                        start_time=new_slot_date
+                                        start_time__date=new_slot_date
                                         )
-
                 if len(new_slot_date_slots) >= settings.LIMIT:
                     messages.warning(request,'Cannot Book more than {0} \
                         slots in advance in a day'.format(settings.LIMIT))
diff --git a/sbhs_server/settings.py b/sbhs_server/settings.py
index 88b85d8..d9ce67b 100644
--- a/sbhs_server/settings.py
+++ b/sbhs_server/settings.py
@@ -129,7 +129,7 @@ USE_I18N = True
 
 USE_L10N = True
 
-USE_TZ = True
+USE_TZ = False
 
 
 # Static files (CSS, JavaScript, Images)