Author: kmorin Date: 2014-07-27 20:36:54 +0200 (Sun, 27 Jul 2014) New Revision: 441 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/441 Log: fixes #5527 la liste doit ?\195?\170tre tri?\195?\169e par ordre ant?\195?\169-chronologique fixes #5530 l'ordre dans l'historique est incoh?\195?\169rent fixes #5531 pour l'historique, utiliser 'd?\195?\169placer' au lieu de 'transmission' pour les d?\195?\169placements fixes #5535 lorsqu'on groupe, il faut mettre le nom et la r?\195?\169f?\195?\169rence de l'?\195?\169l?\195?\169ment refs #5539 dans les listes, au lieu de mettre 'NULL' il faut mettre '-' Modified: trunk/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.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/content/demande/DemandeListUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupItem.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java 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/util/FaxToMailUIUtil.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties Modified: trunk/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties =================================================================== --- trunk/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties 2014-07-25 09:53:01 UTC (rev 440) +++ trunk/faxtomail-persistence/src/main/resources/i18n/faxtomail-persistence_fr_FR.properties 2014-07-27 18:36:54 UTC (rev 441) @@ -38,7 +38,7 @@ faxtomail.historyType.opening=Ouverture faxtomail.historyType.printing=Impression faxtomail.historyType.reply=Réponse -faxtomail.historyType.transmission=Transmission +faxtomail.historyType.transmission=Déplacement faxtomail.historyType.transmissionToEdi=Transmission à l'EDI faxtomail.persistence.loader.error= faxtomail.persistence.mkDir.error= Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-07-25 09:53:01 UTC (rev 440) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-07-27 18:36:54 UTC (rev 441) @@ -106,7 +106,6 @@ demand.getValidRangeRowModels().add(rangeRowModel); } } - // / getValidRangeRowModels() demand.setValid(handler.isDemandeValid(demand)); demands.add(demand); @@ -116,4 +115,16 @@ model.setPaginationParameter(paginationResult.getCurrentPage()); model.setPaginationResult(paginationResult); } + + @Override + public void postSuccessAction() { + super.postSuccessAction(); + getUI().getNavigationTree().setEnabled(true); + } + + @Override + public void postFailedAction(Throwable error) { + super.postFailedAction(error); + getUI().getNavigationTree().setEnabled(true); + } } 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-07-25 09:53:01 UTC (rev 440) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-07-27 18:36:54 UTC (rev 441) @@ -143,6 +143,8 @@ this.ui.setContextValue(model); } + private boolean loading = false; + @Override public void afterInit(DemandeListUI ui) { @@ -252,14 +254,17 @@ }); // init tree + final JTree navigationTree = ui.getNavigationTree(); + final Map<MailFolder, FolderTreeNode> nodesByFolder = - FaxToMailUIUtil.initFolderTree(getContext(), ui.getNavigationTree(), model.getFolders(), true); + FaxToMailUIUtil.initFolderTree(getContext(), navigationTree, model.getFolders(), true); - ui.getNavigationTree().addTreeSelectionListener(new TreeSelectionListener() { + navigationTree.addTreeSelectionListener(new TreeSelectionListener() { @Override public void valueChanged(TreeSelectionEvent e) { FolderTreeNode folderNode = (FolderTreeNode) e.getPath().getLastPathComponent(); if (folderNode.isCanSelect()) { + navigationTree.setEnabled(false); MailFolder folder = folderNode.getMailFolder(); // open new transaction for current folder @@ -320,7 +325,7 @@ } if (currentMailFolder != null) { DefaultMutableTreeNode node = nodesByFolder.get(currentMailFolder); - ui.getNavigationTree().setSelectionPath(new TreePath(node.getPath())); + navigationTree.setSelectionPath(new TreePath(node.getPath())); } } 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-07-25 09:53:01 UTC (rev 440) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIModel.java 2014-07-27 18:36:54 UTC (rev 441) @@ -58,7 +58,7 @@ protected List<DemandeUIModel> emails; - protected PaginationParameter paginationParameter = PaginationParameter.of(0, 50, Email.PROPERTY_RECEPTION_DATE, true); + protected PaginationParameter paginationParameter = PaginationParameter.of(0, 50, Email.PROPERTY_RECEPTION_DATE, false); protected PaginationResult<Email> paginationResult = PaginationResult.of(null, 0, paginationParameter); @@ -113,7 +113,7 @@ } public void resetPaginationParameter() { - setPaginationParameter(PaginationParameter.of(0, 50, Email.PROPERTY_RECEPTION_DATE, true)); + setPaginationParameter(PaginationParameter.of(0, 50, Email.PROPERTY_RECEPTION_DATE, false)); } public void setPaginationResult(PaginationResult<Email> paginationResult) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupItem.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupItem.css 2014-07-25 09:53:01 UTC (rev 440) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupItem.css 2014-07-27 18:36:54 UTC (rev 441) @@ -26,7 +26,7 @@ } #demandeSubjectLabel { - text: { getDemande().getObject() }; + text: { getDemande().getTitle() }; } #toolbar { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java 2014-07-25 09:53:01 UTC (rev 440) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java 2014-07-27 18:36:54 UTC (rev 441) @@ -29,6 +29,8 @@ import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.util.AbstractToolbarPopupHandler; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUIUtil; +import com.google.common.base.Function; +import com.google.common.collect.Ordering; import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.model.JaxxDefaultListModel; @@ -96,7 +98,16 @@ JXList list = ui.getHistories(); list.setCellRenderer(new HistoryListCellRenderer()); JaxxDefaultListModel listModel = new JaxxDefaultListModel<History>(); - listModel.setAllElements(getModel().getHistory()); + final List<History> histories = new ArrayList<History>(getModel().getHistory()); + //sort histories by modification date + Collections.sort(histories, Ordering.natural().onResultOf(new Function<History, Comparable>() { + @Override + public Comparable apply(History history) { + return history.getModificationDate(); + } + })); + + listModel.setAllElements(histories); list.setModel(listModel); list.addHighlighter(HighlighterFactory.createAlternateStriping()); @@ -116,7 +127,6 @@ // AbstractToolbarPopupHandler.this.ui.dispose(); // AbstractToolbarPopupHandler.this.ui.setVisible(false); StringBuilder historyAsString = new StringBuilder(); - Collection<History> histories = getModel().getHistory(); for (History history : histories) { historyAsString.append(t("faxtomail.common.on.label") + " " + decorate(history.getModificationDate())) .append(" : " + JAXXUtil.getStringValue(history.getType().getLabel())); 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-07-25 09:53:01 UTC (rev 440) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java 2014-07-27 18:36:54 UTC (rev 441) @@ -59,7 +59,7 @@ protected final EmailFilter editObject = new EmailFilter(); - protected PaginationParameter paginationParameter = PaginationParameter.of(0, 50, Email.PROPERTY_RECEPTION_DATE, true); + protected PaginationParameter paginationParameter = PaginationParameter.of(0, 50, Email.PROPERTY_RECEPTION_DATE, false); protected PaginationResult<Email> paginationResult = PaginationResult.of(null, 0, paginationParameter); protected List<DemandeUIModel> results; @@ -404,7 +404,7 @@ } public void resetPaginationParameter() { - setPaginationParameter(PaginationParameter.of(0, 50, Email.PROPERTY_RECEPTION_DATE, true)); + setPaginationParameter(PaginationParameter.of(0, 50, Email.PROPERTY_RECEPTION_DATE, false)); } public void setPaginationResult(PaginationResult<Email> paginationResult) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-07-25 09:53:01 UTC (rev 440) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-07-27 18:36:54 UTC (rev 441) @@ -180,7 +180,7 @@ foreground = sel ? Color.WHITE : Color.BLACK; } else { - foreground = Color.LIGHT_GRAY; + foreground = Color.GRAY; } component.setForeground(foreground); 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-07-25 09:53:01 UTC (rev 440) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-07-27 18:36:54 UTC (rev 441) @@ -61,6 +61,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -259,9 +260,6 @@ log.debug(String.format("Message %d/%d : %s", i, count, message.getSubject())); } - // email.s(message.getSubject()); - // modifiedProperties.add(Email.PROPERTY_OBJECT); - List<Address> recipients = new ArrayList<>(); Address[] toRecipients = message.getRecipients(Message.RecipientType.TO); if (toRecipients != null) { @@ -318,17 +316,22 @@ Client client = clientService.getClientForEmailAddress(sender, email); modifiedProperties.add(Email.PROPERTY_SENDER); + String object; if (client != null) { - String object = client.getCaracteristic1() + " / " + - client.getCode() + " / " + - client.getName() + " / " + - client.getFaxNumber() + " / " + + object = ObjectUtils.defaultIfNull(client.getCaracteristic1(), "-") + " / " + + ObjectUtils.defaultIfNull(client.getCode(), "-") + " / " + + ObjectUtils.defaultIfNull(client.getName(), "-") + " / " + + ObjectUtils.defaultIfNull(client.getFaxNumber(), "-") + " / " + DateFormat.getDateInstance(DateFormat.MEDIUM).format(new Date()); - email.setObject(object); - modifiedProperties.add(Email.PROPERTY_OBJECT); + modifiedProperties.add(Email.PROPERTY_CLIENT); + + } else { + object = t("faxtomail.email.object.noClient"); } + email.setObject(object); email.setClient(client); + modifiedProperties.add(Email.PROPERTY_OBJECT); MailFolder mailFolder = null; if (!filter.isFilterFolderPriority() && client != null) { Modified: trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 2014-07-25 09:53:01 UTC (rev 440) +++ trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 2014-07-27 18:36:54 UTC (rev 441) @@ -36,5 +36,6 @@ com.franciaflex.faxtomail.persistence.entities.MailField.TAKEN_BY=Pris par faxtomail.email.content.attachment.htmlfileName=contenu html du mail faxtomail.email.content.attachment.plainfileName=contenu texte du mail +faxtomail.email.object.noClient=Client non trouvé faxtomail.email.projectReference.default= faxtomail.email.subject.re=Re \: %s