Commit 7c175628 authored by Daniel W Bond's avatar Daniel W Bond
Browse files

implemented onFloor and inBuilding

parent 5e7fac32
...@@ -36,14 +36,21 @@ class DetailFloor(LoginRequiredMixin, DetailView): ...@@ -36,14 +36,21 @@ class DetailFloor(LoginRequiredMixin, DetailView):
context_object_name = 'floor' context_object_name = 'floor'
template_name = detail_floor.html template_name = detail_floor.html
requesting_student = Student.objects.filter(user=self.request.user)
# if self.request.user is on the floor
def onFloor(): def onFloor():
# if self.request.user is on the floor floor_status = False
return False if requesting_student.get_floor == self.get_object():
floor_status = True
return floor_status
# if self.request.user is in the building
def inBuilding(): def inBuilding():
inBuilding = False building_status = False
# if self.request.user is in the building if requesting_student.get_building == self.get_object().building:
return False building_status = True
return building_status
rooms = Room.objects.filter(floor=self.get_object()).order_by('-number') rooms = Room.objects.filter(floor=self.get_object()).order_by('-number')
floor_students = [] floor_students = []
...@@ -67,14 +74,21 @@ class DetailRoom(LoginRequiredMixin, DetailView): ...@@ -67,14 +74,21 @@ class DetailRoom(LoginRequiredMixin, DetailView):
context_object_name = 'room' context_object_name = 'room'
template_name='detailBuilding.html' template_name='detailBuilding.html'
requesting_student = Student.objects.filter(user=self.request.user)
# if self.request.user is on the floor
def onFloor(): def onFloor():
# if self.request.user is on the floor floor_status = False
return False if requesting_student.get_floor == self.get_object().floor:
floor_status = True
return floor_status
# if self.request.user is in the building
def inBuilding(): def inBuilding():
inBuilding = False building_status = False
# if self.request.user is in the building if requesting_student.get_building == self.get_object().get_building:
return False building_status = True
return building_status
if onFloor(): if onFloor():
students = Student.objects.filter(room=self.get_object()).floor_building_students() students = Student.objects.filter(room=self.get_object()).floor_building_students()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment