This is an automated email from the git hooks/post-receive script. New commit to branch develop-1.1.x in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 8d836a14c0109fb1f499c3ed91b032a90c4fb2ed Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 10 14:42:40 2016 +0100 ajout du filtre sur la colonne subject (fixes #8103) --- .../faxtomail/persistence/entities/EmailFilter.java | 14 ++++++++++++++ .../faxtomail/persistence/entities/EmailTopiaDao.java | 11 +++++++++++ .../ui/swing/content/demande/DemandeListTableFilter.java | 4 ++++ .../ui/swing/content/demande/DemandeListUIHandler.java | 4 ++++ 4 files changed, 33 insertions(+) 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 c1d485b..d80d6fb 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 @@ -55,6 +55,7 @@ public class EmailFilter extends AbstractSerializableBean { public static final String PROPERTY_EDI_CODE_NUMBERS = "ediCodeNumbers"; public static final String PROPERTY_LAST_ATTACHMENT_OPENERS = "lastAttachmentOpeners"; public static final String PROPERTY_WAITING_STATES = "waitingStates"; + public static final String PROPERTY_SUBJECTS = "subjects"; protected Set<Priority> priorities; @@ -99,6 +100,8 @@ public class EmailFilter extends AbstractSerializableBean { protected Set<WaitingState> waitingStates; + protected Set<String> subjects; + public Set<Priority> getPriorities() { return priorities; } @@ -288,6 +291,16 @@ public class EmailFilter extends AbstractSerializableBean { firePropertyChange(PROPERTY_WAITING_STATES,null, waitingStates); } + public Set<String> getSubjects() { + return subjects; + } + + public void setSubjects(Set<String> subjects) { + Object oldValue = getSubjects(); + this.subjects = subjects; + firePropertyChange(PROPERTY_SUBJECTS, oldValue, subjects); + } + public void clear() { setClientCodes(null); setWaitingStates(null); @@ -310,5 +323,6 @@ public class EmailFilter extends AbstractSerializableBean { setRecipients(null); setSavQuantities(null); setSenders(null); + setSubjects(null); } } diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java index 2e61f5c..120fb28 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java @@ -941,6 +941,17 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { query.append(")"); } + Set<String> subjects = emailFilter.getSubjects(); + if (subjects != null) { + query.append(" AND (E." + Email.PROPERTY_SUBJECT + " in (:" + EmailFilter.PROPERTY_SUBJECTS + ")"); + args.put(EmailFilter.PROPERTY_SUBJECTS, subjects); + + if (subjects.contains(null)) { + query.append(" OR E." + Email.PROPERTY_SUBJECT + " IS NULL"); + } + query.append(")"); + } + return query.toString(); } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java index 21b53da..821423b 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java @@ -159,6 +159,10 @@ public class DemandeListTableFilter extends AbstractTableFilter<JXTable> { case Email.PROPERTY_COMMENT: emailFilter.setComments(!filtered ? null : new HashSet<String>((Collection) items)); break; + + case Email.PROPERTY_SUBJECT: + emailFilter.setSubjects(!filtered ? null : new HashSet<String>((Collection) items)); + break; } executeFilter(); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java index 8102b04..bb55b7f 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java @@ -439,6 +439,10 @@ public class DemandeListUIHandler extends AbstractFaxToMailDemandListHandler<Dem case COMMENT: property = EmailFilter.PROPERTY_COMMENTS; break; + + case SUBJECT: + property = EmailFilter.PROPERTY_SUBJECTS; + break; } if (log.isTraceEnabled()) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.