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

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

09 Jul '14

Author: echatellier Date: 2014-07-09 10:39:16 +0200 (Wed, 09 Jul 2014) New Revision: 366 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/366 Log: Oubli d'affectation du charg?\195?\169 de clientelle Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-07-08 14:12:57 UTC (rev 365) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-07-09 08:39:16 UTC (rev 366) @@ -155,7 +155,7 @@ // update person in charge FaxToMailUser personInCharge = null; if (StringUtils.isNotBlank(newClient.getPersonInCharge())) { - faxToMailUserDao.forLoginEquals(newClient.getPersonInCharge()).findUniqueOrNull(); + personInCharge = faxToMailUserDao.forLoginEquals(newClient.getPersonInCharge()).findUniqueOrNull(); } client.setPersonInCharge(personInCharge);

1 0

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

08 Jul '14

Author: echatellier Date: 2014-07-08 16:12:57 +0200 (Tue, 08 Jul 2014) New Revision: 365 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/365 Log: Readd old fields for old files Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java 2014-07-08 14:12:34 UTC (rev 364) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java 2014-07-08 14:12:57 UTC (rev 365) @@ -59,6 +59,9 @@ newMandatoryColumn("Adresse_Mail", Client.PROPERTY_EMAIL_ADDRESS, nullParser); newMandatoryColumn("Code_Client", Client.PROPERTY_CODE); + newIgnoredColumn("Client_Top"); + newIgnoredColumn("Objet_Message"); + newIgnoredColumn("Destination"); } @Override

1 0

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

08 Jul '14

Author: echatellier Date: 2014-07-08 16:12:34 +0200 (Tue, 08 Jul 2014) New Revision: 364 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/364 Log: Add fixme. Only generate edi once once (there is still a problem with TRANSFER to edi state). Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 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-07-08 14:10:53 UTC (rev 363) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-07-08 14:12:34 UTC (rev 364) @@ -42,6 +42,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.regex.Pattern; import javax.activation.DataSource; import javax.activation.FileDataSource; @@ -63,6 +64,7 @@ import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm; import org.apache.pdfbox.pdmodel.interactive.form.PDField; import org.nuiton.topia.persistence.TopiaEntities; +import org.nuiton.util.FileUtil; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; import org.nuiton.util.pagination.PaginationParameter; @@ -259,6 +261,8 @@ while (!folder.isUseCurrentLevelEdiFolder() && folder.getParent() != null) { folder = folder.getParent(); } + + // FIXME echatellier : et si on définit le ediFolder après ? la demande ne peux pas passer en TRANSMITTED_TO_EDI ? if (StringUtils.isNotBlank(folder.getEdiFolder())) { History transmissionToEdi = CollectionUtils.find(email.getHistory(), new Predicate<History>() { @Override @@ -335,6 +339,7 @@ protected void transmitDemandToEdi(Email email) { Preconditions.checkArgument(email.getDemandStatus() == DemandStatus.TRANSMITTED_TO_EDI); + // FIXME echatellier : une demande transmise a EDI sasn rangeRow restera en TRANSMITTED_TO_EDI pour toujours if (CollectionUtils.isEmpty(email.getRangeRow())) { return; } @@ -347,9 +352,22 @@ ediDirectory.mkdirs(); String fileDate = DateFormatUtils.format(now, "yyMMddHHmmss"); - + // create a file for each commande for (RangeRow rangeRow : email.getRangeRow()) { + + // il n'y a pas de condition si le fait que le fichier à déjà été généré + // si il existe déjà, on ne le génére pas à nouveau + // TODO comment avoir une vraie condition de non génération en double ? + String pattern = Pattern.quote("ORD_FAX_") + ".*" + Pattern.quote(rangeRow.getTopiaId() + ".txt"); + Collection<File> files = FileUtil.find(ediDirectory, pattern, false); + if (!files.isEmpty()) { + if (log.isDebugEnabled()) { + log.debug("Already existing file found for " + rangeRow.getTopiaId() + ". Skipping."); + } + continue; + } + String fileName = "ORD_FAX_" + fileDate + "_" + rangeRow.getTopiaId() + ".txt"; File ediFile = new File(ediDirectory, fileName);

1 0

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

08 Jul '14

Author: echatellier Date: 2014-07-08 16:10:53 +0200 (Tue, 08 Jul 2014) New Revision: 363 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/363 Log: refs #5354: Label des verrous Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/lock-input.jsp Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java 2014-07-08 14:10:47 UTC (rev 362) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java 2014-07-08 14:10:53 UTC (rev 363) @@ -75,7 +75,9 @@ @Override @Action(results = {@Result(type = "redirectAction", params = {"actionName", "lock-input"})}) public String execute() throws Exception { - emailService.unlockMails(unlockMails); + if (unlockMails != null) { + emailService.unlockMails(unlockMails); + } return SUCCESS; } Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/lock-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/lock-input.jsp 2014-07-08 14:10:47 UTC (rev 362) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/lock-input.jsp 2014-07-08 14:10:53 UTC (rev 363) @@ -27,7 +27,7 @@ <html> <head> - <title>Vérrouillages</title> + <title>Verrouillages</title> <link rel="stylesheet" type="text/css" href="<s:url value='/nuiton-js/faxtomail-lock.css' />" /> </head> @@ -43,8 +43,10 @@ <thead> <tr> <th></th> - <th>Demande</th> - <th>Vérrouillé par</th> + <th>Objet</th> + <th>Notre référence</th> + <th>Émetteur</th> + <th>Verrouillé par</th> </tr> </thead> <tbody> @@ -52,6 +54,8 @@ <tr> <td><input type="checkbox" name="unlockMails" value="<s:property value="topiaId" />" /> <td><s:property value="object" /></td> + <td><s:property value="companyReference" /></td> + <td><s:property value="sender" /></td> <td> <s:property value="lockedBy.firstName" /> <s:property value="lockedBy.lastName" /> </td> @@ -59,7 +63,7 @@ </s:iterator> <s:if test="lockedMails == null || lockedMails.empty"> <tr class="emptyTable"> - <td colspan="3">Aucune demande n'est actuellement vérrouillée.</td> + <td colspan="5">Aucune demande n'est actuellement verrouillée.</td> </tr> </s:if> </tbody> @@ -67,7 +71,7 @@ <nav class="navbar navbar-default navbar-fixed-bottom"> <div class="container"> - <button type="submit" class="btn btn-primary navbar-btn pull-right">Valider</button> + <button type="submit" class="btn btn-primary navbar-btn pull-right">Supprimer les verrous</button> </div> </nav> </s:form>

1 0

r362 - in trunk/faxtomail-ui-web/src/main/webapp/WEB-INF: content decorators
by echatellier＠users.forge.codelutin.com 08 Jul '14

08 Jul '14

Author: echatellier Date: 2014-07-08 16:10:47 +0200 (Tue, 08 Jul 2014) New Revision: 362 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/362 Log: refs #5354: Label des verrous Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp 2014-07-08 14:10:30 UTC (rev 361) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp 2014-07-08 14:10:47 UTC (rev 362) @@ -41,7 +41,7 @@ <li><a href="<s:url action='import-input' namespace="/admin" />"> <span class="fa fa-file-excel-o"></span> Import</a></li> <li><a href="<s:url action='lock-input' namespace="/admin" />"> - <span class="fa fa-unlock-alt"></span> Vérrouillages</a></li> + <span class="fa fa-unlock-alt"></span> Verrouillages</a></li> </s:if> <li><a href="<s:url action='user-folder-input' namespace="/admin" />"> <span class="fa fa-folder-open"></span> Dossiers utilisateur</a></li> Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-07-08 14:10:30 UTC (rev 361) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-07-08 14:10:47 UTC (rev 362) @@ -64,7 +64,7 @@ <li><a href="<s:url action='import-input' namespace="/admin" />"> <span class="fa fa-file-excel-o"></span> Import</a></li> <li><a href="<s:url action='lock-input' namespace="/admin" />"> - <span class="fa fa-unlock-alt"></span> Vérrouillages</a></li> + <span class="fa fa-unlock-alt"></span> Verrouillages</a></li> </s:if> <li><a href="<s:url action='user-folder-input' namespace="/admin" />">

1 0

r361 - trunk/faxtomail-ui-swing/src/main/resources/i18n
by echatellier＠users.forge.codelutin.com 08 Jul '14

08 Jul '14

Author: echatellier Date: 2014-07-08 16:10:30 +0200 (Tue, 08 Jul 2014) New Revision: 361 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/361 Log: refs #5354: Label des verrous Modified: trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 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-07-08 09:34:19 UTC (rev 360) +++ trunk/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties 2014-07-08 14:10:30 UTC (rev 361) @@ -23,8 +23,8 @@ faxtomail.action.search.tip=Rechercher faxtomail.action.start.tip=Démarrer FaxToMail faxtomail.action.transmit.tip=Déplacer l'élément -faxtomail.alert.alreadyLockedBy.message=L'élément est déjà vérrouillé par %s, vous ne pouvez pas l'ouvrir. -faxtomail.alert.alreadyLockedBy.title=Document déjà vérrouillé +faxtomail.alert.alreadyLockedBy.message=L'élément est déjà verrouillé par %s, vous ne pouvez pas l'ouvrir. +faxtomail.alert.alreadyLockedBy.title=Document déjà verrouillé faxtomail.alert.alreadyTakenBy.help=Voulez-vous le prendre ?<ul><li><strong>Annuler</strong> pour ne retourner à la liste</li><li><strong>Non</strong> pour visualiser l'élément en lecture seule</li><li><strong>Oui</strong> pour le prendre</li></ul> faxtomail.alert.alreadyTakenBy.message=L'élément est déjà pris par %s. faxtomail.alert.alreadyTakenBy.title=Document déjà pris

1 0

r360 - trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail
by echatellier＠users.forge.codelutin.com 08 Jul '14

08 Jul '14

Author: echatellier Date: 2014-07-08 11:34:19 +0200 (Tue, 08 Jul 2014) New Revision: 360 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/360 Log: Move edi directory to data directory Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-07-08 08:43:00 UTC (rev 359) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-07-08 09:34:19 UTC (rev 360) @@ -204,7 +204,7 @@ EDI_DIRECTORY( "faxtomail.edi.directory", n("faxtomail.config.option.edi.directory.description"), - "${faxtomail.basedir}/edi", + "${faxtomail.data.directory}/edi", File.class), // UI

1 0

r359 - in trunk: faxtomail-persistence/src/main/xmi 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 08 Jul '14

08 Jul '14

Author: echatellier Date: 2014-07-08 10:43:00 +0200 (Tue, 08 Jul 2014) New Revision: 359 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/359 Log: Correction des contraintes d'unicit?\195?\169 pour les clients et ediReturn Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-07-07 16:29:06 UTC (rev 358) +++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-07-08 08:43:00 UTC (rev 359) @@ -40,12 +40,17 @@ com.franciaflex.faxtomail.persistence.entities.DemandType.attribute.label.tagvalue.naturalId=true # Client +com.franciaflex.faxtomail.persistence.entities.Client.attribute.brand.tagvalue.naturalId=true com.franciaflex.faxtomail.persistence.entities.Client.attribute.code.tagvalue.naturalId=true # NewClient com.franciaflex.faxtomail.persistence.entities.NewClient.attribute.code.tagvalue.notNull=true +com.franciaflex.faxtomail.persistence.entities.NewClient.attribute.brand.tagvalue.notNull=true com.franciaflex.faxtomail.persistence.entities.NewClient.attribute.type.tagvalue.notNull=true +#�EdiReturn +com.franciaflex.faxtomail.persistence.entities.EdiReturn.attribute.rangeRowTopiaId.tagvalue.notNull=true + # EmailAccount com.franciaflex.faxtomail.persistence.entities.EmailAccount.attribute.protocol.tagvalue.naturalId=true com.franciaflex.faxtomail.persistence.entities.EmailAccount.attribute.host.tagvalue.naturalId=true Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-07-07 16:29:06 UTC (rev 358) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-07-08 08:43:00 UTC (rev 359) @@ -133,15 +133,16 @@ case UPDATE: // find client to create or update - Client client = clientDao.forCodeEquals(newClient.getCode()).findUniqueOrNull(); + Client client = clientDao.forCodeEquals(newClient.getCode()) + .addEquals(Client.PROPERTY_BRAND, newClient.getBrand()).findUniqueOrNull(); if (client == null) { client = new ClientImpl(); if (type == NewClientType.UPDATE && log.isWarnEnabled()) { - log.warn("Can't find client code " + newClient.getCode() + " to update. Client created."); + log.warn(String.format("Can't find client code %s/%s to update. Client created.", newClient.getCode(), newClient.getBrand())); } } else { if (type == NewClientType.CREATION && log.isWarnEnabled()) { - log.warn("Creating a already existing client " + newClient.getCode() + ". Client updated."); + log.warn(String.format("Creating a already existing client %s/%s. Client updated.", newClient.getCode(), newClient.getBrand())); } } @@ -168,16 +169,17 @@ break; case DELETION: - Client deleteClient = clientDao.forCodeEquals(newClient.getCode()).findUniqueOrNull(); + Client deleteClient = clientDao.forCodeEquals(newClient.getCode()) + .addEquals(Client.PROPERTY_BRAND, newClient.getBrand()).findUniqueOrNull(); if (deleteClient == null) { if (log.isWarnEnabled()) { - log.warn("Can't find client code " + newClient.getCode() + " to delete"); + log.warn(String.format("Can't find client code %s/%s to delete", newClient.getCode(), newClient.getBrand())); } } else { // FIXME le delete ne fonctionnera pas si des mails porte sur ce client clientDao.delete(deleteClient); if (log.isDebugEnabled()) { - log.debug("Client " + newClient.getCode() + " deleted"); + log.debug(String.format("Client %s/%s deleted", newClient.getCode(), newClient.getBrand())); } } break; Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java 2014-07-07 16:29:06 UTC (rev 358) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java 2014-07-08 08:43:00 UTC (rev 359) @@ -73,6 +73,7 @@ // add new clients NewClient newClient = new NewClientImpl(); newClient.setCode("99154"); + newClient.setBrand("FX"); newClient.setEmailAddress("gerard.menvussa(a)lutin.com"); newClient.setType(NewClientType.UPDATE); newClient = newClientDao.create(newClient); @@ -86,6 +87,7 @@ // add new clients NewClient deleteClient = new NewClientImpl(); deleteClient.setCode("99154"); + deleteClient.setBrand("FX"); deleteClient.setType(NewClientType.DELETION); deleteClient = newClientDao.create(deleteClient);

1 0

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

07 Jul '14

Author: echatellier Date: 2014-07-07 18:29:06 +0200 (Mon, 07 Jul 2014) New Revision: 358 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/358 Log: Just another deprecated field :( Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-07-07 14:25:03 UTC (rev 357) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-07-07 16:29:06 UTC (rev 358) @@ -199,6 +199,10 @@ @Deprecated protected DemandeUIModel currentEmail; + /** + * @deprecated Ca pose problème de conserver des entités alors que le persistence contexte change (lazy). + */ + @Deprecated protected List<MailFolder> expandedFolders = new ArrayList<MailFolder>(); protected SearchUIModel search;

1 0

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

07 Jul '14

Author: echatellier Date: 2014-07-07 16:25:03 +0200 (Mon, 07 Jul 2014) New Revision: 357 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/357 Log: Add original content Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 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-07-07 13:51:00 UTC (rev 356) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-07-07 14:25:03 UTC (rev 357) @@ -535,6 +535,8 @@ ReplyFormUI dialogContent = new ReplyFormUI(ui); ReplyFormUIModel model = dialogContent.getModel(); + model.setOriginalDemand(demand); + //TODO kmorin 20140626 to test String sender = JAXXUtil.getStringValue(demand.getSender()); if (demand.isFax()) {

1 0