Merge pull request #236 from piql/release-v1.0/fix-dashboard

Release v1.0/fix dashboard
piql · Oct 16, 2020 · 1f7ed75 · 1f7ed75
2 parents 9b4f4d0 + 09e5570
commit 1f7ed75
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/Stats/StatisticsData.php b/app/Stats/StatisticsData.php
@@ -11,8 +11,8 @@ class StatisticsData
 
     public function monthlyIngested($userId)
     {
-        $first = new \DateTime('-12 months');
-        $last = new \DateTime();
+        $first = new \DateTime('-11 months');
+        $last = new \DateTime('+1 months');
 
         $interval = DateInterval::createFromDateString('1 month');
         $period = new DatePeriod($first, $interval, $last);
@@ -59,8 +59,8 @@ private function monthlyOfflineIngested($date, $userId)
 
     public function monthlyAccessed($userId)
     {
-        $first = new \DateTime('-12 months');
-        $last = new \DateTime();
+        $first = new \DateTime('-11 months');
+        $last = new \DateTime('+1 months');
 
         $interval = DateInterval::createFromDateString('1 month');
         $period = new DatePeriod($first, $interval, $last);

diff --git a/deploy/logstash/conf.d/inputs/ingested_file_formats.conf b/deploy/logstash/conf.d/inputs/ingested_file_formats.conf
@@ -15,7 +15,7 @@ input {
 					                path not like '%/data/objects/submissionDocumentation/%'
 				                )
 		                ) fo
-		                left join bags on bags.id = fo.storable_id
+		                left join aips a on a.id = fo.storable_id
 		                group by mime_type, owner
 	                ) ingested_file_formats"
     schedule => "* * * * *"