[llvm-commits] [zorg] r130213 - in /zorg/trunk/lnt/lnt: server/ui/app.py server/ui/templates/browse.html server/ui/templates/index.html server/ui/templates/layout.html server/ui/views.py viewer/PerfDB.py

[Daniel Dunbar]

Author: ddunbar
Date: Tue Apr 26 12:47:53 2011
New Revision: 130213

URL: http://llvm.org/viewvc/llvm-project?rev=130213&view=rev
Log:
LNT/Flask: Port browse page.

Added:
    zorg/trunk/lnt/lnt/server/ui/templates/browse.html
Modified:
    zorg/trunk/lnt/lnt/server/ui/app.py
    zorg/trunk/lnt/lnt/server/ui/templates/index.html
    zorg/trunk/lnt/lnt/server/ui/templates/layout.html
    zorg/trunk/lnt/lnt/server/ui/views.py
    zorg/trunk/lnt/lnt/viewer/PerfDB.py

Modified: zorg/trunk/lnt/lnt/server/ui/app.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/ui/app.py?rev=130213&r1=130212&r2=130213&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/ui/app.py (original)
+++ zorg/trunk/lnt/lnt/server/ui/app.py Tue Apr 26 12:47:53 2011
@@ -85,6 +85,7 @@
 
         self.jinja_env.globals.update(
             app=current_app,
+            perfdb=PerfDB,
             old_config=self.old_config)
 
     def get_db_summary(self, db_name, db):

Added: zorg/trunk/lnt/lnt/server/ui/templates/browse.html
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/ui/templates/browse.html?rev=130213&view=auto
==============================================================================
--- zorg/trunk/lnt/lnt/server/ui/templates/browse.html (added)
+++ zorg/trunk/lnt/lnt/server/ui/templates/browse.html Tue Apr 26 12:47:53 2011
@@ -0,0 +1,59 @@
+{% extends "layout.html" %}
+{% set components = [] %}
+{% block title %}Database Browser{% endblock %}
+{% block body %}
+
+{% set db = request.get_db() %}
+<h3>Machines</h3>
+<table class="sortable" border=1 cellborder=1>
+  <thead>
+  <tr>
+    <th>Name</th>
+  </tr>
+  </thead>
+{% for m in db.machines() %}
+  <tr>
+    <td><a href="machines/{{m.id}}/">{{m.name}}:{{m.number}}</a></td>
+  </tr>
+{% endfor %}
+</table>
+
+{# List runs. #}
+<h3>Run List</h3>
+<table class="sortable" border=1 cellborder=1>
+  <thead>
+  <tr>
+    <th>ID</th>
+    <th>Machine</th>
+    <th>Start Time</th>
+    <th>End Time</th>
+  </tr>
+  </thead>
+{% for r,m in db.query(perfdb.Run, perfdb.Machine).join(perfdb.Machine) %}
+  <tr>
+    <td><a href="runs/{{r.id}}/">{{r.id}}</a></td>
+    <td><a href="machines/{{m.machine_id}}/">{{m.name}}:{{m.number}}</a></td>
+    <td>{{r.start_time}}</td>
+    <td>{{r.end_time}}</td>
+  </tr>
+{% endfor %}
+</table>
+
+{# List tests. #}
+<h3>Test List</h3>
+<table class="sortable" border=1 cellborder=1>
+  <thead>
+  <tr>
+    <th>ID</th>
+    <th>Test</th>
+  </tr>
+  </thead>
+{% for id,name in db.query(perfdb.Test.id, perfdb.Test.name) %}
+  <tr>
+    <td><a href="tests/{{id}}/">{{id}}</a></td>
+    <td>{{name}}</td>
+  </tr>
+{% endfor %}
+</table>
+
+{% endblock %}

Modified: zorg/trunk/lnt/lnt/server/ui/templates/index.html
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/ui/templates/index.html?rev=130213&r1=130212&r2=130213&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/ui/templates/index.html (original)
+++ zorg/trunk/lnt/lnt/server/ui/templates/index.html Tue Apr 26 12:47:53 2011
@@ -3,7 +3,6 @@
 {% block title %}Overview{% endblock %}
 {% block body %}
 
-
 {# Display available test result suites. #}
 {% set summary = request.get_db_summary() %}
 <h3>Test Results</h3>

Modified: zorg/trunk/lnt/lnt/server/ui/templates/layout.html
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/ui/templates/layout.html?rev=130213&r1=130212&r2=130213&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/ui/templates/layout.html (original)
+++ zorg/trunk/lnt/lnt/server/ui/templates/layout.html Tue Apr 26 12:47:53 2011
@@ -38,7 +38,7 @@
   <strong>Database:</strong>
   <select name="db" onchange="submit()">
 {% for name in old_config.databases.keys()|sort %}
-    <option{{" selected" if FIXME_is_selected}}>{{ name }}</option>
+    <option{{" selected" if name == g.db_name}}>{{ name }}</option>
 {% endfor %}
   </select>
   <input type="submit" value="Go"/>

Modified: zorg/trunk/lnt/lnt/server/ui/views.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/ui/views.py?rev=130213&r1=130212&r2=130213&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/ui/views.py (original)
+++ zorg/trunk/lnt/lnt/server/ui/views.py Tue Apr 26 12:47:53 2011
@@ -74,7 +74,7 @@
 
 @db_route('/browse')
 def browse():
-    raise NotImplementedError
+    return render_template("browse.html")
 
 @db_route('/submitRun')
 def submit_run():

Modified: zorg/trunk/lnt/lnt/viewer/PerfDB.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/viewer/PerfDB.py?rev=130213&r1=130212&r2=130213&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/viewer/PerfDB.py (original)
+++ zorg/trunk/lnt/lnt/viewer/PerfDB.py Tue Apr 26 12:47:53 2011
@@ -192,6 +192,9 @@
             self.get_revision(r)
         self.commit()
 
+        # Add shortcut alias.
+        self.query = self.session.query
+
     def get_revision(self, name):
         for r in self.session.query(Revision).filter_by(name=name):
             return r