Author: vbriand Date: 2011-04-15 17:53:43 +0200 (Fri, 15 Apr 2011) New Revision: 95 Url: http://chorem.org/repositories/revision/chorem/95 Log: Added a succinct list of the company's employees Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companyDetails.jsp Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java 2011-04-15 15:06:56 UTC (rev 94) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java 2011-04-15 15:53:43 UTC (rev 95) @@ -1,5 +1,6 @@ package org.chorem.bonzoms.action; +import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -12,6 +13,8 @@ import org.chorem.entities.CompanyImpl; import org.chorem.entities.ContactDetails; import org.chorem.entities.ContactDetailsImpl; +import org.chorem.entities.Employee; +import org.chorem.entities.Person; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; @@ -188,6 +191,24 @@ return companies; } + public List<Person> getEmployees() { + ChoremProxy proxy = getChoremProxy(); + Search search = Search.query(); + Criteria criteria = search.eq(Employee.FQ_FIELD_EMPLOYEE_COMPANY, + companyId).criteria(); + PagedResult<Employee> result = proxy.findAllByCriteria(Employee.class, + criteria); + List<Employee> employees = result.getAll(); + List<Person> persons = new ArrayList<Person>(); + Person person; + + for (Employee employee : employees) { + person = proxy.restore(Person.class, employee.getPerson()); + persons.add(person); + } + return persons; + } + /** * @return the name */ Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companyDetails.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companyDetails.jsp 2011-04-15 15:06:56 UTC (rev 94) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companyDetails.jsp 2011-04-15 15:53:43 UTC (rev 95) @@ -1,4 +1,6 @@ <%@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.CompanyAction" %> <%@taglib prefix="s" uri="/struts-tags" %> @@ -27,5 +29,22 @@ <s:textfield key="chorem.bonzoms.company.phoneNb" name="phoneNb" labelSeparator=": " readonly="true" /> <br /> <s:textfield key="chorem.bonzoms.company.website" name="website" labelSeparator=": " readonly="true" /> + <br /> + <br /> + <s:text name="chorem.bonzoms.company.employees" /> + <br /> + <br /> + <% + List<Person> employees = CompanyAction.getAction().getEmployees(); + + for (Person employee : employees) { + %> + <%= employee.getFirstName() %> <%= employee.getLastName() %><br /> + <%= employee.getBirthDate() %><br /> + <%= employee.getEmail() %><br /> + <% + } + %> + <br /> </body> </html>