From c96d6bb61e43b79c4d4926763cbd32ae41b70d7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felipe=20Corr=C3=AAa=20da=20Silva=20Sanches?=
 <juca@members.fsf.org>
Date: Tue, 18 Apr 2017 00:13:58 -0300
Subject: [PATCH] display score comparison between upstream and prod fonts

(issue #1239)
---
 dashboard/containers/web/app.py               | 11 +++++++++--
 .../web/templates/family_details.html         | 19 ++++++++++++-------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/dashboard/containers/web/app.py b/dashboard/containers/web/app.py
index 87b0a123f5..e23bf28f93 100755
--- a/dashboard/containers/web/app.py
+++ b/dashboard/containers/web/app.py
@@ -87,6 +87,7 @@ def family_details(familyname):
 
     fonts_prod = list(db.table('check_results').filter({"commit": "prod", "familyname": familyname}).run())
     fonts_dev = list(db.table('check_results').filter({"HEAD": True, "familyname": familyname}).run())
+
     family_prod = db.table('cached_stats').filter({"commit": "prod", "familyname": familyname}).run().next()
     family_dev = []
     try:
@@ -108,10 +109,16 @@ def family_details(familyname):
       else:
         f['stylename'] = "{} (bad name)".format(f['fontname'])
 
+    # I think that the rearrangement of data below could be avoided by crafting a smarter database schema...
+    fonts = []
+    for p in fonts_prod:
+      for d in fonts_dev:
+        if d['stylename'] == p['stylename']:
+          fonts.append([p, d])
+
     return render_template("family_details.html",
                            delta=delta,
-                           dev=fonts_dev,
-                           prod=fonts_prod,
+                           fonts=fonts,
                            familyname=familyname,
                            chart_data=json.dumps(chart_data),
                            giturl=family_prod['giturl'])
diff --git a/dashboard/containers/web/templates/family_details.html b/dashboard/containers/web/templates/family_details.html
index 59f211e59c..bfa3d3da1e 100644
--- a/dashboard/containers/web/templates/family_details.html
+++ b/dashboard/containers/web/templates/family_details.html
@@ -25,17 +25,18 @@ <h2>Details for {{ familyname }} - <a href="{{ giturl }}">{{ giturl }}</a></h2>
       <div id="piechart"></div>
       <div id="tabs" style="display:hidden">
         <!-- tabs -->
-        <ul>{% for font in prod %}
-          <li><a href="#tab-{{ loop.index }}">{{ font['stylename'] }}</a></li>
+        <ul>{% for prod, dev in fonts %}
+          <li><a href="#tab-{{ loop.index }}">{{ prod['stylename'] }}</a></li>
           {% endfor %}</ul>
 
         <!-- Tabs content -->
-        {% for font in prod %}
+        {% for prod, dev in fonts %}
         <div id="tab-{{ loop.index }}">
           <div class="progress_item">
-            <span class="familyname">{{ font['fontname'] }}</span><br/>
-            <progress max="{{ font['stats']['Total'] }}" value="{{ font['stats']['OK'] }}"></progress>
-            <small style='text-align:right; margin-left:12px; color:grey'>({{ font['stats']['OK']*100/font['stats']['Total'] }} %)</small>
+            <span class="familyname">{{ prod['fontname'] }}</span><br/>
+            <progress max="{{ prod['stats']['Total'] }}" value="{{ prod['stats']['OK'] }}"></progress>
+            <small style='text-align:right; margin-left:12px; color:grey'>({{ 100*prod['stats']['OK']/prod['stats']['Total'] | round(2, 'floor') }} %)</small>
+            <p>upstream score change: {{ 100*(dev['stats']['OK']/dev['stats']['Total'] - prod['stats']['OK']/prod['stats']['Total']) | round(2, 'floor') }} %</p>
           </div>
 
           <table>
@@ -44,9 +45,10 @@ <h2>Details for {{ familyname }} - <a href="{{ giturl }}">{{ giturl }}</a></h2>
               <th data-sort="string">Check ID</th>
               <th data-sort="string">Check description</th>
               <th data-sort="string">Log Messages</th>
+              <!--<th data-sort="string">Upstream changes</th>-->
             </thead>
             <tbody>
-              {% for entry in font['results'] %}
+              {% for entry in prod['results'] %}
               <tr>
                 <td>{{ entry.result }}</td>
                 <td>{{ entry.check_number }}</td>
@@ -55,6 +57,9 @@ <h2>Details for {{ familyname }} - <a href="{{ giturl }}">{{ giturl }}</a></h2>
                 {% for msg in entry.log_messages %}
                   {{ msg }} <br/>
                 {% endfor %}
+                <!--</td>
+                <td>-->
+                
                 </td>
               </tr>
               {% endfor %}