This is an automated email from the git hooks/post-receive script. New commit to branch feature/9929_Tri_sur_colonnes_non_identique in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 4f686cefd99494b488cc795e712c373c935c07f7 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Jun 5 15:52:55 2018 +0200 refs #9929 : trier les demandes par la colonne sélectionné puis par la date de réception et enfin par topiaId --- .../ui/swing/content/demande/DemandeListUIModel.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java index 9e6dd402..05b971cc 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java @@ -24,6 +24,7 @@ package com.franciaflex.faxtomail.ui.swing.content.demande; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.EmailFilter; +import com.franciaflex.faxtomail.persistence.entities.EmailTopiaDao; import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import org.jdesktop.beans.AbstractSerializableBean; @@ -158,11 +159,25 @@ public class DemandeListUIModel extends AbstractSerializableBean { } public void resetPaginationParameterPage() { - setPaginationParameter(PaginationParameter.of(0, resultPerPage, orderByMailField.getOrderProperty(), orderDesc)); + resetOrderPaginationParameterForPage(0); } public void resetOrderPaginationParameter() { - setPaginationParameter(PaginationParameter.of(paginationParameter.getPageNumber(), resultPerPage, orderByMailField.getOrderProperty(), orderDesc)); + resetOrderPaginationParameterForPage(paginationParameter.getPageNumber()); + } + + protected void resetOrderPaginationParameterForPage(int page) { + + PaginationParameter.PaginationParameterBuilder builder = PaginationParameter.builder(page, resultPerPage); + builder.addOrder(orderByMailField.getOrderProperty(), orderDesc); + + if (MailField.RECEPTION_DATE != orderByMailField) { + + builder.addOrder(MailField.RECEPTION_DATE.getOrderProperty()); + } + builder.addOrder(EmailTopiaDao.EMAIL_IDENTIFIER + "." + Email.PROPERTY_TOPIA_ID); + + setPaginationParameter(builder.build()); } public void setPaginationResult(PaginationResult<Email> paginationResult) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.