From 189ab85b14168b0d1e74adbc4588efd36d92a192 Mon Sep 17 00:00:00 2001
From: arnovr <arnovanrossum1@gmail.com>
Date: Mon, 6 Oct 2014 10:50:41 +0200
Subject: [PATCH] Bugfix activities per month

---
 .../c3js/activity/activityusagepermonthadapter.php        | 8 +++-----
 lib/entity/activity/activityusagerepository.php           | 2 --
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/adapters/c3js/activity/activityusagepermonthadapter.php b/lib/adapters/c3js/activity/activityusagepermonthadapter.php
index dc198ca..13763c5 100644
--- a/lib/adapters/c3js/activity/activityusagepermonthadapter.php
+++ b/lib/adapters/c3js/activity/activityusagepermonthadapter.php
@@ -47,7 +47,7 @@ public function formatData($data)
             {
                 $x[] = $date;
             }
-            $result = $this->parseUsernamesToRow($usernames);
+            $this->parseUsernamesToRow($result, $usernames);
         }
 
         $result["x"] = $x;
@@ -57,13 +57,12 @@ public function formatData($data)
     }
 
     /**
-     * @TODO Check if this isn't obsolete, what goes in and what goes out
+     * @param array $result
      * @param array $usernames
      * @return array
      */
-    private function parseUsernamesToRow(array $usernames)
+    private function parseUsernamesToRow(&$result, array $usernames)
     {
-        $result = array();
         foreach($usernames as $username => $count)
         {
             if ( !in_array($username, array_keys($result)) )
@@ -73,7 +72,6 @@ private function parseUsernamesToRow(array $usernames)
 
             $result[$username][] = $count;
         }
-        return $result;
     }
 
 }
diff --git a/lib/entity/activity/activityusagerepository.php b/lib/entity/activity/activityusagerepository.php
index 4c8e75b..d93083d 100644
--- a/lib/entity/activity/activityusagerepository.php
+++ b/lib/entity/activity/activityusagerepository.php
@@ -93,7 +93,6 @@ public function findAllPerMonth($username = '')
         for($i = 1; $i <= $runs; $i++)
         {
             list($startTimestamp, $endTimestamp) = $this->calculateStartAndEndTimestamp($i, $created);
-
             if ( $username !== '' )
             {
                 $return[$created->format('Y-m-d')] = $this->findActivitiesBetweenTimestampAndUser($startTimestamp, $endTimestamp, $username);
@@ -103,7 +102,6 @@ public function findAllPerMonth($username = '')
                 $return[$created->format('Y-m-d')] = $this->findActivitiesBetweenTimestamp($startTimestamp, $endTimestamp);
             }
         }
-
         return $return;
     }