- Faxtomail-commits - mailman.cloud.codelutin.com

r644 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history faxtomail-ui-swing/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com 24 Sep '14

24 Sep '14

Author: kmorin Date: 2014-09-24 18:00:33 +0200 (Wed, 24 Sep 2014) New Revision: 644 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/644 Log: - correction de la recherche par personne ayant archiv?\195?\169 - copie de l'historique dans le presse-papier pour que l'utilisateur le colle dans le mail. Si l'historique est trop long, il est coup?\195?\169 dans le mail. Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.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-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-09-24 13:47:37 UTC (rev 643) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-09-24 16:00:33 UTC (rev 644) @@ -182,8 +182,8 @@ // history maxArchivedDate && transferBy if (searchFilter.getMaxArchivedDate() != null || searchFilter.getArchivedBy() != null) { query.append(" AND EXISTS (FROM " + History.class.getName() + " H WHERE H in elements(E." + Email.PROPERTY_HISTORY + ")"); - query.append(" AND H." + History.PROPERTY_TYPE + " = :transmissionType"); - args.put("transmissionType", HistoryType.TRANSMISSION); + query.append(" AND H." + History.PROPERTY_TYPE + " = :archivedType"); + args.put("archivedType", HistoryType.ARCHIVED); if (searchFilter.getMaxArchivedDate() != null) { Date date = DateUtils.ceiling(searchFilter.getMaxArchivedDate(), Calendar.DAY_OF_MONTH); query.append(" AND H." + History.PROPERTY_MODIFICATION_DATE + " <= :" + SearchFilter.PROPERTY_MAX_ARCHIVED_DATE); 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-09-24 13:47:37 UTC (rev 643) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java 2014-09-24 16:00:33 UTC (rev 644) @@ -43,6 +43,8 @@ import javax.swing.*; import java.awt.*; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.StringSelection; import java.awt.event.ActionEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -144,7 +146,15 @@ historyAsString.append(" ").append(decorateUser(history.getFaxToMailUser(), true)); historyAsString.append("\n"); } - FaxToMailUIUtil.email(t("faxtomail.demande.history.send.subject", getModel().getTitle()), historyAsString.toString()); + + StringSelection stringSelection = new StringSelection(historyAsString.toString()); + Clipboard clpbrd = Toolkit.getDefaultToolkit().getSystemClipboard(); + clpbrd.setContents (stringSelection, null); + + FaxToMailUIUtil.email(t("faxtomail.demande.history.send.subject", getModel().getTitle()), + t("faxtomail.demande.history.send.body")); + + closeEditor(); } }; 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-09-24 13:47:37 UTC (rev 643) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-09-24 16:00:33 UTC (rev 644) @@ -115,6 +115,7 @@ faxtomail.demande.group.button.label=Grouper faxtomail.demande.group.successful=Groupement réussi faxtomail.demande.history.action.send.tip=Envoyer l'historique par email +faxtomail.demande.history.send.body=L'historique de l'élément a été copié dans le presse-papier. Vous pouvez le coller dans cet email en appuyant sur les touches Ctrl+V ou ou en cliquant sur le menu "Édition -> Coller" 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

1 0

r643 - trunk/faxtomail-ui-web/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com 24 Sep '14

24 Sep '14

Author: kmorin Date: 2014-09-24 15:47:37 +0200 (Wed, 24 Sep 2014) New Revision: 643 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/643 Log: modif traduction Modified: trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 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-09-24 13:26:13 UTC (rev 642) +++ trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 2014-09-24 13:47:37 UTC (rev 643) @@ -11,7 +11,7 @@ com.franciaflex.faxtomail.persistence.entities.MailField.CLIENT=Client com.franciaflex.faxtomail.persistence.entities.MailField.CLIENT_BRAND=Marque com.franciaflex.faxtomail.persistence.entities.MailField.CLIENT_CODE=Code client -com.franciaflex.faxtomail.persistence.entities.MailField.COMMENT=Commentaire +com.franciaflex.faxtomail.persistence.entities.MailField.COMMENT=Message com.franciaflex.faxtomail.persistence.entities.MailField.COMPANY_REFERENCE=Notre référence com.franciaflex.faxtomail.persistence.entities.MailField.DEMAND_STATUS=Statut de demande com.franciaflex.faxtomail.persistence.entities.MailField.DEMAND_TYPE=Type de demande

1 0

r642 - in trunk: faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by kmorin＠users.forge.codelutin.com 24 Sep '14

24 Sep '14

Author: kmorin Date: 2014-09-24 15:26:13 +0200 (Wed, 24 Sep 2014) New Revision: 642 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/642 Log: - ne pas g?\195?\169n?\195?\169rer la version text plain du mail en pdf s'il existe une version html - retourner ?\195?\160 la page 1 quand on filtre Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-09-24 12:43:29 UTC (rev 641) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-09-24 13:26:13 UTC (rev 642) @@ -274,6 +274,8 @@ protected void executeFilter() { FaxToMailUIContext context = handler.getContext(); + handler.getModel().resetPaginationParameter(); + LoadFolderEmailsAction loadFolderEmailsAction = context.getActionFactory().createLogicAction(handler, LoadFolderEmailsAction.class); 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-09-24 12:43:29 UTC (rev 641) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-09-24 13:26:13 UTC (rev 642) @@ -465,6 +465,14 @@ } Attachment attachment = convertHTMLToPdf(attachments, htmlContent, t("faxtomail.email.content.attachment.htmlfileName")); if (attachment != null) { + //remove text plain attachement if exists, to avoid having twice the mail content in the attachments + String plainTextFileName = t("faxtomail.email.content.attachment.plainfileName") + ".pdf"; + for (Attachment a : attachments) { + if (plainTextFileName.equals(a.getOriginalFileName())) { + attachments.remove(a); + break; + } + } attachments.add(attachment); } }

1 0

r641 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util
by kmorin＠users.forge.codelutin.com 24 Sep '14

24 Sep '14

Author: kmorin Date: 2014-09-24 14:43:29 +0200 (Wed, 24 Sep 2014) New Revision: 641 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/641 Log: try to use portrait Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 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-09-24 12:35:48 UTC (rev 640) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-09-24 12:43:29 UTC (rev 641) @@ -506,6 +506,8 @@ // see http://lynema.org/2010/12/29/printing-a-pdf-in-java-with-pdfrenderer PrinterJob pjob = PrinterJob.getPrinterJob(); PageFormat pf = pjob.defaultPage(); + pf.setOrientation(PageFormat.PORTRAIT); + Paper paper = new Paper(); paper.setImageableArea(0, 0, paper.getWidth() * 2, paper.getHeight()); pf.setPaper(paper);

1 0

r640 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by kmorin＠users.forge.codelutin.com 24 Sep '14

24 Sep '14

Author: kmorin Date: 2014-09-24 14:35:48 +0200 (Wed, 24 Sep 2014) New Revision: 640 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/640 Log: - filtre sur les quantit?\195?\169s plut?\195?\180t que sur les gammes Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java 2014-09-24 09:23:49 UTC (rev 639) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java 2014-09-24 12:35:48 UTC (rev 640) @@ -48,9 +48,9 @@ public static final String PROPERTY_RECEPTION_DATES = "receptionDates"; public static final String PROPERTY_RECIPIENTS = "recipients"; public static final String PROPERTY_DEMAND_STATUS = "demandStatus"; - public static final String PROPERTY_PRODUCT_RANGES = "productsRanges"; - public static final String PROPERTY_SAV_RANGES = "savRanges"; - public static final String PROPERTY_QUOTATION_RANGES = "quotationRanges"; + public static final String PROPERTY_PRODUCT_QUANTITIES = "productsQuantities"; + public static final String PROPERTY_SAV_QUANTITIES = "savQuantities"; + public static final String PROPERTY_QUOTATION_QUANTITIES = "quotationQuantities"; public static final String PROPERTY_TAKEN_BYS = "takenBys"; public static final String PROPERTY_COMMENTS = "comments"; public static final String PROPERTY_EDI_CODE_NUMBERS = "ediCodeNumbers"; @@ -82,11 +82,11 @@ protected Set<DemandStatus> demandStatus; - protected Set<Range> productsRanges; + protected Set<Long> productsQuantities; - protected Set<Range> savRanges; + protected Set<Long> savQuantities; - protected Set<Range> quotationRanges; + protected Set<Long> quotationQuantities; protected Set<FaxToMailUser> takenBys; @@ -206,31 +206,31 @@ firePropertyChange(PROPERTY_DEMAND_STATUS, null, demandStatus); } - public Set<Range> getProductsRanges() { - return productsRanges; + public Set<Long> getProductsQuantities() { + return productsQuantities; } - public void setProductsRanges(Set<Range> productsRanges) { - this.productsRanges = productsRanges; - firePropertyChange(PROPERTY_PRODUCT_RANGES, null, productsRanges); + public void setProductsQuantities(Set<Long> productsQuantities) { + this.productsQuantities = productsQuantities; + firePropertyChange(PROPERTY_PRODUCT_QUANTITIES, null, productsQuantities); } - public Set<Range> getSavRanges() { - return savRanges; + public Set<Long> getSavQuantities() { + return savQuantities; } - public void setSavRanges(Set<Range> savRanges) { - this.savRanges = savRanges; - firePropertyChange(PROPERTY_SAV_RANGES, null, savRanges); + public void setSavQuantities(Set<Long> savQuantities) { + this.savQuantities = savQuantities; + firePropertyChange(PROPERTY_SAV_QUANTITIES, null, savQuantities); } - public Set<Range> getQuotationRanges() { - return quotationRanges; + public Set<Long> getQuotationQuantities() { + return quotationQuantities; } - public void setQuotationRanges(Set<Range> quotationRanges) { - this.quotationRanges = quotationRanges; - firePropertyChange(PROPERTY_QUOTATION_RANGES, null, quotationRanges); + public void setQuotationQuantities(Set<Long> quotationQuantities) { + this.quotationQuantities = quotationQuantities; + firePropertyChange(PROPERTY_QUOTATION_QUANTITIES, null, quotationQuantities); } public Set<FaxToMailUser> getTakenBys() { @@ -282,7 +282,7 @@ setClientCodes(null); setWaitingStates(null); setDemandStatus(null); - setQuotationRanges(null); + setQuotationQuantities(null); setPriorities(null); setClientBrands(null); setComments(null); @@ -294,10 +294,10 @@ setLocalReferences(null); setReferences(null); setProjectReferences(null); - setProductsRanges(null); + setProductsQuantities(null); setReceptionDates(null); setRecipients(null); - setSavRanges(null); + setSavQuantities(null); setSenders(null); } } Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-09-24 09:23:49 UTC (rev 639) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-09-24 12:35:48 UTC (rev 640) @@ -706,48 +706,36 @@ query.append(")"); } - Set<Range> productRanges = emailFilter.getProductsRanges(); - if (CollectionUtils.isNotEmpty(productRanges)) { - query.append(" AND ((EXISTS (FROM " + RangeRow.class.getName() + " RR WHERE RR in elements(E." + Email.PROPERTY_RANGE_ROW + ")"); - query.append(" AND RR." + RangeRow.PROPERTY_RANGE + " IN (:" + EmailFilter.PROPERTY_PRODUCT_RANGES + ")"); - query.append(" AND RR." + RangeRow.PROPERTY_PRODUCT_QUANTITY + " > 0 )"); + Set<Long> savQuantities = emailFilter.getSavQuantities(); + if (CollectionUtils.isNotEmpty(savQuantities)) { + query.append(" AND ((EXISTS (FROM " + RangeRow.class.getName() + " RR WHERE RR in elements(E." + Email.PROPERTY_RANGE_ROW + "))" + + " AND (select sum(RR." + RangeRow.PROPERTY_SAV_QUANTITY + ") " + + "FROM " + RangeRow.class.getName() + " RR WHERE RR in elements(E." + Email.PROPERTY_RANGE_ROW + ")"); + query.append(") IN (:" + EmailFilter.PROPERTY_SAV_QUANTITIES + ")"); - if (productRanges.contains(null)) { + if (savQuantities.contains(null) || savQuantities.contains(0L)) { query.append(" OR NOT EXISTS (FROM " + RangeRow.class.getName() + " RR WHERE RR in elements(E." + Email.PROPERTY_RANGE_ROW + "))"); } query.append("))"); - args.put(EmailFilter.PROPERTY_PRODUCT_RANGES, productRanges); + args.put(EmailFilter.PROPERTY_SAV_QUANTITIES, savQuantities); } - Set<Range> savRanges = emailFilter.getSavRanges(); - if (CollectionUtils.isNotEmpty(savRanges)) { - query.append(" AND ((EXISTS (FROM " + RangeRow.class.getName() + " RR WHERE RR in elements(E." + Email.PROPERTY_RANGE_ROW + ")"); - query.append(" AND RR." + RangeRow.PROPERTY_RANGE + " IN (:" + EmailFilter.PROPERTY_SAV_RANGES + ")"); - query.append(" AND RR." + RangeRow.PROPERTY_SAV_QUANTITY + " > 0 )"); + Set<Long> quotationQuantities = emailFilter.getQuotationQuantities(); + if (CollectionUtils.isNotEmpty(quotationQuantities)) { + query.append(" AND ((EXISTS (FROM " + RangeRow.class.getName() + " RR WHERE RR in elements(E." + Email.PROPERTY_RANGE_ROW + "))" + + " AND (select sum(RR." + RangeRow.PROPERTY_QUOTATION_QUANTITY + ") " + + "FROM " + RangeRow.class.getName() + " RR WHERE RR in elements(E." + Email.PROPERTY_RANGE_ROW + ")"); + query.append(") IN (:" + EmailFilter.PROPERTY_QUOTATION_QUANTITIES + ")"); - if (savRanges.contains(null)) { + if (quotationQuantities.contains(null) || quotationQuantities.contains(0L)) { query.append(" OR NOT EXISTS (FROM " + RangeRow.class.getName() + " RR WHERE RR in elements(E." + Email.PROPERTY_RANGE_ROW + "))"); } query.append("))"); - args.put(EmailFilter.PROPERTY_SAV_RANGES, savRanges); + args.put(EmailFilter.PROPERTY_QUOTATION_QUANTITIES, quotationQuantities); } - Set<Range> quotationRanges = emailFilter.getQuotationRanges(); - if (CollectionUtils.isNotEmpty(quotationRanges)) { - query.append(" AND ((EXISTS (FROM " + RangeRow.class.getName() + " RR WHERE RR in elements(E." + Email.PROPERTY_RANGE_ROW + ")"); - query.append(" AND RR." + RangeRow.PROPERTY_RANGE + " IN (:" + EmailFilter.PROPERTY_QUOTATION_RANGES + ")"); - query.append(" AND RR." + RangeRow.PROPERTY_QUOTATION_QUANTITY + " > 0 )"); - - if (quotationRanges.contains(null)) { - query.append(" OR NOT EXISTS (FROM " + RangeRow.class.getName() + " RR WHERE RR in elements(E." + Email.PROPERTY_RANGE_ROW + "))"); - } - query.append("))"); - - args.put(EmailFilter.PROPERTY_QUOTATION_RANGES, quotationRanges); - } - Set<String> projectReferences = emailFilter.getProjectReferences(); if (projectReferences != null) { query.append(" AND (E." + Email.PROPERTY_PROJECT_REFERENCE + " in (:" + EmailFilter.PROPERTY_PROJECT_REFERENCES + ")"); @@ -922,14 +910,19 @@ return result; } - public Set<Object> getDistinctValues(MailFolder folder, String[] properties, String condition) { + public Set<Object> getDistinctValues(MailFolder folder, String[] properties, boolean sum) { Map<String, Object> args = new HashMap<>(); String folderAndStatusCondition = " WHERE email." + Email.PROPERTY_MAIL_FOLDER + " = :folder" + " AND email." + Email.PROPERTY_DEMAND_STATUS + " != :archiveStatus"; args.put("folder", folder); args.put("archiveStatus", DemandStatus.ARCHIVED); - String propertyList = StringUtils.join(properties, ", "); + String propertyList; + if (sum) { + propertyList = "sum(" + StringUtils.join(properties, "), sum(") + ")"; + } else { + propertyList = StringUtils.join(properties, ", "); + } String query = "SELECT DISTINCT " + propertyList + " FROM " + Email.class.getName() + " AS email"; @@ -947,8 +940,8 @@ } query += folderAndStatusCondition; - if (StringUtils.isNotBlank(condition)) { - query += " AND " + condition; + if (sum) { + query += " group by email." + Email.PROPERTY_TOPIA_ID; } List<Object> queryResults = findAll(query, args); @@ -999,7 +992,11 @@ // TODO echatellier 20140918 : on ajoute null dans tous les cas car les requetes precendente // sont trop lente juste pour savoir si on a vraiment besoin de savoir si l'on doit vraiment // avoir des valeurs nulles - if (!result.contains("")) { + if (sum && result.contains(null)) { + result.remove(null); + result.add(0L); + + } else if (!result.contains("")) { result.add(null); } Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-09-24 09:23:49 UTC (rev 639) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-09-24 12:35:48 UTC (rev 640) @@ -73,7 +73,7 @@ void transmitPendingDemandsToEdi(); - Set<Object> getDistinctValues(MailFolder folder, String[] properties, String condition); + Set<Object> getDistinctValues(MailFolder folder, String[] properties, boolean sum); PaginationResult<Email> getEmailForFolder(MailFolder folder, FaxToMailUser currentUser, EmailFilter filter, PaginationParameter page); Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-09-24 09:23:49 UTC (rev 639) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-09-24 12:35:48 UTC (rev 640) @@ -614,11 +614,11 @@ } @Override - public Set<Object> getDistinctValues(MailFolder folder, String[] properties, String condition) { + public Set<Object> getDistinctValues(MailFolder folder, String[] properties, boolean sum) { Set<Object> result = null; if (folder.isFolderReadable()) { EmailTopiaDao dao = getPersistenceContext().getEmailDao(); - result = dao.getDistinctValues(folder, properties, condition); + result = dao.getDistinctValues(folder, properties, sum); } return result; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java 2014-09-24 09:23:49 UTC (rev 639) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java 2014-09-24 12:35:48 UTC (rev 640) @@ -37,8 +37,8 @@ } @Override - public void doAction() throws Exception { - super.doAction(); + public void postSuccessAction() { + super.postSuccessAction(); getActionEngine().runInternalAction(getContext().getMainUI().getHandler(), GoToPreviousScreenAction.class); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-09-24 09:23:49 UTC (rev 639) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-09-24 12:35:48 UTC (rev 640) @@ -141,15 +141,15 @@ break; case DemandeUIModel.PROPERTY_PF_NB: - emailFilter.setProductsRanges(!filtered ? null : new HashSet<Range>((Collection) items)); + emailFilter.setProductsQuantities(!filtered ? null : new HashSet<Long>((Collection) items)); break; case DemandeUIModel.PROPERTY_SAV_NB: - emailFilter.setSavRanges(!filtered ? null : new HashSet<Range>((Collection) items)); + emailFilter.setSavQuantities(!filtered ? null : new HashSet<Long>((Collection) items)); break; case DemandeUIModel.PROPERTY_QUOTATION_NB: - emailFilter.setQuotationRanges(!filtered ? null : new HashSet<Range>((Collection) items)); + emailFilter.setQuotationQuantities(!filtered ? null : new HashSet<Long>((Collection) items)); break; case Email.PROPERTY_LAST_ATTACHMENT_OPENER: @@ -183,7 +183,7 @@ Set<Object> result = new HashSet<>(); - String condition = null; + boolean sum = false; String[] properties; switch (property) { case DemandeUIModel.PROPERTY_CLIENT_CODE: @@ -200,18 +200,18 @@ break; case DemandeUIModel.PROPERTY_PF_NB: - condition = "rangeRow." + RangeRow.PROPERTY_PRODUCT_QUANTITY + " > 0"; - properties = new String[] { "rangeRow." + RangeRow.PROPERTY_RANGE }; + properties = new String[] { "rangeRow." + RangeRow.PROPERTY_PRODUCT_QUANTITY }; + sum = true; break; case DemandeUIModel.PROPERTY_SAV_NB: - condition = "rangeRow." + RangeRow.PROPERTY_SAV_QUANTITY + " > 0"; - properties = new String[] { "rangeRow." + RangeRow.PROPERTY_RANGE }; + properties = new String[] { "rangeRow." + RangeRow.PROPERTY_SAV_QUANTITY }; + sum = true; break; case DemandeUIModel.PROPERTY_QUOTATION_NB: - condition = "rangeRow." + RangeRow.PROPERTY_QUOTATION_QUANTITY + " > 0"; - properties = new String[] { "rangeRow." + RangeRow.PROPERTY_RANGE }; + properties = new String[] { "rangeRow." + RangeRow.PROPERTY_QUOTATION_QUANTITY }; + sum = true; break; case Email.PROPERTY_ATTACHMENT: @@ -224,7 +224,7 @@ result.addAll(emailService.getDistinctValues(selectedFolder, properties, - condition)); + sum)); if (Email.PROPERTY_RECEPTION_DATE.equals(property)) { Set<Object> filteredDates = new HashSet<>();

1 0

r639 - trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities
by kmorin＠users.forge.codelutin.com 24 Sep '14

24 Sep '14

Author: kmorin Date: 2014-09-24 11:23:49 +0200 (Wed, 24 Sep 2014) New Revision: 639 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/639 Log: correction de la recherche avec ?\195?\169l?\195?\169ments group?\195?\169s Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-09-24 08:31:35 UTC (rev 638) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-09-24 09:23:49 UTC (rev 639) @@ -371,7 +371,19 @@ } // add same fecth liste as emailService#getEmailForFolder() - String hqlForFetchStep1 = "select E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " + query.toString(); + String hqlForFetchStep1 = "select E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " + + "WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " IN (" + + "select E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " + + query.toString() + ") "; + + if (searchFilter.isAddGroupDemands()) { + hqlForFetchStep1 += "OR E." + TopiaEntity.PROPERTY_TOPIA_ID + " IN (" + + "select E2." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E " + + "LEFT OUTER JOIN E." + Email.PROPERTY_EMAIL_GROUP + " AS G " + + "LEFT OUTER JOIN G." + EmailGroup.PROPERTY_EMAIL + " AS E2 " + + query.toString() + ")"; + } + String hqlForFetchStep2 = "select distinct E FROM " + Email.class.getName() + " E " + addAllFecthes( Email.PROPERTY_PRIORITY, Email.PROPERTY_DEMAND_TYPE, @@ -987,7 +999,9 @@ // TODO echatellier 20140918 : on ajoute null dans tous les cas car les requetes precendente // sont trop lente juste pour savoir si on a vraiment besoin de savoir si l'on doit vraiment // avoir des valeurs nulles - result.add(null); + if (!result.contains("")) { + result.add(null); + } return result; }

1 0

r638 - in trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing: content/print content/reply content/search content/transmit util
by kmorin＠users.forge.codelutin.com 24 Sep '14

24 Sep '14

Author: kmorin Date: 2014-09-24 10:31:35 +0200 (Wed, 24 Sep 2014) New Revision: 638 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/638 Log: - correction des fen?\195?\170tres qui s'affichent par dessus l'application quand on quitte une frame modale Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-09-23 19:21:15 UTC (rev 637) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/print/AttachmentToPrintChooserUIHandler.java 2014-09-24 08:31:35 UTC (rev 638) @@ -24,6 +24,7 @@ * #L% */ +import java.awt.*; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; @@ -150,6 +151,11 @@ return ui.getAttachmentPanel(); } + @Override + public Component getTopestUI() { + return getUI(); + } + public void print() { Multimap<DemandeUIModel, AttachmentFile> attachmentToPrints = HashMultimap.create(); attachmentToPrints.putAll(getModel().getDemand(), getModel().getAttachmentsToPrint()); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-09-23 19:21:15 UTC (rev 637) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java 2014-09-24 08:31:35 UTC (rev 638) @@ -219,6 +219,11 @@ return getUI().getMessage(); } + @Override + public Component getTopestUI() { + return getUI(); + } + public void removeAttachment(ReplyAttachmentModel attachment) { ReplyFormUIModel model = getModel(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-09-23 19:21:15 UTC (rev 637) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-09-24 08:31:35 UTC (rev 638) @@ -313,6 +313,11 @@ closeFrame(); } + @Override + public Component getTopestUI() { + return getUI(); + } + public void group(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_ENTER) { group(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-09-23 19:21:15 UTC (rev 637) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/MailFolderChooserUIHandler.java 2014-09-24 08:31:35 UTC (rev 638) @@ -24,6 +24,7 @@ * #L% */ +import java.awt.*; import java.util.Collection; import java.util.HashSet; import java.util.Map; @@ -136,4 +137,8 @@ return ui.getNavigationTree(); } + @Override + public Component getTopestUI() { + return getUI(); + } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-09-23 19:21:15 UTC (rev 637) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-09-24 08:31:35 UTC (rev 638) @@ -320,6 +320,7 @@ public void windowClosed(WindowEvent e) { parentContainer.setEnabled(true); parentContainer.setFocusableWindowState(true); + parentContainer.toFront(); Component ui = (Component) e.getSource(); if (log.isDebugEnabled()) {

1 0

r637 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search
by kmorin＠users.forge.codelutin.com 23 Sep '14

23 Sep '14

Author: kmorin Date: 2014-09-23 21:21:15 +0200 (Tue, 23 Sep 2014) New Revision: 637 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/637 Log: - relance la recherche quand on revient d'un ?\195?\169l?\195?\169ment - am?\195?\169lioration de la r?\195?\169cup?\195?\169ration des valeurs distinctes pour le filtre Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-09-23 16:30:37 UTC (rev 636) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-09-23 19:21:15 UTC (rev 637) @@ -910,22 +910,29 @@ return result; } - public Set<Object> getDistinctValues(MailFolder folder, String property, String condition) { + public Set<Object> getDistinctValues(MailFolder folder, String[] properties, String condition) { Map<String, Object> args = new HashMap<>(); String folderAndStatusCondition = " WHERE email." + Email.PROPERTY_MAIL_FOLDER + " = :folder" + " AND email." + Email.PROPERTY_DEMAND_STATUS + " != :archiveStatus"; args.put("folder", folder); args.put("archiveStatus", DemandStatus.ARCHIVED); - String query = "SELECT DISTINCT " + property + + String propertyList = StringUtils.join(properties, ", "); + String query = "SELECT DISTINCT " + propertyList + " FROM " + Email.class.getName() + " AS email"; - if (property.startsWith("client.")) { - query += " LEFT OUTER JOIN email." + Email.PROPERTY_CLIENT + " AS client"; - - } else if (property.startsWith("rangeRow.")) { - query += " LEFT OUTER JOIN email." + Email.PROPERTY_RANGE_ROW + " AS rangeRow"; + for (String property : properties) { + if (property.startsWith("client.")) { + query += " LEFT OUTER JOIN email." + Email.PROPERTY_CLIENT + " AS client"; + break; + } } + for (String property : properties) { + if (property.startsWith("rangeRow.")) { + query += " LEFT OUTER JOIN email." + Email.PROPERTY_RANGE_ROW + " AS rangeRow"; + break; + } + } query += folderAndStatusCondition; if (StringUtils.isNotBlank(condition)) { @@ -933,8 +940,19 @@ } List<Object> queryResults = findAll(query, args); - Set<Object> result = new HashSet<>(queryResults); + Set<Object> result = new HashSet<>(); + if (properties.length == 1) { + result.addAll(queryResults); + } else { + for (Object o1 : queryResults) { + Object[] objects = (Object[]) o1; + for (Object o2 : objects) { + result.add(o2); + } + } + } + // check if the property is sometimes null /*if (property.startsWith("rangeRow.")) { query = "FROM " + Email.class.getName() + " AS email" + Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-09-23 16:30:37 UTC (rev 636) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-09-23 19:21:15 UTC (rev 637) @@ -73,7 +73,7 @@ void transmitPendingDemandsToEdi(); - Set<Object> getDistinctValues(MailFolder folder, String property, String condition); + Set<Object> getDistinctValues(MailFolder folder, String[] properties, String condition); PaginationResult<Email> getEmailForFolder(MailFolder folder, FaxToMailUser currentUser, EmailFilter filter, PaginationParameter page); Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-09-23 16:30:37 UTC (rev 636) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-09-23 19:21:15 UTC (rev 637) @@ -614,11 +614,11 @@ } @Override - public Set<Object> getDistinctValues(MailFolder folder, String property, String condition) { + public Set<Object> getDistinctValues(MailFolder folder, String[] properties, String condition) { Set<Object> result = null; if (folder.isFolderReadable()) { EmailTopiaDao dao = getPersistenceContext().getEmailDao(); - result = dao.getDistinctValues(folder, property, condition); + result = dao.getDistinctValues(folder, properties, condition); } return result; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-09-23 16:30:37 UTC (rev 636) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-09-23 19:21:15 UTC (rev 637) @@ -222,11 +222,9 @@ properties = new String[] { "email." + property }; } - for (String prop : properties) { - result.addAll(emailService.getDistinctValues(selectedFolder, - prop, - condition)); - } + result.addAll(emailService.getDistinctValues(selectedFolder, + properties, + condition)); if (Email.PROPERTY_RECEPTION_DATE.equals(property)) { Set<Object> filteredDates = new HashSet<>(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-09-23 16:30:37 UTC (rev 636) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-09-23 19:21:15 UTC (rev 637) @@ -37,11 +37,13 @@ import javax.swing.ListSelectionModel; import com.franciaflex.faxtomail.persistence.entities.SearchFilter; +import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; +import org.nuiton.jaxx.application.swing.action.ApplicationActionEngine; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import org.nuiton.jaxx.application.swing.util.CloseableUI; @@ -213,15 +215,20 @@ } protected void runSearchAction() { + FaxToMailUIContext context = getContext(); try { SearchAction searchAction = new SearchAction(this); - getContext().getActionEngine().runAction(searchAction); + if (context.isActionInProgress(null)) { + context.getActionEngine().runFullInternalAction(searchAction); + } else { + context.getActionEngine().runAction(searchAction); + } } catch (Exception e) { if (log.isErrorEnabled()) { log.error("error while searching", e); } - getContext().getErrorHelper().showErrorDialog(t("faxtomail.search.action.error")); + context.getErrorHelper().showErrorDialog(t("faxtomail.search.action.error")); } }

1 0

r636 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by kmorin＠users.forge.codelutin.com 23 Sep '14

23 Sep '14

Author: kmorin Date: 2014-09-23 18:30:37 +0200 (Tue, 23 Sep 2014) New Revision: 636 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/636 Log: - Couleur orange dispara?\195?\174t quand on recharge le dossier - Ecart entre fct d?\195?\169placer par la liste ou par l'?\195?\169l?\195?\169ment (dans ?\195?\169l?\195?\169ment, tiens compte du groupage, pas dans la liste). Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 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 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-09-23 15:41:05 UTC (rev 635) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-09-23 16:30:37 UTC (rev 636) @@ -526,6 +526,10 @@ EmailGroup emailGroup = email.getEmailGroup(); if (emailGroup != null) { Hibernate.initialize(emailGroup.getEmail()); + // initialize folder of the grouped demand to transmit the grouped emails of the same folder + for (Email groupedEmail : emailGroup.getEmail()) { + Hibernate.initialize(groupedEmail.getMailFolder()); + } } } return result; 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-09-23 15:41:05 UTC (rev 635) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-09-23 16:30:37 UTC (rev 636) @@ -120,7 +120,7 @@ List<DemandeUIModel> demands = new ArrayList<DemandeUIModel>(); for (Email email : emails) { DemandeUIModel demand = new DemandeUIModel(); - demand.fromEntityExcluding(email, Sets.newHashSet(Email.PROPERTY_MAIL_FOLDER, Email.PROPERTY_EMAIL_GROUP, Email.PROPERTY_HISTORY)); + demand.fromEntityExcluding(email, Sets.newHashSet(Email.PROPERTY_MAIL_FOLDER, Email.PROPERTY_HISTORY)); // on ajoute toutes les lignes de rangeRow, // qui sont toutes valides puisqu'on les récupère de la base et qu'on ne sauvegarde que les lignes valides 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-09-23 15:41:05 UTC (rev 635) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-09-23 16:30:37 UTC (rev 636) @@ -410,8 +410,8 @@ } return Boolean.TRUE.equals(folder.getOpenAttachmentReportNoTaken()) - && row.getLastAttachmentOpeningInThisFolderUser() != null - && !row.getLastAttachmentOpeningInThisFolderUser().equals(row.getTakenBy()); + && row.getLastAttachmentOpener() != null + && !row.getLastAttachmentOpener().equals(row.getTakenBy()); } }; Color color = Color.ORANGE;

1 0

r635 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search faxtomail-ui-web/src/main/resources/i18n
by kmorin＠users.forge.codelutin.com 23 Sep '14

23 Sep '14

Author: kmorin Date: 2014-09-23 17:41:05 +0200 (Tue, 23 Sep 2014) New Revision: 635 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/635 Log: - prendre l'?\195?\169l?\195?\169ment quand on enregsitre m?\195?\170me s'il n'y a pas eu de modifications - correction du bug des colonnes (toutes les colonnes etaient affich?\195?\169es quand on quittait un ?\195?\169l?\195?\169ment) - les gammes ne s'affichaient plus quand on venait de la recherche - correction du message d'erreur quand on ne pouvait d?\195?\169placer un ?\195?\169l?\195?\169ment depuis la liste - fermeture de la fenetre des pieces jointes dans la liste quand on change de dossier Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/SearchFilter.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenMailFolderChooserFromListAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.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/DemandesUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-09-23 15:41:05 UTC (rev 635) @@ -438,10 +438,6 @@ Hibernate.initialize(history.getFields()); } } - EmailGroup emailGroup = email.getEmailGroup(); - if (emailGroup != null) { - Hibernate.initialize(emailGroup.getEmail()); - } } return result; } Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/SearchFilter.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/SearchFilter.java 2014-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/SearchFilter.java 2014-09-23 15:41:05 UTC (rev 635) @@ -65,6 +65,7 @@ public static final String PROPERTY_MIN_REPLY_DATE = "minReplyDate"; public static final String PROPERTY_MAX_REPLY_DATE = "maxReplyDate"; public static final String PROPERTY_CLIENT_CODE = "clientCode"; + public static final String PROPERTY_ADD_GROUP_DEMANDS = "addGroupDemands"; protected String sender; @@ -128,6 +129,8 @@ protected String clientCode; + protected boolean addGroupDemands; + public String getSender() { return sender; } @@ -432,4 +435,14 @@ this.maxReplyDate = maxReplyDate; firePropertyChange(PROPERTY_MAX_REPLY_DATE, oldValue, maxReplyDate); } + + public boolean isAddGroupDemands() { + return addGroupDemands; + } + + public void setAddGroupDemands(boolean addGroupDemands) { + Object oldValue = this.addGroupDemands; + this.addGroupDemands = addGroupDemands; + firePropertyChange(PROPERTY_ADD_GROUP_DEMANDS, oldValue, addGroupDemands); + } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/EditAttachmentAction.java 2014-09-23 15:41:05 UTC (rev 635) @@ -91,7 +91,9 @@ @Override protected void releaseAction() { super.releaseAction(); - frame.toFront(); - frame = null; + if (frame != null) { + frame.toFront(); + frame = null; + } } } \ No newline at end of file Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenMailFolderChooserFromListAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenMailFolderChooserFromListAction.java 2014-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenMailFolderChooserFromListAction.java 2014-09-23 15:41:05 UTC (rev 635) @@ -101,7 +101,9 @@ @Override protected void releaseAction() { super.releaseAction(); - frame.toFront(); - frame = null; + if (frame != null) { + frame.toFront(); + frame = null; + } } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java 2014-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveAndOpenModalFrameAction.java 2014-09-23 15:41:05 UTC (rev 635) @@ -58,7 +58,9 @@ @Override protected void releaseAction() { super.releaseAction(); - frame.toFront(); - frame = null; + if (frame != null) { + frame.toFront(); + frame = null; + } } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java 2014-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SaveDemandeAndExitAction.java 2014-09-23 15:41:05 UTC (rev 635) @@ -37,8 +37,8 @@ } @Override - public void postSuccessAction() { - super.postSuccessAction(); + public void doAction() throws Exception { + super.doAction(); getActionEngine().runInternalAction(getContext().getMainUI().getHandler(), GoToPreviousScreenAction.class); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java 2014-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchAction.java 2014-09-23 15:41:05 UTC (rev 635) @@ -27,10 +27,19 @@ import static org.nuiton.i18n.I18n.t; import java.util.ArrayList; +import java.util.Collection; import java.util.List; +import java.util.Map; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.persistence.entities.SearchFilter; +import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; +import com.franciaflex.faxtomail.ui.swing.content.demande.RangeRowModel; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.util.pagination.PaginationResult; import com.franciaflex.faxtomail.persistence.entities.Email; @@ -60,19 +69,41 @@ FaxToMailServiceContext serviceContext = getContext().newServiceContext(); PaginationResult<Email> paginationResult = serviceContext.getEmailService().search(searchFilter, getContext().getCurrentUser(), getModel().getPaginationParameter()); + List<Email> emails = paginationResult.getElements(); List<DemandeUIModel> result = new ArrayList<>(); + + Map<String, WaitingState> waitingStateById = Maps.uniqueIndex(getContext().getWaitingStateCache(), TopiaEntities.getTopiaIdFunction()); + for (Email email : emails) { DemandeUIModel demand = new DemandeUIModel(); - demand.fromEntity(email); - demand.setMailFolder(email.getMailFolder()); + demand.fromEntityExcluding(email, Sets.newHashSet(Email.PROPERTY_MAIL_FOLDER, Email.PROPERTY_EMAIL_GROUP, Email.PROPERTY_HISTORY)); + + // on ajoute toutes les lignes de rangeRow, + // qui sont toutes valides puisqu'on les récupère de la base et qu'on ne sauvegarde que les lignes valides + Collection<RangeRow> rangeRows = demand.getRangeRow(); + if (rangeRows != null) { + for (RangeRow rangeRow : rangeRows) { + if (rangeRow != null) { + RangeRowModel rangeRowModel = new RangeRowModel(); + rangeRowModel.fromEntity(rangeRow); + if (rangeRowModel.isValid()) { + demand.addValidRangeRow(rangeRowModel); + } + } + } + } + + MailFolder mailFolder = email.getMailFolder(); demand.setValid(handler.isDemandeValid(demand)); + demand.setMailFolder(mailFolder); + demand.setEditable(mailFolder.isFolderWritable()); + WaitingState waitingState = email.getWaitingState(); + if (waitingState != null) { + demand.setWaitingState(waitingStateById.get(waitingState.getTopiaId())); + } + result.add(demand); - - if (model.isShowGroupesDemandsInResults()) { - demand.setGroupedDemandes(email.getEmailGroup()); - result.addAll(demand.getGroupedDemandes()); - } } model.setResults(result); model.setPaginationParameter(paginationResult.getCurrentPage()); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java 2014-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/SearchToGroupAction.java 2014-09-23 15:41:05 UTC (rev 635) @@ -25,16 +25,25 @@ */ import com.franciaflex.faxtomail.persistence.entities.Email; +import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.persistence.entities.SearchFilter; +import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import com.franciaflex.faxtomail.ui.swing.content.demande.RangeRowModel; import com.franciaflex.faxtomail.ui.swing.content.search.SearchToGroupUI; import com.franciaflex.faxtomail.ui.swing.content.search.SearchToGroupUIHandler; import com.franciaflex.faxtomail.ui.swing.content.search.SearchUIModel; import java.util.ArrayList; +import java.util.Collection; import java.util.List; +import java.util.Map; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.util.pagination.PaginationResult; import static org.nuiton.i18n.I18n.t; @@ -59,13 +68,39 @@ FaxToMailServiceContext serviceContext = getContext().newServiceContext(); PaginationResult<Email> paginationResult = serviceContext.getEmailService().search(searchFilter, getContext().getCurrentUser(), getModel().getPaginationParameter()); + List<Email> emails = paginationResult.getElements(); + List<DemandeUIModel> result = new ArrayList<>(); - List<DemandeUIModel> result = new ArrayList<>(); - for (Email mail : emails) { + Map<String, WaitingState> waitingStateById = Maps.uniqueIndex(getContext().getWaitingStateCache(), TopiaEntities.getTopiaIdFunction()); + + for (Email email : emails) { DemandeUIModel demand = new DemandeUIModel(); - demand.fromEntity(mail); + demand.fromEntityExcluding(email, Sets.newHashSet(Email.PROPERTY_MAIL_FOLDER, Email.PROPERTY_EMAIL_GROUP, Email.PROPERTY_HISTORY)); + + // on ajoute toutes les lignes de rangeRow, + // qui sont toutes valides puisqu'on les récupère de la base et qu'on ne sauvegarde que les lignes valides + Collection<RangeRow> rangeRows = demand.getRangeRow(); + if (rangeRows != null) { + for (RangeRow rangeRow : rangeRows) { + if (rangeRow != null) { + RangeRowModel rangeRowModel = new RangeRowModel(); + rangeRowModel.fromEntity(rangeRow); + if (rangeRowModel.isValid()) { + demand.addValidRangeRow(rangeRowModel); + } + } + } + } + + MailFolder mailFolder = email.getMailFolder(); demand.setValid(handler.isDemandeValid(demand)); + demand.setMailFolder(mailFolder); + demand.setEditable(mailFolder.isFolderWritable()); + WaitingState waitingState = email.getWaitingState(); + if (waitingState != null) { + demand.setWaitingState(waitingStateById.get(waitingState.getTopiaId())); + } result.add(demand); } model.setResults(result); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-09-23 15:41:05 UTC (rev 635) @@ -280,7 +280,7 @@ context.getActionFactory().createLogicAction(handler, LoadFolderEmailsAction.class); if (context.isActionInProgress(null)) { - context.getActionEngine().runInternalAction(loadFolderEmailsAction); + context.getActionEngine().runFullInternalAction(loadFolderEmailsAction); } else { context.getActionEngine().runAction(loadFolderEmailsAction); } 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-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-09-23 15:41:05 UTC (rev 635) @@ -49,6 +49,7 @@ import javax.swing.event.ListSelectionListener; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; +import javax.swing.table.TableCellEditor; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; @@ -253,12 +254,17 @@ navigationTree.addTreeSelectionListener(new TreeSelectionListener() { @Override public void valueChanged(TreeSelectionEvent e) { + TableCellEditor cellEditor = dataTable.getCellEditor(); + if (cellEditor != null) { + cellEditor.stopCellEditing(); + } + FolderTreeNode folderNode = (FolderTreeNode) e.getPath().getLastPathComponent(); if (folderNode.isCanSelect()) { MailFolder folder = folderNode.getMailFolder(); + getContext().setCurrentMailFolder(folder); getModel().setSelectedFolder(folder); - getContext().setCurrentMailFolder(folder); DemandeUIModel currentEmail = getContext().getCurrentEmail(); if (currentEmail != null) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandesUIHandler.java 2014-09-23 15:41:05 UTC (rev 635) @@ -303,6 +303,7 @@ closeButtonPopups(); DemandeUI demandeUI = (DemandeUI) getTabPanel().getSelectedComponent(); SaveDemandeAndExitAction action = new SaveDemandeAndExitAction(demandeUI.getHandler()); + action.setTakeIfNotTaken(true); getContext().getActionEngine().runAction(action); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.css 2014-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.css 2014-09-23 15:41:05 UTC (rev 635) @@ -267,6 +267,7 @@ #addGroupedElementCheckbox { text: "faxtomail.search.addGroupedElement.label"; + selected: { model.isAddGroupDemands() }; } #searchButton { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx 2014-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx 2014-09-23 15:41:05 UTC (rev 635) @@ -345,7 +345,7 @@ <row> <cell columns="6"> <JCheckBox id="addGroupedElementCheckbox" - onItemStateChanged='handler.setBoolean(event, "showGroupesDemandsInResults")'/> + onItemStateChanged='handler.setBoolean(event, "addGroupDemands")'/> </cell> </row> 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-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java 2014-09-23 15:41:05 UTC (rev 635) @@ -63,7 +63,6 @@ protected boolean menuEnabled; protected boolean groupEnabled; - protected boolean showGroupesDemandsInResults; protected static Binder<SearchUIModel, SearchFilter> toBeanBinder = BinderFactory.newBinder(SearchUIModel.class, @@ -445,12 +444,14 @@ firePropertyChanged(PROPERTY_GROUP_ENABLED, oldValue, groupEnabled); } - public boolean isShowGroupesDemandsInResults() { - return showGroupesDemandsInResults; + public boolean isAddGroupDemands() { + return editObject.isAddGroupDemands(); } - public void setShowGroupesDemandsInResults(boolean showGroupesDemandsInResults) { - this.showGroupesDemandsInResults = showGroupesDemandsInResults; + public void setAddGroupDemands(boolean addGroupDemands) { + Object oldValue = isAddGroupDemands(); + editObject.setAddGroupDemands(addGroupDemands); + firePropertyChange(SearchFilter.PROPERTY_ADD_GROUP_DEMANDS, oldValue, addGroupDemands); } @Override 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-09-19 13:11:03 UTC (rev 634) +++ trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 2014-09-23 15:41:05 UTC (rev 635) @@ -16,7 +16,6 @@ com.franciaflex.faxtomail.persistence.entities.MailField.DEMAND_STATUS=Statut de demande com.franciaflex.faxtomail.persistence.entities.MailField.DEMAND_TYPE=Type de demande com.franciaflex.faxtomail.persistence.entities.MailField.EDI_RETURN=Retour EDI -com.franciaflex.faxtomail.persistence.entities.MailField.WAITING_STATE=État d'attente com.franciaflex.faxtomail.persistence.entities.MailField.FAX=Fax com.franciaflex.faxtomail.persistence.entities.MailField.LAST_ATTACHMENT_OPENING_IN_THIS_FOLDER_USER=Dernier à ouvrir une PJ com.franciaflex.faxtomail.persistence.entities.MailField.MAIL_FOLDER=Dossier @@ -34,6 +33,7 @@ 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.TAKEN_BY=Pris par +com.franciaflex.faxtomail.persistence.entities.MailField.WAITING_STATE=État d'attente 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é

1 0