Author: kmorin Date: 2014-05-14 19:23:11 +0200 (Wed, 14 May 2014) New Revision: 74 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/74 Log: send history by email 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/history/HistoryListUIHandler.java trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 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-05-14 14:34:29 UTC (rev 73) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-05-14 17:23:11 UTC (rev 74) @@ -871,7 +871,12 @@ @Override public String getTitle() { - return getObject(); + String result = getObject(); + String ref = getReference(); + if (!ref.isEmpty()) { + result = ref + " - " + result; + } + return result; } @Override 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-05-14 14:34:29 UTC (rev 73) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java 2014-05-14 17:23:11 UTC (rev 74) @@ -28,6 +28,9 @@ import com.franciaflex.faxtomail.persistence.entities.History; 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 jaxx.runtime.JAXXUtil; +import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.model.JaxxDefaultListModel; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections.CollectionUtils; @@ -40,6 +43,7 @@ import javax.swing.*; import java.awt.*; +import java.awt.event.ActionEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.*; @@ -75,6 +79,8 @@ n("faxtomail.demande.rangeRow.label"); } + protected Action sendAction; + @Override public void beforeInit(HistoryListUI ui) { super.beforeInit(ui); @@ -101,6 +107,41 @@ ((JaxxDefaultListModel) getUI().getHistories().getModel()).setAllElements(history); } }); + + sendAction = new AbstractAction() { + private static final long serialVersionUID = 1L; + + @Override + public void actionPerformed(ActionEvent e) { +// 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())); + String decoratedFields = decorateFields(history.getFields()); + if (!decoratedFields.isEmpty()) { + historyAsString.append(" (" + decoratedFields + ")"); + } + historyAsString.append("\n"); + } + FaxToMailUIUtil.mail(t("faxtomail.demande.history.send.subject", getModel().getTitle()), historyAsString.toString()); + } + }; + + ImageIcon actionIcon = SwingUtil.createActionIcon("reply"); + sendAction.putValue(Action.SMALL_ICON, actionIcon); + sendAction.putValue(Action.LARGE_ICON_KEY, actionIcon); + sendAction.putValue(Action.NAME, "send"); + sendAction.putValue(Action.SHORT_DESCRIPTION, t("faxtomail.demande.history.action.send.tip")); + JButton sendButton = new JButton(sendAction); + sendButton.setText(null); + sendButton.setFocusPainted(false); + sendButton.setRequestFocusEnabled(false); + sendButton.setFocusable(false); + + ui.getBody().getRightDecoration().add(sendButton, 0); } @Override Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-05-14 14:34:29 UTC (rev 73) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-05-14 17:23:11 UTC (rev 74) @@ -88,6 +88,8 @@ faxtomail.demande.gamme.label=Gamme faxtomail.demande.group.button.label=Grouper faxtomail.demande.group.successful=Groupement réussi avec l'élément %s +faxtomail.demande.history.action.send.tip= +faxtomail.demande.history.send.subject=Historique de %s faxtomail.demande.lastAttachmentOpening.label=Dernière ouverture de pièce-jointe faxtomail.demande.lastModified.label=Dernière modification faxtomail.demande.localReference.label=Référence