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

r356 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions
by echatellier＠users.forge.codelutin.com July 7, 2014

July 7, 2014

Author: echatellier Date: 2014-07-07 15:51:00 +0200 (Mon, 07 Jul 2014) New Revision: 356 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/356 Log: Sa fonctionne mieux dans le sens inverse Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveFromListAction.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveFromListAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveFromListAction.java 2014-07-07 13:35:29 UTC (rev 355) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveFromListAction.java 2014-07-07 13:51:00 UTC (rev 356) @@ -75,8 +75,8 @@ @Override public void postSuccessAction() { super.postSuccessAction(); + getModel().removeEmails(getModel().getCurrentEmails()); getModel().setCurrentEmails(null); - getModel().removeEmails(getModel().getCurrentEmails()); } @Override

1 0

r355 - trunk/faxtomail-ui-web/src/main/webapp/js
by echatellier＠users.forge.codelutin.com July 7, 2014

July 7, 2014

Author: echatellier Date: 2014-07-07 15:35:29 +0200 (Mon, 07 Jul 2014) New Revision: 355 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/355 Log: Correction du reaffichage avec les noms complets des dossiers Modified: trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js Modified: trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js 2014-07-07 11:05:17 UTC (rev 354) +++ trunk/faxtomail-ui-web/src/main/webapp/js/user-folder.js 2014-07-07 13:35:29 UTC (rev 355) @@ -29,16 +29,19 @@ */ UserFolderModule.controller('UserFolderController', ['$scope', '$http', 'UserFolderData', function($scope, $http, UserFolderData) { - //{Array} mail folders + // {Array} mail folders $scope.mailFolders = UserFolderData.mailFolders; // {Array} Liste des utilisateurs ldap $scope.users = UserFolderData.users; - //{Map<MailFolder id, Array<MailFolder>>} liste des + // {Array} Group list + $scope.groups = UserFolderData.groups; + // {Map<MailFolder id, Array<MailFolder>>} liste des dossiers classé par topia Id du noeud racine $scope.flatMailFolders; - //{Map} Topia id : mailFolders + // {Map<MailFolder id, MailFolder>} dossier accessible par topia id + $scope.flatMailFolders2; + // {Map} user id : mailFolders $scope.userFolders = UserFolderData.userFolders; - //{Array} Group list - $scope.groups = UserFolderData.groups; + // method privée recursive pour retourner l'ensemble des dossiers en les modifiant pour ajouter // des metadata (full path from root, and root node instance) @@ -47,15 +50,16 @@ angular.forEach(mailFolders, function(mailFolder) { // warning modify input object :( - // use $ from this, even not recommended because angular exlude those fields when jsonify + // use $ from this, even not recommended because angular exclude those fields when jsonify mailFolder.$fullPath = prefix + "/" + mailFolder.name; // ha la la, modify input object again :( - // use $ from this, even not recommended because angular exlude those fields when jsonify + // use $ from this, even not recommended because angular exclude those fields when jsonify mailFolder.$rootFolder = rootFolder; // encore pour le parent mailFolder.$parent = parent; result.push(mailFolder); + $scope.flatMailFolders2[mailFolder.topiaId] = mailFolder; recursiveAddMailFolder(result, mailFolder.children, rootFolder, mailFolder.$fullPath, mailFolder); }); } @@ -65,6 +69,7 @@ $scope._updateFlatMailFolders = function() { console.log("Update flatMailFolders map"); $scope.flatMailFolders = {}; + $scope.flatMailFolders2 = {}; angular.forEach($scope.mailFolders, function(mailFolder) { $scope.flatMailFolders[mailFolder.topiaId] = []; recursiveAddMailFolder($scope.flatMailFolders[mailFolder.topiaId], mailFolder.children, mailFolder, mailFolder.name, mailFolder); @@ -72,6 +77,18 @@ }; $scope._updateFlatMailFolders(); + // mise à jour des configurations actuelle des dossiers pour inclure les metas info des dossiers + $scope._updateUserFolders = function() { + angular.forEach($scope.userFolders, function(value, key) { + angular.forEach(value, function(folder) { + var realFolder = $scope.flatMailFolders2[folder.topiaId]; + // update text with full path + folder.text = realFolder.$fullPath; + }); + }); + }; + $scope._updateUserFolders(); + // fonction retournant l'ensemble des options disponibles $scope.getObjectsData = function(term, result) { var resultArray = [];

1 0

r354 - in trunk/faxtomail-service/src: main/java/com/franciaflex/faxtomail/services/service test/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com July 7, 2014

July 7, 2014

Author: echatellier Date: 2014-07-07 13:05:17 +0200 (Mon, 07 Jul 2014) New Revision: 354 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/354 Log: Utilisation du code plutot que l'id de correspondance Modified: 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-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 10:59:14 UTC (rev 353) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-07-07 11:05:17 UTC (rev 354) @@ -133,15 +133,15 @@ case UPDATE: // find client to create or update - Client client = clientDao.forIdEquals(newClient.getId()).findUniqueOrNull(); + Client client = clientDao.forCodeEquals(newClient.getCode()).findUniqueOrNull(); if (client == null) { client = new ClientImpl(); if (type == NewClientType.UPDATE && log.isWarnEnabled()) { - log.warn("Can't find client " + newClient.getId() + " to update. Client created."); + log.warn("Can't find client code " + newClient.getCode() + " to update. Client created."); } } else { if (type == NewClientType.CREATION && log.isWarnEnabled()) { - log.warn("Creating a already existing client " + newClient.getId() + ". Client updated."); + log.warn("Creating a already existing client " + newClient.getCode() + ". Client updated."); } } @@ -168,16 +168,16 @@ break; case DELETION: - Client deleteClient = clientDao.forIdEquals(newClient.getId()).findUniqueOrNull(); + Client deleteClient = clientDao.forCodeEquals(newClient.getCode()).findUniqueOrNull(); if (deleteClient == null) { if (log.isWarnEnabled()) { - log.warn("Can't find client " + newClient.getId() + " to delete"); + log.warn("Can't find client code " + newClient.getCode() + " to delete"); } } else { // FIXME le delete ne fonctionnera pas si des mails porte sur ce client clientDao.delete(deleteClient); if (log.isDebugEnabled()) { - log.debug("Client " + newClient.getId() + " deleted"); + log.debug("Client " + newClient.getCode() + " deleted"); } } 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 10:59:14 UTC (rev 353) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java 2014-07-07 11:05:17 UTC (rev 354) @@ -72,7 +72,7 @@ // add new clients NewClient newClient = new NewClientImpl(); - newClient.setId("253142"); + newClient.setCode("99154"); newClient.setEmailAddress("gerard.menvussa(a)lutin.com"); newClient.setType(NewClientType.UPDATE); newClient = newClientDao.create(newClient); @@ -85,7 +85,7 @@ // add new clients NewClient deleteClient = new NewClientImpl(); - deleteClient.setId("253142"); + deleteClient.setCode("99154"); deleteClient.setType(NewClientType.DELETION); deleteClient = newClientDao.create(deleteClient); @@ -93,6 +93,6 @@ clientService.updateNewClients(); // asserts - Assert.assertNull(clientDao.forIdEquals("253142").findAnyOrNull()); + Assert.assertNull(clientDao.forCodeEquals("99154").findAnyOrNull()); } }

1 0

r353 - in trunk: faxtomail-persistence/src/main/xmi faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service faxtomail-service/src/test/resources faxtomail-service/src/test/resources/csv faxtomail-ui-web/src/main/webapp/WEB-INF/content faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin faxtomail-ui-web/src/main/webapp/WEB-INF/decorators
by echatellier＠users.forge.codelutin.com July 7, 2014

July 7, 2014

Author: echatellier Date: 2014-07-07 12:59:14 +0200 (Mon, 07 Jul 2014) New Revision: 353 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/353 Log: refs #5354: Labels de l'interface web Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java trunk/faxtomail-service/src/test/resources/csv/clients.csv trunk/faxtomail-service/src/test/resources/log4j.properties 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/import-input.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/login-input.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-07-07 09:49:31 UTC (rev 352) +++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-07-07 10:59:14 UTC (rev 353) @@ -40,10 +40,10 @@ com.franciaflex.faxtomail.persistence.entities.DemandType.attribute.label.tagvalue.naturalId=true # Client -com.franciaflex.faxtomail.persistence.entities.Client.attribute.id.tagvalue.naturalId=true +com.franciaflex.faxtomail.persistence.entities.Client.attribute.code.tagvalue.naturalId=true # NewClient -com.franciaflex.faxtomail.persistence.entities.NewClient.attribute.id.tagvalue.naturalId=true +com.franciaflex.faxtomail.persistence.entities.NewClient.attribute.code.tagvalue.notNull=true com.franciaflex.faxtomail.persistence.entities.NewClient.attribute.type.tagvalue.notNull=true # EmailAccount 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-07 09:49:31 UTC (rev 352) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java 2014-07-07 10:59:14 UTC (rev 353) @@ -59,9 +59,6 @@ newMandatoryColumn("Adresse_Mail", Client.PROPERTY_EMAIL_ADDRESS, nullParser); newMandatoryColumn("Code_Client", Client.PROPERTY_CODE); - newIgnoredColumn("Client_Top"); - newIgnoredColumn("Objet_Message"); - newIgnoredColumn("Destination"); } @Override Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java 2014-07-07 09:49:31 UTC (rev 352) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java 2014-07-07 10:59:14 UTC (rev 353) @@ -37,6 +37,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; +import org.hibernate.dialect.H2Dialect; import org.junit.After; import org.nuiton.util.FileUtil; @@ -71,10 +72,11 @@ hibernateH2Config.putAll(getApplicationConfig().getTopiaProperties()); + hibernateH2Config.put(Environment.DIALECT, H2Dialect.class.getName()); hibernateH2Config.put(Environment.DRIVER, org.h2.Driver.class.getName()); hibernateH2Config.put(Environment.USER, "sa"); hibernateH2Config.put(Environment.PASS, ""); - hibernateH2Config.put(Environment.HBM2DDL_AUTO, "create"); + hibernateH2Config.put(Environment.HBM2DDL_AUTO, ""); // default validate won't work with h2 File tempDirFile = SystemUtils.getJavaIoTmpDir(); 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 09:49:31 UTC (rev 352) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java 2014-07-07 10:59:14 UTC (rev 353) @@ -1,6 +1,9 @@ package com.franciaflex.faxtomail.services.service; +import java.io.IOException; + import org.junit.Assert; +import org.junit.Before; import org.junit.Test; import com.franciaflex.faxtomail.persistence.entities.ClientTopiaDao; @@ -40,7 +43,21 @@ */ public class ClientServiceTest extends AbstractFaxToMailServiceTest { + @Before + public void setUp() throws IOException { + newService(InitTestData.class).initTestData(); + } + /** + * Test le nombre de client importés. + */ + @Test + public void testImportClientCount() { + ClientTopiaDao clientDao = getServiceContext().getPersistenceContext().getClientDao(); + Assert.assertEquals(4, clientDao.count()); + } + + /** * Ajout des clients dans la table temporaire et appel le service de traitement de cette table. */ @Test Modified: trunk/faxtomail-service/src/test/resources/csv/clients.csv =================================================================== --- trunk/faxtomail-service/src/test/resources/csv/clients.csv 2014-07-07 09:49:31 UTC (rev 352) +++ trunk/faxtomail-service/src/test/resources/csv/clients.csv 2014-07-07 10:59:14 UTC (rev 353) @@ -1,5 +1,5 @@ -Id_Correspondance;Societe;Nom;Caracteristique1;Caracteristique2;Caracteristique3;Client_Top;Numero_Fax;Adresse_Mail;Code_Client;Objet_Message;Destination -253042;FX;John Doe;A;71 Allo;NULL;NULL;03 12 34 56 78;john(a)doe.fr;99153;NULL; -253142;FX;Gerard Menvussa;A+;40 Nabi;NULL;NULL;05 12 23 34 45;gerard.menvussa(a)code.com;99154;NULL; -253242;FX;Ella Elli;NULL;38 LA;NULL;NULL;04 98 87 76 65;NULL;99184;NULL; -253243;FX;Cossé David;NULL;38 LA;NULL;NULL;04 98 87 76 65;david.cosse(a)sfr.fr;22152;NULL; \ No newline at end of file +Id_Correspondance;Societe;Nom;Caracteristique1;Caracteristique2;Caracteristique3;Numero_Fax;Adresse_Mail;Code_Client +253042;FX;John Doe;A;71 Allo;NULL;03 12 34 56 78;john(a)doe.fr;99153 +253142;FX;Gerard Menvussa;A+;40 Nabi;NULL;05 12 23 34 45;gerard.menvussa(a)code.com;99154 +253242;FX;Ella Elli;NULL;38 LA;NULL;04 98 87 76 65;NULL;99184 +253243;FX;Cossé David;NULL;38 LA;NULL;04 98 87 76 65;david.cosse(a)sfr.fr;22152 \ No newline at end of file Modified: trunk/faxtomail-service/src/test/resources/log4j.properties =================================================================== --- trunk/faxtomail-service/src/test/resources/log4j.properties 2014-07-07 09:49:31 UTC (rev 352) +++ trunk/faxtomail-service/src/test/resources/log4j.properties 2014-07-07 10:59:14 UTC (rev 353) @@ -19,18 +19,11 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -log4j.rootCategory=WARN, console +log4j.rootCategory=ERROR, console log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %M %m%n +log4j.appender.console.layout.ConversionPattern=%d{yyyy/MM/dd HH:mm:ss} %5p (%F:%L) %M %m%n # global level -log4j.logger.com.franciaflex.faxtomail.ui.swing=DEBUG - -### persistence level -# log4j.logger.org.nuiton.topia=TRACE -# log4j.logger.com.franciaflex.faxtomail.persistence=TRACE - -### services level -# log4j.logger.com.franciaflex.faxtomail.services=TRACE +log4j.logger.com.franciaflex.faxtomail.services.service=INFO 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-07 09:49:31 UTC (rev 352) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-07-07 10:59:14 UTC (rev 353) @@ -928,7 +928,7 @@ Il peut commencer ou se terminer par <code>%</code> pour respectivement appliquer le filtre à la fin ou au début de l'adresse de réception</p> </div> <div class="form-group"> - <label for="folderField">Dossier</label> + <label for="folderField">Dossier de destination des email</label> <select class="form-control" ng-model="newFilter.mailFolder" ng-options="mailFolder.$fullPath for mailFolder in flatMailFolders[mailFolder.topiaId]"></select> </div> <div class="form-group"> Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp 2014-07-07 09:49:31 UTC (rev 352) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp 2014-07-07 10:59:14 UTC (rev 353) @@ -44,7 +44,7 @@ <div class="form-group"> <label for="clientField" class="control-label">Fichier client :</label> <input type="file" id="clientField" name="clientFile" class="form-control"> - <p class="help-block">Format du fichier csv : <code>Id_Correspondance;Societe;Nom;Caracteristique1;Caracteristique2;Caracteristique3;Client_Top;Numero_Fax;Adresse_Mail;Code_Client;Objet_Message;Destination</code></p> + <p class="help-block">Format du fichier csv : <code>Id_Correspondance;Societe;Nom;Caracteristique1;Caracteristique2;Caracteristique3;Numero_Fax;Adresse_Mail;Code_Client</code></p> </div> <button type="submit" class="btn btn-primary navbar-btn">Valider</button> <hr /> Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp 2014-07-07 09:49:31 UTC (rev 352) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp 2014-07-07 10:59:14 UTC (rev 353) @@ -42,13 +42,13 @@ <div id="main-container" class="container"> - <h1 class="page-header">Ldap</h1> + <h1 class="page-header">Active Directory</h1> <s:form id="main_form" action="ldap" method="post"> Cette action permet d'importer tout les utilisateurs et les groupes du serveur Active Directory dans l'application FaxToMail. Cette action peut prendre quelques minutes. - <button id="submit_button" type="button" class="btn btn-primary navbar-btn" onclick="disableAndSubmit()">Mettre à jour les groupes et utilisateurs LDAP</button> + <button id="submit_button" type="button" class="btn btn-primary navbar-btn" onclick="disableAndSubmit()">Mettre à jour les groupes et utilisateurs</button> </s:form> </div> 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-07 09:49:31 UTC (rev 352) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/index.jsp 2014-07-07 10:59:14 UTC (rev 353) @@ -35,11 +35,11 @@ <ul> <s:if test="admin"> <li><a href="<s:url action='ldap-input' namespace="/admin" />"> - <span class="fa fa-database"></span> Ldap</a></li> + <span class="fa fa-database"></span> Active Directory</a></li> <li><a href="<s:url action='configuration-input' namespace="/admin" />"> <span class="fa fa-cog"></span> Configuration</a></li> <li><a href="<s:url action='import-input' namespace="/admin" />"> - <span class="fa fa-upload"></span> Import</a></li> + <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> </s:if> Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/login-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/login-input.jsp 2014-07-07 09:49:31 UTC (rev 352) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/login-input.jsp 2014-07-07 10:59:14 UTC (rev 353) @@ -38,15 +38,15 @@ <s:actionerror/> <div class="form-group"> - <label for="loginField" class="col-sm-2 control-label">Identifiant LDAP :</label> + <label for="loginField" class="col-sm-2 control-label">Identifiant :</label> <div class="col-sm-10"> - <input type="text" name="login" class="form-control" id="loginField" placeholder="ex: dupont" required> + <input type="text" name="login" class="form-control" id="loginField" placeholder="ex: dpt" required> </div> </div> <div class="form-group"> <label for="passwordField" class="col-sm-2 control-label">Mot de passe :</label> <div class="col-sm-10"> - <input type="password" name="password" class="form-control" id="passwordField" placeholder="password" required> + <input type="password" name="password" class="form-control" id="passwordField" placeholder="ex: password" required> </div> </div> <!-- <div class="form-group"> 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-07 09:49:31 UTC (rev 352) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-07-07 10:59:14 UTC (rev 353) @@ -58,11 +58,11 @@ <s:if test="admin"> <li><a href="<s:url action='ldap-input' namespace="/admin" />"> - <span class="fa fa-database"></span> Ldap</a></li> + <span class="fa fa-database"></span> Active Directory</a></li> <li><a href="<s:url action='configuration-input' namespace="/admin" />"> <span class="fa fa-cog"></span> Configuration</a></li> <li><a href="<s:url action='import-input' namespace="/admin" />"> - <span class="fa fa-upload"></span> Import</a></li> + <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> </s:if>

1 0

r352 - in trunk/faxtomail-service/src: main/java/com/franciaflex/faxtomail/services/service test/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com July 7, 2014

July 7, 2014

Author: echatellier Date: 2014-07-07 11:49:31 +0200 (Mon, 07 Jul 2014) New Revision: 352 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/352 Log: fixes #5382: Mettre ?\195?\160 jour la table client ?\195?\160 partir de la table interm?\195?\169diaire Added: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.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/EmailService.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-07 08:50:47 UTC (rev 351) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientService.java 2014-07-07 09:49:31 UTC (rev 352) @@ -24,29 +24,34 @@ * #L% */ +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; + import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.ClientImpl; import com.franciaflex.faxtomail.persistence.entities.ClientTopiaDao; import com.franciaflex.faxtomail.persistence.entities.Email; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserTopiaDao; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.NewClient; import com.franciaflex.faxtomail.persistence.entities.NewClientTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.NewClientType; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.math.NumberUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.beans.Binder; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - /** * @author Kevin Morin (Code Lutin) * @@ -110,24 +115,78 @@ return client; } + /** + * Récupère les information de la table NewClient pour mettre à jour la table Client. + */ public void updateNewClients() { - NewClientTopiaDao dao = getPersistenceContext().getNewClientDao(); - List<NewClient> newClients = dao.findAll(); + NewClientTopiaDao newClientDao = getPersistenceContext().getNewClientDao(); + ClientTopiaDao clientDao = getPersistenceContext().getClientDao(); + FaxToMailUserTopiaDao faxToMailUserDao = getPersistenceContext().getFaxToMailUserDao(); + Iterable<NewClient> newClients = newClientDao.findAll(); + Binder<NewClient, Client> binder = BinderFactory.newBinder(NewClient.class, Client.class); + + for (NewClient newClient : newClients) { + + NewClientType type = newClient.getType(); + switch (type) { + case CREATION: + case UPDATE: - Binder<NewClient, Client> binder = new Binder<>(); - List<Client> clients = new ArrayList<>(); - for (NewClient newClient : newClients) { - Client client = new ClientImpl(); - binder.copyExcluding(newClient, client, - NewClient.PROPERTY_TOPIA_ID, - NewClient.PROPERTY_TOPIA_CREATE_DATE, - NewClient.PROPERTY_TOPIA_VERSION); - clients.add(client); + // find client to create or update + Client client = clientDao.forIdEquals(newClient.getId()).findUniqueOrNull(); + if (client == null) { + client = new ClientImpl(); + if (type == NewClientType.UPDATE && log.isWarnEnabled()) { + log.warn("Can't find client " + newClient.getId() + " to update. Client created."); + } + } else { + if (type == NewClientType.CREATION && log.isWarnEnabled()) { + log.warn("Creating a already existing client " + newClient.getId() + ". Client updated."); + } + } + + // update client instance + binder.copyExcluding(newClient, client, + Client.PROPERTY_TOPIA_ID, + Client.PROPERTY_TOPIA_CREATE_DATE, + Client.PROPERTY_TOPIA_VERSION); + + // update person in charge + FaxToMailUser personInCharge = null; + if (StringUtils.isNotBlank(newClient.getPersonInCharge())) { + faxToMailUserDao.forLoginEquals(newClient.getPersonInCharge()).findUniqueOrNull(); + } + client.setPersonInCharge(personInCharge); + + // persist + if (client.isPersisted()) { + clientDao.update(client); + } else { + clientDao.create(client); + } + + break; + + case DELETION: + Client deleteClient = clientDao.forIdEquals(newClient.getId()).findUniqueOrNull(); + if (deleteClient == null) { + if (log.isWarnEnabled()) { + log.warn("Can't find client " + newClient.getId() + " to delete"); + } + } else { + // FIXME le delete ne fonctionnera pas si des mails porte sur ce client + clientDao.delete(deleteClient); + if (log.isDebugEnabled()) { + log.debug("Client " + newClient.getId() + " deleted"); + } + } + break; + } + } - //TODO kmorin 20140626 update some clients and add others -// dao.deleteAll(newClients); -// getPersistenceContext().commit(); + newClientDao.deleteAll(newClients); + getPersistenceContext().commit(); } } 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-07 08:50:47 UTC (rev 351) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-07-07 09:49:31 UTC (rev 352) @@ -346,7 +346,7 @@ File ediDirectory = getApplicationConfig().getEdiDirectory(); ediDirectory.mkdirs(); - String fileDate = DateFormatUtils.format(now, "yyMMddhhmmss"); + String fileDate = DateFormatUtils.format(now, "yyMMddHHmmss"); // create a file for each commande for (RangeRow rangeRow : email.getRangeRow()) { Added: 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 (rev 0) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java 2014-07-07 09:49:31 UTC (rev 352) @@ -0,0 +1,81 @@ +package com.franciaflex.faxtomail.services.service; + +import org.junit.Assert; +import org.junit.Test; + +import com.franciaflex.faxtomail.persistence.entities.ClientTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.NewClient; +import com.franciaflex.faxtomail.persistence.entities.NewClientImpl; +import com.franciaflex.faxtomail.persistence.entities.NewClientTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.NewClientType; + +/* + * #%L + * FaxToMail :: Service + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2014 Franciaflex, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +/** + * Test de client service. + * + * @author Eric Chatellier + */ +public class ClientServiceTest extends AbstractFaxToMailServiceTest { + + /** + * Ajout des clients dans la table temporaire et appel le service de traitement de cette table. + */ + @Test + public void testAddNewClientInTmpTable() { + + ClientService clientService = newService(ClientService.class); + NewClientTopiaDao newClientDao = getServiceContext().getPersistenceContext().getNewClientDao(); + ClientTopiaDao clientDao = getServiceContext().getPersistenceContext().getClientDao(); + + // asserts + Assert.assertNull(clientDao.forEmailAddressEquals("gerard.menvussa(a)lutin.com").findAnyOrNull()); + + // add new clients + NewClient newClient = new NewClientImpl(); + newClient.setId("253142"); + newClient.setEmailAddress("gerard.menvussa(a)lutin.com"); + newClient.setType(NewClientType.UPDATE); + newClient = newClientDao.create(newClient); + + // precedure de mise à jour + clientService.updateNewClients(); + + // asserts + Assert.assertNotNull(clientDao.forEmailAddressEquals("gerard.menvussa(a)lutin.com").findAnyOrNull()); + + // add new clients + NewClient deleteClient = new NewClientImpl(); + deleteClient.setId("253142"); + deleteClient.setType(NewClientType.DELETION); + deleteClient = newClientDao.create(deleteClient); + + // precedure de mise à jour + clientService.updateNewClients(); + + // asserts + Assert.assertNull(clientDao.forIdEquals("253142").findAnyOrNull()); + } +} Property changes on: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ClientServiceTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r351 - trunk/faxtomail-persistence/src/main/xmi
by echatellier＠users.forge.codelutin.com July 7, 2014

July 7, 2014

Author: echatellier Date: 2014-07-07 10:50:47 +0200 (Mon, 07 Jul 2014) New Revision: 351 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/351 Log: Mise ?\195?\160 jour des contraintes dans le modele Removed: trunk/faxtomail-persistence/src/main/xmi/faxtomail.txt Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-07-07 08:37:09 UTC (rev 350) +++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-07-07 08:50:47 UTC (rev 351) @@ -40,8 +40,11 @@ com.franciaflex.faxtomail.persistence.entities.DemandType.attribute.label.tagvalue.naturalId=true # Client -#com.franciaflex.faxtomail.persistence.entities.Client.attribute.emailAddress.tagvalue.naturalId=true +com.franciaflex.faxtomail.persistence.entities.Client.attribute.id.tagvalue.naturalId=true +# NewClient +com.franciaflex.faxtomail.persistence.entities.NewClient.attribute.id.tagvalue.naturalId=true +com.franciaflex.faxtomail.persistence.entities.NewClient.attribute.type.tagvalue.notNull=true # EmailAccount com.franciaflex.faxtomail.persistence.entities.EmailAccount.attribute.protocol.tagvalue.naturalId=true @@ -93,7 +96,6 @@ com.franciaflex.faxtomail.persistence.entities.History.attribute.type.tagvalue.notNull=true - # FaxToMailUser com.franciaflex.faxtomail.persistence.entities.FaxToMailUser.attribute.login.tagvalue.naturalId=true Deleted: trunk/faxtomail-persistence/src/main/xmi/faxtomail.txt =================================================================== --- trunk/faxtomail-persistence/src/main/xmi/faxtomail.txt 2014-07-07 08:37:09 UTC (rev 350) +++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.txt 2014-07-07 08:50:47 UTC (rev 351) @@ -1,5 +0,0 @@ -À faire sur le modèle -===================== - -Ajouter un natural-id sur Client#id et NewClient#id -Ajouter un not-null sur NewClient#type

1 0

r350 - trunk/faxtomail-persistence/src/main/xmi
by echatellier＠users.forge.codelutin.com July 7, 2014

July 7, 2014

Author: echatellier Date: 2014-07-07 10:37:09 +0200 (Mon, 07 Jul 2014) New Revision: 350 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/350 Log: Ajout d'un doc sur les contraintes de mod?\195?\168le oubli?\195?\169es Added: trunk/faxtomail-persistence/src/main/xmi/faxtomail.txt Added: trunk/faxtomail-persistence/src/main/xmi/faxtomail.txt =================================================================== --- trunk/faxtomail-persistence/src/main/xmi/faxtomail.txt (rev 0) +++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.txt 2014-07-07 08:37:09 UTC (rev 350) @@ -0,0 +1,5 @@ +À faire sur le modèle +===================== + +Ajouter un natural-id sur Client#id et NewClient#id +Ajouter un not-null sur NewClient#type

1 0

r349 - trunk/faxtomail-ui-swing/src/main/resources/icons
by kmorin＠users.forge.codelutin.com July 4, 2014

July 4, 2014

Author: kmorin Date: 2014-07-04 15:18:36 +0200 (Fri, 04 Jul 2014) New Revision: 349 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/349 Log: ajout de l'icone d'acrhive Added: trunk/faxtomail-ui-swing/src/main/resources/icons/action-archive.png Added: trunk/faxtomail-ui-swing/src/main/resources/icons/action-archive.png =================================================================== (Binary files differ) Property changes on: trunk/faxtomail-ui-swing/src/main/resources/icons/action-archive.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r348 - trunk/faxtomail-ui-swing/src/main/resources
by echatellier＠users.forge.codelutin.com July 4, 2014

July 4, 2014

Author: echatellier Date: 2014-07-04 15:15:08 +0200 (Fri, 04 Jul 2014) New Revision: 348 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/348 Log: Remove file appender Modified: trunk/faxtomail-ui-swing/src/main/resources/log4j.properties Modified: trunk/faxtomail-ui-swing/src/main/resources/log4j.properties =================================================================== --- trunk/faxtomail-ui-swing/src/main/resources/log4j.properties 2014-07-04 13:14:24 UTC (rev 347) +++ trunk/faxtomail-ui-swing/src/main/resources/log4j.properties 2014-07-04 13:15:08 UTC (rev 348) @@ -20,7 +20,7 @@ # #L% ### # Global logging configuration -log4j.rootLogger=ERROR, stdout, file +log4j.rootLogger=ERROR, stdout # Console output log4j.appender.stdout=org.apache.log4j.ConsoleAppender

1 0

r347 - trunk/faxtomail-ui-web/src/main/resources
by echatellier＠users.forge.codelutin.com July 4, 2014

July 4, 2014

Author: echatellier Date: 2014-07-04 15:14:24 +0200 (Fri, 04 Jul 2014) New Revision: 347 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/347 Log: Update date pattern Modified: trunk/faxtomail-ui-web/src/main/resources/log4j.properties Modified: trunk/faxtomail-ui-web/src/main/resources/log4j.properties =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/log4j.properties 2014-07-04 11:20:25 UTC (rev 346) +++ trunk/faxtomail-ui-web/src/main/resources/log4j.properties 2014-07-04 13:14:24 UTC (rev 347) @@ -25,10 +25,10 @@ log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %M %m%n +log4j.appender.console.layout.ConversionPattern=%d{yyyy/MM/dd HH:mm:ss} %5p (%F:%L) %M %m%n # global level -log4j.logger.com.franciaflex.faxtomail=TRACE +log4j.logger.com.franciaflex.faxtomail=DEBUG ### persistence level # log4j.logger.org.nuiton.topia=TRACE @@ -44,6 +44,3 @@ #log4j.logger.com.opensymphony.xwork2.interceptor.ParametersInterceptor=FATAL #log4j.logger.com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler=FATAL #log4j.logger.com.opensymphony.xwork2.ognl.OgnlValueStack=ERROR - -# struts object facotry -log4j.logger.com.franciaflex.faxtomail.web.FaxToMailStrutsObjectFactory=TRACE

1 0