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> <!-- ACTIONS --> - <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}"> + <!--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}"> <img src="${asset:context:/img/icons/crystal/delete.png}" alt="${message:del-organization-confirm}"/> - </a> + </a--> <!-- PROPERTIES DISPLAY --> <div t:type="beandisplay" object="organization" exclude="id, type" /> <!-- Contact Manager --> @@ -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}"> + <!--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}"> <img src="${asset:context:/img/icons/crystal/delete.png}" alt="${message:del-person}"/> - </a> + </a--> <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>