From 06bcd3cc4ee94e7cd994d6dcebefe720bb0539cc Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Tue, 2 May 2017 16:25:04 +0200
Subject: [PATCH] Adjustment to interface and ranking

---
 pullrequests/analyze.py        | 20 ++++++++++++++++++--
 www/template_pullrequests.html |  9 +++++----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/pullrequests/analyze.py b/pullrequests/analyze.py
index a63d675..af24ec9 100755
--- a/pullrequests/analyze.py
+++ b/pullrequests/analyze.py
@@ -5,6 +5,8 @@ import datetime
 
 prs = {}
 
+prioritary_milestone = "2.6.x"
+
 def get_teams():
 
     with open("repos.json", "r") as f:
@@ -56,6 +58,9 @@ def priority(pr):
     if "dying" in pr["labels"] and base_priority > -100:
         base_priority += 5
 
+    if pr["milestone"] != None and pr["milestone"] != prioritary_milestone:
+        base_priority -= 10
+
     return base_priority
 
 
@@ -74,6 +79,10 @@ def main():
             if "pull_request" not in issue.keys():
                 continue
 
+            milestone = None
+            if issue["milestone"]:
+                milestone = issue["milestone"]["title"]
+
             pr = {
                "repo":    repo,
                "title":   issue["title"],
@@ -81,10 +90,17 @@ def main():
                "id":      "%s-%s" % (repo, issue["number"]),
                "createdDaysAgo": githubDateToDaysAgo(issue["created_at"]),
                "updatedDaysAgo": githubDateToDaysAgo(issue["updated_at"]),
-               "url":     issue["pull_request"]["html_url"],
-               "teams":   teams
+               "url":       issue["pull_request"]["html_url"],
+               "teams":     teams,
+               "milestone": milestone,
+               "size": None
             }
 
+            for size in ["small", "medium", "big"]:
+                if "%s decision" % size in pr["labels"]:
+                    pr["labels"].remove("%s decision" % size)
+                    pr["labels"].insert(0,size)
+
             if isPRDying(pr):
                 pr["labels"].append("dying")
             pr["priority"] = priority(pr)
diff --git a/www/template_pullrequests.html b/www/template_pullrequests.html
index b833efd..9088cb9 100644
--- a/www/template_pullrequests.html
+++ b/www/template_pullrequests.html
@@ -102,15 +102,16 @@
                             <span class="label 
                         {% if label == "important" %}label-danger{%else%}
                         {% if label == "opinion needed" %}label-warning{%else%}
-                        {% if label == "small decision" %}label-info{%else%}
-                        {% if label == "medium decision" %}label-info{%else%}
-                        {% if label == "big decision" %}label-info{%else%}
+                        {% if label == "small" %}label-info{%else%}
+                        {% if label == "medium" %}label-info{%else%}
+                        {% if label == "big" %}label-info{%else%}
+                        {% if label == "ready to merge" %}label-success{%else%}
                         {% if label == "work needed" %}label-primary{%else%}
                         {% if label == "inactive" %}label-default{%else%}
                         {% if label == "postponed" %}label-default{%else%}
                         {% if label == "dying" %}label-danger{%else%}
                                                  label-primary
-                        {%endif%}{%endif%}{%endif%}{%endif%}{%endif%}{%endif%}{%endif%}{%endif%}{%endif%}
+                        {%endif%}{%endif%}{%endif%}{%endif%}{%endif%}{%endif%}{%endif%}{%endif%}{%endif%}{%endif%}
                             ">{{ label }}</span>
                             &nbsp;
                             {% endfor %}