December 2014 - Faxtomail-commits - mailman.cloud.codelutin.com

r726 - in trunk: . faxtomail-service/src/main/java/com/franciaflex/faxtomail/services faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util
by kmorin＠users.forge.codelutin.com 11 Dec '14

11 Dec '14

Author: kmorin Date: 2014-12-11 14:13:27 +0000 (Thu, 11 Dec 2014) New Revision: 726 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/726 Log: fixes #6284 Garder le filtre du tableau tout au long de l'application Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java trunk/pom.xml Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java 2014-12-09 11:19:50 UTC (rev 725) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java 2014-12-11 14:13:27 UTC (rev 726) @@ -138,7 +138,7 @@ } }); registerMultiJXPathDecorator(Reply.class, "${sentDate}$s#${subject}$s", SEPARATOR, " - "); - registerMultiJXPathDecorator(FaxToMailUser.class, "${trigraph}$s#${firstName}$s#${lastName}$s", SEPARATOR, " "); + registerMultiJXPathDecorator(FaxToMailUser.class, "${lastName}$s#${firstName}$s#${trigraph}$s", SEPARATOR, " "); } }; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-12-09 11:19:50 UTC (rev 725) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-12-11 14:13:27 UTC (rev 726) @@ -41,7 +41,9 @@ import javax.swing.JOptionPane; import com.franciaflex.faxtomail.persistence.entities.Email; +import com.franciaflex.faxtomail.persistence.entities.EmailFilter; import com.franciaflex.faxtomail.services.service.ldap.Contact; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListTableFilter; import jaxx.runtime.swing.editor.bean.BeanDoubleList; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.swing.session.BeanDoubleListState; @@ -49,6 +51,7 @@ import jaxx.runtime.swing.session.State; import jaxx.runtime.swing.session.SwingSession; +import jaxx.runtime.swing.table.filter.TableFilter; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -56,6 +59,7 @@ import org.jdesktop.beans.AbstractBean; import org.jdesktop.swingx.JXLoginPane; import org.jdesktop.swingx.JXLoginPane.Status; +import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.auth.LoginService; import org.jdesktop.swingx.error.ErrorInfo; import org.nuiton.i18n.I18n; @@ -225,6 +229,8 @@ /** */ protected List<Contact> contactCache; + protected EmailFilter emailFilter = new EmailFilter(); + public static FaxToMailUIContext newContext(FaxToMailConfiguration config) { Preconditions.checkNotNull(config); Preconditions.checkState(applicationContext == null, @@ -394,6 +400,7 @@ // init action UI //--------------------------------------------------------------------// setActionUI(new ApplicationActionUI(null, this)); + } /** @@ -861,4 +868,12 @@ this.paginationResult = paginationResult; } } + + public EmailFilter getEmailFilter() { + return emailFilter; + } + + public void setEmailFilter(EmailFilter emailFilter) { + this.emailFilter = emailFilter; + } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-12-09 11:19:50 UTC (rev 725) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-12-11 14:13:27 UTC (rev 726) @@ -285,7 +285,7 @@ executeFilter(); } - protected void executeFilter() { + public void executeFilter() { FaxToMailUIContext context = handler.getContext(); // reset pagination when folder change Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-12-09 11:19:50 UTC (rev 725) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-12-11 14:13:27 UTC (rev 726) @@ -30,12 +30,17 @@ import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.awt.event.MouseEvent; +import java.beans.IntrospectionException; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.beans.PropertyDescriptor; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.Enumeration; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -51,17 +56,24 @@ import javax.swing.tree.TreePath; import com.franciaflex.faxtomail.persistence.entities.Configuration; +import com.franciaflex.faxtomail.persistence.entities.DemandType; import com.franciaflex.faxtomail.persistence.entities.EmailFilter; import com.franciaflex.faxtomail.persistence.entities.MailAction; +import com.franciaflex.faxtomail.persistence.entities.Priority; +import com.franciaflex.faxtomail.persistence.entities.Range; +import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.actions.OpenMailFolderChooserFromListAction; import com.franciaflex.faxtomail.ui.swing.util.DemandeTableModel; +import com.google.common.collect.Lists; import jaxx.runtime.JAXXUtil; +import jaxx.runtime.swing.table.filter.FilterChangeListener; import jaxx.runtime.swing.table.filter.TableFilter; import jaxx.runtime.swing.table.filter.TableRowFilterSupport; import jaxx.runtime.validator.swing.SwingValidator; +import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -97,6 +109,10 @@ import com.franciaflex.faxtomail.ui.swing.util.PaginationComboModel; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import org.nuiton.util.ObjectUtil; +import org.nuiton.util.beans.BeanUtil; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; import org.nuiton.util.pagination.PaginationParameter; /** @@ -113,16 +129,26 @@ protected Configuration config; - protected TableFilter<JXTable> tableFilter; + protected DemandeListTableFilter tableFilter; + protected final Binder<EmailFilter, EmailFilter> binder = BinderFactory.newBinder(EmailFilter.class); + public TableFilter<JXTable> getTableFilter() { return tableFilter; } - public final PropertyChangeListener selectedDemandeChangeListener = new PropertyChangeListener() { + protected final PropertyChangeListener emailFilterPropertyChangeListener = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { + EmailFilter emailFilter = (EmailFilter) evt.getSource(); + binder.copy(emailFilter, getContext().getEmailFilter(), evt.getPropertyName()); + } + }; + protected final PropertyChangeListener selectedDemandeChangeListener = new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + String propertyName = evt.getPropertyName(); if (Email.PROPERTY_PRIORITY.equals(propertyName)) { if (evt.getNewValue() != null || evt.getOldValue() != null) { @@ -304,6 +330,12 @@ } public void initTableFilter() { + + EmailFilter emailFilter = getModel().getEmailFilter(); + emailFilter.removePropertyChangeListener(emailFilterPropertyChangeListener); + filtersFromContextToModel(); + emailFilter.addPropertyChangeListener(emailFilterPropertyChangeListener); + Decorator<Object> decorator = new Decorator<Object>(Object.class) { @Override public String toString(Object bean) { @@ -320,14 +352,156 @@ return s; } }; - TableRowFilterSupport.forFilter(tableFilter) - .searchable(true) - .searchDecorator(decorator) - .useTableRenderers(true) - .setPopupDefaultSize(new Dimension(250, 290)) - .apply(); + + JTable table = TableRowFilterSupport.forFilter(tableFilter) + .searchable(true) + .searchDecorator(decorator) + .useTableRenderers(true) + .setPopupDefaultSize(new Dimension(250, 290)) + .apply(); + + tableFilter.modelChanged(table.getModel()); } + protected void filtersFromContextToModel() { + EmailFilter contextEmailFilter = getContext().getEmailFilter(); + EmailFilter currentEmailFilter = getModel().getEmailFilter(); + + currentEmailFilter.clear(); + + List<MailField> fields = getColumns(); + if (CollectionUtils.isEmpty(fields)) { + fields = Lists.newArrayList(MailField.getTableFields()); + } + + List<String> propertiesToBind = new ArrayList<>(); + + for (int i = 0; i < fields.size(); i++) { + String property = null; + + MailField field = fields.get(i); + switch (field) { + case DEMAND_STATUS: + property = EmailFilter.PROPERTY_DEMAND_STATUS; + break; + + case RECEPTION_DATE: + property = EmailFilter.PROPERTY_RECEPTION_DATES; + break; + + case RECIPIENT: + property = EmailFilter.PROPERTY_RECIPIENTS; + break; + + case SENDER: + property = EmailFilter.PROPERTY_SENDERS; + break; + + case OBJECT: + property = EmailFilter.PROPERTY_DEMAND_OBJECTS; + break; + + case CLIENT_CODE: + property = EmailFilter.PROPERTY_CLIENT_CODES; + break; + + case CLIENT_BRAND: + property = EmailFilter.PROPERTY_CLIENT_BRANDS; + break; + + case DEMAND_TYPE: + property = EmailFilter.PROPERTY_DEMAND_TYPES; + break; + + case EDI_RETURN: + property = EmailFilter.PROPERTY_EDI_CODE_NUMBERS; + break; + + case WAITING_STATE: + property = EmailFilter.PROPERTY_WAITING_STATES; + break; + + case TAKEN_BY: + property = EmailFilter.PROPERTY_TAKEN_BYS; + break; + + case PRIORITY: + property = EmailFilter.PROPERTY_PRIORITIES; + break; + + case PROJECT_REFERENCE: + property = EmailFilter.PROPERTY_PROJECT_REFERENCES; + break; + + case COMPANY_REFERENCE: + property = EmailFilter.PROPERTY_LOCAL_REFERENCES; + break; + + case REFERENCE: + property = EmailFilter.PROPERTY_REFERENCES; + break; + + case RANGE_ROW: + property = EmailFilter.PROPERTY_RANGES; + break; + + case PF_NB: + property = EmailFilter.PROPERTY_PRODUCT_QUANTITIES; + break; + + case SAV_NB: + property = EmailFilter.PROPERTY_SAV_QUANTITIES; + break; + + case QUOTATION_NB: + property = EmailFilter.PROPERTY_QUOTATION_QUANTITIES; + break; + + case LAST_ATTACHMENT_OPENING_IN_THIS_FOLDER_USER: + property = EmailFilter.PROPERTY_LAST_ATTACHMENT_OPENERS; + break; + + case COMMENT: + property = EmailFilter.PROPERTY_COMMENTS; + break; + } + + if (log.isDebugEnabled()) { + log.debug(i + "property to copy to model's emailfilter : " + property); + } + if (property != null) { + try { + Method getter = new PropertyDescriptor(property, EmailFilter.class).getReadMethod(); + Collection value = (Collection) getter.invoke(contextEmailFilter); + tableFilter.setFilterState(i, value); + + } catch (IntrospectionException e) { + if (log.isErrorEnabled()) { + log.error("error while introspecting emailfilter for property " + property, e); + } + } catch (InvocationTargetException e) { + if (log.isErrorEnabled()) { + log.error("error while calling getter for property " + property, e); + } + } catch (IllegalAccessException e) { + if (log.isErrorEnabled()) { + log.error("error while calling getter for property " + property, e); + } + } + propertiesToBind.add(property); + + } else { + tableFilter.setFilterState(i, null); + } + } + + binder.copy(contextEmailFilter, currentEmailFilter, propertiesToBind.toArray(new String[propertiesToBind.size()])); + } + + public String populateColumnModel(JXTable table, boolean sortable) { + return super.populateColumnModel(table, sortable); + } + protected void loadFolderDemands(MailFolder folder, Map<MailFolder, FolderTreeNode> nodesByFolder) { if (folder != null) { FolderTreeNode folderNode = nodesByFolder.get(folder); @@ -343,7 +517,7 @@ model.setNewDemandEnabled(readable && folder != null && Boolean.TRUE.equals(folder.getAllowCreateDemandIntoFolder())); } - tableFilter.clear(); + tableFilter.executeFilter(); } public void goToNextPage() { @@ -443,6 +617,8 @@ log.debug("closing: " + ui); } + getModel().getEmailFilter().removePropertyChangeListener(emailFilterPropertyChangeListener); + JTree tree = getUI().getNavigationTree(); TreeModel treeModel = tree.getModel(); Enumeration<TreePath> paths = tree.getExpandedDescendants(new TreePath(treeModel.getRoot())); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java 2014-12-09 11:19:50 UTC (rev 725) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java 2014-12-11 14:13:27 UTC (rev 726) @@ -360,9 +360,6 @@ public final Object getValueAt(int rowIndex, int columnIndex) { DemandeUIModel entry = getEntry(rowIndex); ColumnIdentifier<DemandeUIModel> identifier = getIdentifier(columnIndex); - if (log.isDebugEnabled()) { - log.debug("columnIndex: " + columnIndex + " :: " + identifier.getPropertyName()); - } Object result = identifier.getValue(entry); return result; } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-12-09 11:19:50 UTC (rev 725) +++ trunk/pom.xml 2014-12-11 14:13:27 UTC (rev 726) @@ -111,7 +111,7 @@ <h2Version>1.3.176</h2Version> <guavaVersion>18.0</guavaVersion> - <jaxxVersion>2.18-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.19-SNAPSHOT</jaxxVersion>  <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.16.3</xworkVersion>

1 0

r725 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by kmorin＠users.forge.codelutin.com 09 Dec '14

09 Dec '14

Author: kmorin Date: 2014-12-09 11:19:50 +0000 (Tue, 09 Dec 2014) New Revision: 725 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/725 Log: fixes #6276 Les mails ne sont pas rout?\195?\169s quand le destinataire est en copie cach?\195?\169 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-12-08 11:53:29 UTC (rev 724) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderService.java 2014-12-09 11:19:50 UTC (rev 725) @@ -29,12 +29,15 @@ import java.util.Map; import java.util.Set; +import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailFilter; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.FaxToMailService; +import javax.mail.Address; + /** * @author Kevin Morin (Code Lutin) */ @@ -62,4 +65,6 @@ MailFolder getFolderForFaxToMailUser(FaxToMailUser customerResponsible); MailFolder getMailFolder(String topiaId); + + MailFilter findMailFilter(Email email, Set<String> modifiedProperties, List<Address> recipients); } Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java 2014-12-08 11:53:29 UTC (rev 724) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java 2014-12-09 11:19:50 UTC (rev 725) @@ -32,6 +32,7 @@ import java.util.Map; import java.util.Set; +import com.franciaflex.faxtomail.persistence.entities.Email; import org.apache.commons.collections4.CollectionUtils; import org.hibernate.Hibernate; import org.nuiton.util.pagination.PaginationParameter; @@ -45,6 +46,8 @@ import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; +import javax.mail.Address; + /** * @author kmorin - kmorin(a)codelutin.com */ @@ -324,4 +327,32 @@ return result; } + @Override + public MailFilter findMailFilter(Email email, Set<String> modifiedProperties, List<Address> recipients) { + MailFilter filter = null; + for (Address address : recipients) { + + String recipient = address.toString(); + + // some recipient are like "toto tutu<toto.tutu73(a)gmail.com>" + // the regex is to extract email address from it + recipient = recipient.replaceFirst("^.*<(.*)>$", "$1"); + recipient = recipient.toLowerCase(); + + List<MailFilter> filters = getFiltersForRecipient(recipient); + + if (CollectionUtils.isNotEmpty(filters)) { + MailFilter mailFilter = filters.get(0); + // see #6161 + if (filter == null || mailFilter.getPosition() < filter.getPosition()) { + filter = mailFilter; + email.setRecipient(recipient); + modifiedProperties.add(Email.PROPERTY_RECIPIENT); + } + } + } + return filter; + } + + } Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java 2014-12-08 11:53:29 UTC (rev 724) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java 2014-12-09 11:19:50 UTC (rev 725) @@ -25,9 +25,13 @@ */ import java.io.IOException; +import java.util.HashSet; import java.util.List; +import com.franciaflex.faxtomail.persistence.entities.EmailImpl; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +import com.franciaflex.faxtomail.persistence.entities.MailFilter; +import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -36,6 +40,10 @@ import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import javax.mail.Address; +import javax.mail.internet.AddressException; +import javax.mail.internet.InternetAddress; + /** * @author Kevin Morin (Code Lutin) * @@ -58,6 +66,33 @@ public void testFindFilter() { MailFolder folder = service.getFolderForRecipient("fx.savtest(a)franciaflex.com"); Assert.assertNotNull(folder); + + try { + Address a1 = new InternetAddress(" etyhjsd sqhdksd sdlksqdj - sqjdsq <test(a)franciaflex.com>"); + Address a2 = new InternetAddress("dfsdf fsf- sdfs<fx.adv%test(a)franciaflex.com>"); + Address a3 = new InternetAddress("dsfdsf qd qsdsq d <fx.01test(a)franciaflex.com>"); + + EmailImpl email = new EmailImpl(); + HashSet<String> modifiedProperties = new HashSet<String>(); + + MailFilter filter = service.findMailFilter(email, modifiedProperties, Lists.newArrayList(a1, a2, a3)); + Assert.assertNotNull(filter); + Assert.assertEquals(filter.getMailFolder().getName(), "Cyril"); + + filter = service.findMailFilter(email, modifiedProperties, Lists.newArrayList(a1, a3, a2)); + Assert.assertNotNull(filter); + Assert.assertEquals(filter.getMailFolder().getName(), "Cyril"); + + filter = service.findMailFilter(email, modifiedProperties, Lists.newArrayList(a3, a1, a2)); + Assert.assertNotNull(filter); + Assert.assertEquals(filter.getMailFolder().getName(), "Cyril"); + + + } catch (AddressException e) { + if (log.isErrorEnabled()) { + log.error("error on email creation", e); + } + } } @Test Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-12-08 11:53:29 UTC (rev 724) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-12-09 11:19:50 UTC (rev 725) @@ -26,6 +26,9 @@ import static org.nuiton.i18n.I18n.t; +import com.google.common.base.Function; +import com.google.common.collect.Collections2; +import com.google.common.collect.Lists; import gui.ava.html.Html2Image; import java.io.ByteArrayOutputStream; @@ -43,6 +46,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Properties; import java.util.Set; import java.util.regex.Pattern; @@ -52,6 +56,7 @@ import javax.mail.Address; import javax.mail.Flags; import javax.mail.Folder; +import javax.mail.Header; import javax.mail.Message; import javax.mail.MessagingException; import javax.mail.Part; @@ -256,7 +261,7 @@ int unread = folder.getUnreadMessageCount(); if (log.isDebugEnabled()) { - log.debug(count + " messages, " + unread + " unread"); + log.debug(emailAccount.getLogin() + "@" + emailAccount.getHost() + " : " + count + " messages, " + unread + " unread"); } for (int i = 0 ; i < count ; i++) { @@ -275,26 +280,48 @@ log.debug(String.format("Message %d/%d : %s", i, count, message.getSubject())); } - List<Address> recipients = new ArrayList<>(); - Address[] toRecipients = message.getRecipients(Message.RecipientType.TO); - if (toRecipients != null) { - recipients.addAll(Arrays.asList(toRecipients)); + List<Address> recipientAddresses = new ArrayList<>(); + Address[] allRecipients = message.getAllRecipients(); + if (allRecipients != null) { + recipientAddresses.addAll(Arrays.asList(allRecipients)); } - Address[] ccRecipients = message.getRecipients(Message.RecipientType.CC); - if (ccRecipients != null) { - recipients.addAll(Arrays.asList(ccRecipients)); - } + Set<String> recipients = new HashSet<String>( + Collections2.transform(recipientAddresses, new Function<Address, String>() { + @Override + public String apply(Address address) { + String recipient = address.toString(); + // some recipient are like "toto tutu<toto.tutu73(a)gmail.com>" + // the regex is to extract email address from it + recipient = recipient.replaceFirst("^.*<(.*)>$", "$1"); + recipient = recipient.toLowerCase(); + return recipient; + } + })); - MailFilter filter = null; - for (Address address : recipients) { + // try to find the real recipient, in case it is in the bcc + Enumeration allHeaders = message.getAllHeaders(); + String regex = "^.*for<(.*)>.*$"; - String recipient = address.toString(); + while (allHeaders.hasMoreElements()) { + Header header = (Header) allHeaders.nextElement(); + if ("Received".equals(header.getName())) { + String forRecipient = StringUtils.removePattern(header.getValue(), "\\s"); - // some recipient are like "toto tutu<toto.tutu73(a)gmail.com>" - // the regex is to extract email address from it - recipient = recipient.replaceFirst("^.*<(.*)>$", "$1"); - recipient = recipient.toLowerCase(); + if (forRecipient != null && forRecipient.matches(regex)) { + forRecipient = forRecipient.replaceFirst(regex, "$1"); + if (StringUtils.isNotBlank(forRecipient) && recipients.add(forRecipient)) { + if (log.isDebugEnabled()) { + log.debug("recipient found in \"Received\" header: " + forRecipient); + } + break; + } + } + } + } + + MailFilter filter = null; + for (String recipient : recipients) { List<MailFilter> filters = mailFolderService.getFiltersForRecipient(recipient); if (CollectionUtils.isNotEmpty(filters)) { @@ -312,8 +339,8 @@ if (log.isDebugEnabled()) { log.debug(" ==> No filter found for this message"); if (log.isTraceEnabled()) { - for (Address address : recipients) { - log.trace(" - for recipient " + address.toString()); + for (String recipient : recipients) { + log.trace(" - for recipient " + recipient); } } }

1 0

r724 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing
by kmorin＠users.forge.codelutin.com 08 Dec '14

08 Dec '14

Author: kmorin Date: 2014-12-08 11:53:29 +0000 (Mon, 08 Dec 2014) New Revision: 724 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/724 Log: fix mauvaise requete de recherche Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-12-05 15:37:03 UTC (rev 723) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-12-08 11:53:29 UTC (rev 724) @@ -390,12 +390,12 @@ + "WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " IN ("; if (searchFilter.isAddGroupDemands()) { - hqlForFetchStep1 += "SELECT CASE WHEN E." + Email.PROPERTY_EMAIL_GROUP + " IS NULL " + + hqlForFetchStep1 += "SELECT CASE WHEN G IS NULL " + "THEN E." + TopiaEntity.PROPERTY_TOPIA_ID + " ELSE E2." + TopiaEntity.PROPERTY_TOPIA_ID + " END " + "FROM " + Email.class.getName() + " E " + - "INNER JOIN E." + Email.PROPERTY_EMAIL_GROUP + " AS G " + - "INNER JOIN G." + EmailGroup.PROPERTY_EMAIL + " AS E2 "; + "LEFT OUTER JOIN E." + Email.PROPERTY_EMAIL_GROUP + " AS G " + + "LEFT OUTER JOIN G." + EmailGroup.PROPERTY_EMAIL + " AS E2 "; } else { hqlForFetchStep1 += "select E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E "; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-12-05 15:37:03 UTC (rev 723) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-12-08 11:53:29 UTC (rev 724) @@ -414,12 +414,14 @@ UserService userService = serviceContext.getUserService(); setFaxtomailUserCache(userService.getAllActiveUsers()); - try { - setContactCache(serviceContext.getLdapService().getUserAndEmails()); + if (!config.isLdapMock()) { + try { + setContactCache(serviceContext.getLdapService().getUserAndEmails()); - } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error("Error while getting contact from ldap", e); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Error while getting contact from ldap", e); + } } } }

1 0

r723 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by kmorin＠users.forge.codelutin.com 05 Dec '14

05 Dec '14

Author: kmorin Date: 2014-12-05 15:37:03 +0000 (Fri, 05 Dec 2014) New Revision: 723 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/723 Log: amelioration des perf de recherche Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-12-05 14:02:48 UTC (rev 722) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-12-05 15:37:03 UTC (rev 723) @@ -386,18 +386,20 @@ } // add same fecth liste as emailService#getEmailForFolder() - String hqlForFetchStep1 = "select E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " - + "WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " IN (" - + "select E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " - + query.toString() + ") "; + String hqlForFetchStep1 = "SELECT E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " + + "WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " IN ("; if (searchFilter.isAddGroupDemands()) { - hqlForFetchStep1 += "OR E." + TopiaEntity.PROPERTY_TOPIA_ID + " IN (" - + "select E2." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " - + "LEFT OUTER JOIN E." + Email.PROPERTY_EMAIL_GROUP + " AS G " - + "LEFT OUTER JOIN G." + EmailGroup.PROPERTY_EMAIL + " AS E2 " - + query.toString() + ")"; + hqlForFetchStep1 += "SELECT CASE WHEN E." + Email.PROPERTY_EMAIL_GROUP + " IS NULL " + + "THEN E." + TopiaEntity.PROPERTY_TOPIA_ID + + " ELSE E2." + TopiaEntity.PROPERTY_TOPIA_ID + " END " + + "FROM " + Email.class.getName() + " E " + + "INNER JOIN E." + Email.PROPERTY_EMAIL_GROUP + " AS G " + + "INNER JOIN G." + EmailGroup.PROPERTY_EMAIL + " AS E2 "; + } else { + hqlForFetchStep1 += "select E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E "; } + hqlForFetchStep1 += query.toString() + ")"; String hqlForFetchStep2 = "select distinct E FROM " + Email.class.getName() + " E " + addAllFecthes( Email.PROPERTY_PRIORITY, @@ -471,6 +473,7 @@ // initialize folder of the grouped demand to transmit the grouped emails of the same folder for (Email groupedEmail : emailGroup.getEmail()) { Hibernate.initialize(groupedEmail.getMailFolder()); + Hibernate.initialize(groupedEmail.getAttachment()); } } } Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-12-05 14:02:48 UTC (rev 722) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-12-05 15:37:03 UTC (rev 723) @@ -549,4 +549,10 @@ } } + public static void main(String[] args) { + String recipient = "- ftm_mailfx03 - <adv29(a)franciaflex.com>"; + recipient = recipient.replaceFirst("^.*<(.*)>$", "$1"); + recipient = recipient.toLowerCase(); + System.out.println(recipient); + } }

1 0

r722 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by kmorin＠users.forge.codelutin.com 05 Dec '14

05 Dec '14

Author: kmorin Date: 2014-12-05 14:02:48 +0000 (Fri, 05 Dec 2014) New Revision: 722 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/722 Log: fixes #6250 Les pj ne sont pas dans la liste d?\195?\169roulante dans la r?\195?\169ponse quand l'?\195?\169l?\195?\169ment est group?\195?\169 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-12-05 09:53:15 UTC (rev 721) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-12-05 14:02:48 UTC (rev 722) @@ -581,9 +581,11 @@ EmailGroup emailGroup = email.getEmailGroup(); if (emailGroup != null) { Hibernate.initialize(emailGroup.getEmail()); - // initialize folder of the grouped demand to transmit the grouped emails of the same folder for (Email groupedEmail : emailGroup.getEmail()) { + // initialize folder of the grouped demand to transmit the grouped emails of the same folder Hibernate.initialize(groupedEmail.getMailFolder()); + // initialize the attachments for the attachments in the replies + Hibernate.initialize(groupedEmail.getAttachment()); } } } Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-12-05 09:53:15 UTC (rev 721) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-12-05 14:02:48 UTC (rev 722) @@ -198,6 +198,7 @@ Collection<Email> emails = emailGroup.getEmail(); for (Email email2 : emails) { Hibernate.initialize(email2.getMailFolder()); + Hibernate.initialize(email2.getAttachment()); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-12-05 09:53:15 UTC (rev 721) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-12-05 14:02:48 UTC (rev 722) @@ -729,6 +729,7 @@ demandeUIModel.setTopiaId(email.getTopiaId()); demandeUIModel.setMailFolder(email.getMailFolder()); demandeUIModel.setDemandStatus(email.getDemandStatus()); + demandeUIModel.loadAttachments(email); groupedDemandes.add(demandeUIModel); } }

1 0

r721 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by kmorin＠users.forge.codelutin.com 05 Dec '14

05 Dec '14

Author: kmorin Date: 2014-12-05 09:53:15 +0000 (Fri, 05 Dec 2014) New Revision: 721 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/721 Log: fixes #6248 Erreur quand on veut d?\195?\169placer un ?\195?\169l?\195?\169ment Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java 2014-12-04 18:36:57 UTC (rev 720) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java 2014-12-05 09:53:15 UTC (rev 721) @@ -202,9 +202,8 @@ if (folder.isChildrenNotEmpty()) { for (MailFolder child : folder.getChildren()) { // if the child is in the moveable roots, remove it to merge the branches - if (!readableRoots.remove(child)) { - browseMoveableFolders(child, readableRoots, inheritedAllowMoveDemandIntoFolder); - } + readableRoots.remove(child); + browseMoveableFolders(child, readableRoots, inheritedAllowMoveDemandIntoFolder); } }

1 0

r720 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search
by kmorin＠users.forge.codelutin.com 04 Dec '14

04 Dec '14

Author: kmorin Date: 2014-12-04 18:36:57 +0000 (Thu, 04 Dec 2014) New Revision: 720 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/720 Log: improve perfs Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-12-03 15:57:45 UTC (rev 719) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-12-04 18:36:57 UTC (rev 720) @@ -394,8 +394,8 @@ if (searchFilter.isAddGroupDemands()) { hqlForFetchStep1 += "OR E." + TopiaEntity.PROPERTY_TOPIA_ID + " IN (" + "select E2." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " - + "INNER JOIN E." + Email.PROPERTY_EMAIL_GROUP + " AS G " - + "INNER JOIN G." + EmailGroup.PROPERTY_EMAIL + " AS E2 " + + "LEFT OUTER JOIN E." + Email.PROPERTY_EMAIL_GROUP + " AS G " + + "LEFT OUTER JOIN G." + EmailGroup.PROPERTY_EMAIL + " AS E2 " + query.toString() + ")"; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java 2014-12-03 15:57:45 UTC (rev 719) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java 2014-12-04 18:36:57 UTC (rev 720) @@ -65,7 +65,7 @@ protected int resultPerPage = 50; - protected PaginationParameter paginationParameter = PaginationParameter.of(0, resultPerPage, Email.PROPERTY_RECEPTION_DATE, false); + protected PaginationParameter paginationParameter = PaginationParameter.of(0, resultPerPage, Email.PROPERTY_TOPIA_CREATE_DATE, false); protected PaginationResult<Email> paginationResult = PaginationResult.of(null, 0, paginationParameter); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java 2014-12-03 15:57:45 UTC (rev 719) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java 2014-12-04 18:36:57 UTC (rev 720) @@ -421,7 +421,7 @@ } public void resetPaginationParameter() { - setPaginationParameter(PaginationParameter.of(0, resultPerPage, Email.PROPERTY_RECEPTION_DATE, false)); + setPaginationParameter(PaginationParameter.of(0, resultPerPage, Email.PROPERTY_TOPIA_CREATE_DATE, false)); } public void setPaginationResult(PaginationResult<Email> paginationResult) {

1 0

r719 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by kmorin＠users.forge.codelutin.com 03 Dec '14

03 Dec '14

Author: kmorin Date: 2014-12-03 15:57:45 +0000 (Wed, 03 Dec 2014) New Revision: 719 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/719 Log: forgot to remove comments Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-12-03 15:45:21 UTC (rev 718) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-12-03 15:57:45 UTC (rev 719) @@ -535,7 +535,7 @@ loopFolder = loopFolder.getParent(); } while (ediTranfer == null && loopFolder != null); -// if (BooleanUtils.isTrue(ediTranfer)) { + if (BooleanUtils.isTrue(ediTranfer)) { // ajout d'un historique transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, History.PROPERTY_MODIFICATION_DATE, new Date(), @@ -546,19 +546,19 @@ email.setDemandStatus(DemandStatus.TRANSMISSION_TO_EDI); fieldSet.add(Email.PROPERTY_DEMAND_STATUS); -// } else { -// // TODO echatellier : pas sur qu'il faille l'ajouter tout le temps, mais sinon, le transfer se reproduira -//// transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, -//// History.PROPERTY_MODIFICATION_DATE, new Date(), -//// History.PROPERTY_EMAIL, email); -//// email.addHistory(transmissionToEdi); -// -// // passage en status -// if (email.getDemandStatus() == DemandStatus.UNTREATED) { -// email.setDemandStatus(DemandStatus.IN_PROGRESS); -// } -// fieldSet.add(Email.PROPERTY_DEMAND_STATUS); -// } + } else { + // TODO echatellier : pas sur qu'il faille l'ajouter tout le temps, mais sinon, le transfer se reproduira +// transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, +// History.PROPERTY_MODIFICATION_DATE, new Date(), +// History.PROPERTY_EMAIL, email); +// email.addHistory(transmissionToEdi); + + // passage en status + if (email.getDemandStatus() == DemandStatus.UNTREATED) { + email.setDemandStatus(DemandStatus.IN_PROGRESS); + } + fieldSet.add(Email.PROPERTY_DEMAND_STATUS); + } } } else {

1 0

r718 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by kmorin＠users.forge.codelutin.com 03 Dec '14

03 Dec '14

Author: kmorin Date: 2014-12-03 15:45:21 +0000 (Wed, 03 Dec 2014) New Revision: 718 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/718 Log: fix status lors du d?\195?\169placement fix erreur r?\195?\169ception d'email quand une pj est vide Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-12-03 12:42:49 UTC (rev 717) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-12-03 15:45:21 UTC (rev 718) @@ -535,7 +535,7 @@ loopFolder = loopFolder.getParent(); } while (ediTranfer == null && loopFolder != null); - if (BooleanUtils.isTrue(ediTranfer)) { +// if (BooleanUtils.isTrue(ediTranfer)) { // ajout d'un historique transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, History.PROPERTY_MODIFICATION_DATE, new Date(), @@ -546,19 +546,19 @@ email.setDemandStatus(DemandStatus.TRANSMISSION_TO_EDI); fieldSet.add(Email.PROPERTY_DEMAND_STATUS); - } else { - // TODO echatellier : pas sur qu'il faille l'ajouter tout le temps, mais sinon, le transfer se reproduira -// transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, -// History.PROPERTY_MODIFICATION_DATE, new Date(), -// History.PROPERTY_EMAIL, email); -// email.addHistory(transmissionToEdi); - - // passage en status - if (email.getDemandStatus() == DemandStatus.UNTREATED) { - email.setDemandStatus(DemandStatus.IN_PROGRESS); - } - fieldSet.add(Email.PROPERTY_DEMAND_STATUS); - } +// } else { +// // TODO echatellier : pas sur qu'il faille l'ajouter tout le temps, mais sinon, le transfer se reproduira +//// transmissionToEdi = historyDao.create(History.PROPERTY_TYPE, HistoryType.TRANSMISSION_TO_EDI, +//// History.PROPERTY_MODIFICATION_DATE, new Date(), +//// History.PROPERTY_EMAIL, email); +//// email.addHistory(transmissionToEdi); +// +// // passage en status +// if (email.getDemandStatus() == DemandStatus.UNTREATED) { +// email.setDemandStatus(DemandStatus.IN_PROGRESS); +// } +// fieldSet.add(Email.PROPERTY_DEMAND_STATUS); +// } } } else { @@ -1252,7 +1252,7 @@ List<Email> emails = dao.forTopiaIdIn(emailIds).findAll(); for (Email email : emails) { if (email.getDemandStatus() != DemandStatus.TRANSMISSION_TO_EDI - || email.getDemandStatus() != DemandStatus.TRANSMITTED_TO_EDI) { + && email.getDemandStatus() != DemandStatus.TRANSMITTED_TO_EDI) { email.setDemandStatus(DemandStatus.QUALIFIED); } email.setMailFolder(newFolder); Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-12-03 12:42:49 UTC (rev 717) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-12-03 15:45:21 UTC (rev 718) @@ -497,8 +497,10 @@ } else { // convertit le contenu texte en PDF String content = IOUtils.toString(message.getInputStream(), charset); - Attachment attachment = emailService.convertTextToPdf(content, t("faxtomail.email.content.attachment.plainfileName")); - attachments.add(0, attachment); + if (StringUtils.isNotBlank(content)) { + Attachment attachment = emailService.convertTextToPdf(content, t("faxtomail.email.content.attachment.plainfileName")); + attachments.add(0, attachment); + } } emailService.saveEmail(email,

1 0

r717 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search
by kmorin＠users.forge.codelutin.com 03 Dec '14

03 Dec '14

Author: kmorin Date: 2014-12-03 12:42:49 +0000 (Wed, 03 Dec 2014) New Revision: 717 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/717 Log: fixes #6238 Erreur quand on ouvre un ?\195?\169l?\195?\169ment group?\195?\169 refs #6237 La recherche pour grouper se lance parfois toute seule ?\195?\160 l'ouverture de l'?\195?\169cran Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-12-03 09:10:22 UTC (rev 716) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-12-03 12:42:49 UTC (rev 717) @@ -1076,7 +1076,7 @@ EmailGroupTopiaDao groupDao = getPersistenceContext().getEmailGroupDao(); Email email1 = getFullEmailById(email1Id, user); - Email email2 = getEmailById(email2Id); + Email email2 = getFullEmailById(email2Id, user); EmailGroup group1 = email1.getEmailGroup(); EmailGroup group2 = email2.getEmailGroup(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java 2014-12-03 09:10:22 UTC (rev 716) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java 2014-12-03 12:42:49 UTC (rev 717) @@ -64,7 +64,6 @@ @Override public void doAction() throws Exception { SearchUIModel model = getModel(); - getContext().setSearch(model); SearchFilter searchFilter = model.toEntity(); FaxToMailServiceContext serviceContext = getContext().newServiceContext(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-12-03 09:10:22 UTC (rev 716) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-12-03 12:42:49 UTC (rev 717) @@ -90,25 +90,14 @@ public void beforeInit(SearchToGroupUI ui) { super.beforeInit(ui); - SearchUIModel searchUIModel = getContext().getSearch(); - if (searchUIModel == null) { - searchUIModel = new SearchUIModel(); -// searchUIModel.setTakenBy(getContext().getCurrentUser()); -// searchUIModel.setModifiedBy(getContext().getCurrentUser()); + SearchUIModel searchUIModel = new SearchUIModel(); + Date now = new Date(); + Calendar cal = Calendar.getInstance(); + cal.add(Calendar.MONTH, -2); + Date twoMonthsAgo = cal.getTime(); + searchUIModel.setMaxReceptionDate(now); + searchUIModel.setMinReceptionDate(twoMonthsAgo); - Date now = new Date(); - Calendar cal = Calendar.getInstance(); - cal.add(Calendar.MONTH, -2); - Date twoMonthsAgo = cal.getTime(); - -// searchUIModel.setMaxModificationDate(now); -// searchUIModel.setMinModificationDate(twoMonthsAgo); - searchUIModel.setMaxReceptionDate(now); - searchUIModel.setMinReceptionDate(twoMonthsAgo); - //searchUIModel.setMaxPrintingDate(now); - //searchUIModel.setMinPrintingDate(twoMonthsAgo); - } - getUI().setContextValue(searchUIModel); }

1 0