DMC/scipro
7
0
Fork 0
Code Issues40 Pull Requests6 Actions1 Projects1 Releases Wiki Activity

Fixat nya grejor

Browse Source 
git-svn-id: svn://svn.dsv.su.se/scipro/scipro/trunk@244 73ecded7-942e-4092-bab0-0e58ef0ee984
This commit is contained in:
joha-asc 2011-02-23 13:52:42 +00:00
parent b3945039a3
commit 29b3901ea3
6 changed files with 56 additions and 28 deletions

0
src/main/java/se/su/dsv/scipro/message/panels/MessagePanel.html → src/main/java/se/su/dsv/scipro/message/panels/MessageBoardPanel.html

8
src/main/java/se/su/dsv/scipro/message/panels/MessagePanel.java → src/main/java/se/su/dsv/scipro/message/panels/MessageBoardPanel.java

@ -40,7 +40,7 @@ import se.su.dsv.scipro.data.dataobjects.User;
* @author Johan Aschan - aschan@dsv.su.se
*
*/
public class MessagePanel extends Panel {
public class MessageBoardPanel extends Panel {
@SpringBean
@ -59,7 +59,7 @@ public class MessagePanel extends Panel {
private ListView<Recipient> privateMessageListView;
public MessagePanel(String id, Project project) {
public MessageBoardPanel(String id, Project project) {
super(id);
this.project = project;
loadListView();
@ -75,6 +75,10 @@ public class MessagePanel extends Panel {
add(listContainer);
}
public MessageBoardPanel(String id) {
super(id);
}
public void loadListView() {
project = projectDao.reLoad(project);

13
src/main/java/se/su/dsv/scipro/message/panels/PrivateMessagePanel.html

@ -11,25 +11,24 @@
<wicket:panel>
<div wicket:id="listContainer">
<table wicket:id="private-message-item">
<tr>
<tr>
<hr/>
</tr>
<tr><strong>Private Message</strong></tr>
<tr >
<td wicket:id="application.date"></td>
<td wicket:id="date"></td>
</tr>
<tr >
<td wicket:id="application.dateRead"></td>
<td wicket:id="dateRead"></td>
</tr>
<tr >
<td wicket:id="application.from"></td>
<td wicket:id="from"></td>
</tr>
<tr >
<td wicket:id="application.title"></td>
<td wicket:id="title"></td>
</tr>
<tr>
<td wicket:id="application.message"></td>
<td wicket:id="message"></td>
</tr>
<tr>

11
src/main/java/se/su/dsv/scipro/message/panels/PrivateMessagePanel.java

@ -64,6 +64,7 @@ public class PrivateMessagePanel extends Panel {
}
public void loadListView() {
privateMessageListView = new ListView<Recipient>(
"private-message-item", recipientDao.getRecipientsByUser(user)) {
@ -72,17 +73,17 @@ public class PrivateMessagePanel extends Panel {
protected void populateItem(final ListItem<Recipient> item) {
final Recipient rec = item.getModelObject();
PrivateMessage pm = rec.getPrivateMessage();
item.add(new Label("application.date", pm.getDateCreated()
item.add(new Label("date", pm.getDateCreated()
.toString()));
String read = "Not Read";
if(rec.getDateRead() != null){
read = rec.getDateRead().toString();
}
item.add(new Label("application.dateRead", read));
item.add(new Label("application.from", pm.getFromUser()
item.add(new Label("dateRead","Read: " + read));
item.add(new Label("from", "From: " + pm.getFromUser()
.getFirstName() + " " + pm.getFromUser().getLastName()));
item.add(new Label("application.title", pm.getTitle()));
item.add(new Label("application.message", pm.getMessage()));
item.add(new Label("title","Title: " + pm.getTitle()));
item.add(new Label("message","Message: " + pm.getMessage()));
RecipientDeleteLink rdl = new RecipientDeleteLink("removeLink", item.getModelObject());
item.add(new AjaxLink<Recipient>("setReadLink"){

3
src/main/java/se/su/dsv/scipro/message/panels/SentPrivateMessagePanel.html

@ -25,6 +25,9 @@
<tr >
<td wicket:id="title"></td>
</tr>
<tr >
<td wicket:id="message"></td>
</tr>
<tr>
<td><a href="#" wicket:id="removeLink">Remove</a></td>
</tr>

49
src/main/java/se/su/dsv/scipro/message/panels/SentPrivateMessagePanel.java

@ -15,23 +15,26 @@ import org.apache.wicket.spring.injection.annot.SpringBean;
import se.su.dsv.scipro.data.dao.interfaces.PrivateMessageDao;
import se.su.dsv.scipro.data.dao.interfaces.RecipientDao;
import se.su.dsv.scipro.data.dataobjects.PrivateMessage;
import se.su.dsv.scipro.data.dataobjects.Recipient;
import se.su.dsv.scipro.data.dataobjects.User;
/**
* @author Johan Aschan - aschan@dsv.su.se
*
*
*/
public class SentPrivateMessagePanel extends Panel {
@SpringBean
private PrivateMessageDao privateMessageDao;
@SpringBean
private RecipientDao recipientDao;
private WebMarkupContainer listContainer;
private ListView<PrivateMessage> privateMessageListView;
private User user;
public SentPrivateMessagePanel(String id, User user) {
@ -44,25 +47,45 @@ public class SentPrivateMessagePanel extends Panel {
add(listContainer);
}
public void loadListView() {
privateMessageListView = new ListView<PrivateMessage>(
"private-message-item", privateMessageDao.getPrivateMessagesFromUser(user)) {
"private-message-item",
privateMessageDao.getPrivateMessagesFromUser(user)) {
@Override
protected void populateItem(final ListItem<PrivateMessage> item) {
final PrivateMessage pm = item.getModelObject();
item.add(new Label("date", pm.getDateCreated()
.toString()));;
item.add(new Label("to", pm.getRecipientList().toString()));
PrivateMessage pm = item.getModelObject();
item.add(new Label("date", pm.getDateCreated().toString()));
;
String recipients = "To users: ";
int count = 0;
for (Recipient r : pm.getRecipientList()) {
String read = "Not read";
if (r.getDateRead() != null) {
read = "Read: " + r.getDateRead().toString();
}
if (count > 0)
recipients += ", " + r.getToUser().getFirstName() + " "
+ r.getToUser().getLastName() + " " + read;
else{
recipients += r.getToUser().getFirstName() + " "
+ r.getToUser().getLastName() + " " + read;
count++;
}
}
item.add(new Label("to", recipients));
item.add(new Label("title", pm.getTitle()));
DeletePrivateMessage rdl = new DeletePrivateMessage("removeLink", item.getModelObject());
item.add(new Label("message", pm.getMessage()));
DeletePrivateMessage rdl = new DeletePrivateMessage(
"removeLink", item.getModelObject());
item.add(rdl);
};
};
}
private class DeletePrivateMessage extends AjaxLink<PrivateMessage> {
private static final long serialVersionUID = 5900025667153930797L;
@ -86,5 +109,3 @@ public class SentPrivateMessagePanel extends Panel {
}
}