Merge "Split the dashboard into different apps, add tests"

[pharos.git] / tools / pharos-dashboard / dashboard / views.py

diff --git a/tools/pharos-dashboard/dashboard/views/table_views.py b/tools/pharos-dashboard/dashboard/views.py
similarity index 73%
rename from tools/pharos-dashboard/dashboard/views/table_views.py
rename to tools/pharos-dashboard/dashboard/views.py
index 4404234..ed62b35 100644 (file)
--- a/tools/pharos-dashboard/dashboard/views/table_views.py
+++ b/tools/pharos-dashboard/dashboard/views.py
@@ -1,18 +1,18 @@
-import dashboard.jenkins.jenkins_util as jenkins_util
-
-import dashboard.jenkins.jenkins_adapter as jenkins
-from dashboard.models import Resource, Booking
 from django.utils import timezone
 from django.views.generic import TemplateView
 
+from booking.models import Booking
+from dashboard.models import Resource
+from jenkins import adapter as jenkins
+
 
 class JenkinsSlavesView(TemplateView):
-    template_name = "tables/jenkins_slaves.html"
+    template_name = "dashboard/jenkins_slaves.html"
 
     def get_context_data(self, **kwargs):
         slaves = jenkins.get_all_slaves()
         for slave in slaves:
-            jenkins_util.parse_slave_data(slave, slave)
+            jenkins.parse_slave_data(slave, slave)
 
         context = super(JenkinsSlavesView, self).get_context_data(**kwargs)
         context.update({'title': "Jenkins Slaves", 'slaves': slaves})
@@ -20,7 +20,7 @@ class JenkinsSlavesView(TemplateView):
 
 
 class CIPodsView(TemplateView):
-    template_name = "tables/ci_pods.html"
+    template_name = "dashboard/ci_pods.html"
 
     def get_context_data(self, **kwargs):
         resources = Resource.objects.filter().values()  # get resources as a set of dicts
@@ -29,7 +29,7 @@ class CIPodsView(TemplateView):
             if not jenkins.is_ci_slave(resource['slavename']):
                 continue
             ci_slave = jenkins.get_slave(resource['slavename'])
-            jenkins_util.parse_slave_data(resource, ci_slave)
+            jenkins.parse_slave_data(resource, ci_slave)
             ci_pods.append(resource)
 
         context = super(CIPodsView, self).get_context_data(**kwargs)
@@ -38,20 +38,20 @@ class CIPodsView(TemplateView):
 
 
 class DevelopmentPodsView(TemplateView):
-    template_name = "tables/dev_pods.html"
+    template_name = "dashboard/dev_pods.html"
 
     def get_context_data(self, **kwargs):
         resources = Resource.objects.filter().values()  # get resources as a set of dicts
         dev_pods = []
 
-        current_bookings = Booking.objects.filter(start_date_time__lte=timezone.now())
-        current_bookings = current_bookings.filter(end_date_time__gt=timezone.now())
+        current_bookings = Booking.objects.filter(start__lte=timezone.now())
+        current_bookings = current_bookings.filter(end__gt=timezone.now())
 
         for resource in resources:
             if not jenkins.is_dev_pod(resource['slavename']):
                 continue
             dev_pod = jenkins.get_slave(resource['slavename'])
-            jenkins_util.parse_slave_data(resource, dev_pod)
+            jenkins.parse_slave_data(resource, dev_pod)
             for booking in current_bookings:
                 if booking.resource.slavename == resource['slavename']:
                     resource['current_booking'] = booking