This is an automated email from the git hooks/post-receive script. New commit to branch feature/8053 in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 7a1da45acfa95e2b53e7d39dd5f0f38e5a8bee69 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 3 12:37:47 2016 +0100 ajout de la colonne sujet (refs #8053) --- .../faxtomail/persistence/entities/MailField.java | 4 +++- .../faxtomail/ui/swing/actions/OpenGroupedDemandAction.java | 8 ++------ .../faxtomail/ui/swing/actions/ShowDemandeAction.java | 2 +- .../faxtomail/ui/swing/content/demande/DemandeUIModel.java | 13 ++++++++++--- .../faxtomail/ui/swing/util/DemandeTableModel.java | 6 ++++++ .../main/resources/i18n/faxtomail-ui-swing_fr_FR.properties | 2 ++ .../main/resources/i18n/faxtomail-ui-web_fr_FR.properties | 1 + 7 files changed, 25 insertions(+), 11 deletions(-) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java index 6fe2f31..4918043 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailField.java @@ -55,7 +55,8 @@ public enum MailField { REPLIES, ATTACHMENT, GROUP, - EDI_RETURN; + EDI_RETURN, + SUBJECT; public static MailField[] getCanBeRequiredMailFields() { return new MailField[] { @@ -78,6 +79,7 @@ public enum MailField { CLIENT_CODE, CLIENT_BRAND, SENDER, + SUBJECT, PROJECT_REFERENCE, COMPANY_REFERENCE, REFERENCE, diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java index d8bc25d..8c90f27 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java @@ -27,7 +27,6 @@ package com.franciaflex.faxtomail.ui.swing.actions; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailFolder; -import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.services.service.exceptions.AlreadyLockedMailException; @@ -35,15 +34,12 @@ import com.franciaflex.faxtomail.services.service.exceptions.FolderNotReadableEx import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUI; -import com.franciaflex.faxtomail.ui.swing.content.demande.RangeRowModel; import com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup.DemandGroupUI; import com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup.DemandGroupUIHandler; import org.apache.commons.lang3.StringUtils; import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; -import javax.swing.*; -import java.util.ArrayList; -import java.util.Collection; +import javax.swing.JOptionPane; import static org.nuiton.i18n.I18n.t; @@ -155,7 +151,7 @@ public class OpenGroupedDemandAction extends AbstractFaxToMailAction<DemandeUIMo getContext().getCurrentUser(), takeEmail); - demandToOpen.fromEntity(email); + demandToOpen.fromEntity(email, true); demandToOpen.recomputeValidRangeRows(); MailFolder folder = demandToOpen.getMailFolder(); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java index 351a6b3..54a7472 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java @@ -157,7 +157,7 @@ public class ShowDemandeAction extends AbstractChangeScreenAction { currentEmail.getTitle())); } - currentEmail.fromEntity(email); + currentEmail.fromEntity(email, true); MailFolder folder = currentEmail.getMailFolder(); if (currentEmail.getArchiveDate() != null diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java index 581c117..76079d0 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java @@ -190,6 +190,10 @@ public class DemandeUIModel extends AbstractFaxToMailBeanUIModel<Email, DemandeU */ @Override public void fromEntity(Email entity) { + fromEntity(entity, false); + } + + public void fromEntity(Email entity, boolean decomposeEmail) { fromBeanBinder.copyExcluding(entity, this, Email.PROPERTY_ATTACHMENT, Email.PROPERTY_REPLIES, @@ -199,6 +203,9 @@ public class DemandeUIModel extends AbstractFaxToMailBeanUIModel<Email, DemandeU setGroupedDemandes(entity.getEmailGroup()); loadReplies(entity); this.subject = entity.getSubject(); + if (decomposeEmail) { + decomposeEmail(); + } } public void fromEntityExcluding(Email entity, Set<String> properties) { @@ -327,9 +334,9 @@ public class DemandeUIModel extends AbstractFaxToMailBeanUIModel<Email, DemandeU } public String getSubject() { - if (subject == null) { - decomposeEmail(); - } +// if (subject == null) { +// decomposeEmail(); +// } return subject; } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java index 01c3426..a308789 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java @@ -203,6 +203,12 @@ public class DemandeTableModel extends AbstractTableModel { n("faxtomail.demandeList.table.header.comment"), n("faxtomail.demandeList.table.header.comment.tip"))); + put(MailField.SUBJECT, + ColumnIdentifier.<Email>newId( + Email.PROPERTY_SUBJECT, + n("faxtomail.demandeList.table.header.subject"), + n("faxtomail.demandeList.table.header.subject.tip"))); + }}; public DemandeTableModel(TableColumnModelExt columnModel, MailField... editableProperties) { diff --git a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties index 4d00e1a..0cc2754 100644 --- a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties +++ b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties @@ -211,6 +211,8 @@ faxtomail.demandeList.table.header.sender=Émetteur faxtomail.demandeList.table.header.sender.tip=Addresse email ou numéro de fax de l'émetteur faxtomail.demandeList.table.header.status=Statut faxtomail.demandeList.table.header.status.tip=Statut +faxtomail.demandeList.table.header.subject=Sujet +faxtomail.demandeList.table.header.subject.tip=Sujet de l'email reçu faxtomail.demandeList.table.header.type=Type faxtomail.demandeList.table.header.type.tip=Type faxtomail.demandeList.table.header.user=Pris par diff --git a/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties b/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties index 4ed536f..7c3d4f1 100644 --- a/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties +++ b/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties @@ -33,6 +33,7 @@ com.franciaflex.faxtomail.persistence.entities.MailField.REFERENCE=Référence com.franciaflex.faxtomail.persistence.entities.MailField.REPLIES=Réponses com.franciaflex.faxtomail.persistence.entities.MailField.SAV_NB=Quantité de SAV com.franciaflex.faxtomail.persistence.entities.MailField.SENDER=Émetteur +com.franciaflex.faxtomail.persistence.entities.MailField.SUBJECT=Sujet com.franciaflex.faxtomail.persistence.entities.MailField.TAKEN_BY=Pris par com.franciaflex.faxtomail.persistence.entities.MailField.WAITING_STATE=État d'attente faxtomail.demandDetail.noAttachmentForId=Aucune pièce jointe ne correspond à l'identifiant %s. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.