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
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@doe.fr;99153;NULL; -253142;FX;Gerard Menvussa;A+;40 Nabi;NULL;NULL;05 12 23 34 45;gerard.menvussa@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@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@doe.fr;99153 +253142;FX;Gerard Menvussa;A+;40 Nabi;NULL;05 12 23 34 45;gerard.menvussa@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@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>
participants (1)
-
echatellier@users.forge.codelutin.com