From e8cfd2a52777f0a93c7e5930e4ec03b695de0613 Mon Sep 17 00:00:00 2001
From: Ilya Shakhat <ishakhat@mirantis.com>
Date: Thu, 15 Aug 2013 15:25:27 +0400
Subject: [PATCH] Added more details into review record

Change-Id: I0ea99bf132869d9a827d377411c9e2548d52aa12
---
 dashboard/static/css/style.css    |  4 ++++
 dashboard/templates/layout.html   |  7 ++++++-
 dashboard/templates/overview.html | 27 ++++++++++++++++++---------
 dashboard/web.py                  |  4 ++--
 4 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/dashboard/static/css/style.css b/dashboard/static/css/style.css
index a503c963e..9b31da065 100644
--- a/dashboard/static/css/style.css
+++ b/dashboard/static/css/style.css
@@ -208,6 +208,10 @@ a[href^="https://launchpad"]:after {
     font-size: 9pt;
 }
 
+.review_mark {
+    font-weight: bold;
+}
+
 /* MIRANTIS CSS*/
 
 #miraheader {
diff --git a/dashboard/templates/layout.html b/dashboard/templates/layout.html
index 27fa7068f..b74e0ac97 100644
--- a/dashboard/templates/layout.html
+++ b/dashboard/templates/layout.html
@@ -101,7 +101,7 @@
         });
     }
 
-    function chartAndTableRenderer(url, table_id, chart_id, link_param, options) {
+    function chartAndTableRenderer(url, container_id, table_id, chart_id, link_param, options) {
 
         $(document).ready(function () {
 
@@ -119,6 +119,11 @@
                     var i;
                     var hasComment = false;
 
+                    if (data.length == 0) {
+                        $("#" + container_id).hide();
+                        return;
+                    }
+
                     for (i = 0; i < data.length; i++) {
                         if (i < limit - 1) {
                             chartData.push([data[i].name, data[i].metric]);
diff --git a/dashboard/templates/overview.html b/dashboard/templates/overview.html
index d1a53aaa6..5b01db0ef 100644
--- a/dashboard/templates/overview.html
+++ b/dashboard/templates/overview.html
@@ -15,13 +15,13 @@
     timelineRenderer();
 
     {% if show_company_breakdown %}
-    chartAndTableRenderer("/data/companies", "company_table", "company_chart", "company");
+    chartAndTableRenderer("/data/companies", "company_container", "company_table", "company_chart", "company");
     {% endif %}
     {% if show_engineer_breakdown %}
-    chartAndTableRenderer("/data/engineers", "engineer_table", "engineer_chart", "user_id", {company: "{{ company|encode }}" });
+    chartAndTableRenderer("/data/engineers", "engineer_container", "engineer_table", "engineer_chart", "user_id", {company: "{{ company|encode }}" });
     {% endif %}
     {% if show_module_breakdown %}
-    chartAndTableRenderer("/data/modules", "module_table", "module_chart", "module");
+    chartAndTableRenderer("/data/modules", "module_container", "module_table", "module_chart", "module");
     {% endif %}
 
     {% if show_activity %}
@@ -37,6 +37,9 @@
                     if (data["activity"].length < page_size) {
                         $('#activity_more').hide();
                     }
+                    if ((start_record == 0) && (data["activity"].length == 0)) {
+                        $('#activity_header').hide();
+                    }
                     {% if metric == 'marks' %}
                     $("#review_activity_template").tmpl(data["activity"]).appendTo("#activity_container");
                     {% else %}
@@ -99,7 +102,7 @@
         <div style='font-weight: bold;'>${subject}</div>
         <div style='white-space: pre-wrap; '>{%html message %}</div>
         <div><span style="color: green">+<span>${lines_added}</span></span>
-            <span style="color: red">- <span>${lines_deleted}</span></span></div>
+            <span style="color:">- <span>${lines_deleted}</span></span></div>
     </div>
     </div>
     {% endraw %}
@@ -111,12 +114,13 @@
     <div style='float: left; '><img src="${gravatar}" style="width: 32px; height: 32px;"></div>
     <div style="margin-left: 40px;">
         <div style="font-weight: bold;">{%html author_link %} ({%html company_link %})</div>
-        <div style="font-weight: bold;">${date_str} to <a href="https://launchpad.net/${module}">${module}</a></div>
+        <div style="font-weight: bold;">${date_str} in <a href="https://launchpad.net/${module}">${module}</a></div>
     </div>
     <div style="margin-left: 40px;">
+        <div>Patch submitted by {%html parent_author_link %}</div>
         <div style='font-weight: bold;'>${subject}</div>
         <div>Change Id: <a href="${url}">${review_id}</a></div>
-        <div>Review mark: ${value}</div>
+        <div style="color: {%if value > 0 %} green {%else%} blue {%/if%}">${description}: <span class="review_mark">${value}</span></div>
     </div>
     </div>
     {% endraw %}
@@ -167,6 +171,7 @@
 
 <div>Total commits: <b>${commit_count}</b></div>
 <div>Total LOC: <b>${loc}</b></div>
+<div>Review stat (-2, -1, +1, +2): <b>${marks["-2"]}, ${marks["-1"]}, ${marks["1"]}, ${marks["2"]}</b></div>
     {% endraw %}
 </script>
 
@@ -175,6 +180,7 @@
 {% block left_frame %}
 
     {% if show_company_breakdown %}
+    <div id="company_container">
     <h2>Contribution by companies</h2>
 
     <div id="company_chart" style="width: 100%; height: 350px;"></div>
@@ -191,10 +197,11 @@
         </tbody>
     </table>
     <div class="spacer"></div>
+    </div>
     {% endif %}
 
     {% if show_engineer_breakdown %}
-
+    <div id="engineer_container">
     <h2>Contribution by engineers</h2>
 
     <div id="engineer_chart" style="width: 100%; height: 350px;"></div>
@@ -214,14 +221,14 @@
         </tbody>
     </table>
     <div class="spacer"></div>
-
+    </div>
     {% endif %}
 
     {% if show_user_profile %}
         <div id="user_profile_container" style="margin-bottom: 2em;"></div>
     {% endif %}
     {% if show_user_activity %}
-        <h3>Activity log</h3>
+        <h3 id="activity_header">Activity log</h3>
         <div id="activity_container"></div>
 
         <div style="height: 44px;">
@@ -236,6 +243,7 @@
 {% block right_frame %}
 
     {% if show_module_breakdown %}
+    <div id="module_container">
     <h2>Contribution by modules</h2>
 
     <div id="module_chart" style="width: 100%; height: 350px;"></div>
@@ -252,6 +260,7 @@
         </tbody>
     </table>
     <div class="spacer"></div>
+    </div>
     {% endif %}
 
     {% if show_user_activity %}
diff --git a/dashboard/web.py b/dashboard/web.py
index 484ce4a94..e2a0f1453 100644
--- a/dashboard/web.py
+++ b/dashboard/web.py
@@ -584,12 +584,12 @@ def get_activity_json(records):
             if parent:
                 review['subject'] = parent['subject']
                 review['url'] = parent['url']
+                review['parent_author_link'] = make_link(
+                    parent['author_name'], '/', {'user_id': parent['user_id']})
                 extend_record(review)
                 result.append(review)
 
     result.sort(key=lambda x: x['date'], reverse=True)
-    if start_record < 0:
-        start_record += len(result)
     return json.dumps({'activity':
                       result[start_record:start_record + page_size]})