Extend (live) user statistics beyond ExternalUsers

The graphs shown at /statistics/graphs only included external users without providing a clear information on that. Now, we show activity of any contributor for these graphs.

Author: MrSerth

app/helpers/statistics_helper.rb

@@ -48,7 +48,7 @@ def contributor_statistics
       },
       {
         key: 'currently_active',
-          name: t('statistics.entries.users.currently_active'),
+          name: t('statistics.entries.contributors.currently_active'),
           data: Submission.from(Submission.where(created_at: 5.minutes.ago..).distinct.select(:contributor_id, :contributor_type)).count,
           url: statistics_graphs_path,
       },
@@ -113,15 +113,12 @@ def rfc_statistics
     ]
   end
 
-  # TODO: Need to consider and support programming groups
   def user_activity_live_data
     [
       {
         key: 'active_in_last_hour',
-          name: t('statistics.entries.users.currently_active'),
-          data: ExternalUser.joins(:submissions)
-            .where(submissions: {created_at: DateTime.now - 5.minutes..})
-            .distinct('external_users.id').count,
+          name: t('statistics.entries.contributors.currently_active'),
+          data: Submission.where(created_at: DateTime.now - 5.minutes..).distinct.select(:contributor_id, :contributor_type).count,
       },
       {
         key: 'submissions_per_minute',
@@ -215,15 +212,13 @@ def ranged_rfc_data(interval = 'year', from = DateTime.new(0), to = DateTime.now
     ]
   end
 
-  # TODO: Need to consider and support programming groups
   def ranged_user_data(interval = 'year', from = DateTime.new(0), to = DateTime.now)
     [
       {
         key: 'active',
-          name: t('statistics.entries.users.active'),
-          data: ExternalUser.joins(:submissions)
-            .where(submissions: {created_at: from..to})
-            .select(ExternalUser.sanitize_sql(['date_trunc(?, submissions.created_at) AS "key", count(distinct external_users.id) AS "value"', interval]))
+          name: t('statistics.entries.contributors.active'),
+          data: Submission.where(created_at: from..to)
+            .select(Submission.sanitize_sql(['date_trunc(?, created_at) AS "key", count(distinct CONCAT(contributor_type, contributor_id)) AS "value"', interval]))
             .group('key').order('key'),
       },
       {

config/locales/de/statistic.yml

@@ -7,6 +7,9 @@ de:
       to: Bis
       update: Aktualisieren
     entries:
+      contributors:
+        active: Aktive Mitwirkende
+        currently_active: Aktiv (5 Minuten)
       exercises:
         autosaves_per_minute: Aktuelle Autosaves (1h)
         average_number_of_submissions: Durchschnittliche Zahl von Abgaben
@@ -18,9 +21,6 @@ de:
         percent_solved: Beantwortete Anfragen
         percent_unsolved: Unbeantwortete Anfragen
         with_comments: Anfragen mit Kommentaren
-      users:
-        active: Aktive Personen
-        currently_active: Aktiv (5 Minuten)
     graphs:
       history: Historie
       rfc_activity: Kommentaranfragenaktivität

config/locales/en/statistic.yml

@@ -7,6 +7,9 @@ en:
       to: To
       update: Update
     entries:
+      contributors:
+        active: Active Contributors
+        currently_active: Active (5 minutes)
       exercises:
         autosaves_per_minute: Current Autosave Volume (1h)
         average_number_of_submissions: Average Number of Submissions
@@ -18,9 +21,6 @@ en:
         percent_solved: Solved Requests
         percent_unsolved: Unsolved Requests
         with_comments: RfCs with Comments
-      users:
-        active: Active Users
-        currently_active: Active (5 minutes)
     graphs:
       history: History
       rfc_activity: RfC Activity