From 8b8693df5afad21ec2fbc5c4029349296e7e7399 Mon Sep 17 00:00:00 2001
From: Patrick Gansterer <paroga@paroga.com>
Date: Thu, 18 Feb 2016 00:00:55 +0100
Subject: [PATCH] Show last activity of ordergroups

---
 app/models/ordergroup.rb                              | 7 +++++++
 app/views/foodcoop/ordergroups/_ordergroups.html.haml | 3 ++-
 config/locales/de.yml                                 | 1 +
 config/locales/en.yml                                 | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/models/ordergroup.rb b/app/models/ordergroup.rb
index 153ff379..6b74d572 100644
--- a/app/models/ordergroup.rb
+++ b/app/models/ordergroup.rb
@@ -26,6 +26,13 @@ class Ordergroup < Group
     User.natural_order.all.reject { |u| (users.include?(u) || u.ordergroup) }
   end
 
+  def last_user_activity
+    last_active_user = users.order('users.last_activity DESC').first
+    if last_active_user
+      last_active_user.last_activity
+    end
+  end
+
   # the most recent order this ordergroup was participating in
   def last_order
     orders.order('orders.starts DESC').first
diff --git a/app/views/foodcoop/ordergroups/_ordergroups.html.haml b/app/views/foodcoop/ordergroups/_ordergroups.html.haml
index 6059499d..946da98c 100644
--- a/app/views/foodcoop/ordergroups/_ordergroups.html.haml
+++ b/app/views/foodcoop/ordergroups/_ordergroups.html.haml
@@ -7,6 +7,7 @@
     %tr
       %th= heading_helper Ordergroup, :name
       %th= heading_helper Ordergroup, :user_tokens
+      %th= heading_helper Ordergroup, :last_user_activity
       %th= heading_helper Ordergroup, :last_order
 
   %tbody
@@ -14,5 +15,5 @@
       %tr
         %td= ordergroup.name
         %td=h ordergroup.users.collect { |u| show_user(u) }.join(", ")
+        %td= format_date ordergroup.last_user_activity
         %td= format_date ordergroup.last_order.try(:starts)
-
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 9908a9e0..453cad5c 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -105,6 +105,7 @@ de:
         description: Beschreibung
         ignore_apple_restriction: Bestellstop bei zu wenig Äpfeln ignorieren
         last_order: Zuletst bestellt
+        last_user_activity: Zuletzt aktiv
         name: Name
         user_tokens: Mitglieder
       page:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 112ba2be..6d6cd22b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -106,6 +106,7 @@ en:
         description: Description
         ignore_apple_restriction: Ignore order stop by apple points restriction
         last_order: Last order
+        last_user_activity: Last activity
         name: Name
         user_tokens: Members
       page: