From 819d2d7f12324ad355c364be58f8da87bce8db56 Mon Sep 17 00:00:00 2001
From: Austin Clark <austin.clark@hp.com>
Date: Thu, 16 Jul 2015 12:23:30 -0600
Subject: [PATCH] refactored latest_results to results, updated urls

---
 .../{latest_results.html => results.html}     |  0
 stackviz/templates/menu.html                  |  6 ++---
 .../{latest_results.html => results.html}     |  5 ++--
 stackviz/templates/template.html              |  6 +++++
 stackviz/views/devstack/results.py            |  4 +++
 stackviz/views/devstack/urls.py               |  4 +--
 stackviz/views/tempest/latest_results.py      |  4 ---
 stackviz/views/tempest/results.py             | 27 +++++++++++++++++++
 stackviz/views/tempest/urls.py                |  9 +++++--
 9 files changed, 52 insertions(+), 13 deletions(-)
 rename stackviz/templates/devstack/{latest_results.html => results.html} (100%)
 rename stackviz/templates/tempest/{latest_results.html => results.html} (96%)
 create mode 100644 stackviz/views/devstack/results.py
 delete mode 100644 stackviz/views/tempest/latest_results.py
 create mode 100644 stackviz/views/tempest/results.py

diff --git a/stackviz/templates/devstack/latest_results.html b/stackviz/templates/devstack/results.html
similarity index 100%
rename from stackviz/templates/devstack/latest_results.html
rename to stackviz/templates/devstack/results.html
diff --git a/stackviz/templates/menu.html b/stackviz/templates/menu.html
index 89817d6..53ba359 100644
--- a/stackviz/templates/menu.html
+++ b/stackviz/templates/menu.html
@@ -7,7 +7,7 @@
             <a href="#"><i class="fa fa-bar-chart-o fa-fw"></i> DevStack<span class="fa arrow"></span></a>
             <ul class="nav nav-second-level">
                 <li>
-                    <a href="/devstack/latest_results"><i class="fa fa-clock-o fa-fw"></i> Latest Results</a>
+                    <a href="/devstack/results"><i class="fa fa-clock-o fa-fw"></i> Results</a>
                 </li>
                 <li>
                     <a href="/devstack/"><i class="fa fa-calendar fa-fw"></i> History</a>
@@ -22,10 +22,10 @@
             <a href="#"><i class="fa fa-bar-chart-o fa-fw"></i> Tempest<span class="fa arrow"></span></a>
             <ul class="nav nav-second-level">
                 <li>
-                    <a href="/tempest/latest_results"><i class="fa fa-clock-o fa-fw"></i> Latest Results</a>
+                    <a href="/tempest/results"><i class="fa fa-clock-o fa-fw"></i> Results</a>
                 </li>
                 <li>
-                    <a href="/tempest/"><i class="fa fa-calendar fa-fw"></i> History</a>
+                    <a href="/tempest/timeline"><i class="fa fa-calendar fa-fw"></i> Timeline</a>
                 </li>
                 <li>
                     <a href="/tempest/"><i class="fa fa-database fa-fw"></i> Compare</a>
diff --git a/stackviz/templates/tempest/latest_results.html b/stackviz/templates/tempest/results.html
similarity index 96%
rename from stackviz/templates/tempest/latest_results.html
rename to stackviz/templates/tempest/results.html
index 6aa7c85..d1c2fc5 100644
--- a/stackviz/templates/tempest/latest_results.html
+++ b/stackviz/templates/tempest/results.html
@@ -1,12 +1,12 @@
 {% extends 'template.html' %}
 
-{% block title %}Tempest Latest Results{% endblock %}
+{% block title %}Tempest Results{% endblock %}
 
 {% block body %}
 
 <div class="row">
     <div class="col-lg-12">
-        <h1 class="page-header">Latest Results</h1>
+        <h1 class="page-header">Results</h1>
     </div>
 </div>
 
@@ -107,6 +107,7 @@
                      }
 
                 document.getElementById("result-table-div").appendChild(tbl);
+                $( "table-test" ).DataTable();
 
                }
 
diff --git a/stackviz/templates/template.html b/stackviz/templates/template.html
index 90a51b1..59d873e 100644
--- a/stackviz/templates/template.html
+++ b/stackviz/templates/template.html
@@ -30,6 +30,9 @@
     <!-- Custom Fonts -->
     <link href="{% static 'components/font-awesome/css/font-awesome.min.css' %}" rel="stylesheet" type="text/css">
 
+    <!-- DataTables CSS -->
+    <link href="{% static 'components/datatables/media/css/jquery.dataTables.min.css' %}" rel="stylesheet" type="text/css">
+
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
@@ -90,6 +93,9 @@
     <!-- d3.js -->
     <script src="{% static 'components/d3/d3.min.js' %}"></script>
 
+    <!-- DataTable for jQuery -->
+    <script src="{% static 'components/datatables/media/js/jquery.dataTables.min.js' %}"></script>
+
 
 </body>
 
diff --git a/stackviz/views/devstack/results.py b/stackviz/views/devstack/results.py
new file mode 100644
index 0000000..096cba4
--- /dev/null
+++ b/stackviz/views/devstack/results.py
@@ -0,0 +1,4 @@
+from django.views.generic import TemplateView
+
+class ResultsView(TemplateView):
+    template_name = 'devstack/results.html'
diff --git a/stackviz/views/devstack/urls.py b/stackviz/views/devstack/urls.py
index 2fd2300..fd0802b 100644
--- a/stackviz/views/devstack/urls.py
+++ b/stackviz/views/devstack/urls.py
@@ -1,7 +1,7 @@
 from django.conf.urls import patterns, include, url
 from django.contrib import admin
 
-from stackviz.views.devstack.latest_results import LatestResultsView
+from stackviz.views.devstack.results import ResultsView
 
 
 urlpatterns = patterns('',
@@ -9,5 +9,5 @@ urlpatterns = patterns('',
     # url(r'^$', 'stackviz.views.home', name='home'),
     # url(r'^blog/', include('blog.urls')),
 
-    url(r'^latest_results$', LatestResultsView.as_view()),
+    url(r'^results$', ResultsView.as_view()),
 )
diff --git a/stackviz/views/tempest/latest_results.py b/stackviz/views/tempest/latest_results.py
deleted file mode 100644
index 4c7e908..0000000
--- a/stackviz/views/tempest/latest_results.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from django.views.generic import TemplateView
-
-class LatestResultsView(TemplateView):
-    template_name = 'tempest/latest_results.html'
diff --git a/stackviz/views/tempest/results.py b/stackviz/views/tempest/results.py
new file mode 100644
index 0000000..9199480
--- /dev/null
+++ b/stackviz/views/tempest/results.py
@@ -0,0 +1,27 @@
+from django.core.urlresolvers import reverse
+from django.views.generic import TemplateView, RedirectView
+from django.http import Http404
+
+from stackviz.parser.tempest_subunit import get_repositories
+
+
+class ResultsView(TemplateView):
+    template_name = 'tempest/results.html'
+
+    def get_context_data(self, **kwargs):
+        context = super(ResultsView, self).get_context_data(**kwargs)
+        context['run_id'] = self.kwargs['run_id']
+
+        return context
+
+
+class LatestResultsView(RedirectView):
+    def get_redirect_url(self, run_id):
+        repos = get_repositories()
+        if not repos:
+            raise Http404("No testr repositories could be loaded")
+
+        return reverse('tempest_results', kwargs={
+            'run_id': repos[0].get_latest_run().get_id()
+        })
+
diff --git a/stackviz/views/tempest/urls.py b/stackviz/views/tempest/urls.py
index 3c05107..1b46eed 100644
--- a/stackviz/views/tempest/urls.py
+++ b/stackviz/views/tempest/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls import patterns, include, url
 
-from .latest_results import LatestResultsView
+from .results import ResultsView,LatestResultsView
 from .timeline import TimelineView, TimelineLatestView
 
 from .api import (TempestRunTreeEndpoint,
@@ -9,7 +9,12 @@ from .api import (TempestRunTreeEndpoint,
 
 
 urlpatterns = patterns('',
-    url(r'^latest_results$', LatestResultsView.as_view()),
+    url(r'^results/(?P<run_id>\d+)/$',
+        ResultsView.as_view(),
+        name='tempest_results'),
+    url(r'^latest_results$',
+        LatestResultsView.as_view(),
+        name='tempest_results_latest'),
 
     url(r'^timeline/(?P<run_id>\d+)/$',
         TimelineView.as_view(),