DMC/scipro
7
0
Fork 0
Code Issues43 Pull Requests9 Actions Projects1 Releases Wiki Activity

added date to notifications

Browse Source
This commit is contained in:
Fredrik Friis 2012-04-06 14:18:16 +09:00
parent d6b745c7b6
commit 704ba00aa6
2 changed files with 5 additions and 5 deletions
src/main/java/se/su/dsv/scipro/project/panels
NotificationsPanel.htmlNotificationsPanel.java

3
src/main/java/se/su/dsv/scipro/project/panels/NotificationsPanel.html

@ -10,7 +10,8 @@
</div> </div>
<div wicket:id="notificationsListView" class="rounded-border-notification"> <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="readNotification">Set read</a>
<a href="#" wicket:id="bookmarkLink">Go to</a> <a href="#" wicket:id="bookmarkLink">Go to</a>
</div> </div>

7
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.model.LoadableDetachableModel;
import org.apache.wicket.request.target.basic.RedirectRequestTarget; import org.apache.wicket.request.target.basic.RedirectRequestTarget;
import org.apache.wicket.spring.injection.annot.SpringBean; import org.apache.wicket.spring.injection.annot.SpringBean;
import se.su.dsv.scipro.SciProSession; import se.su.dsv.scipro.SciProSession;
import se.su.dsv.scipro.data.dao.interfaces.WebNotificationDao; import se.su.dsv.scipro.data.dao.interfaces.WebNotificationDao;
import se.su.dsv.scipro.data.dataobjects.WebNotification; import se.su.dsv.scipro.data.dataobjects.WebNotification;
import se.su.dsv.scipro.dataproviders.WebNotificationDataProvider; import se.su.dsv.scipro.dataproviders.WebNotificationDataProvider;
import se.su.dsv.scipro.security.auth.Authorization; import se.su.dsv.scipro.util.DateFormatter;
import se.su.dsv.scipro.security.auth.roles.Roles;
/** /**
* @author Johan Aschan <aschan@dsv.su.se> * @author Johan Aschan <aschan@dsv.su.se>
@ -73,7 +71,8 @@ public class NotificationsPanel extends Panel {
@Override @Override
protected void populateItem(final Item<WebNotification> item) { 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") { item.add(new Link<Void>("bookmarkLink") {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;