Author: vbriand Date: 2011-04-29 10:05:06 +0200 (Fri, 29 Apr 2011) New Revision: 115 Url: http://chorem.org/repositories/revision/chorem/115 Log: Added a page to view the list of all persons Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/persons.jsp Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/PersonAction.java trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties trunk/chorem-web/src/main/resources/struts.xml trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/menu.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/personDetails.jsp Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/PersonAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/PersonAction.java 2011-04-28 15:48:42 UTC (rev 114) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/PersonAction.java 2011-04-29 08:05:06 UTC (rev 115) @@ -389,6 +389,22 @@ } /** + * Gets the list of all persons + * + * @return a list containing all persons + */ + public List<Person> getAllPersons() { + ChoremProxy proxy = getChoremProxy(); + Search search = Search.query(); + Criteria criteria = search.exteq(Person.EXT_PERSON).criteria(); + PagedResult<Person> result = proxy.findAllByCriteria(Person.class, + criteria); + List<Person> persons = result.getAll(); + + return persons; + } + + /** * @return the firstName */ public String getFirstName() { Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-28 15:48:42 UTC (rev 114) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-04-29 08:05:06 UTC (rev 115) @@ -78,6 +78,7 @@ chorem.bonzoms.person.postcode=Postcode chorem.bonzoms.personDetails.name= chorem.bonzoms.personDetails.title= +chorem.bonzoms.persons= chorem.config.configFileName.description=chorem''s configuration filename chorem.create.error=An error occurred, please try again. If the problem persists, please contact an administrator chorem.date.wrongFormat=The date must be in the following format \: dd/mm/yyyy Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-28 15:48:42 UTC (rev 114) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-04-29 08:05:06 UTC (rev 115) @@ -74,9 +74,11 @@ chorem.bonzoms.person.employmentContracts=Contrats de travail \: chorem.bonzoms.person.firstName=Pr\u00E9nom chorem.bonzoms.person.lastName=Nom +chorem.bonzoms.person.list=Obtenir la liste des personnes chorem.bonzoms.person.phoneNb=Num\u00E9ro de t\u00E9l\u00E9phone (opt.) chorem.bonzoms.person.postcode=Code postal chorem.bonzoms.personDetails.title=Informations d\u00E9taill\u00E9es de "{0}" +chorem.bonzoms.persons=Liste des personnes chorem.config.configFileName.description=Nom du fichier de configuration de chorem chorem.create.error=Une erreur s''est produite, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur chorem.date.wrongFormat=La date doit respecter le format suivant \: jj/mm/yyyy Modified: trunk/chorem-web/src/main/resources/struts.xml =================================================================== --- trunk/chorem-web/src/main/resources/struts.xml 2011-04-28 15:48:42 UTC (rev 114) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-04-29 08:05:06 UTC (rev 115) @@ -50,6 +50,9 @@ <result name="error" type="redirectAction">home</result> <result>/WEB-INF/jsp/bonzoms/personDetails.jsp</result> </action> + <action name="persons" class="org.chorem.bonzoms.action.PersonAction"> + <result>/WEB-INF/jsp/bonzoms/persons.jsp</result> + </action> <action name="modifyPerson" class="org.chorem.bonzoms.action.PersonAction" method="modify"> <result name="input">/WEB-INF/jsp/bonzoms/personDetails.jsp</result> <result type="redirectAction"> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/menu.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/menu.jsp 2011-04-28 15:48:42 UTC (rev 114) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/menu.jsp 2011-04-29 08:05:06 UTC (rev 115) @@ -5,5 +5,6 @@ <li><s:a action="addCompanyInput"><s:text name="chorem.bonzoms.company.add" /></s:a></li> <li><s:a action="addPersonInput"><s:text name="chorem.bonzoms.person.add" /></s:a></li> <li><s:a action="companies"><s:text name="chorem.bonzoms.company.list" /></s:a></li> + <li><s:a action="persons"><s:text name="chorem.bonzoms.person.list" /></s:a></li> </ul> </div> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/personDetails.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/personDetails.jsp 2011-04-28 15:48:42 UTC (rev 114) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/personDetails.jsp 2011-04-29 08:05:06 UTC (rev 115) @@ -61,7 +61,7 @@ <label for="workingTime"><s:text name="chorem.bonzoms.employmentContract.workingTime" /></label>: <input type="text" name="workingTime" id="workingTime" value="<%= employmentContract.getWorkingTime() %>" size="2" /> <br /> - <input type="submit" name="modify" /> + <s:submit key="chorem.misc.modify" name="modify" /> </p> </form> <% } %> Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/persons.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/persons.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/persons.jsp 2011-04-29 08:05:06 UTC (rev 115) @@ -0,0 +1,28 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@page import="java.util.List" %> +<%@page import="org.chorem.entities.Person" %> +<%@page import="org.chorem.bonzoms.action.PersonAction" %> +<%@taglib prefix="s" uri="/struts-tags" %> + +<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <head> + <title><s:text name="chorem.bonzoms.persons" /></title> + <s:head /> + </head> + <body> + <h2><s:text name="chorem.bonzoms.persons" /></h2> + <% + List<Person> persons = PersonAction.getAction().getAllPersons(); + + for (Person person : persons) { + %> + <s:url namespace="/bonzoms" action="personDetails" var="personDetails"> + <s:param name="personId"><%= person.getWikittyId() %></s:param> + </s:url> + <a href="${personDetails}"><%= person.getFirstName() %> <%= person.getLastName() %></a><br /> + <% + } + %> + </body> +</html> Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/persons.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain