diff --git a/src/main/java/se/su/dsv/scipro/project/panels/NotificationsPanel.html b/src/main/java/se/su/dsv/scipro/project/panels/NotificationsPanel.html index 8e2429c059..eb56a2dad6 100644 --- a/src/main/java/se/su/dsv/scipro/project/panels/NotificationsPanel.html +++ b/src/main/java/se/su/dsv/scipro/project/panels/NotificationsPanel.html @@ -10,7 +10,8 @@ </div> <div wicket:id="notificationsListView" class="rounded-border-notification"> - <div wicket:id="infoText"></div> + <div wicket:id="dateLabel"></div> + <div wicket:id="infoText"></div> <a href="#" wicket:id="readNotification">Set read</a> <a href="#" wicket:id="bookmarkLink">Go to</a> </div> diff --git a/src/main/java/se/su/dsv/scipro/project/panels/NotificationsPanel.java b/src/main/java/se/su/dsv/scipro/project/panels/NotificationsPanel.java index a649b4e936..2878aa21f6 100644 --- a/src/main/java/se/su/dsv/scipro/project/panels/NotificationsPanel.java +++ b/src/main/java/se/su/dsv/scipro/project/panels/NotificationsPanel.java @@ -17,13 +17,11 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.request.target.basic.RedirectRequestTarget; import org.apache.wicket.spring.injection.annot.SpringBean; - import se.su.dsv.scipro.SciProSession; import se.su.dsv.scipro.data.dao.interfaces.WebNotificationDao; import se.su.dsv.scipro.data.dataobjects.WebNotification; import se.su.dsv.scipro.dataproviders.WebNotificationDataProvider; -import se.su.dsv.scipro.security.auth.Authorization; -import se.su.dsv.scipro.security.auth.roles.Roles; +import se.su.dsv.scipro.util.DateFormatter; /** * @author Johan Aschan <aschan@dsv.su.se> @@ -73,7 +71,8 @@ public class NotificationsPanel extends Panel { @Override protected void populateItem(final Item<WebNotification> item) { - item.add(new Label("infoText", item.getModel().getObject().getInfoText())); + item.add(new DateFormatter(DateFormatter.FORMAT.EXTENDED).createFormattedDateLabel("dateLabel", item.getModelObject().getDateCreated())); + item.add(new Label("infoText", item.getModel().getObject().getInfoText())); item.add(new Link<Void>("bookmarkLink") { private static final long serialVersionUID = 1L;