branch develop updated (92566c5 -> c92c6f0)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 92566c5 fixes #9031 correction des sélections des listes new 89fdce0 fixes #9041 Listes de mails : le filtre sur le nom des clients n'est pas supprimé quand on supprime tous les filtres new e7bb5a6 fixes #9042 Impression : les éléments ne sont pas imprimés dans l'ordre chronologique new c92c6f0 fixes #9043 Contenu du mail : si le mail est long, on affiche le bas du mail The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c92c6f0c628f1dc8a32b1f8e45e01846e37c7229 Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 10 15:39:53 2017 +0100 fixes #9043 Contenu du mail : si le mail est long, on affiche le bas du mail commit e7bb5a6b76d44c4273ec792ab1dc36fb97b1954e Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 10 15:24:28 2017 +0100 fixes #9042 Impression : les éléments ne sont pas imprimés dans l'ordre chronologique commit 89fdce0242c932e7302bb0116528f14d59fc1a96 Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 10 14:58:32 2017 +0100 fixes #9041 Listes de mails : le filtre sur le nom des clients n'est pas supprimé quand on supprime tous les filtres Summary of changes: .../faxtomail/persistence/entities/EmailFilter.java | 1 + .../ui/swing/actions/PrintOnDefaultPrinterAction.java | 13 ++++++++++++- .../ui/swing/content/demande/DemandeUIHandler.java | 7 +++++++ .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 2 +- 4 files changed, 21 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 89fdce0242c932e7302bb0116528f14d59fc1a96 Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 10 14:58:32 2017 +0100 fixes #9041 Listes de mails : le filtre sur le nom des clients n'est pas supprimé quand on supprime tous les filtres --- .../java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java | 1 + 1 file changed, 1 insertion(+) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java index 1b767de..2970dbd 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java @@ -336,5 +336,6 @@ public class EmailFilter extends AbstractSerializableBean { setSavQuantities(null); setSenders(null); setSubjects(null); + setClientNames(null); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit e7bb5a6b76d44c4273ec792ab1dc36fb97b1954e Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 10 15:24:28 2017 +0100 fixes #9042 Impression : les éléments ne sont pas imprimés dans l'ordre chronologique --- .../ui/swing/actions/PrintOnDefaultPrinterAction.java | 13 ++++++++++++- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java index f782259..154c72f 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java @@ -41,6 +41,8 @@ import com.google.common.collect.Multimap; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.List; @@ -80,7 +82,16 @@ public class PrintOnDefaultPrinterAction extends AbstractFaxToMailAction { Multimap<DemandeUIModel, AttachmentFile> nonPrintedAttachment = HashMultimap.create(); notPrintableDemands = new ArrayList<DemandeUIModel>(); - for (DemandeUIModel demandeUIModel : attachmentsToPrintByDemand.keySet()) { + List<DemandeUIModel> orderedDemands = new ArrayList<>(attachmentsToPrintByDemand.keySet()); + // order the demands by reception date + Collections.sort(orderedDemands, new Comparator<DemandeUIModel>() { + + @Override + public int compare(DemandeUIModel o1, DemandeUIModel o2) { + return o1.getReceptionDate().compareTo(o2.getReceptionDate()); + } + }); + for (DemandeUIModel demandeUIModel : orderedDemands) { if(!handler.isActionEnabled(demandeUIModel, MailAction.PRINT, config)) { notPrintableDemands.add(demandeUIModel); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java index c2f35ca..86ae50f 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java @@ -435,7 +435,7 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { * @return true if file has been printed, false otherwise */ public static boolean print(AttachmentFile attachmentFile, boolean defaultPrinter) { - boolean result = false; + boolean result; FileInputStream fileInputStream = null; try { File file; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit c92c6f0c628f1dc8a32b1f8e45e01846e37c7229 Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 10 15:39:53 2017 +0100 fixes #9043 Contenu du mail : si le mail est long, on affiche le bas du mail --- .../faxtomail/ui/swing/content/demande/DemandeUIHandler.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java index 888cea2..6a0415b 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java @@ -215,6 +215,13 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, JPanel editorPanel = ui.getMailBodyPanel(); FaxToMailUIUtil.setEmailContentInTextPane(this, model, editorPanel); + SwingUtilities.invokeLater(new Runnable() { + public void run() { + JScrollPane mailBodyScrollPane = getUI().getMailBodyScrollPane(); + mailBodyScrollPane.getVerticalScrollBar().setValue(0); + mailBodyScrollPane.getHorizontalScrollBar().setValue(0); + } + }); // init table final JXTable table = ui.getRangeTable(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm