Bugfix activities per month

arnovr · Oct 6, 2014 · 189ab85 · 189ab85
1 parent 6577524
commit 189ab85
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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;
  }