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

r594 - in trunk/faxtomail-ui-swing/src/main: java/com/franciaflex/faxtomail/ui/swing/util resources/i18n
by echatellier＠users.forge.codelutin.com Aug. 26, 2014

Aug. 26, 2014

Author: echatellier Date: 2014-08-26 10:05:27 +0200 (Tue, 26 Aug 2014) New Revision: 594 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/594 Log: fixes #5668: Erreur lors d'un double clic sur une pi?\195?\168ce jointe Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.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/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-08-26 07:48:21 UTC (rev 593) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-08-26 08:05:27 UTC (rev 594) @@ -64,13 +64,6 @@ import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; -import com.franciaflex.faxtomail.persistence.entities.DemandType; -import com.franciaflex.faxtomail.persistence.entities.MailField; -import com.franciaflex.faxtomail.services.FaxToMailServiceContext; -import com.franciaflex.faxtomail.services.FaxToMailServiceUtils; -import com.google.common.base.Function; -import com.google.common.collect.Ordering; - import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXUtil; @@ -89,15 +82,21 @@ import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; +import com.franciaflex.faxtomail.persistence.entities.DemandType; import com.franciaflex.faxtomail.persistence.entities.ExtensionCommand; +import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.services.FaxToMailServiceContext; +import com.franciaflex.faxtomail.services.FaxToMailServiceUtils; import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.RangeRowModel; +import com.google.common.base.Function; import com.google.common.collect.Lists; +import com.google.common.collect.Ordering; /** * @author kmorin - morin(a)codelutin.com @@ -540,8 +539,10 @@ // DesktopUtil.open(file); try { - Desktop desktop = getDesktopForOpen(); - desktop.open(file); + // for a mysterious reason, EDIT action is working better than OPEN action + // on windows (ie for ms paint for JPG files) + Desktop desktop = getDesktopForEdit(); + desktop.edit(file); } catch (Exception ex) { throw new ApplicationTechnicalException( t("jaxx.application.error.cannot.open"), ex); @@ -550,6 +551,29 @@ } /** + * Return Desktop support for edit files. + * + * @return desktop support + */ + protected static Desktop getDesktopForEdit() { + + if (!Desktop.isDesktopSupported()) { + throw new ApplicationTechnicalException( + t("jaxx.application.error.desktop.not.supported")); + } + + Desktop desktop = Desktop.getDesktop(); + + if (!desktop.isSupported(Desktop.Action.EDIT)) { + + throw new ApplicationTechnicalException( + t("jaxx.application.error.desktop.edit.not.supported")); + } + + return desktop; + } + + /** * Send email. * * @param subject 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-08-26 07:48:21 UTC (rev 593) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-08-26 08:05:27 UTC (rev 594) @@ -302,9 +302,11 @@ faxtomail.validator.error.reply.subject.required= faxtomail.validator.error.reply.to.email=Le champ 'A\:' doit être une adresse email valide \! faxtomail.validator.error.reply.to.required=Le champ 'A\:' est requis \! +jaxx.application.error.cannot.mail=Erreur lors de l'ouverture du client mail jaxx.application.error.cannot.open=Erreur lors de l'ouverture de la pièce jointe -jaxx.application.error.cannot.mail=Erreur lors de l'ouverture du client mail jaxx.application.error.cannot.print=Erreur lors de l'impression +jaxx.application.error.desktop.not.supported=L'ouverture des fichiers par le syst�me n'est pas support� +jaxx.application.error.desktop.edit.not.supported=L'action d'edition des fichiers par le syst�me n'est pas support� jaxx.application.error.desktop.print.not.supported=Erreur lors de l'impression jaxx.application.error.noPrinter=Erreur lors de l'impression swing.error.cannot.copy.file=Erreur lors de la copie des fichiers

1 0

r593 - trunk
by echatellier＠users.forge.codelutin.com Aug. 26, 2014

Aug. 26, 2014

Author: echatellier Date: 2014-08-26 09:48:21 +0200 (Tue, 26 Aug 2014) New Revision: 593 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/593 Log: Update libs Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-08-26 07:31:10 UTC (rev 592) +++ trunk/pom.xml 2014-08-26 07:48:21 UTC (rev 593) @@ -95,13 +95,12 @@ <siteDeployClassifier />  - <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonConfigVersion>3.0-rc-1</nuitonConfigVersion> <nuitonCsvVersion>3.0-rc-4</nuitonCsvVersion> <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> <nuitonUpdaterVersion>3.0-alpha-2</nuitonUpdaterVersion> - <nuitonUtilsVersion>3.0-rc-6</nuitonUtilsVersion> + <nuitonUtilsVersion>3.0-rc-7</nuitonUtilsVersion> <nuitonValidatorVersion>3.0-rc-2</nuitonValidatorVersion> <nuitonWebVersion>1.16</nuitonWebVersion> @@ -109,8 +108,9 @@ <topiaVersion>3.0-SNAPSHOT</topiaVersion> <hibernateVersion>4.3.6.Final</hibernateVersion> <h2Version>1.3.176</h2Version> + <guavaVersion>18.0</guavaVersion> - <jaxxVersion>2.10</jaxxVersion> + <jaxxVersion>2.11</jaxxVersion>  <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.16.3</xworkVersion>

1 0

r592 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment
by echatellier＠users.forge.codelutin.com Aug. 26, 2014

Aug. 26, 2014

Author: echatellier Date: 2014-08-26 09:31:10 +0200 (Tue, 26 Aug 2014) New Revision: 592 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/592 Log: fixes #5668: Erreur lors d'un double clic sur une pi?\195?\168ce jointe Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-08-25 09:43:48 UTC (rev 591) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUIHandler.java 2014-08-26 07:31:10 UTC (rev 592) @@ -25,8 +25,6 @@ */ import com.franciaflex.faxtomail.persistence.entities.Attachment; -import com.franciaflex.faxtomail.persistence.entities.AttachmentImpl; -import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.ui.swing.actions.EditAttachmentAction; import com.franciaflex.faxtomail.ui.swing.actions.OpenAttachmentAction; import com.franciaflex.faxtomail.ui.swing.util.AbstractToolbarPopupHandler; @@ -47,9 +45,6 @@ import java.awt.event.ActionListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; import javax.swing.AbstractCellEditor; import javax.swing.Icon; @@ -67,8 +62,6 @@ import javax.swing.table.TableColumnModel; import javax.swing.table.TableModel; -import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; - import static org.nuiton.i18n.I18n.t; /** @@ -156,7 +149,9 @@ public void openAttachment(Attachment attachment) { openAttachmentAction.setAttachment(attachment, true); - getContext().getActionFactory().createUIAction(null, openAttachmentAction).actionPerformed(null); + + // run Internal to prevent multiple successive execution (#5668) + getContext().getActionEngine().runInternalAction(openAttachmentAction); } public void editAttachment(Attachment attachment) { @@ -164,11 +159,13 @@ if (model.isEditable() && FaxToMailUIUtil.isFileTypeEditable(attachment.getOriginalFileName())) { editAttachmentAction.setAttachment(attachment); - getContext().getActionEngine().runAction(editAttachmentAction); + // run Internal to prevent multiple successive execution (#5668) + getContext().getActionEngine().runInternalAction(editAttachmentAction); } else if (attachment.getEditedFileName() != null) { openAttachmentAction.setAttachment(attachment, false); - getContext().getActionEngine().runAction(openAttachmentAction); + // run Internal to prevent multiple successive execution (#5668) + getContext().getActionEngine().runInternalAction(openAttachmentAction); } } @@ -191,7 +188,6 @@ if (answer == JOptionPane.YES_OPTION) { ui.getAttachments().getCellEditor().stopCellEditing(); -// getPersistenceService().deleteAttachment(attachment.getId()); getModel().removeAttachment(attachment); ui.pack();

1 0

r591 - in trunk/faxtomail-ui-swing/src/main: java/com/franciaflex/faxtomail/ui/swing/util resources/i18n
by echatellier＠users.forge.codelutin.com Aug. 25, 2014

Aug. 25, 2014

Author: echatellier Date: 2014-08-25 11:43:48 +0200 (Mon, 25 Aug 2014) New Revision: 591 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/591 Log: Fix log message Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.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/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-08-25 09:41:41 UTC (rev 590) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-08-25 09:43:48 UTC (rev 591) @@ -544,7 +544,7 @@ desktop.open(file); } catch (Exception ex) { throw new ApplicationTechnicalException( - t("jaxx.application.error.cannot.mail"), ex); + t("jaxx.application.error.cannot.open"), ex); } } } 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-08-25 09:41:41 UTC (rev 590) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-08-25 09:43:48 UTC (rev 591) @@ -302,6 +302,7 @@ faxtomail.validator.error.reply.subject.required= faxtomail.validator.error.reply.to.email=Le champ 'A\:' doit être une adresse email valide \! faxtomail.validator.error.reply.to.required=Le champ 'A\:' est requis \! +jaxx.application.error.cannot.open=Erreur lors de l'ouverture de la pièce jointe jaxx.application.error.cannot.mail=Erreur lors de l'ouverture du client mail jaxx.application.error.cannot.print=Erreur lors de l'impression jaxx.application.error.desktop.print.not.supported=Erreur lors de l'impression

1 0

r590 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com Aug. 25, 2014

Aug. 25, 2014

Author: echatellier Date: 2014-08-25 11:41:41 +0200 (Mon, 25 Aug 2014) New Revision: 590 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/590 Log: refs #5655: Remove left outer join to speed up sql server query time 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/EmailServiceImpl.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.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-08-25 08:51:59 UTC (rev 589) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-08-25 09:41:41 UTC (rev 590) @@ -35,6 +35,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; +import org.hibernate.Hibernate; import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.pagination.PaginationParameter; @@ -60,8 +61,8 @@ */ public PaginationResult<Email> search(EmailFilter emailFilter, Set<MailFolder> readMailFolders, PaginationParameter pagination) { - //StringBuilder query = new StringBuilder("FROM " + Email.class.getName() + " E"); - StringBuilder query = new StringBuilder(); + StringBuilder query = new StringBuilder("FROM " + Email.class.getName() + " E"); + //StringBuilder query = new StringBuilder(); Map<String, Object> args = new HashMap<>(); // apply security @@ -365,7 +366,7 @@ } // 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 " + query.toString(); String hqlForFetchStep2 = "select distinct E FROM " + Email.class.getName() + " E " + addAllFecthes( Email.PROPERTY_PRIORITY, Email.PROPERTY_DEMAND_TYPE, @@ -396,7 +397,47 @@ } PaginationResult<Email> result = PaginationResult.of(sortedEntities, pageResult.getCount(), pageResult.getCurrentPage()); - //PaginationResult<Email> result = findPage(query.toString(), args, pagination); + PaginationResult<Email> result = findPage(query.toString(), args, pagination);*/ + + PaginationResult<Email> result = findPage(query.toString(), args, pagination); + // manual fetch + // Email.PROPERTY_PRIORITY, + // Email.PROPERTY_DEMAND_TYPE, + // Email.PROPERTY_CLIENT, + // Email.PROPERTY_RANGE_ROW + "." + RangeRow.PROPERTY_RANGE, + // Email.PROPERTY_ETAT_ATTENTE, + // Email.PROPERTY_TAKEN_BY, + // Email.PROPERTY_REPLIES, + // Email.PROPERTY_ATTACHMENT, + // Email.PROPERTY_HISTORY + "." + History.PROPERTY_FAX_TO_MAIL_USER, + // Email.PROPERTY_HISTORY + "." + History.PROPERTY_FIELDS, + // Email.PROPERTY_EMAIL_GROUP + "." + EmailGroup.PROPERTY_EMAIL) + for (Email email : result.getElements()) { + Hibernate.initialize(email.getPriority()); + Hibernate.initialize(email.getDemandType()); + Hibernate.initialize(email.getClient()); + List<RangeRow> rangeRows = email.getRangeRow(); + if (rangeRows != null) { + for (RangeRow rangeRow : rangeRows) { + Hibernate.initialize(rangeRow.getRange()); + } + } + Hibernate.initialize(email.getEtatAttente()); + Hibernate.initialize(email.getTakenBy()); + Hibernate.initialize(email.getReplies()); + Hibernate.initialize(email.getAttachment()); + List<History> histories = email.getHistory(); + if (histories != null) { + for (History history : histories) { + Hibernate.initialize(history.getFaxToMailUser()); + Hibernate.initialize(history.getFields()); + } + } + EmailGroup emailGroup = email.getEmailGroup(); + if (emailGroup != null) { + Hibernate.initialize(emailGroup.getEmail()); + } + } return result; } @@ -471,9 +512,9 @@ // List<Pair<String, FaxToMailUser>> result = findAll(query, params); // } - /** + /* * @deprecated beacause this need to be supported by topia (see http://forge.nuiton.org/issues/3427) - */ + * @Deprecated protected String addAllFecthes(String... fetchProperties) { StringBuilder hqlFromClauseBuilder = new StringBuilder(); @@ -520,9 +561,9 @@ return hqlFromClauseBuilder.toString(); } - /** + /* * @deprecated beacause this need to be supported by topia (see http://forge.nuiton.org/issues/3427) - */ + * @Deprecated protected <O extends TopiaEntity> List<O> sortAccordingToIds(List<O> entities, final List<String> idsList) { @@ -537,5 +578,5 @@ List<O> result = Lists.newArrayList(transformed); return result; - } + }*/ } 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-08-25 08:51:59 UTC (rev 589) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-25 09:41:41 UTC (rev 590) @@ -42,7 +42,6 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -122,21 +121,48 @@ public Email getFullEmailById(String id) { Email email = getPersistenceContext().getEmailDao() .forTopiaIdEquals(id) - .addAllFetches(Email.PROPERTY_DEMAND_TYPE, + /*.addAllFetches(Email.PROPERTY_DEMAND_TYPE, Email.PROPERTY_RANGE_ROW + "." + RangeRow.PROPERTY_RANGE, - Email.PROPERTY_HISTORY, Email.PROPERTY_HISTORY + "." + History.PROPERTY_FAX_TO_MAIL_USER, Email.PROPERTY_HISTORY + "." + History.PROPERTY_FIELDS, Email.PROPERTY_REPLIES, Email.PROPERTY_ATTACHMENT, Email.PROPERTY_TAKEN_BY, Email.PROPERTY_CLIENT, - Email.PROPERTY_EMAIL_GROUP, Email.PROPERTY_EMAIL_GROUP + "." + EmailGroup.PROPERTY_EMAIL, - Email.PROPERTY_EMAIL_GROUP + "." + EmailGroup.PROPERTY_EMAIL +"." + Email.PROPERTY_MAIL_FOLDER, + Email.PROPERTY_EMAIL_GROUP + "." + EmailGroup.PROPERTY_EMAIL + "." + Email.PROPERTY_MAIL_FOLDER, Email.PROPERTY_ETAT_ATTENTE, - Email.PROPERTY_PRIORITY).findUnique(); + Email.PROPERTY_PRIORITY)*/.findUnique(); + // manual fetch + Hibernate.initialize(email.getPriority()); + Hibernate.initialize(email.getDemandType()); + Hibernate.initialize(email.getClient()); + List<RangeRow> rangeRows = email.getRangeRow(); + if (rangeRows != null) { + for (RangeRow rangeRow : rangeRows) { + Hibernate.initialize(rangeRow.getRange()); + } + } + Hibernate.initialize(email.getEtatAttente()); + Hibernate.initialize(email.getTakenBy()); + Hibernate.initialize(email.getReplies()); + Hibernate.initialize(email.getAttachment()); + List<History> histories = email.getHistory(); + if (histories != null) { + for (History history : histories) { + Hibernate.initialize(history.getFaxToMailUser()); + Hibernate.initialize(history.getFields()); + } + } + EmailGroup emailGroup = email.getEmailGroup(); + if (emailGroup != null) { + Collection<Email> emails = emailGroup.getEmail(); + for (Email email2 : emails) { + Hibernate.initialize(email2.getMailFolder()); + } + } + return email; } @@ -573,7 +599,7 @@ result = dao.forMailFolderEquals(folder) .addNull(Email.PROPERTY_ARCHIVE_DATE) .addNotEquals(Email.PROPERTY_DEMAND_STATUS, DemandStatus.ARCHIVED) - .addAllFetches(Email.PROPERTY_PRIORITY, + /*.addAllFetches(Email.PROPERTY_PRIORITY, Email.PROPERTY_DEMAND_TYPE, Email.PROPERTY_CLIENT, Email.PROPERTY_RANGE_ROW + "." + RangeRow.PROPERTY_RANGE, @@ -582,8 +608,33 @@ Email.PROPERTY_REPLIES, Email.PROPERTY_ATTACHMENT, Email.PROPERTY_HISTORY + "." + History.PROPERTY_FAX_TO_MAIL_USER, - Email.PROPERTY_HISTORY + "." + History.PROPERTY_FIELDS) + Email.PROPERTY_HISTORY + "." + History.PROPERTY_FIELDS)*/ .findPage(page); + + + // manual fetch + for (Email email : result.getElements()) { + Hibernate.initialize(email.getPriority()); + Hibernate.initialize(email.getDemandType()); + Hibernate.initialize(email.getClient()); + List<RangeRow> rangeRows = email.getRangeRow(); + if (rangeRows != null) { + for (RangeRow rangeRow : rangeRows) { + Hibernate.initialize(rangeRow.getRange()); + } + } + Hibernate.initialize(email.getEtatAttente()); + Hibernate.initialize(email.getTakenBy()); + Hibernate.initialize(email.getReplies()); + Hibernate.initialize(email.getAttachment()); + List<History> histories = email.getHistory(); + if (histories != null) { + for (History history : histories) { + Hibernate.initialize(history.getFaxToMailUser()); + Hibernate.initialize(history.getFields()); + } + } + } } else { List<Email> elements = Collections.emptyList(); Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java 2014-08-25 08:51:59 UTC (rev 589) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java 2014-08-25 09:41:41 UTC (rev 590) @@ -26,6 +26,8 @@ import java.util.List; +import org.hibernate.Hibernate; + import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroup; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroupTopiaDao; @@ -85,8 +87,9 @@ public FaxToMailUser getUser(String topiaId) { FaxToMailUserTopiaDao dao = getPersistenceContext().getFaxToMailUserDao(); FaxToMailUser user = dao.forTopiaIdEquals(topiaId) - .addAllFetches(FaxToMailUser.PROPERTY_AFFECTED_FOLDERS) + /*.addAllFetches(FaxToMailUser.PROPERTY_AFFECTED_FOLDERS)*/ .findUnique(); + Hibernate.initialize(user.getAffectedFolders()); return user; } }

1 0

r589 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com Aug. 25, 2014

Aug. 25, 2014

Author: echatellier Date: 2014-08-25 10:51:59 +0200 (Mon, 25 Aug 2014) New Revision: 589 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/589 Log: fixes #5649: Remove order from query 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/EmailServiceImpl.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-08-22 15:08:31 UTC (rev 588) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-08-25 08:51:59 UTC (rev 589) @@ -436,8 +436,7 @@ " INNER JOIN email." + Email.PROPERTY_RANGE_ROW + " AS rangeRow" + " INNER JOIN rangeRow." + RangeRow.PROPERTY_RANGE + " AS range" + " WHERE email." + Email.PROPERTY_MAIL_FOLDER + " IN :folders" + - " GROUP BY range." + Range.PROPERTY_TOPIA_ID + - " ORDER BY range.label"; + " GROUP BY range." + Range.PROPERTY_TOPIA_ID; Map<String, Object> args = new HashMap<>(); args.put("folders", folders); 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-08-22 15:08:31 UTC (rev 588) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-25 08:51:59 UTC (rev 589) @@ -37,6 +37,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.Enumeration; import java.util.HashMap; @@ -46,6 +47,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import java.util.TreeMap; import javax.activation.DataSource; import javax.activation.FileDataSource; @@ -612,7 +614,12 @@ // convert topiaId to entities RangeTopiaDao rangeDao = getPersistenceContext().getRangeDao(); - Map<Range, Long[]> result = new LinkedHashMap<Range, Long[]>(); + Map<Range, Long[]> result = new TreeMap<Range, Long[]>(new Comparator<Range>() { + @Override + public int compare(Range o1, Range o2) { + return o1.getLabel().compareTo(o2.getLabel()); + } + }); for (Entry<String, Long[]> entry : daoResult.entrySet()) { Range range = rangeDao.forTopiaIdEquals(entry.getKey()).findUnique(); result.put(range, entry.getValue());

1 0

r588 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com Aug. 22, 2014

Aug. 22, 2014

Author: echatellier Date: 2014-08-22 17:08:31 +0200 (Fri, 22 Aug 2014) New Revision: 588 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/588 Log: fixes #5649: Erreur de calcul des quantit?\195?\169s par gamme 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/EmailServiceImpl.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-08-22 14:07:53 UTC (rev 587) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-08-22 15:08:31 UTC (rev 588) @@ -419,26 +419,34 @@ return result; } - public Map<Range, Long[]> computeQuantitiesByRange(List<MailFolder> folders) { - String query = "SELECT range, " + - "SUM(rangeRow." + RangeRow.PROPERTY_PRODUCT_QUANTITY + ") AS prodQ, " + - "SUM(rangeRow." + RangeRow.PROPERTY_SAV_QUANTITY + ") AS savQ, " + - "SUM(rangeRow." + RangeRow.PROPERTY_QUOTATION_QUANTITY + ") AS quotQ " + - "FROM " + Email.class.getName() + " AS email " + - "INNER JOIN email." + Email.PROPERTY_RANGE_ROW + " AS rangeRow " + - "INNER JOIN rangeRow." + RangeRow.PROPERTY_RANGE + " AS range " + - "WHERE email." + Email.PROPERTY_MAIL_FOLDER + " IN :folders " + - "GROUP BY range " + - "ORDER BY range.label"; + public Map<String, Long[]> computeQuantitiesByRange(List<MailFolder> folders) { + // this has been modifier from + // SELECT range + // to + // SELECT range.topiaId + // do to bug https://hibernate.atlassian.net/browse/HHH-1615 that can be reproduced + // on sql server + + String query = "SELECT range." + Range.PROPERTY_TOPIA_ID + "," + + " SUM(rangeRow." + RangeRow.PROPERTY_PRODUCT_QUANTITY + ") AS prodQ," + + " SUM(rangeRow." + RangeRow.PROPERTY_SAV_QUANTITY + ") AS savQ," + + " SUM(rangeRow." + RangeRow.PROPERTY_QUOTATION_QUANTITY + ") AS quotQ" + + " FROM " + Email.class.getName() + " AS email " + + " INNER JOIN email." + Email.PROPERTY_RANGE_ROW + " AS rangeRow" + + " INNER JOIN rangeRow." + RangeRow.PROPERTY_RANGE + " AS range" + + " WHERE email." + Email.PROPERTY_MAIL_FOLDER + " IN :folders" + + " GROUP BY range." + Range.PROPERTY_TOPIA_ID + + " ORDER BY range.label"; + Map<String, Object> args = new HashMap<>(); args.put("folders", folders); - Map<Range, Long[]> result = new LinkedHashMap<>(); + Map<String, Long[]> result = new LinkedHashMap<>(); List<Object[]> queryResuts = findAll(query, args); for (Object[] queryResut : queryResuts) { - Range range = (Range) queryResut[0]; + String range = (String) queryResut[0]; Long[] sums = new Long[3]; sums[0] = (Long) queryResut[1]; sums[1] = (Long) queryResut[2]; 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-08-22 14:07:53 UTC (rev 587) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-22 15:08:31 UTC (rev 588) @@ -41,16 +41,16 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import javax.activation.DataSource; import javax.activation.FileDataSource; import javax.mail.MessagingException; -import com.franciaflex.faxtomail.services.service.exceptions.FolderNotReadableException; - import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.Predicate; import org.apache.commons.io.FileUtils; @@ -82,6 +82,7 @@ import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import com.franciaflex.faxtomail.services.FaxToMailServiceUtils; import com.franciaflex.faxtomail.services.service.exceptions.AlreadyLockedMailException; +import com.franciaflex.faxtomail.services.service.exceptions.FolderNotReadableException; import com.franciaflex.faxtomail.services.service.exceptions.InvalidClientException; import com.franciaflex.faxtomail.services.service.imports.ArchiveImportBean; import com.franciaflex.faxtomail.services.service.imports.ArchiveImportModel; @@ -604,9 +605,20 @@ @Override public Map<Range, Long[]> computeQuantitiesByRange(MailFolder rootFolder) { + // get results by topia id List<MailFolder> folders = getChildrenRecursively(rootFolder); EmailTopiaDao emailDao = getPersistenceContext().getEmailDao(); - return emailDao.computeQuantitiesByRange(folders); + Map<String, Long[]> daoResult = emailDao.computeQuantitiesByRange(folders); + + // convert topiaId to entities + RangeTopiaDao rangeDao = getPersistenceContext().getRangeDao(); + Map<Range, Long[]> result = new LinkedHashMap<Range, Long[]>(); + for (Entry<String, Long[]> entry : daoResult.entrySet()) { + Range range = rangeDao.forTopiaIdEquals(entry.getKey()).findUnique(); + result.put(range, entry.getValue()); + } + + return result; } @Override

1 0

r587 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com Aug. 22, 2014

Aug. 22, 2014

Author: echatellier Date: 2014-08-22 16:07:53 +0200 (Fri, 22 Aug 2014) New Revision: 587 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/587 Log: refs #5649: Ajout d'un test unitaire 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/EmailServiceImpl.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.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-08-22 13:33:51 UTC (rev 586) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-08-22 14:07:53 UTC (rev 587) @@ -27,6 +27,7 @@ import java.util.Calendar; import java.util.Date; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -427,12 +428,13 @@ "INNER JOIN email." + Email.PROPERTY_RANGE_ROW + " AS rangeRow " + "INNER JOIN rangeRow." + RangeRow.PROPERTY_RANGE + " AS range " + "WHERE email." + Email.PROPERTY_MAIL_FOLDER + " IN :folders " + - "GROUP BY range"; + "GROUP BY range " + + "ORDER BY range.label"; Map<String, Object> args = new HashMap<>(); args.put("folders", folders); - Map<Range, Long[]> result = new HashMap<>(); + Map<Range, Long[]> result = new LinkedHashMap<>(); List<Object[]> queryResuts = findAll(query, args); for (Object[] queryResut : queryResuts) { 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-08-22 13:33:51 UTC (rev 586) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-22 14:07:53 UTC (rev 587) @@ -594,8 +594,10 @@ List<MailFolder> folders = new ArrayList<>(); folders.add(folder); Collection<MailFolder> children = folder.getChildren(); - for (MailFolder child : children) { - folders.addAll(getChildrenRecursively(child)); + if (children != null) { + for (MailFolder child : children) { + folders.addAll(getChildrenRecursively(child)); + } } return folders; } Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java 2014-08-22 13:33:51 UTC (rev 586) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java 2014-08-22 14:07:53 UTC (rev 587) @@ -28,6 +28,8 @@ import java.io.IOException; import java.io.InputStream; import java.util.Collections; +import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import org.junit.Assert; @@ -43,6 +45,7 @@ import com.franciaflex.faxtomail.persistence.entities.EmailFilter; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.MailFolderTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.Range; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; @@ -173,4 +176,24 @@ service.importArchive(is, attachmentBase); } } + + /** + * Test le la fonction de calcul des quantités par gammes qui fesait une erreur de groupBy en + * 1.0.0-rc-3. + */ + @Test + public void testComputeQuantititesByRange() { + MailFolderTopiaDao mailFolderDao = getServiceContext().getPersistenceContext().getMailFolderDao(); + MailFolder cyril = mailFolderDao.forNameEquals("Cyril").findUnique(); + + Map<Range, Long[]> quantitiesByRange = service.computeQuantitiesByRange(cyril); + Assert.assertEquals(4, quantitiesByRange.size()); + + // recupere la premiere lignes + Entry<Range, Long[]> entry = quantitiesByRange.entrySet().iterator().next(); + Assert.assertEquals("Bas de gamme", entry.getKey().getLabel()); + Assert.assertEquals(500, entry.getValue()[0].longValue()); + Assert.assertEquals(600, entry.getValue()[1].longValue()); + // NPE : Assert.assertEquals(600, entry.getValue()[2].longValue()); + } } Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java 2014-08-22 13:33:51 UTC (rev 586) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java 2014-08-22 14:07:53 UTC (rev 587) @@ -32,6 +32,7 @@ import java.util.Calendar; import java.util.Collection; import java.util.Date; +import java.util.EnumSet; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -212,6 +213,9 @@ List<DemandType> types = null; try (InputStream is = InitTestDataImpl.class.getResourceAsStream("/csv/demandtypes.csv")) { types = referentielService.importDemandTypes(is); + + // ajoute le champ GAMME en champ obligatoire pour tester les quantités par gammes + types.get(0).setRequiredFields(EnumSet.of(MailField.CLIENT, MailField.RANGE_ROW)); } try (InputStream is = InitTestDataImpl.class.getResourceAsStream("/csv/email_filters.csv")) { referentielService.importEmailFilters(is, foldersByName); @@ -271,7 +275,7 @@ if (opened) { getEmailService().addToHistory(email.getTopiaId(), HistoryType.OPENING, user, now); - DemandType demandType = types.get(0); + DemandType demandType = types.get(0); // types.get(0) à des gammes obligatoires if (FaxToMailServiceUtils.contains(demandType.getRequiredFields(), MailField.RANGE_ROW)) { for (int j = 0; j < 4; j++) { RangeRow rangeRow = rangeRowDao.create(RangeRow.PROPERTY_RANGE, ranges.get(j), @@ -309,7 +313,7 @@ if (opened) { getEmailService().addToHistory(email.getTopiaId(), HistoryType.OPENING, user, now); - DemandType demandType = types.get(0); + DemandType demandType = types.get(0); // types.get(0) à des gammes obligatoires if (FaxToMailServiceUtils.contains(demandType.getRequiredFields(), MailField.RANGE_ROW)) { for (int j = 0; j < 4; j++) { RangeRow rangeRow = rangeRowDao.create(RangeRow.PROPERTY_RANGE, ranges.get(j),

1 0

r586 - trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
by echatellier＠users.forge.codelutin.com Aug. 22, 2014

Aug. 22, 2014

Author: echatellier Date: 2014-08-22 15:33:51 +0200 (Fri, 22 Aug 2014) New Revision: 586 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/586 Log: Label 'type de demande' Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-08-22 13:30:33 UTC (rev 585) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-08-22 13:33:51 UTC (rev 586) @@ -195,7 +195,7 @@ <div class="row"> <div class="col-md-4"> - <h3>Type de document <input type="button" class="btn btn-success btn-xs pull-right" value="Nouveau" ng-click="newDemandType()" /></h3> + <h3>Type de demande <input type="button" class="btn btn-success btn-xs pull-right" value="Nouveau" ng-click="newDemandType()" /></h3> <table class="table table-hover"> <tbody> <tr ng-repeat="demandType in demandTypes" @@ -208,8 +208,8 @@ </div> <div class="col-md-8" ng-if="selectedDemandType"> - <h3>Édition du type de document {{selectedDemandType.label}}</h3> - Champs obligatoires pour le type de document : + <h3>Édition du type de demande {{selectedDemandType.label}}</h3> + Champs obligatoires pour le type de demande : <div class="checkbox" ng-repeat="(mailField,label) in canBeRequiredMailFields"> <label> <input type="checkbox" ng-checked="selectedDemandType.requiredFields.indexOf(mailField) != -1" @@ -223,7 +223,7 @@ </div> </div> <div class="col-md-8" ng-if="!selectedDemandType"> - <em>Sélectionnez un type de document.</em> + <em>Sélectionnez un type de demande.</em> </div> </div>

1 0

r585 - trunk/faxtomail-ui-web/src/main/webapp/WEB-INF
by echatellier＠users.forge.codelutin.com Aug. 22, 2014

Aug. 22, 2014

Author: echatellier Date: 2014-08-22 15:30:33 +0200 (Fri, 22 Aug 2014) New Revision: 585 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/585 Log: Update libs Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml 2014-08-22 13:29:14 UTC (rev 584) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/wro.xml 2014-08-22 13:30:33 UTC (rev 585) @@ -24,9 +24,9 @@ <groups xmlns="http://www.isdc.ro/wro"> <group name='webjar-select2' abstract="true"> - <css>classpath:META-INF/resources/webjars/select2/3.5.0/select2.css</css> - <js>classpath:META-INF/resources/webjars/select2/3.5.0/select2.js</js> - <js>classpath:META-INF/resources/webjars/select2/3.5.0/select2_locale_fr.js</js> + <css>classpath:META-INF/resources/webjars/select2/3.5.1/select2.css</css> + <js>classpath:META-INF/resources/webjars/select2/3.5.1/select2.js</js> + <js>classpath:META-INF/resources/webjars/select2/3.5.1/select2_locale_fr.js</js> </group> <group name='webjar-angular-ui-sortable' abstract="true">

1 0