From dd5bfda720de876823e141aae2b4b8cf8fb470b7 Mon Sep 17 00:00:00 2001
From: Miquel Torres <tobami@googlemail.com>
Date: Tue, 6 Apr 2010 10:16:38 +0200
Subject: [PATCH] Better display of overview table when no baseline is present

---
 speedcenter/codespeed/views.py                      | 6 +++---
 speedcenter/media/css/main.css                      | 2 +-
 speedcenter/templates/codespeed/overview_table.html | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/speedcenter/codespeed/views.py b/speedcenter/codespeed/views.py
index 7427bac4..7d5cea57 100644
--- a/speedcenter/codespeed/views.py
+++ b/speedcenter/codespeed/views.py
@@ -15,9 +15,9 @@ def getbaselineexecutables():
             for entry in settings.baselinelist:
                 executable = Executable.objects.get(id=entry['executable'])
                 rev = Revision.objects.filter(
-                    commitid=entry['revision'], project=executable.project
+                    commitid=str(entry['revision']), project=executable.project
                 )
-                if len(rev) > 1:
+                if len(rev) > 0:
                     rev = rev[0]
                 else:
                     raise Revision.DoesNotExist
@@ -26,7 +26,7 @@ def getbaselineexecutables():
                     #shortname += " " + executable.coptions
                 name = executable.name + " " + executable.coptions
                 if rev.tag: name += " " + rev.tag
-                else: name += " " + str(rev.commitid)
+                else: name += " " + rev.commitid
                 baseline.append({
                     'executable': executable.id,
                     'name': name,
diff --git a/speedcenter/media/css/main.css b/speedcenter/media/css/main.css
index 6829f3d1..6d2517b5 100644
--- a/speedcenter/media/css/main.css
+++ b/speedcenter/media/css/main.css
@@ -204,7 +204,7 @@ table.tablesorter {
     border: 1px solid #CDCDCD;
 }
 
-table#results thead tr th { padding-right: 9px; }
+table#results thead tr th { padding-right: 10px; }
 table#results thead tr th.w {  width: 6em; }
 table#results thead tr th.bar {
     background-image: url(/media/images/gridline_units.png);
diff --git a/speedcenter/templates/codespeed/overview_table.html b/speedcenter/templates/codespeed/overview_table.html
index 3ffa4fa7..1b4a50c3 100644
--- a/speedcenter/templates/codespeed/overview_table.html
+++ b/speedcenter/templates/codespeed/overview_table.html
@@ -1,15 +1,15 @@
 <table id="results" class="tablesorter">
 <thead>
   <tr>
-    <th class="w">Benchmark</th><th class="w">Time (s)</th><th class="w">Current change</th><th class="w">Trend ({{ trendconfig }})</th>{% if baselineflag %}<th class="w" title="Compared to {{ baseexecutable.name }} {{ baserevision }}">Times {{ baseexecutable.shortname }}</th><th class="bar" title="Compared to {{ baseexecutable.name }} in log 2 scale"><div style="float:left;font-size:smaller;">slower</div><div style="float:left;margin-left:48px;">(log<sub>2</sub> scale)</div><div style="float:left;margin-left:60px;font-size:smaller;">faster</div></th>{% endif %}
+    <th class="w">Benchmark</th><th class="w">Time (s)</th><th class="w">Current change</th><th class="w">Trend ({{ trendconfig }})</th><th class="w" title="Compared to {{ baseexecutable.name }} {{ baserevision }}">Times {{ baseexecutable.shortname }}</th><th class="bar" {% if not baselineflag %}style="visibility:hidden; "{% endif %}title="Compared to {{ baseexecutable.name }} in log 2 scale"><div style="float:left;font-size:smaller;">slower</div><div style="float:left;margin-left:48px;">(log<sub>2</sub> scale)</div><div style="float:left;margin-left:60px;font-size:smaller;">faster</div></th>
   </tr>
 </thead>
 <tfoot>
-  <tr><td class="text" title="Arithmetic mean">Average</td><td></td><td>{{ totals.change|floatformat:2 }}%</td><td>{{ totals.trend|floatformat:2 }}%</td>{% if baselineflag %}<td></td><td></td>{% endif %}</tr>
+  <tr><td class="text" title="Arithmetic mean">Average</td><td></td><td>{{ totals.change|floatformat:2 }}%</td><td>{{ totals.trend|floatformat:2 }}%</td><td></td><td{% if not baselineflag %} style="visibility:hidden;"{% endif %}></td></tr>
 </tfoot>
 <tbody>
 {% for row in table_list %}  <tr>
-        <td class="text"{% ifnotequal row.bench_description "" %} title="{{ row.bench_description }}"{% endifnotequal %}>{{ row.benchmark }}</td><td>{{ row.result|floatformat:4 }}</td><td>{{ row.change|floatformat:2 }}%</td><td>{% ifequal row.trend "-" %}-{% endifequal %}{% ifnotequal row.trend "-" %}{{ row.trend|floatformat:2 }}%{% endifnotequal %}</td>{% if baselineflag %}<td>{{ row.relative|floatformat:2 }}</td><td class="bar"><span>-</span></td>{% endif %}
+        <td class="text"{% ifnotequal row.bench_description "" %} title="{{ row.bench_description }}"{% endifnotequal %}>{{ row.benchmark }}</td><td>{{ row.result|floatformat:4 }}</td><td>{{ row.change|floatformat:2 }}%</td><td>{% ifequal row.trend "-" %}-{% endifequal %}{% ifnotequal row.trend "-" %}{{ row.trend|floatformat:2 }}%{% endifnotequal %}</td><td>{{ row.relative|floatformat:2 }}</td><td class="bar"{% if not baselineflag %} style="visibility:hidden;"{% endif %}><span>-</span></td>
   </tr>{% endfor %}
 </tbody>
 </table>
\ No newline at end of file