Author: kmorin Date: 2014-04-03 16:21:15 +0200 (Thu, 03 Apr 2014) New Revision: 27 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/27 Log: refs #4654 [ECRAN] Liste des mails / fax ajout des colonnes pris par et dernier ?\195?\160 ouvrir une pi?\195?\168ce jointe 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/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_en_GB.properties 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-04-03 14:00:27 UTC (rev 26) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-04-03 14:21:15 UTC (rev 27) @@ -65,6 +65,7 @@ public static final String PROPERTY_CLIENT_CODE = "clientCode"; public static final String PROPERTY_CLIENT_BRAND = "clientBrand"; public static final String PROPERTY_EDITABLE = "editable"; + public static final String PROPERTY_LAST_ATTACHMENT_OPENING_USER = "lastAttachmentOpeningUser"; protected final Email editObject = new EmailImpl(); @@ -462,25 +463,37 @@ } public void addRangeRow(RangeRow rangeRow) { - Object oldValue = new ArrayList<RangeRow>(getRangeRow()); + Object oldValue = null; + if (getRangeRow() != null) { + oldValue = new ArrayList<RangeRow>(getRangeRow()); + } editObject.addRangeRow(rangeRow); firePropertyChange(Email.PROPERTY_RANGE_ROW, oldValue, getRangeRow()); } public void addAllRangeRow(Collection<RangeRow> rangeRow) { - Object oldValue = new ArrayList<RangeRow>(getRangeRow()); + Object oldValue = null; + if (getRangeRow() != null) { + oldValue = new ArrayList<RangeRow>(getRangeRow()); + } editObject.addAllRangeRow(rangeRow); firePropertyChange(Email.PROPERTY_RANGE_ROW, oldValue, getRangeRow()); } public void removeRangeRow(RangeRow rangeRow) { - Object oldValue = new ArrayList<RangeRow>(getRangeRow()); + Object oldValue = null; + if (getRangeRow() != null) { + oldValue = new ArrayList<RangeRow>(getRangeRow()); + } editObject.removeRangeRow(rangeRow); firePropertyChange(Email.PROPERTY_RANGE_ROW, oldValue, getRangeRow()); } public void setRangeRow(Collection<RangeRow> rangeRow) { - Object oldValue = new ArrayList<RangeRow>(getRangeRow()); + Object oldValue = null; + if (getRangeRow() != null) { + oldValue = new ArrayList<RangeRow>(getRangeRow()); + } if (rangeRow == null) { rangeRow = new ArrayList<RangeRow>(); } 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-04-03 14:00:27 UTC (rev 26) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-04-03 14:21:15 UTC (rev 27) @@ -4,6 +4,7 @@ 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.HasLabel; import com.franciaflex.faxtomail.persistence.entities.HistoryType; import com.franciaflex.faxtomail.persistence.entities.Priority; @@ -72,6 +73,8 @@ Email.PROPERTY_ETAT_ATTENTE, DemandeUIModel.PROPERTY_PF_NB, DemandeUIModel.PROPERTY_SAV_NB, + Email.PROPERTY_TAKEN_BY, + DemandeUIModel.PROPERTY_LAST_ATTACHMENT_OPENING_USER, Email.PROPERTY_ATTACHMENT }, ','); } @@ -117,11 +120,17 @@ case Email.PROPERTY_DEMAND_STATUS: tableCellRenderer = newTableCellRender(DemandStatus.class); break; + case Email.PROPERTY_DEMAND_TYPE: case Email.PROPERTY_ETAT_ATTENTE: tableCellRenderer = newTableCellRender(HasLabel.class); break; + case Email.PROPERTY_TAKEN_BY: + case DemandeUIModel.PROPERTY_LAST_ATTACHMENT_OPENING_USER: + tableCellRenderer = newTableCellRender(FaxToMailUser.class); + break; + default: tableCellRenderer = newTableCellRender(new Decorator<Object>(Object.class) { @Override 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-04-03 14:00:27 UTC (rev 26) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/DemandeTableModel.java 2014-04-03 14:21:15 UTC (rev 27) @@ -150,6 +150,12 @@ n("faxtomail.demandeList.table.header.attachment"), n("faxtomail.demandeList.table.header.attachment.tip"))); + put(DemandeUIModel.PROPERTY_LAST_ATTACHMENT_OPENING_USER, + ColumnIdentifier.<Email>newId( + DemandeUIModel.PROPERTY_LAST_ATTACHMENT_OPENING_USER, + n("faxtomail.demandeList.table.header.lastAttachmentOpeningUser"), + n("faxtomail.demandeList.table.header.lastAttachmentOpeningUser.tip"))); + }}; public DemandeTableModel(TableColumnModelExt columnModel) { Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_en_GB.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_en_GB.properties 2014-04-03 14:00:27 UTC (rev 26) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_en_GB.properties 2014-04-03 14:21:15 UTC (rev 27) @@ -202,6 +202,8 @@ faxtomail.demandeList.table.header.ediCodeNumber.tip= faxtomail.demandeList.table.header.folder= faxtomail.demandeList.table.header.folder.tip= +faxtomail.demandeList.table.header.lastAttachmentOpeningUser= +faxtomail.demandeList.table.header.lastAttachmentOpeningUser.tip= faxtomail.demandeList.table.header.object= faxtomail.demandeList.table.header.object.tip= faxtomail.demandeList.table.header.pfNb= 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-04-03 14:00:27 UTC (rev 26) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-04-03 14:21:15 UTC (rev 27) @@ -102,6 +102,8 @@ faxtomail.demandeList.table.header.companyReference.tip=Notre référence faxtomail.demandeList.table.header.ediCodeNumber=Code EDI faxtomail.demandeList.table.header.ediCodeNumber.tip=Code EDI +faxtomail.demandeList.table.header.lastAttachmentOpeningUser=Dernier à ouvrir une PJ +faxtomail.demandeList.table.header.lastAttachmentOpeningUser.tip=Dernier utilisateur à avoir ouvert une pièce-jointe faxtomail.demandeList.table.header.object=Objet faxtomail.demandeList.table.header.object.tip=Objet faxtomail.demandeList.table.header.pfNb=Qté produits