Tweak z-score UI

conbench · Jun 7, 2021 · a711b48 · a711b48
1 parent cbf1522
commit a711b48
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 33 deletions.
diff --git a/conbench/templates/compare-entity.html b/conbench/templates/compare-entity.html
@@ -39,26 +39,14 @@
             <caption>{% include 'units-tooltip.html' %}</caption>
                 <thead>
                     <tr>
+                        <th width="25%" scope="col">Change</th>
+                        <th width="25%" scope="col">Z-Score</th>
                         <th width="25%" scope="col">Baseline</th>
                         <th width="25%" scope="col">Contender</th>
-                        <th width="25%" scope="col">Change</th>
                     </tr>
                 </thead>
                 <tbody>
                     {% for c in comparisons %}
-                    <tr>
-                         <td>{{ c.baseline }}</td>
-                         <td>{{ c.contender }}</td>
-                         <td>
-                           {{ c.change }}
-                           {% if c.regression %}
-                           <span class="glyphicon glyphicon-arrow-down"></span></b>
-                           {% endif %}
-                           {% if c.improvement %}
-                           <span class="glyphicon glyphicon-arrow-up"></span></b>
-                           {% endif %}
-                         </td>
-                    </tr>
                     <tr>
                          <td>
                            {{ c.baseline_z_score }} z
@@ -70,15 +58,16 @@
                            {% endif %}
                          </td>
                          <td>
-                           {{ c.contender_z_score }} z
-                           {% if c.contender_z_regression %}
+                           {{ c.change }}
+                           {% if c.regression %}
                            <span class="glyphicon glyphicon-arrow-down"></span></b>
                            {% endif %}
-                           {% if c.contender_z_improvement %}
+                           {% if c.improvement %}
                            <span class="glyphicon glyphicon-arrow-up"></span></b>
                            {% endif %}
                          </td>
-                         <td>&nbsp;</td>
+                         <td>{{ c.baseline }}</td>
+                         <td>{{ c.contender }}</td>
                     </tr>
                     {% endfor %}
                 </tbody>

diff --git a/conbench/templates/compare-list.html b/conbench/templates/compare-list.html
@@ -60,19 +60,25 @@
               </caption>
                 <thead>
                     <tr>
+                        <th scope="col">Z-Score</th>
                         <th scope="col">Change</th>
                         <th scope="col">Batch</th>
                         <th scope="col">Benchmark</th>
-                        <th scope="col">Baseline Z-Score</th>
-                        <th scope="col">Contender Z-Score</th>
                         <th scope="col">Baseline</th>
                         <th scope="col">Contender</th>
                     </tr>
                 </thead>
                 <tbody>
                     {% for c in comparisons %}
                     <tr>
+                         {% if c.contender is none %}
+                           <td>---</td>
+                         {% else %}
+                           <td>{{ c.contender_z_score }}</td>
+                         {% endif %}
+
                          <td>{{ c.change }}</td>
+
                          <td>
                            {% if type == "batch" %}
                              <div>{{ c.batch }}</div>
@@ -86,6 +92,7 @@
                              {% endif %}
                            {% endif %}
                          </td>
+
                          <td>
                            {% if c.contender is not none and c.baseline is not none %}
                              <a href="{{ c.compare_benchmarks_url }}">
@@ -96,18 +103,6 @@
                            {% endif %}
                          </td>
 
-                         {% if c.baseline is none %}
-                           <td>---</td>
-                         {% else %}
-                           <td>{{ c.baseline_z_score }}</td>
-                         {% endif %}
-
-                         {% if c.contender is none %}
-                           <td>---</td>
-                         {% else %}
-                           <td>{{ c.contender_z_score }}</td>
-                         {% endif %}
-
                          {% if c.baseline is none %}
                            <td>---</td>
                          {% else %}
@@ -134,7 +129,7 @@
   var table = $('#benchmarks').dataTable( {
       "responsive": true,
       "order": [[0, 'asc']],
-      "columnDefs": [{ "orderable": false, "targets": [5, 6] }]
+      "columnDefs": [{ "orderable": false, "targets": [4, 5] }]
   } );
   new $.fn.dataTable.FixedHeader( table );