3 files changed, 36 insertions, 40 deletions
diff --git a/dashboard/src/booking/forms.py b/dashboard/src/booking/forms.py
index e48b293..df88cc6 100644
--- a/dashboard/src/booking/forms.py
+++ b/dashboard/src/booking/forms.py
@@ -48,8 +48,7 @@ class QuickBookingForm(forms.Form):
         )
 
         attrs = FormUtils.getLabData(0)
-        attrs['selection_data'] = 'false'
-        self.fields['filter_field'] = MultipleSelectFilterField(widget=MultipleSelectFilterWidget(attrs=attrs))
+        self.fields['filter_field'] = MultipleSelectFilterField(widget=MultipleSelectFilterWidget(**attrs))
         self.fields['length'] = forms.IntegerField(
             widget=NumberInput(
                 attrs={
diff --git a/dashboard/src/booking/quick_deployer.py b/dashboard/src/booking/quick_deployer.py
index 98c535a..0e0cc5a 100644
--- a/dashboard/src/booking/quick_deployer.py
+++ b/dashboard/src/booking/quick_deployer.py
@@ -96,25 +96,22 @@ class BookingPermissionException(Exception):
     pass
 
 
-def parse_host_field(host_field_contents):
-    host_json = json.loads(host_field_contents)
-    lab_dict = host_json['labs'][0]
-    lab_id = list(lab_dict.keys())[0]
-    lab_user_id = int(lab_id.split("_")[-1])
-    lab = Lab.objects.get(lab_user__id=lab_user_id)
-
-    host_dict = host_json['hosts'][0]
-    profile_id = list(host_dict.keys())[0]
-    profile_id = int(profile_id.split("_")[-1])
-    profile = HostProfile.objects.get(id=profile_id)
-
-    # check validity of field data before trying to apply to models
-    if len(host_json['labs']) != 1:
+def parse_host_field(host_json):
+    lab, profile = (None, None)
+    lab_dict = host_json['lab']
+    for lab_info in lab_dict.values():
+        if lab_info['selected']:
+            lab = Lab.objects.get(lab_user__id=lab_info['id'])
+
+    host_dict = host_json['host']
+    for host_info in host_dict.values():
+        if host_info['selected']:
+            profile = HostProfile.objects.get(pk=host_info['id'])
+
+    if lab is None:
         raise NoLabSelectedError("No lab was selected")
-    if not lab:
-        raise LabDNE("Lab with provided ID does not exist")
-    if not profile:
-        raise HostProfileDNE("Host type with provided ID does not exist")
+    if profile is None:
+        raise HostProfileDNE("No Host was selected")
 
     return lab, profile
 
diff --git a/dashboard/src/booking/stats.py b/dashboard/src/booking/stats.py
index b706577..62ba648 100644
--- a/dashboard/src/booking/stats.py
+++ b/dashboard/src/booking/stats.py
@@ -25,7 +25,7 @@ class StatisticsManager(object):
         some point in the given date span is the number of days to plot.
         The last x value will always be the current time
         """
-        x_set = set()
+        data = []
         x = []
         y = []
         users = []
@@ -33,26 +33,26 @@ class StatisticsManager(object):
         delta = datetime.timedelta(days=span)
         end = now - delta
         bookings = Booking.objects.filter(start__lte=now, end__gte=end)
-        for booking in bookings:
-            x_set.add(booking.start)
-            if booking.end < now:
-                x_set.add(booking.end)
+        for booking in bookings:  # collect data from each booking
+            user_list = [u.pk for u in booking.collaborators.all()]
+            user_list.append(booking.owner.pk)
+            data.append((booking.start, 1, user_list))
+            data.append((booking.end, -1, user_list))
 
-        x_set.add(now)
-        x_set.add(end)
+        # sort based on time
+        data.sort(key=lambda i: i[0])
 
-        x_list = list(x_set)
-        x_list.sort(reverse=True)
-        for time in x_list:
-            x.append(str(time))
-            active = Booking.objects.filter(start__lte=time, end__gt=time)
-            booking_count = len(active)
-            users_set = set()
-            for booking in active:
-                users_set.add(booking.owner)
-                for user in booking.collaborators.all():
-                    users_set.add(user)
-            y.append(booking_count)
-            users.append(len(users_set))
+        # collect data
+        count = 0
+        active_users = {}
+        for datum in data:
+            x.append(str(datum[0]))  # time
+            count += datum[1]  # booking count
+            y.append(count)
+            for pk in datum[2]:  # maintain count of each user's active bookings
+                active_users[pk] = active_users.setdefault(pk, 0) + datum[1]
+                if active_users[pk] == 0:
+                    del active_users[pk]
+            users.append(len([x for x in active_users.values() if x > 0]))
 
         return {"booking": [x, y], "user": [x, users]}