Author: kmorin Date: 2014-05-13 19:18:45 +0200 (Tue, 13 May 2014) New Revision: 71 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/71 Log: - ajout d'une colonne qui combine notre r?\195?\169f?\195?\169rence et les num?\195?\169ros de commande - A la cr?\195?\169ation manuelle d'une fiche, il faut pouvoir choisir le statut. 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/DemandeUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 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/util/AbstractFaxToMailDemandListHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.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/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-05-13 10:10:24 UTC (rev 70) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-05-13 17:18:45 UTC (rev 71) @@ -28,6 +28,7 @@ import com.ezware.oxbow.swingbits.table.filter.JTableFilter; import com.ezware.oxbow.swingbits.table.filter.TableRowFilterSupport; import com.franciaflex.faxtomail.persistence.entities.Company; +import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.History; @@ -396,6 +397,7 @@ email.setReceptionDate(now); email.setTakenBy(currentUser); email.setHistory(histories); + email.setDemandStatus(DemandStatus.UNTREATED); openDemand(email); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css 2014-05-13 10:10:24 UTC (rev 70) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.css 2014-05-13 17:18:45 UTC (rev 71) @@ -112,8 +112,15 @@ #statusField { text: { model.getDemandStatus().getLabel() }; + visible: { model.getTopiaId() != null }; } +#statusComboBox { + property: demandStatus; + selectedItem: { model.getDemandStatus() }; + visible: { model.getTopiaId() == null }; +} + #etatAttenteLabel { text: "faxtomail.demande.etatAttente.label"; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx 2014-05-13 10:10:24 UTC (rev 70) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUI.jaxx 2014-05-13 17:18:45 UTC (rev 71) @@ -185,7 +185,13 @@ <JLabel id='statusLabel'/> </cell> <cell weightx='1' columns="3"> - <JLabel id='statusField'/> + <JPanel layout="{new BorderLayout()}"> + <JLabel id='statusField' constraints='BorderLayout.NORTH'/> + <BeanFilterableComboBox id='statusComboBox' + constructorParams='this' + genericType="DemandStatus" + constraints='BorderLayout.SOUTH'/> + </JPanel> </cell> </row> <row> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-05-13 10:10:24 UTC (rev 70) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-05-13 17:18:45 UTC (rev 71) @@ -24,6 +24,7 @@ import com.franciaflex.faxtomail.persistence.entities.Attachment; +import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.DemandType; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.EtatAttente; @@ -75,6 +76,7 @@ import java.beans.PropertyChangeListener; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.List; @@ -145,6 +147,7 @@ initBeanFilterableComboBox(ui.getDocTypeComboBox(), referentielService.getAllDemandType(), model.getDemandType()); initBeanFilterableComboBox(ui.getPriorityComboBox(), referentielService.getAllPriority(), model.getPriority()); + initBeanFilterableComboBox(ui.getStatusComboBox(), Arrays.asList(DemandStatus.values()), model.getDemandStatus()); List<EtatAttente> etatAttentes = new ArrayList<EtatAttente>(); Collection<EtatAttente> folderEtatAttentes = getEtatAttenteForFolder(folder); 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-13 10:10:24 UTC (rev 70) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-05-13 17:18:45 UTC (rev 71) @@ -39,6 +39,9 @@ import com.franciaflex.faxtomail.persistence.entities.Reply; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailBeanUIModel; import com.franciaflex.faxtomail.ui.swing.content.attachment.AttachmentModelAware; +import com.google.common.base.Function; +import com.google.common.base.Predicate; +import com.google.common.collect.Collections2; import jaxx.runtime.swing.JAXXWidgetUtil; import org.apache.commons.io.Charsets; import org.apache.commons.io.FileUtils; @@ -84,10 +87,9 @@ public static final String PROPERTY_QUOTATION_NB = "quotationNb"; public static final String PROPERTY_PF_NB = "pfNb"; public static final String PROPERTY_SAV_NB = "savNb"; - public static final String PROPERTY_PLAIN_CONTENT = "plainContent"; - public static final String PROPERTY_HTML_CONTENT = "htmlContent"; public static final String PROPERTY_CLIENT_CODE = "clientCode"; public static final String PROPERTY_CLIENT_BRAND = "clientBrand"; + public static final String PROPERTY_REFERENCE = "reference"; public static final String PROPERTY_EDITABLE = "editable"; public static final String PROPERTY_LAST_ATTACHMENT_OPENING_USER = "lastAttachmentOpeningUser"; public static final String PROPERTY_GROUPED_DEMANDES = "groupedDemandes"; @@ -388,14 +390,40 @@ public void setCompanyReference(String companyReference) { Object oldValue = getCompanyReference(); + Object refOldValue = getReference(); editObject.setCompanyReference(companyReference); firePropertyChanged(Email.PROPERTY_COMPANY_REFERENCE, oldValue, companyReference); + firePropertyChanged(PROPERTY_REFERENCE, refOldValue, getReference()); } public String getCompanyReference() { return editObject.getCompanyReference(); } + public String getReference() { + List<String> reference = new ArrayList<String>(); + if (StringUtils.isNotBlank(getCompanyReference())) { + reference.add(getCompanyReference()); + } + Collection<RangeRow> rangeRow = getRangeRow(); + if (rangeRow != null) { + Collection<String> commandNumbers = Collections2.transform(rangeRow, new Function<RangeRow, String>() { + @Override + public String apply(RangeRow input) { + return input.getCommandNumber(); + } + }); + Collections2.filter(commandNumbers, new Predicate<String>() { + @Override + public boolean apply(String input) { + return StringUtils.isNotBlank(input); + } + }); + reference.addAll(commandNumbers); + } + return StringUtils.join(reference, ", "); + } + public void setHistory(Collection<History> history) { editObject.setHistory(history); firePropertyChanged(Email.PROPERTY_HISTORY, null, history); @@ -546,8 +574,10 @@ if (getRangeRow() != null) { oldValue = new ArrayList<RangeRow>(getRangeRow()); } + String refOldValue = getReference(); editObject.addRangeRow(rangeRow); firePropertyChange(Email.PROPERTY_RANGE_ROW, oldValue, getRangeRow()); + firePropertyChanged(PROPERTY_REFERENCE, refOldValue, getReference()); } public void addAllRangeRow(Collection<RangeRow> rangeRow) { @@ -555,8 +585,10 @@ if (getRangeRow() != null) { oldValue = new ArrayList<RangeRow>(getRangeRow()); } + String refOldValue = getReference(); editObject.addAllRangeRow(rangeRow); firePropertyChange(Email.PROPERTY_RANGE_ROW, oldValue, getRangeRow()); + firePropertyChanged(PROPERTY_REFERENCE, refOldValue, getReference()); } public void removeRangeRow(RangeRow rangeRow) { @@ -564,8 +596,10 @@ if (getRangeRow() != null) { oldValue = new ArrayList<RangeRow>(getRangeRow()); } + String refOldValue = getReference(); editObject.removeRangeRow(rangeRow); firePropertyChange(Email.PROPERTY_RANGE_ROW, oldValue, getRangeRow()); + firePropertyChanged(PROPERTY_REFERENCE, refOldValue, getReference()); } public void setRangeRow(Collection<RangeRow> rangeRow) { @@ -576,8 +610,10 @@ if (rangeRow == null) { rangeRow = new ArrayList<RangeRow>(); } + String refOldValue = getReference(); editObject.setRangeRow(rangeRow); firePropertyChange(Email.PROPERTY_RANGE_ROW, oldValue, getRangeRow()); + firePropertyChanged(PROPERTY_REFERENCE, refOldValue, getReference()); } public MailFolder getMailFolder() { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-05-13 10:10:24 UTC (rev 70) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-05-13 17:18:45 UTC (rev 71) @@ -97,6 +97,7 @@ Email.PROPERTY_SENDER, Email.PROPERTY_PROJECT_REFERENCE, Email.PROPERTY_COMPANY_REFERENCE, + DemandeUIModel.PROPERTY_REFERENCE, Email.PROPERTY_RECEPTION_DATE, Email.PROPERTY_RECIPIENT, Email.PROPERTY_DEMAND_STATUS, 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-05-13 10:10:24 UTC (rev 70) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java 2014-05-13 17:18:45 UTC (rev 71) @@ -131,6 +131,12 @@ n("faxtomail.demandeList.table.header.companyReference"), n("faxtomail.demandeList.table.header.companyReference.tip"))); + put(DemandeUIModel.PROPERTY_REFERENCE, + ColumnIdentifier.<Email>newReadOnlyId( + DemandeUIModel.PROPERTY_REFERENCE, + n("faxtomail.demandeList.table.header.reference"), + n("faxtomail.demandeList.table.header.reference.tip"))); + put(DemandeUIModel.PROPERTY_PF_NB, ColumnIdentifier.<Email>newReadOnlyId( DemandeUIModel.PROPERTY_PF_NB, 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-13 10:10:24 UTC (rev 70) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-05-13 17:18:45 UTC (rev 71) @@ -153,6 +153,8 @@ faxtomail.demandeList.table.header.receptionDate.tip=Date de réception faxtomail.demandeList.table.header.recipient=Destinataire faxtomail.demandeList.table.header.recipient.tip=Addresse email ou numéro de fax du destinataire +faxtomail.demandeList.table.header.reference=Référence +faxtomail.demandeList.table.header.reference.tip=Référence (notre référence + numéros de commande) faxtomail.demandeList.table.header.replies=Réponses faxtomail.demandeList.table.header.replies.tip=Réponses envoyées faxtomail.demandeList.table.header.savNb=Qté SAV