From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 20 Jun 2014 14:44:28 +0000 (+0200)
Subject: Grouping notifications by date
X-Git-Tag: 2.1.0_Alpha_1~669^2~4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=aa6fcadfbbc75a3833c351410ebda04627189ef8;p=GitHub%2FWoltLab%2FWCF.git

Grouping notifications by date
---

diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml
index eceb72f287..fb60484a92 100644
--- a/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@ -160,6 +160,7 @@
 		</type>
 		<!-- /activity points -->
 		
+		<!-- comments -->
 		<type>
 			<name>com.woltlab.wcf.user.profileComment</name>
 			<definitionname>com.woltlab.wcf.comment.commentableContent</definitionname>
@@ -202,6 +203,7 @@
 			<classname><![CDATA[wcf\system\user\notification\object\type\UserProfileCommentResponseUserNotificationObjectType]]></classname>
 			<category>com.woltlab.wcf.user</category>
 		</type>
+		<!-- /comments -->
 		
 		<!-- moderation -->
 		<type>
diff --git a/com.woltlab.wcf/templates/notificationList.tpl b/com.woltlab.wcf/templates/notificationList.tpl
index 5b0f6787c3..5bf55adc74 100644
--- a/com.woltlab.wcf/templates/notificationList.tpl
+++ b/com.woltlab.wcf/templates/notificationList.tpl
@@ -46,9 +46,23 @@
 </div>
 
 {if $notifications[notifications]}
-	<div class="container marginTop">
-		<ul class="containerList" id="userNotificationItemList">
-			{foreach from=$notifications[notifications] item=$notification}
+	{assign var=lastPeriod value=''}
+	
+	{foreach from=$notifications[notifications] item=$notification}
+		{if $notification[event]->getPeriod() != $lastPeriod}
+			{if $lastPeriod}
+					</ul>
+				</div>
+			{/if}
+			{assign var=lastPeriod value=$notification[event]->getPeriod()}
+			
+			<header class="boxHeadline boxSubHeadline">
+				<h2>{$lastPeriod}</h2>
+			</header>
+			
+			<div class="container marginTop">
+				<ul class="containerList"{* id="userNotificationItemList"*}>
+		{/if}
 				<li class="jsNotificationItem{if $notification[authors] > 1} groupedNotificationItem{/if}" data-notification-id="{@$notification[notificationID]}" data-link="{$notification[event]->getLink()}" data-is-grouped="{if $notification[authors] > 1}true{else}false{/if}">
 					<div class="box48">
 						{if $notification[authors] < 2}
@@ -114,7 +128,7 @@
 						{/if}
 					</div>
 				</li>
-			{/foreach}
+	{/foreach}
 		</ul>
 	</div>
 	
diff --git a/wcfsetup/install/files/lib/system/user/notification/event/AbstractUserNotificationEvent.class.php b/wcfsetup/install/files/lib/system/user/notification/event/AbstractUserNotificationEvent.class.php
index 20a5a68d47..cbd2245277 100644
--- a/wcfsetup/install/files/lib/system/user/notification/event/AbstractUserNotificationEvent.class.php
+++ b/wcfsetup/install/files/lib/system/user/notification/event/AbstractUserNotificationEvent.class.php
@@ -6,6 +6,7 @@ use wcf\data\user\UserProfile;
 use wcf\data\DatabaseObjectDecorator;
 use wcf\system\user\notification\object\IUserNotificationObject;
 use wcf\system\WCF;
+use wcf\util\DateUtil;
 
 /**
  * Provides default a implementation for user notification events.
@@ -65,6 +66,12 @@ abstract class AbstractUserNotificationEvent extends DatabaseObjectDecorator imp
 	 */
 	protected $language = null;
 	
+	/**
+	 * list of point of times for each period's end
+	 * @var	array<string>
+	 */
+	protected static $periods = array();
+	
 	/**
 	 * notification trigger count
 	 * @var	integer
@@ -185,4 +192,37 @@ abstract class AbstractUserNotificationEvent extends DatabaseObjectDecorator imp
 	public function isStackable() {
 		return $this->stackable;
 	}
+	
+	/**
+	 * Returns the readable period matching this notification.
+	 * 
+	 * @return	string
+	 */
+	public function getPeriod() {
+		if (empty(self::$periods)) {
+			$date = DateUtil::getDateTimeByTimestamp(TIME_NOW);
+			$date->setTimezone(WCF::getUser()->getTimeZone());
+			$date->setTime(0, 0, 0);
+			
+			self::$periods[$date->getTimestamp()] = WCF::getLanguage()->get('wcf.date.period.today');
+			
+			// 1 day back
+			$date->modify('-1 day');
+			self::$periods[$date->getTimestamp()] = WCF::getLanguage()->get('wcf.date.period.yesterday');
+			
+			// 2-6 days back
+			for ($i = 0; $i < 6; $i++) {
+				$date->modify('-1 day');
+				self::$periods[$date->getTimestamp()] = DateUtil::format($date, 'l');
+			}
+		}
+		
+		foreach (self::$periods as $time => $period) {
+			if ($this->notification->time >= $time) {
+				return $period;
+			}
+		}
+		
+		return WCF::getLanguage()->get('wcf.date.period.older');
+	}
 }
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 535a14b8e7..ae2aa6ae0a 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1771,6 +1771,11 @@ Fehler sind beispielsweise:
 		<item name="wcf.date.interval.weeks.future"><![CDATA[In {if $weeks > 1}{#$weeks} Wochen{else}einer Woche{/if}]]></item>
 		<item name="wcf.date.interval.years.future"><![CDATA[In {if $years > 1}{#$years} Jahren{else}einem Jahr{/if}]]></item>
 		
+		<!-- variables for time periods -->
+		<item name="wcf.date.period.older"><![CDATA[Älter]]></item>
+		<item name="wcf.date.period.today"><![CDATA[Heute]]></item>
+		<item name="wcf.date.period.yesterday"><![CDATA[Gestern]]></item>
+		
 		<!-- variables for dynamic javascript datetime -->
 		<item name="wcf.date.relative.now"><![CDATA[Vor einem Moment]]></item>
 		<item name="wcf.date.relative.minutes"><![CDATA[{literal}Vor {if $minutes > 1}{#$minutes} Minuten{else}einer Minute{/if}{/literal}]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index dee5ef8f39..ca69f9967e 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1740,6 +1740,11 @@ Errors are:
 		<item name="wcf.date.interval.weeks.future"><![CDATA[In {if $weeks > 1}{#$weeks} weeks{else}A week{/if}]]></item>
 		<item name="wcf.date.interval.years.future"><![CDATA[In {if $years > 1}{#$years} years{else}A year{/if}]]></item>
 		
+		<!-- variables for time periods -->
+		<item name="wcf.date.period.older"><![CDATA[Older]]></item>
+		<item name="wcf.date.period.today"><![CDATA[Today]]></item>
+		<item name="wcf.date.period.yesterday"><![CDATA[Yesterday]]></item>
+		
 		<!-- variables for dynamic javascript datetime -->
 		<item name="wcf.date.relative.now"><![CDATA[A moment ago]]></item>
 		<item name="wcf.date.relative.minutes"><![CDATA[{literal}{if $minutes > 1}{#$minutes} minutes{else}A minute{/if} ago{/literal}]]></item>