August 2009 - Bonzoms-commits - mailman.cloud.codelutin.com

r66 - trunk
by fdesbois＠users.chorem.org 31 Aug '09

31 Aug '09

Author: fdesbois Date: 2009-08-31 18:37:36 +0200 (Mon, 31 Aug 2009) New Revision: 66 Modified: trunk/pom.xml Log: Add missing version for JRst Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-31 13:39:34 UTC (rev 65) +++ trunk/pom.xml 2009-08-31 16:37:36 UTC (rev 66) @@ -143,7 +143,6 @@  <topia.version>2.2.0</topia.version> <generator.version>1.0.0</generator.version> -  <choreg.version>1.0.0-alpha-2-SNAPSHOT</choreg.version> @@ -174,7 +173,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>1.0.0</version> </dependency> </dependencies> </plugin>

2 1

r68 - in trunk/bonzoms-business/src: main/resources test/resources
by fdesbois＠users.chorem.org 31 Aug '09

31 Aug '09

Author: fdesbois Date: 2009-08-31 19:12:29 +0200 (Mon, 31 Aug 2009) New Revision: 68 Modified: trunk/bonzoms-business/src/main/resources/ContextBonzoms.properties trunk/bonzoms-business/src/test/resources/ContextBonzoms.properties Log: Clean config Modified: trunk/bonzoms-business/src/main/resources/ContextBonzoms.properties =================================================================== --- trunk/bonzoms-business/src/main/resources/ContextBonzoms.properties 2009-08-31 17:12:10 UTC (rev 67) +++ trunk/bonzoms-business/src/main/resources/ContextBonzoms.properties 2009-08-31 17:12:29 UTC (rev 68) @@ -8,7 +8,5 @@ hibernate.connection.driver_class=org.h2.Driver hibernate.connection.url=jdbc:h2:file:~/h2data/bonzoms -topia.application.service.org.chorem.registry.ChoremRegistry=xml-rpc://localhost:8888 - # fix java.lang.ClassCastException: org.hibernate.hql.ast.HqlToken cannot be cast to antlr.Token hibernate.query.factory_class=org.hibernate.hql.classic.ClassicQueryTranslatorFactory Modified: trunk/bonzoms-business/src/test/resources/ContextBonzoms.properties =================================================================== --- trunk/bonzoms-business/src/test/resources/ContextBonzoms.properties 2009-08-31 17:12:10 UTC (rev 67) +++ trunk/bonzoms-business/src/test/resources/ContextBonzoms.properties 2009-08-31 17:12:29 UTC (rev 68) @@ -1,5 +1,5 @@ # Propri\u00C3\u00A9t\u00C3\u00A9s par d\u00C3\u00A9faut pour une base de donn\u00C3\u00A9es de type H2 -hibernate.hbm2ddl.auto=update +hibernate.hbm2ddl.auto=create hibernate.show_sql=false hibernate.dialect=org.hibernate.dialect.H2Dialect

1 0

r67 - trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl
by fdesbois＠users.chorem.org 31 Aug '09

31 Aug '09

Author: fdesbois Date: 2009-08-31 19:12:10 +0200 (Mon, 31 Aug 2009) New Revision: 67 Modified: trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonXPIL.java Log: Add alias for Relationship in Hql Query Modified: trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonXPIL.java =================================================================== --- trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonXPIL.java 2009-08-31 16:37:36 UTC (rev 66) +++ trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonXPIL.java 2009-08-31 17:12:10 UTC (rev 67) @@ -62,10 +62,10 @@ PartyRoleEntityDAO roleDAO = BonzomsModelDAOHelper.getPartyRoleEntityDAO(transaction); List<RelationshipEntity> employments = transaction.find( - "FROM " + RelationshipEntity.class.getName() + - " WHERE " + RelationshipEntity.FROM_ROLE + "." + PartyRoleEntity.PARTY_ENTITY + " = :person " + - " AND " + RelationshipEntity.RELATIONSHIP_TYPE + "." + RelationshipType.NAME + " = :type" + - " ORDER BY " + RelationshipEntity.FROM_DATE + " DESC, " + RelationshipEntity.THRU_DATE + " DESC", + "FROM " + RelationshipEntity.class.getName() + " as rel " + + " WHERE rel." + RelationshipEntity.FROM_ROLE + "." + PartyRoleEntity.PARTY_ENTITY + " = :person " + + " AND rel." + RelationshipEntity.RELATIONSHIP_TYPE + "." + RelationshipType.NAME + " = :type" + + " ORDER BY rel." + RelationshipEntity.FROM_DATE + " DESC, rel." + RelationshipEntity.THRU_DATE + " DESC", "person", entity, "type", RelationshipTypeValues.EMPLOYMENT);

1 0

r65 - trunk
by tchemit＠users.chorem.org 31 Aug '09

31 Aug '09

Author: tchemit Date: 2009-08-31 15:39:34 +0200 (Mon, 31 Aug 2009) New Revision: 65 Modified: trunk/pom.xml Log: mavenpom 1.0.2 is not yet released Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-31 13:23:00 UTC (rev 64) +++ trunk/pom.xml 2009-08-31 13:39:34 UTC (rev 65) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.2</version> + <version>1.0.2-SNAPSHOT</version> </parent> <groupId>org.chorem</groupId>

1 0

r64 - trunk
by tchemit＠users.chorem.org 31 Aug '09

31 Aug '09

Author: tchemit Date: 2009-08-31 15:23:00 +0200 (Mon, 31 Aug 2009) New Revision: 64 Modified: trunk/pom.xml Log: use mavenpom 1.0.2 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-31 13:20:29 UTC (rev 63) +++ trunk/pom.xml 2009-08-31 13:23:00 UTC (rev 64) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion>   @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.1</version> + <version>1.0.2</version> </parent> <groupId>org.chorem</groupId> @@ -55,9 +55,9 @@ <version>${lang.version}</version> </dependency> <dependency> - <groupId>org.apache.xmlbeans</groupId> - <artifactId>xmlbeans</artifactId> - <version>2.4.0</version> + <groupId>org.apache.xmlbeans</groupId> + <artifactId>xmlbeans</artifactId> + <version>2.4.0</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -81,10 +81,10 @@ <artifactId>chenillekit-tapestry</artifactId> <version>${chenillekit.version}</version> <exclusions> - <exclusion> - <groupId>jboss</groupId> - <artifactId>javassist</artifactId> - </exclusion> + <exclusion> + <groupId>jboss</groupId> + <artifactId>javassist</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -109,6 +109,14 @@ <description>Gestion des personnes, sociétés et services : leurs relations, leurs rôles et leurs contacts</description> <inceptionYear>2009</inceptionYear> + <licenses> + <license> + <name>General Public License (GPL)</name> + <url>${maven.license.file}</url> + <distribution>local</distribution> + </license> + </licenses> +  <developers> <developer> @@ -135,8 +143,7 @@  <topia.version>2.2.0</topia.version> <generator.version>1.0.0</generator.version> - <jrst.version>1.0.0</jrst.version> - +  <choreg.version>1.0.0-alpha-2-SNAPSHOT</choreg.version> @@ -151,6 +158,10 @@  <tapestry.version>5.1.0.5</tapestry.version> <chenillekit.version>1.0.2</chenillekit.version> + +  + <license.licenseName>gpl_v3</license.licenseName> + </properties> <build>

1 0

r63 - trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services
by tchemit＠users.chorem.org 31 Aug '09

31 Aug '09

Author: tchemit Date: 2009-08-31 15:20:29 +0200 (Mon, 31 Aug 2009) New Revision: 63 Modified: trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/BonzomsManager.java Log: use generics Modified: trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/BonzomsManager.java =================================================================== --- trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/BonzomsManager.java 2009-08-31 13:19:59 UTC (rev 62) +++ trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/BonzomsManager.java 2009-08-31 13:20:29 UTC (rev 63) @@ -87,7 +87,7 @@ RegisterBonzomsServices.shutdown(); } - private void register(Class serviceClass, ChoremUIService service) { + private void register(Class<?> serviceClass, ChoremUIService service) { String sid = ChoremConvert.toSid(serviceClass); choreg.register(sid, service); if (log.isDebugEnabled()) { @@ -95,7 +95,7 @@ } } - private void unregister(Class serviceClass) { + private void unregister(Class<?> serviceClass) { String sid = ChoremConvert.toSid(serviceClass); choreg.unregister(sid); if (log.isDebugEnabled()) {

1 0

r62 - trunk/bonzoms-business/src/main/java/org/chorem/bonzoms
by tchemit＠users.chorem.org 31 Aug '09

31 Aug '09

Author: tchemit Date: 2009-08-31 15:19:59 +0200 (Mon, 31 Aug 2009) New Revision: 62 Modified: trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/RegisterBonzomsServices.java Log: [FIX] #31 CLassCastException H2Dialect en Dialect (build hibernate factory at init time) Modified: trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/RegisterBonzomsServices.java =================================================================== --- trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/RegisterBonzomsServices.java 2009-08-31 13:19:32 UTC (rev 61) +++ trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/RegisterBonzomsServices.java 2009-08-31 13:19:59 UTC (rev 62) @@ -16,20 +16,20 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. ##%* */ - package org.chorem.bonzoms; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; import org.chorem.bonzoms.services.*; import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.LogFactory; import org.chorem.bonzoms.impl.ServiceOrganizationXPIL; import org.chorem.bonzoms.impl.ServicePersonXPIL; import org.chorem.choreg.ChoremConvert; import org.chorem.choreg.ChoremRegistry; import org.chorem.choreg.ChoremRegistryImpl; import org.chorem.choreg.ChoremService; +import org.nuiton.topia.framework.TopiaContextImpl; /** * RegisterBonzomsServices.java @@ -49,7 +49,6 @@ public class RegisterBonzomsServices implements ServletContextListener { private static final Log log = LogFactory.getLog(RegisterBonzomsServices.class); - private static final ChoremRegistry choreg = ChoremRegistryImpl.getInstance(); /** @@ -77,8 +76,15 @@ if (log.isInfoEnabled()) { log.info("Bonzoms registration business services"); } + // force le chargement de la factory hibernate + try { + ((TopiaContextImpl) ContextUtilBonzoms.getRootContext()).getHibernateFactory(); + } catch (Exception e) { + log.error(e); + } register(ServicePerson.class, new ServicePersonXPIL()); register(ServiceOrganization.class, new ServiceOrganizationXPIL()); + } /** @@ -102,7 +108,7 @@ * @param serviceClass service class for identification * @param service instance of ChoremService for choreg registration */ - private static void register(Class serviceClass, ChoremService service) { + private static void register(Class<?> serviceClass, ChoremService service) { String sid = ChoremConvert.toSid(serviceClass); choreg.register(sid, service); if (log.isDebugEnabled()) { @@ -114,12 +120,11 @@ * Private unregistration method to add log message and manage identification for services. * @param serviceClass service class for identification */ - private static void unregister(Class serviceClass) { + private static void unregister(Class<?> serviceClass) { String sid = ChoremConvert.toSid(serviceClass); choreg.unregister(sid); if (log.isDebugEnabled()) { log.debug(sid + " unregistered"); } } - }

1 0

r61 - trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl
by tchemit＠users.chorem.org 31 Aug '09

31 Aug '09

Author: tchemit Date: 2009-08-31 15:19:32 +0200 (Mon, 31 Aug 2009) New Revision: 61 Modified: trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonGeneric.java Log: remove unused import + redundant cast Modified: trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonGeneric.java =================================================================== --- trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonGeneric.java 2009-08-31 13:09:52 UTC (rev 60) +++ trunk/bonzoms-business/src/main/java/org/chorem/bonzoms/impl/ServicePersonGeneric.java 2009-08-31 13:19:32 UTC (rev 61) @@ -27,7 +27,6 @@ import org.chorem.bonzoms.persistence.PartyEntity; import org.chorem.bonzoms.persistence.PersonEntity; import org.chorem.bonzoms.persistence.PersonEntityDAO; -import org.chorem.exceptions.ConvertException; import org.chorem.utils.ServiceHelper; import org.nuiton.topia.TopiaContext; @@ -36,6 +35,7 @@ * * Created on 2009-07-28 * + * @param <T> * @author fdesbois * @version $Revision$ * @@ -78,7 +78,7 @@ PersonEntityDAO dao = BonzomsModelDAOHelper.getPersonEntityDAO(transaction); for (PersonEntity entity : dao.findAll()) { - T person = (T) convert(entity, transaction); + T person = convert(entity, transaction); persons.add(person); }

1 0

r60 - trunk/bonzoms-business/src/main/resources
by tchemit＠users.chorem.org 31 Aug '09

31 Aug '09

Author: tchemit Date: 2009-08-31 15:09:52 +0200 (Mon, 31 Aug 2009) New Revision: 60 Modified: trunk/bonzoms-business/src/main/resources/ContextBonzoms.properties Log: [FIX] #30 java.lang.ClassCastException: org.hibernate.hql.ast.HqlToken cannot be cast to antlr.Token Modified: trunk/bonzoms-business/src/main/resources/ContextBonzoms.properties =================================================================== --- trunk/bonzoms-business/src/main/resources/ContextBonzoms.properties 2009-08-28 11:52:35 UTC (rev 59) +++ trunk/bonzoms-business/src/main/resources/ContextBonzoms.properties 2009-08-31 13:09:52 UTC (rev 60) @@ -10,4 +10,5 @@ topia.application.service.org.chorem.registry.ChoremRegistry=xml-rpc://localhost:8888 - +# fix java.lang.ClassCastException: org.hibernate.hql.ast.HqlToken cannot be cast to antlr.Token +hibernate.query.factory_class=org.hibernate.hql.classic.ClassicQueryTranslatorFactory

1 0

r59 - in trunk/bonzoms-ui/src/main: java/org/chorem/bonzoms/ui/base java/org/chorem/bonzoms/ui/services resources/org/chorem/bonzoms/ui/components resources/org/chorem/bonzoms/ui/pages/organization resources/org/chorem/bonzoms/ui/pages/person webapp/organization webapp/person
by fdesbois＠users.chorem.org 28 Aug '09

28 Aug '09

Author: fdesbois Date: 2009-08-28 13:52:35 +0200 (Fri, 28 Aug 2009) New Revision: 59 Added: trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/ServiceUIOrganization.java Modified: trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/base/AbstractPartyView.java trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/BonzomsManager.java trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ui/components/RelationComponent.properties trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ui/components/RoleComponent.properties trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ui/pages/organization/OrganizationView.properties trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ui/pages/person/PersonView.properties trunk/bonzoms-ui/src/main/webapp/organization/OrganizationView.tml trunk/bonzoms-ui/src/main/webapp/person/PersonList.tml trunk/bonzoms-ui/src/main/webapp/person/PersonView.tml Log: - Add messages in components - Add link to person in OrganizationView - Add ServiceUIOrganization - Resolve issue on persist contacts - Suppress delete icons on pages view (caused an error) Modified: trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/base/AbstractPartyView.java =================================================================== --- trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/base/AbstractPartyView.java 2009-08-27 12:58:52 UTC (rev 58) +++ trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/base/AbstractPartyView.java 2009-08-28 11:52:35 UTC (rev 59) @@ -206,7 +206,7 @@ return false; } // Initilisation des contacts - if (contactComponent.getContacts() == null) { + //if (contactComponent.getContacts() == null) { if (log.isDebugEnabled()) { log.debug("BUSINESS:: REQUEST [getDirectContacts]"); } @@ -215,7 +215,7 @@ } catch (BonzomsException eee) { layout.addErrors(ErrorHelper.getMessages(messages.get("error-activate"), eee)); } - } + //} return true; } else { layout.addError(messages.get("error-activate-nullid")); Modified: trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/BonzomsManager.java =================================================================== --- trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/BonzomsManager.java 2009-08-27 12:58:52 UTC (rev 58) +++ trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/BonzomsManager.java 2009-08-28 11:52:35 UTC (rev 59) @@ -79,6 +79,7 @@ log.info("Bonzoms registration uis services"); } register(ServiceUIPerson.getReferenceServiceClass(), new ServiceUIPerson(config)); + register(ServiceUIOrganization.getReferenceServiceClass(), new ServiceUIOrganization(config)); } @Override Added: trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/ServiceUIOrganization.java =================================================================== --- trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/ServiceUIOrganization.java (rev 0) +++ trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/ServiceUIOrganization.java 2009-08-28 11:52:35 UTC (rev 59) @@ -0,0 +1,109 @@ +/** + * *##% Bonzoms Web Interface + * Copyright (C) 2009 CodeLutin + * + * 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 Lesser 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>. ##%* + */ + +package org.chorem.bonzoms.ui.services; + +import java.util.Properties; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.tapestry5.services.PageRenderLinkSource; +import org.chorem.bonzoms.ContextUtilBonzoms; +import org.chorem.bonzoms.services.ServiceOrganization; +import org.chorem.choreg.ChoremUIService; + +/** + * ServiceUIOrganization.java + * + * Created on 2009-08-27 + * + * @author fdesbois + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class ServiceUIOrganization implements ChoremUIService { + + private static final Log log = LogFactory.getLog(ServiceUIOrganization.class); + + private static final String TMP_CONTEXT_PATH = "bonzoms-ui"; + + private String server; + private String contextPath; + + private final PageRenderLinkSource pageRender; + + public ServiceUIOrganization(PageRenderLinkSource pageRender) { + this.pageRender = pageRender; + this.server = BonzomsManager.CONFIG_DEFAULT_UI_SERVER_HOST + ":" + BonzomsManager.CONFIG_DEFAULT_UI_SERVER_PORT; + this.contextPath = TMP_CONTEXT_PATH; + } + + public ServiceUIOrganization(Properties config) { + this.pageRender = null; + String serverHost = config.getProperty(BonzomsManager.CONFIG_KEY_UI_SERVER_HOST, BonzomsManager.CONFIG_DEFAULT_UI_SERVER_HOST); + String serverPort = config.getProperty(BonzomsManager.CONFIG_KEY_UI_SERVER_PORT, BonzomsManager.CONFIG_DEFAULT_UI_SERVER_PORT); + contextPath = config.getProperty(BonzomsManager.CONFIG_KEY_UI_SERVER_CONTEXT_PATH, TMP_CONTEXT_PATH); + server = serverHost + ":" + serverPort; + } + + /*public ServiceUIPerson(/*@InjectService("PageRenderLinkSource") PageRenderLinkSource pageRender) { + //this.pageRender = pageRender; + if (log.isDebugEnabled()) { + log.debug("pageRender : " + pageRender); + } + }*/ + + @Override + public String findViewUrl(String entityId) { + String webId = ContextUtilBonzoms.convertId(entityId); + return createUrl("organization/view/" + webId); + } + + @Override + public String findFormUrl(String entityId) { + String webId = ContextUtilBonzoms.convertId(entityId); + return createUrl("organization/list"); + } + + @Override + public String findListUrl(String filters) { + return createUrl("organization/list"); + } + + public static Class getReferenceServiceClass() { + return ServiceOrganization.class; + } + + private String createUrl(Class pageClass, String context) { + if (log.isDebugEnabled()) { + log.debug("pageRender : " + pageRender); + } + org.apache.tapestry5.Link resultLink = pageRender.createPageRenderLinkWithContext(pageClass, context); + if (log.isDebugEnabled()) { + log.debug("linkTapestry : " + resultLink.toAbsoluteURI()); + } + return "http://" + server + resultLink.toAbsoluteURI(); + } + + private String createUrl(String page) { + return "http://" + server + "/" + contextPath + "/" + page; + } + +} Property changes on: trunk/bonzoms-ui/src/main/java/org/chorem/bonzoms/ui/services/ServiceUIOrganization.java ___________________________________________________________________ Added: svn:keywords + Author Date Revision Modified: trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ui/components/RelationComponent.properties =================================================================== --- trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ui/components/RelationComponent.properties 2009-08-27 12:58:52 UTC (rev 58) +++ trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ui/components/RelationComponent.properties 2009-08-28 11:52:35 UTC (rev 59) @@ -4,3 +4,4 @@ partyCurrentRole-label=Role partyOther-label=En relation avec relationPeriod-label=P\u00E9riode +submit-relation=Enregistrer la relation \ No newline at end of file Modified: trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ui/components/RoleComponent.properties =================================================================== --- trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ui/components/RoleComponent.properties 2009-08-27 12:58:52 UTC (rev 58) +++ trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ui/components/RoleComponent.properties 2009-08-28 11:52:35 UTC (rev 59) @@ -2,4 +2,5 @@ upd-role=Modifier ce r\u00F4le del-role=Supprimer ce r\u00F4le del-role-confirm=Etes vous s\u00FBr de vouloir supprimer ce r\u00F4le ? Toutes les relations associ\u00E9es seront supprim\u00E9s ! +submit-role=Enregistrer le r\u00F4le Modified: trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ui/pages/organization/OrganizationView.properties =================================================================== --- trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ui/pages/organization/OrganizationView.properties 2009-08-27 12:58:52 UTC (rev 58) +++ trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ui/pages/organization/OrganizationView.properties 2009-08-28 11:52:35 UTC (rev 59) @@ -23,3 +23,6 @@ divisionSelect-label=Service personSelect-label=Personne add-employee=Ajouter un employ\u00E9 + +h2-roles=Gestion des r\u00F4les +h2-relations=Gestion des relations Modified: trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ui/pages/person/PersonView.properties =================================================================== --- trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ui/pages/person/PersonView.properties 2009-08-27 12:58:52 UTC (rev 58) +++ trunk/bonzoms-ui/src/main/resources/org/chorem/bonzoms/ui/pages/person/PersonView.properties 2009-08-28 11:52:35 UTC (rev 59) @@ -12,3 +12,4 @@ error-activate=Impossible d'afficher les informations de la personne. error-activate-nullid=Impossible d'afficher la personne, identifiant manquant ! h2-roles=Gestion des r\u00F4les +h2-relations=Gestion des relations Modified: trunk/bonzoms-ui/src/main/webapp/organization/OrganizationView.tml =================================================================== --- trunk/bonzoms-ui/src/main/webapp/organization/OrganizationView.tml 2009-08-27 12:58:52 UTC (rev 58) +++ trunk/bonzoms-ui/src/main/webapp/organization/OrganizationView.tml 2009-08-28 11:52:35 UTC (rev 59) @@ -11,9 +11,9 @@ <h1>${organization.name}</h1> <t:block><t:warnings /></t:block>  - <a t:type="actionlink" class="img" t:id="delOrganization" t:mixins="confirm" t:context="organization.id" t:message="${message:del-confirm}" title="${message:del-organization}"> +   <div t:type="beandisplay" object="organization" exclude="id, type" />  @@ -114,9 +114,15 @@ <p:personNameCell> <t:if t:test="employmentRelation.comment"> <span t:type="ck/Tooltip" title="${message:relationComment-label}" value="${employmentRelation.comment}" effect="blind"> - ${employmentRelation.party.name} + <a t:type="pagelink" t:page="person/view" t:context="employmentRelation.party.id"> + ${employmentRelation.party.name} + </a> </span> - <p:else>${employmentRelation.party.name}</p:else> + <p:else> + <a t:type="pagelink" t:page="person/view" t:context="employmentRelation.party.id"> + ${employmentRelation.party.name} + </a> + </p:else> </t:if> </p:personNameCell> <p:divisionNameCell> @@ -135,4 +141,10 @@ </table> </t:zone> </div> + <div t:type="blockmanager" t:ident="roleManager" t:title="${message:h2-roles}"> + <div t:type="rolecomponent" /> + </div> + <div t:type="blockmanager" t:ident="relationManager" t:title="${message:h2-relations}"> + <div t:type="relationcomponent" /> + </div> </t:layout> Modified: trunk/bonzoms-ui/src/main/webapp/person/PersonList.tml =================================================================== --- trunk/bonzoms-ui/src/main/webapp/person/PersonList.tml 2009-08-27 12:58:52 UTC (rev 58) +++ trunk/bonzoms-ui/src/main/webapp/person/PersonList.tml 2009-08-28 11:52:35 UTC (rev 59) @@ -14,7 +14,7 @@ <img src="${asset:context:/img/icons/crystal/add.png}" alt="${message:add-person}"/> </t:windowlink> <t:zone t:id="gridPersons"> - <t:grid t:source="persons" rowsPerPage="10" pagerPosition="both" + <t:grid t:source="persons" rowsPerPage="30" pagerPosition="both" row="person" include="firstName, lastName, gender, birthDate, totalYearsWorkExperience" add="actions" Modified: trunk/bonzoms-ui/src/main/webapp/person/PersonView.tml =================================================================== --- trunk/bonzoms-ui/src/main/webapp/person/PersonView.tml 2009-08-27 12:58:52 UTC (rev 58) +++ trunk/bonzoms-ui/src/main/webapp/person/PersonView.tml 2009-08-28 11:52:35 UTC (rev 59) @@ -13,9 +13,9 @@ t:disabled="false" t:context="person.id" t:page="person/Form" t:windowWidth="550" t:windowHeight="450"> <img src="${asset:context:/img/icons/crystal/edit.png}" alt="${message:upd-person}" /> </a> - <a t:type="actionlink" class="img" t:id="delPerson" t:mixins="confirm" t:context="person.id" t:message="${message:del-confirm}" title="${message:del-person}"> +  <div t:type="beandisplay" object="person" exclude="id, type, name"> <p:gender> <t:if t:test="person.gender">${message:gender-female}<p:else>${message:gender-male}</p:else></t:if> @@ -32,4 +32,7 @@ <div t:type="blockmanager" t:ident="roleManager" t:title="${message:h2-roles}"> <div t:type="rolecomponent" /> </div> + <div t:type="blockmanager" t:ident="relationManager" t:title="${message:h2-relations}"> + <div t:type="relationcomponent" /> + </div> </t:layout>

1 0