Skip to content

Sort Senders listing by most recently used FMSG-45 #resolve #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Luis-Cruz merged 1 commit into from
Jul 11, 2018
Merged

Sort Senders listing by most recently used FMSG-45 #resolve #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions messaging-core/src/main/java/org/fenixedu/messaging/core/domain/Sender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,13 @@
*/
package org.fenixedu.messaging.core.domain;

import org.joda.time.DateTime;
import pt.ist.fenixframework.Atomic;
import pt.ist.fenixframework.Atomic.TxMode;

import java.text.Collator;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Locale;
import java.util.Objects;
Expand Down Expand Up @@ -294,6 +296,13 @@ public static Set<Sender> all() {
return Sets.newHashSet(MessagingSystem.getInstance().getSenderSet());
}

public DateTime getLastMessageSentDate() {
return getMessageSet().stream()
.map(Message::getCreated)
.max(Comparator.naturalOrder())
.orElseGet(() -> new DateTime(Long.MIN_VALUE));
}

@Override
public int compareTo(Sender sender) {
int c = ptCollator.compare(getName(), sender.getName());
Expand Down
4 changes: 3 additions & 1 deletion messaging-core/src/main/java/org/fenixedu/messaging/core/ui/MessagingController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
*/
package org.fenixedu.messaging.core.ui;

import java.util.Comparator;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
Expand All @@ -44,6 +45,7 @@
import org.fenixedu.messaging.core.domain.MessageFile;
import org.fenixedu.messaging.core.domain.Sender;
import org.fenixedu.messaging.core.exception.MessagingDomainException;
import org.joda.time.DateTime;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
Expand Down Expand Up @@ -83,7 +85,7 @@ public String listSenders(final Model model, @RequestParam(value = "page", defau
Set<Sender> senders = Sender.available().stream()
.filter(sender -> sender.getName().toLowerCase().contains(search.toLowerCase()))
.collect(Collectors.toSet());
PaginationUtils.paginate(model, "messaging/senders", "senders", senders, items, page);
PaginationUtils.paginate(model, "messaging/senders", "senders", senders, Comparator.comparing(Sender::getLastMessageSentDate).reversed(), items, page);
model.addAttribute("search", search);
return "/messaging/listSenders";
}
Expand Down
7 changes: 4 additions & 3 deletions messaging-core/src/main/webapp/WEB-INF/messaging/listSenders.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
<%@ taglib uri="org.fenixedu.messaging.tags.sorter" prefix="sort" %>
<%@taglib prefix="joda" uri="http://www.joda.org/joda/time/tags" %>


<c:choose>
Expand Down Expand Up @@ -35,18 +36,18 @@
<thead>
<tr>
<th><spring:message code="label.sender.name"/></th>
<th><spring:message code="label.sender.address"/></th>
<th><spring:message code="label.sender.lastMessageSent"/></th>
<th></th>
</tr>
</thead>
<tbody>
<c:forEach items="${sort:uniqueSort(senders)}" var="sender">
<c:forEach items="${senders}" var="sender">
<tr>
<td class="col-sm-5">
<c:out value="${sender.name}"/>
</td>
<td class="col-sm-4">
<code><c:out value="${sender.address}"/></code>
<code><joda:format value="${sender.getLastMessageSentDate()}" style="LM" /></code>
</td>
<td class="col-sm-3">
<div class="btn-group btn-group-xs pull-right">
Expand Down
1 change: 1 addition & 0 deletions messaging-core/src/main/webapp/WEB-INF/resources/MessagingResources_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ label.sender.policy.none = None
label.sender.policy.period = For period:
label.sender.recipients = Recipients
label.sender.replyTo = Reply to
label.sender.lastMessageSent = Last Message Sent
label.show = show
label.template.description = Description
label.template.id = Key
Expand Down
1 change: 1 addition & 0 deletions messaging-core/src/main/webapp/WEB-INF/resources/MessagingResources_pt.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,5 @@ title.templates.config = Configuração de Modelos de Mensagem
title.template = Modelo de Mensagem
title.template.edit = Editar Modelo de Mensagem
label.message.attachments=Anexos
label.sender.lastMessageSent=Última Mensagem Enviada