Scarab commit: svn commit: r11001 - trunk/src: java/org/tigris/scarab/notification webapp/WEB-INF/templates/email/notification

Author: dabbous
Date: 2010-04-20 13:42:33-0700
New Revision: 11001

Modified:
   trunk/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java
   trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm

Log:
Layout changes in Email template, personel changes are now sorted by UserAttribute

Modified: trunk/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java?view=diff&pathrev=11001&r1=11000&r2=11001
==============================================================================
--- trunk/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java	(original)
+++ trunk/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java	2010-04-20 13:42:33-0700
@@ -49,6 +49,8 @@
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Comparator;
+import java.util.Collections;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
@@ -949,6 +951,7 @@
      * @param notification
      * @param userActivities
      */
+    @SuppressWarnings("unchecked")
     private void addActivity(NotificationStatus notification, Map<LocalizationKey,List<NotificationStatus>> userActivities)
     {
 
@@ -977,6 +980,24 @@
         if (!bAlreadyPresent)
         {
             activityGroupNotificationList.add(notification);
+            Collections.sort(activityGroupNotificationList, new DisplayNameComparator());
+        }
+    }
+
+    private class DisplayNameComparator implements Comparator<NotificationStatus>
+    {
+
+        public int compare(NotificationStatus o1, NotificationStatus o2) 
+        {
+            int result = 0;
+            try
+            {
+                result =  o1.getActivity().getDisplayName().compareTo(o2.getActivity().getDisplayName());
+            } catch (Exception e) 
+            {
+                // [HD] Compare can not be performed, just ignore it (needs enhancement!!!)
+            }
+            return result;
         }
     }
 

Modified: trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm?view=diff&pathrev=11001&r1=11000&r2=11001
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm	2010-04-20 13:42:33-0700
@@ -38,12 +38,16 @@
 #end
 #end
 #if ($ActivityPersonnelChanges)
+#set ($currentDisplayName = "")
+#foreach ($not in $ActivityPersonnelChanges)
+#set ($displayName = $not.Activity.getDisplayName($l10n) )
+#if ($currentDisplayName != $displayName)
 $cr
 -------------------------------------------------------------------------------
-#markup('b')$l10n.ActivityPersonnelChanges#markup('b')
+#markup('b')$l10n.ActivityPersonnelChanges ($displayName) #markup('b')
 ${cr}-------------------------------------------------------------------------------
-#foreach ($not in $ActivityPersonnelChanges)
-#set ($displayName = $not.Activity.getDisplayName($l10n) )
+#end
+#set ($currentDisplayName = $displayName)
 #set ($newValue    = $not.Activity.getNewValue($l10n) )
 #set ($oldValue    = $not.Activity.getOldValue($l10n) )
   - $displayName: #if ($oldValue.length() > 0 && $oldValue.length()+$newValue.length() < 70) $oldValue -->#end #if ($newValue.length() > 0)$newValue #else($l10n.Deleted) #end #if ($oldValue.length() == 0)   ($l10n.New) #end

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2590792