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

r396 - trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
by echatellier＠users.forge.codelutin.com 16 Jul '14

16 Jul '14

Author: echatellier Date: 2014-07-16 14:26:07 +0200 (Wed, 16 Jul 2014) New Revision: 396 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/396 Log: Orthographe 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-07-16 10:30:12 UTC (rev 395) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-07-16 12:26:07 UTC (rev 396) @@ -216,7 +216,7 @@ </label> <span ng-show="mailField == 'RANGE_ROW'">(<label> <input type="checkbox" ng-model="selectedDemandType.ediTransfer" - ng-disabled="selectedDemandType.fields.indexOf(mailField) == -1"/> Autoriser le transfer EDI + ng-disabled="selectedDemandType.fields.indexOf(mailField) == -1"/> Autoriser le transfert EDI <i class="fa fa-info-circle" tooltip="Si cette case est cochée, les demandes valides seront transférées à l'EDI pour le traitement des numéros de commande des gammes, sinon les demandes passerons directement dans le statut 'en cours'"></i> </label>)</span> </div>

1 0

r395 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job
by echatellier＠users.forge.codelutin.com 16 Jul '14

16 Jul '14

Author: echatellier Date: 2014-07-16 12:30:12 +0200 (Wed, 16 Jul 2014) New Revision: 395 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/395 Log: Attente de la fin du process avant de lire le fichier de sortie Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 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-07-16 10:19:51 UTC (rev 394) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-07-16 10:30:12 UTC (rev 395) @@ -616,7 +616,8 @@ log.debug("Convert attachment with command : " + comArgs); } try { - pb.start(); + Process process = pb.start(); + process.waitFor(); // read output to save into attachment byte[] outContent = FileUtils.readFileToByteArray(outfile); @@ -635,6 +636,10 @@ if (log.isErrorEnabled()) { log.error("Cannot run convert command", e); } + } catch (InterruptedException e) { + if (log.isErrorEnabled()) { + log.error("Cannot run convert command", e); + } } // cleanup

1 0

r394 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web
by echatellier＠users.forge.codelutin.com 16 Jul '14

16 Jul '14

Author: echatellier Date: 2014-07-16 12:19:51 +0200 (Wed, 16 Jul 2014) New Revision: 394 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/394 Log: Gestion des statuts d'erreur ajax Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonAction.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonResultSupport.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonAction.java 2014-07-16 09:55:51 UTC (rev 393) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonAction.java 2014-07-16 10:19:51 UTC (rev 394) @@ -27,14 +27,17 @@ import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; +import com.opensymphony.xwork2.Action; + /** * Abstract action used to render custom objects as json string using gson directly in response output stream. * * @author Eric Chatellier */ @Results({ - @Result(type = "faxtomail-json", name = "success") + @Result(type = "faxtomail-json", name = Action.SUCCESS), + @Result(type = "faxtomail-json", name = Action.ERROR) }) public abstract class FaxToMailJsonAction extends FaxToMailActionSupport { Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonResultSupport.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonResultSupport.java 2014-07-16 09:55:51 UTC (rev 393) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailJsonResultSupport.java 2014-07-16 10:19:51 UTC (rev 394) @@ -35,6 +35,7 @@ import org.apache.struts2.dispatcher.StrutsResultSupport; import com.google.common.base.Charsets; +import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionInvocation; public class FaxToMailJsonResultSupport extends StrutsResultSupport { @@ -58,6 +59,11 @@ // IE workaround servletResponse.setContentType("text/plain"); } + + // manage error code + if (!Action.SUCCESS.equals(invocation.getResultCode())) { + servletResponse.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + } try { ServletOutputStream outputStream = servletResponse.getOutputStream();

1 0

r393 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com 16 Jul '14

16 Jul '14

Author: echatellier Date: 2014-07-16 11:55:51 +0200 (Wed, 16 Jul 2014) New Revision: 393 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/393 Log: Remove log.warn Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-07-15 15:58:37 UTC (rev 392) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-07-16 09:55:51 UTC (rev 393) @@ -436,8 +436,6 @@ } public void saveUserFolders(Map<String, Collection<MailFolder>> userFolders) { - log.warn("user folders = " + userFolders); - FaxToMailUserTopiaDao faxToMailUserTopiaDao = getPersistenceContext().getFaxToMailUserDao(); for (Map.Entry<String, Collection<MailFolder>> entry : userFolders.entrySet()) {

1 0

r392 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply
by echatellier＠users.forge.codelutin.com 15 Jul '14

15 Jul '14

Author: echatellier Date: 2014-07-15 17:58:37 +0200 (Tue, 15 Jul 2014) New Revision: 392 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/392 Log: refs #5434: Taille maximale des email Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.css Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.css 2014-07-15 15:37:06 UTC (rev 391) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.css 2014-07-15 15:58:37 UTC (rev 392) @@ -118,5 +118,7 @@ text: "faxtomail.reply.action.validate"; toolTipText: "faxtomail.reply.action.validate.tip"; _applicationAction: { com.franciaflex.faxtomail.ui.swing.actions.ReplyAction.class }; - enabled: { getModel().isValid() }; + + /* FIXME echatellier 20140715 : ca doit pas se faire comme ca, mais pas trop d'idée */ + enabled: { getModel().isValid() && getModel().isAttachmentSizeValid(getModel().getTotalAttachmentLength()) }; } \ No newline at end of file

1 0

r391 - in trunk: faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
by echatellier＠users.forge.codelutin.com 15 Jul '14

15 Jul '14

Author: echatellier Date: 2014-07-15 17:37:06 +0200 (Tue, 15 Jul 2014) New Revision: 391 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/391 Log: refs #5433: Commentaire des archives en attendant de comprendre leur but Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java 2014-07-15 09:43:42 UTC (rev 390) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java 2014-07-15 15:37:06 UTC (rev 391) @@ -69,6 +69,7 @@ model.setDemandStatus(DemandStatus.ARCHIVED); model.setTakenBy(null); + /* FIXME see #5433: Supprimer les dossiers d'archives MailFolder folder = model.getMailFolder(); MailFolder archiveChild = null; do { @@ -90,7 +91,7 @@ if (archiveChild != null) { model.setMailFolder(archiveChild); - } + }*/ super.doAction(); } 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-07-15 09:43:42 UTC (rev 390) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-07-15 15:37:06 UTC (rev 391) @@ -240,7 +240,9 @@ <span class="glyphicon" ng-class="{'glyphicon-chevron-right': !collapsed, 'glyphicon-chevron-down': collapsed}"></span> </a> <a ng-click="editMailFolder(mailFolder)">{{mailFolder.name}}</a> + <%-- FIXME see #5433: Supprimer les dossiers d'archives <a class="pull-right btn btn-info btn-xs" data-nodrag ng-click="newArchiveSubFolder(this)" style="margin-left: 8px;" ng-show="!mailFolder.hasArchiveFolder && !mailFolder.archiveFolder" tooltip="Créer un dossier d'archive"><span class="glyphicon glyphicon-plus"></span></a> + --%> <a class="pull-right btn btn-primary btn-xs" data-nodrag ng-click="newSubFolder(this)" style="margin-left: 8px;" ng-show="!mailFolder.archiveFolder" tooltip="Créer un sous-dossier"><span class="glyphicon glyphicon-plus"></span></a> <span class="pull-right" tooltip="{{mailFolder.$cumulativeCount > 0 && 'Ce dossier contient ' + mailFolder.$cumulativeCount + ' demandes et ne peut pas être supprimé !'|| 'Supprimer ce dossier'}}"> <a class="btn btn-danger btn-xs" data-nodrag ng-click="deleteFolder(this)" ng-disabled="mailFolder.$cumulativeCount > 0"> @@ -806,6 +808,7 @@ </div> </div> </div> + <%-- FIXME see #5433: Supprimer les dossiers d'archives <div class="col-md-8" ng-show="selectedMailFolder.archiveFolder"> <h3>Édition du dossier {{selectedMailFolder.name}}</h3> @@ -885,7 +888,7 @@ </div> </div> </div> - </div> + </div>--%> </div> </div>

1 0

r390 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions
by echatellier＠users.forge.codelutin.com 15 Jul '14

15 Jul '14

Author: echatellier Date: 2014-07-15 11:43:42 +0200 (Tue, 15 Jul 2014) New Revision: 390 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/390 Log: Correction d'une erreur. Ajout d'un commentaire (pas sur de la correction). Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java 2014-07-15 08:47:23 UTC (rev 389) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java 2014-07-15 09:43:42 UTC (rev 390) @@ -24,19 +24,20 @@ * #L% */ +import static org.nuiton.i18n.I18n.t; + +import java.util.Date; + +import javax.swing.JOptionPane; + import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import javax.swing.*; - -import java.util.Date; - -import static org.nuiton.i18n.I18n.t; - /** * @author Kevin Morin (Code Lutin) * @@ -72,12 +73,16 @@ MailFolder archiveChild = null; do { if (folder.getChildren() != null) { - archiveChild = Iterables.find(folder.getChildren(), new Predicate<MailFolder>() { + // TODO echatellier : ajout du tryFind car ca n'a pas l'air obligatoire, mais pas certains + Optional<MailFolder> optArchiveChild = Iterables.tryFind(folder.getChildren(), new Predicate<MailFolder>() { @Override public boolean apply(MailFolder mailFolder) { return mailFolder.isArchiveFolder(); } }); + if (optArchiveChild.isPresent()) { + archiveChild = optArchiveChild.get(); + } } folder = folder.getParent();

1 0

r389 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web
by echatellier＠users.forge.codelutin.com 15 Jul '14

15 Jul '14

Author: echatellier Date: 2014-07-15 10:47:23 +0200 (Tue, 15 Jul 2014) New Revision: 389 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/389 Log: Move useless log to debug Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-07-15 08:47:03 UTC (rev 388) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-07-15 08:47:23 UTC (rev 389) @@ -207,8 +207,8 @@ @Override public void destroy() { - if (log.isInfoEnabled()) { - log.info("destroy " + this); + if (log.isDebugEnabled()) { + log.debug("destroy " + this); } } }

1 0

r388 - trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web
by echatellier＠users.forge.codelutin.com 15 Jul '14

15 Jul '14

Author: echatellier Date: 2014-07-15 10:47:03 +0200 (Tue, 15 Jul 2014) New Revision: 388 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/388 Log: Move useless log to debug Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-07-15 08:38:45 UTC (rev 387) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-07-15 08:47:03 UTC (rev 388) @@ -57,8 +57,8 @@ @Override public void init() { - if (log.isInfoEnabled()) { - log.info("init " + this); + if (log.isDebugEnabled()) { + log.debug("init " + this); } }

1 0

r387 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content
by echatellier＠users.forge.codelutin.com 15 Jul '14

15 Jul '14

Author: echatellier Date: 2014-07-15 10:38:45 +0200 (Tue, 15 Jul 2014) New Revision: 387 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/387 Log: Add glue Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx 2014-07-11 14:59:06 UTC (rev 386) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.jaxx 2014-07-15 08:38:45 UTC (rev 387) @@ -33,6 +33,7 @@ org.jdesktop.swingx.JXTitledPanel + javax.swing.Box javax.swing.JFrame javax.swing.SwingConstants java.awt.BorderLayout @@ -50,7 +51,7 @@ <JToolBar id='topBar' constraints="BorderLayout.NORTH"> <JToggleButton id='demandListButton'/> <JToggleButton id='searchButton'/> - <JSeparator constructorParams="SwingConstants.VERTICAL"/> + <Component initializer="Box.createHorizontalGlue()"/> <JButton id='exitButton'/> </JToolBar>

1 0