From d6ddc41f73aa03b4aedf4a6d39b41387af8a1c2e Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Dec 01 2016 08:19:00 +0000
Subject: [PATCH 1/4] Fix retrieving user activity when there was only 1 commit that day


We had a bug where retrieving the user's activity when there was only
one commit on that day would crash.
This commit fixes it and add unit-tests confirming the fix.

---

diff --git a/pagure/api/user.py b/pagure/api/user.py
index 7786aaa..4113585 100644
--- a/pagure/api/user.py
+++ b/pagure/api/user.py
@@ -312,7 +312,10 @@ def api_view_user_activity_date(username, date):
                 acts.append(activity)
         for project in commits:
             if len(commits[project]) == 1:
-                tmp = commits[project]
+                tmp = dict(
+                    description_mk=pagure.lib.text2markdown(
+                        str(commits[project][0]))
+                )
             else:
                 tmp = dict(
                     description_mk=pagure.lib.text2markdown(
@@ -323,6 +326,7 @@ def api_view_user_activity_date(username, date):
                 )
             js_act.append(tmp)
         activities = acts
+
     for act in activities:
         activity = act.to_json(public=True)
         activity['description_mk'] = pagure.lib.text2markdown(str(act))
diff --git a/tests/test_pagure_flask_api_user.py b/tests/test_pagure_flask_api_user.py
index 3b171a9..81ef7e9 100644
--- a/tests/test_pagure_flask_api_user.py
+++ b/tests/test_pagure_flask_api_user.py
@@ -25,6 +25,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(
 
 import pagure.api
 import pagure.lib
+import pagure.lib.model as model
 import tests
 
 
@@ -242,6 +243,44 @@ class PagureFlaskApiUSertests(tests.Modeltests):
 
         self.assertEqual(data, exp)
 
+    @patch('pagure.lib.notify.send_email')
+    def test_api_view_user_activity_date_1_activity(self, mockemail):
+        """ Test the api_view_user_activity_date method of the flask user
+        api when the user only did one action. """
+
+        tests.create_projects(self.session)
+        repo = pagure.lib.get_project(self.session, 'test')
+
+        now = datetime.datetime.utcnow()
+        date = now.date().strftime('%Y-%m-%d')
+        # Create a single commit log
+        log = model.PagureLog(
+            user_id=1,
+            user_email='foo@bar.com',
+            project_id=1,
+            log_type='committed',
+            ref_id='githash',
+            date=now.date(),
+            date_created=now
+        )
+        self.session.add(log)
+        self.session.commit()
+
+        # Retrieve the user's logs for today
+        output = self.app.get(
+            '/api/0/user/pingou/activity/%s?grouped=1' % date)
+        self.assertEqual(output.status_code, 200)
+        data = json.loads(output.data)
+        exp = {
+          "activities": [
+            {
+              "description_mk": "<p>pingou committed on test#githash</p>"
+            }
+          ],
+          "date": date,
+        }
+        self.assertEqual(data, exp)
+
 
 if __name__ == '__main__':
     SUITE = unittest.TestLoader().loadTestsFromTestCase(

From 3480dd7a6c330dab30f8df70835c498561a4dc09 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Dec 01 2016 08:19:00 +0000
Subject: [PATCH 2/4] Report when the user clicks on the graph and there was no activity recorded


Fixes https://pagure.io/pagure/issue/1595

---

diff --git a/pagure/templates/_render_repo.html b/pagure/templates/_render_repo.html
index d1ebd27..e5c0056 100644
--- a/pagure/templates/_render_repo.html
+++ b/pagure/templates/_render_repo.html
@@ -322,17 +322,22 @@
             contentType: "application/json",
             dataType: 'json',
             success: function(data) {
+              $('#user-activity-body').html('');
+              $('#user-activity-title').text('Activity on ' + date);
+              $('#user-activity').show();
               if (data.activities.length > 0){
-                $('#user-activity-body').html('');
-                $('#user-activity-title').text('Activity on ' + date);
-                $('#user-activity').show();
+                for (var i=0; i<data.activities.length; i++){
+                  var d = data.activities[i];
+                  $('#user-activity-body').append(
+                    '<div class="list-group-item">'
+                    + d.description_mk
+                    + '</div>'
+                  );
+                }
               }
-              for (var i=0; i<data.activities.length; i++){
-                var d = data.activities[i];
-                $('#user-activity-body').append(
-                  '<div class="list-group-item">'
-                  + d.description_mk
-                  + '</div>'
+               else {
+                  $('#user-activity-body').append(
+                  '<div class="list-group-item">No activity recorded on that day</div>'
                 );
               }
             }

From 484f6f5fd7e17d05096de31bcad23ad897952416 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Dec 01 2016 08:19:00 +0000
Subject: [PATCH 3/4] Use abbreviated months for narrow screens


Fixes https://pagure.io/pagure/issue/1594

---

diff --git a/pagure/templates/_render_repo.html b/pagure/templates/_render_repo.html
index e5c0056..71e761b 100644
--- a/pagure/templates/_render_repo.html
+++ b/pagure/templates/_render_repo.html
@@ -307,6 +307,7 @@
         cellSize: 9,
         domain: "month",
         subDomain: "day",
+        domainLabelFormat: "%b",
         start: new Date(new Date().setMonth(new Date().getMonth() - 11)),
         data: "{{ url_for(
           'api_ns.api_view_user_activity_stats',

From 95c80702e692df3f8c7b177614d025e5fa818bfe Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Dec 01 2016 08:19:00 +0000
Subject: [PATCH 4/4] Add some space around the calendar heatmap so it's less crammed


Fixes https://pagure.io/pagure/issue/1594#comment-43420

---

diff --git a/pagure/static/pagure.css b/pagure/static/pagure.css
index 4dcc17c..9e38f23 100644
--- a/pagure/static/pagure.css
+++ b/pagure/static/pagure.css
@@ -564,6 +564,11 @@ th[data-sort] {
     padding-left:0.5em;
 }
 
+
+#cal-heatmap {
+    padding:0.5em;
+}
+
 /*Our specific responsive overrides*/
 
 @media (min-width:544px) {