Re-use view for user activity

app/controllers/statistics_controller.rb

@@ -25,6 +25,10 @@ class StatisticsController < ApplicationController
   end
 
   def user_activity_history
+    respond_to do |format|
+      format.html { render('activity_history', locals: {resource: :user}) }
+      format.json { render_ranged_data :ranged_user_data}
+    end
   end
 
   def rfc_activity
@@ -35,16 +39,18 @@ class StatisticsController < ApplicationController
 
   def rfc_activity_history
     respond_to do |format|
-      format.html { render 'rfc_activity_history' }
+      format.html { render('activity_history', locals: {resource: :rfc}) }
-      format.json do
+      format.json { render_ranged_data :ranged_rfc_data }
-        interval = params[:interval].to_s.empty? ? 'year' : params[:interval]
-        from = DateTime.strptime(params[:from], '%Y-%m-%d') rescue DateTime.new(0)
-        to = DateTime.strptime(params[:to], '%Y-%m-%d') rescue DateTime.now
-        render(json: ranged_rfc_data(interval, from, to))
-      end
     end
   end
 
+  def render_ranged_data(data_source)
+    interval = params[:interval].to_s.empty? ? 'year' : params[:interval]
+    from = DateTime.strptime(params[:from], '%Y-%m-%d') rescue DateTime.new(0)
+    to = DateTime.strptime(params[:to], '%Y-%m-%d') rescue DateTime.now
+    render(json: self.send(data_source, interval, from, to))
+  end
+
   def authorize!
     authorize self
   end

app/views/statistics/activity_history.html.slim

@@ -4,9 +4,9 @@
 
 .group
   .title
-    h1 = t('statistics.graphs.rfc_activity')
+    h1 = t("statistics.graphs.#{resource}_activity")
   .spinner
-  .graph#rfc-activity-history
+  .graph id="#{resource}-activity-history"
   form
     .form-group
       label for="from-date" = t('.from')

app/views/statistics/user_activity_history.html.slim

@@ -1 +0,0 @@
-

config/locales/de.yml

@@ -765,7 +765,7 @@ de:
       user_activity: "Nutzeraktivität"
       rfc_activity: "Kommentaranfragenaktivität"
       history: "Historie"
-    rfc_activity_history:
+    activity_history:
       from: "Von"
       to: "Bis"
       interval: "Intervall"

config/locales/en.yml

@@ -765,7 +765,7 @@ en:
       user_activity: "User Activity"
       rfc_activity: "RfC Activity"
       history: "History"
-    rfc_activity_history:
+    activity_history:
       from: "From"
       to: "To"
       interval: "Interval"