[Libreoffice-commits] dev-tools.git: esc-reporting/esc-analyze.py esc-reporting/esc-report.py

[jan Iversen]

 esc-reporting/esc-analyze.py |   15 ++++++++++++---
 esc-reporting/esc-report.py  |    4 ++--
 2 files changed, 14 insertions(+), 5 deletions(-)

New commits:
commit acad72edeea75b892de3d9537893f82076deff94
Author: jan Iversen <jani at documentfoundation.org>
Date:   Fri Nov 18 12:00:23 2016 +0100

    updated with UX requested changes

diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index c5fdfdb..aaf8b7a 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -169,6 +169,7 @@ def util_create_statList():
                             '1month': {'added': 0, 'removed': 0, 'commented': 0, 'total': 0},
                             '1week':  {'added': 0, 'removed': 0, 'commented': 0, 'total': 0},
                             'needsUXEval' : 0,
+                            'closed' : 0,
                             'topicUI': 0},
                      'qa': {'1year':  {'UNCONFIRMED': 0, 'NEW': 0, 'ASSIGNED': 0, 'REOPENED': 0, 'RESOLVED': 0,
                                        'VERIFIED': 0, 'CLOSED': 0, 'NEEDINFO': 0, 'PLEASETEST': 0, 'commented': 0, 'total': 0},
@@ -340,17 +341,25 @@ def analyze_ui(statList, openhubData, gerritData, gitData, bugzillaData, cfg):
     print("ui: analyze bugzilla", flush=True)
 
     for key, row in bugzillaData['bugs'].items():
-      if row['status'] == 'RESOLVED' or row['status'] == 'VERIFIED' or not 'topicUI' in row['keywords']:
-        continue
 
       xDate = datetime.datetime.strptime(row['last_change_time'], "%Y-%m-%dT%H:%M:%SZ")
       if xDate > cfg['cutDate']:
         continue
 
-      statList['data']['ui']['topicUI'] += 1
+      if not 'topicUI' in row['keywords'] and not 'needsUXEval' in row['keywords']:
+        continue
+
+      if row['status'] == 'RESOLVED' or row['status'] == 'CLOSED' or row['status'] == 'VERIFIED':
+        if xDate > cfg['1weekDate']:
+          statList['data']['ui']['closed'] += 1
+        continue
+
       if 'needsUXEval' in row['keywords']:
         statList['data']['ui']['needsUXEval'] += 1
 
+      if 'topicUI' in row['keywords']:
+        statList['data']['ui']['topicUI'] += 1
+
       for change in row['comments']:
         email = util_check_mail('*UNKNOWN*', change['creator'], statList, cfg['contributor']['combine-email'])
         xDate = datetime.datetime.strptime(change['creation_time'], "%Y-%m-%dT%H:%M:%SZ")
diff --git a/esc-reporting/esc-report.py b/esc-reporting/esc-report.py
index 6a207ad..7695fe8 100755
--- a/esc-reporting/esc-report.py
+++ b/esc-reporting/esc-report.py
@@ -360,7 +360,7 @@ def report_ui(statList, openhubData, gerritData, gitData, bugzillaData, cfg):
     print("copy/paste to esc pad:\n"
           "* UX update (heiko)\n"
           "    + Bugzilla (topicUI) statistics\n"
-          "        {} bugs open, {} needs to be evaluated by the UXteam\n"
+          "        {} (topicUI) bugs open, {} (needsUXEval) needs to be evaluated by the UXteam\n"
           "    + Updates:".format(
           util_build_escNumber('ui', 'topicUI', statList),
           util_build_escNumber('ui', 'needsUXEval', statList)), file=fp)
@@ -380,7 +380,7 @@ def report_ui(statList, openhubData, gerritData, gitData, bugzillaData, cfg):
     print("    + top 10 contributors:", file=fp)
     for i in range(0, 10):
       print('          {} made {} changes in 1 month, and {} changes in 1 year'.format(
-            top10list[i]['mail'], top10list[i]['month'], top10list[i]['year']), file=fp)
+            top10list[i]['name'], top10list[i]['month'], top10list[i]['year']), file=fp)
     fp.close()
     return {'title': 'esc_mentoring, UI', 'mail': 'jani at documentfoundation.org',
             'file': '/tmp/esc_ui_report.txt'}