Author: vbriand Date: 2011-03-31 18:20:53 +0200 (Thu, 31 Mar 2011) New Revision: 48 Url: http://chorem.org/repositories/revision/chorem/48 Log: For Tony Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/ContactDetailsAction.java trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/EmploymentContractAction.java trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/PersonAction.java trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.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/home.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.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-03-31 08:26:28 UTC (rev 47) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/CompanyAction.java 2011-03-31 16:20:53 UTC (rev 48) @@ -103,7 +103,7 @@ } catch (Exception e) { result = false; addActionError(getText(n_("chorem.bonzoms.company.create.error"))); - log.error("An error occured while creating a new company", e); + log.error("An error occurred while creating a new company", e); } return result; } Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/ContactDetailsAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/ContactDetailsAction.java 2011-03-31 08:26:28 UTC (rev 47) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/ContactDetailsAction.java 2011-03-31 16:20:53 UTC (rev 48) @@ -66,7 +66,7 @@ } catch (Exception e) { result = false; addActionError(getText(n_("chorem.bonzoms.contactDetails.create.error"))); - log.error("An error occured while creating new contact details", e); + log.error("An error occurred while creating new contact details", e); } return result; } Modified: trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/EmploymentContractAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/EmploymentContractAction.java 2011-03-31 08:26:28 UTC (rev 47) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/EmploymentContractAction.java 2011-03-31 16:20:53 UTC (rev 48) @@ -112,7 +112,7 @@ } catch (Exception e) { result = false; addActionError(getText(n_("chorem.bonzoms.employmentContract.create.error"))); - log.error("An error occured while creating a new employment contract", e); + log.error("An error occurred while creating a new employment contract", e); } return result; } 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-03-31 08:26:28 UTC (rev 47) +++ trunk/chorem-web/src/main/java/org/chorem/bonzoms/action/PersonAction.java 2011-03-31 16:20:53 UTC (rev 48) @@ -118,7 +118,7 @@ } catch (Exception e) { result = false; addActionError(getText(n_("chorem.bonzoms.person.create.error"))); - log.error("An error occured while creating a new person", e); + log.error("An error occurred while creating a new person", e); } return result; } Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-03-31 08:26:28 UTC (rev 47) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-03-31 16:20:53 UTC (rev 48) @@ -1,11 +1,19 @@ package org.chorem.gepeto.action; +import java.util.List; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.ChoremProxy; import org.chorem.action.BaseAction; +import org.chorem.entities.Project; import org.chorem.entities.ProjectImpl; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.search.Search; +import com.opensymphony.xwork2.ActionContext; + import static org.nuiton.i18n.I18n.n_; /** @@ -18,7 +26,11 @@ private static final long serialVersionUID = 498267854350348906L; private static final Log log = LogFactory.getLog(ProjectAction.class); - + + static public ProjectAction getAction() { + return (ProjectAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); + } + /** * Adds a new project * @@ -42,7 +54,33 @@ } return result; } + public String execute() throws Exception { + log.info("execute"); + return super.execute(); + } + public String input() throws Exception { + log.info("input"); + return super.input(); + } + + public String projectDetails() { + System.out.println("TOTOTOTOTO"); + /*ChoremProxy proxy = getChoremProxy(); + Criteria criteria = Search.query().eq(element, value)*/ + /*List<Project> projects = getProjectsByYear(); + System.out.println("ID:"+projectId); + for (Project project : projects) { + System.out.println("[[["+project.getWikittyId() + "]]]"); + if (project.getWikittyId().equals(projectId)) { + setName(project.getName()); + setDescription(project.getDescription()); + break; + } + }*/ + return SUCCESS; + } + /** * Removes a project * @@ -53,8 +91,10 @@ return SUCCESS; } + protected String year; protected String name; protected String description; + protected String projectId; /** * Stores the new project through the proxy @@ -75,11 +115,20 @@ } catch (Exception e) { result = false; addActionError(getText(n_("chorem.gepeto.project.create.error"))); - log.error("An error occured while creating a new project", e); + log.error("An error occurred while creating a new project", e); } return result; } - + + public List<Project> getProjectsByYear() { + //TODO: change + ChoremProxy proxy = getChoremProxy(); + Criteria criteria = Search.query().isNotNull(Project.FQ_FIELD_PROJECT_NAME).criteria(); + PagedResult<Project> result = proxy.findAllByCriteria(Project.class, criteria); + List<Project> projects = result.getAll(); + return projects; + } + /** * @return the name */ @@ -107,4 +156,32 @@ public void setDescription(String description) { this.description = description; } + + /** + * @return the year + */ + public String getYear() { + return year; + } + + /** + * @param year the year to set + */ + public void setYear(String year) { + this.year = year; + } + + /** + * @return the projectId + */ + public String getProjectId() { + return projectId; + } + + /** + * @param projectId the projectId to set + */ + public void setProjectId(String projectId) { + this.projectId = projectId; + } } Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java 2011-03-31 08:26:28 UTC (rev 47) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java 2011-03-31 16:20:53 UTC (rev 48) @@ -105,7 +105,7 @@ } catch (Exception e) { result = false; addActionError(getText(n_("chorem.gepeto.projectOrder.create.error"))); - log.error("An error occured while creating a new project order", e); + log.error("An error occurred while creating a new project order", e); } return result; } Modified: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.java 2011-03-31 08:26:28 UTC (rev 47) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.java 2011-03-31 16:20:53 UTC (rev 48) @@ -118,7 +118,7 @@ } catch (Exception e) { result = false; addActionError(getText(n_("chorem.gepeto.task.create.error"))); - log.error("An error occured while creating a new task", e); + log.error("An error occurred while creating a new task", e); } return result; } 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-03-31 08:26:28 UTC (rev 47) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-03-31 16:20:53 UTC (rev 48) @@ -89,6 +89,10 @@ chorem.gepeto.projectOrder.estimatedEndDate.required=You must enter the estimated end date for this project order chorem.gepeto.projectOrder.type=Type chorem.gepeto.projectOrder.type.required=You must specify the project order''s type +chorem.gepeto.projectsByYear.thead.company=Company +chorem.gepeto.projectsByYear.thead.end=End +chorem.gepeto.projectsByYear.thead.name=Name +chorem.gepeto.projectsByYear.thead.start=Start chorem.gepeto.projectsByYear.title=Projects of year {0} chorem.gepeto.results.title=Results by year chorem.gepeto.task=Task {0} 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-03-31 08:26:28 UTC (rev 47) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-03-31 16:20:53 UTC (rev 48) @@ -85,6 +85,10 @@ chorem.gepeto.projectOrder.estimatedEndDate.required=Vous devez renseigner la date de fin estim\u00E9e du contrat chorem.gepeto.projectOrder.type=Type chorem.gepeto.projectOrder.type.required=Vous devez sp\u00E9cifier le type du contrat +chorem.gepeto.projectsByYear.thead.company=Demandeur +chorem.gepeto.projectsByYear.thead.end=Fin +chorem.gepeto.projectsByYear.thead.name=Nom +chorem.gepeto.projectsByYear.thead.start=D\u00E9but chorem.gepeto.projectsByYear.title=Projets de l''ann\u00E9e {0} chorem.gepeto.results.title=R\u00E9sultats par ann\u00E0e chorem.gepeto.task=T\u00E2che {0} Modified: trunk/chorem-web/src/main/resources/struts.xml =================================================================== --- trunk/chorem-web/src/main/resources/struts.xml 2011-03-31 08:26:28 UTC (rev 47) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-03-31 16:20:53 UTC (rev 48) @@ -54,6 +54,7 @@ <package name="gepeto" namespace="/gepeto" extends="struts-default"> <default-action-ref name="home" /> + <action name="home"> <result>/WEB-INF/jsp/gepeto/home.jsp</result> </action> @@ -84,6 +85,13 @@ <result name="error">/WEB-INF/jsp/gepeto/addProjectOrder.jsp</result> <result type="redirectAction">home</result> </action> + <action name="getProjectsByYear" class="org.chorem.gepeto.action.ProjectAction"> + <result name="input">/WEB-INF/jsp/gepeto/projectsByYear.jsp</result> + </action> + <action name="projectDetails" class="org.chorem.gepeto.action.ProjectAction" method="projectDetails"> + + <result name="success">/WEB-INF/jsp/gepeto/projectDetails.jsp</result> + </action> </package> <!--<package name="billy" namespace="/billy" extends="struts-default"> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/home.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/home.jsp 2011-03-31 08:26:28 UTC (rev 47) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/home.jsp 2011-03-31 16:20:53 UTC (rev 48) @@ -9,6 +9,7 @@ </head> <body> <s:a action="addCompany_input"><s:text name="chorem.bonzoms.company.add" /></s:a><br /> - <s:a action=""></s:a> + <s:a action="addEmploymentContract_input"><s:text name="chorem.bonzoms.employmentContract.add" /></s:a><br /> + <s:a action="addPerson_input"><s:text name="chorem.bonzoms.person.add" /></s:a> </body> </html> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp 2011-03-31 08:26:28 UTC (rev 47) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp 2011-03-31 16:20:53 UTC (rev 48) @@ -1,4 +1,5 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@page import="org.chorem.gepeto.action.ProjectAction" %> <%@taglib prefix="s" uri="/struts-tags" %> <html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" @@ -6,7 +7,7 @@ <head> <title> <s:text name="chorem.gepeto.projectDetails.title"> - <s:param><s:property value="projectName" /></s:param> + <s:param><%= ProjectAction.getAction().getName() %></s:param> </s:text> </title> <s:head /> @@ -14,7 +15,7 @@ <body> <h2> <s:text name="chorem.gepeto.project"> - <s:property value="projectName" /> + <%= ProjectAction.getAction().getName() %> </s:text> </h2> <p> Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp 2011-03-31 08:26:28 UTC (rev 47) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp 2011-03-31 16:20:53 UTC (rev 48) @@ -1,4 +1,5 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@page import="org.chorem.gepeto.action.ProjectAction" %> <%@taglib prefix="s" uri="/struts-tags" %> <html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" @@ -6,11 +7,39 @@ <head> <title> <s:text name="chorem.gepeto.projectsByYear.title"> - <s:param><s:property value="year" /></s:param> + <s:param><%= ProjectAction.getAction().getYear() %></s:param> </s:text> </title> <s:head /> </head> <body> + <h2> + <s:text name="chorem.gepeto.projectsByYear.title"> + <s:param><%= ProjectAction.getAction().getYear() %></s:param> + </s:text> + </h2> + <table> + <thead> + <tr> + <th><s:text name="chorem.gepeto.projectsByYear.thead.name" /></th> + <th><s:text name="chorem.gepeto.projectsByYear.thead.company" /></th> + <th><s:text name="chorem.gepeto.projectsByYear.thead.start" /></th> + <th><s:text name="chorem.gepeto.projectsByYear.thead.end" /></th> + <tr> + </thead> + <tbody> + <s:iterator value="projectsByYear"> + <tr> + <s:url action="projectDetails" var="projectDetails"> + <s:param name="projectId"><s:property value="wikittyId" /></s:param> + </s:url> + <td><a href="${projectDetails}"><s:property value="name" /></a></td> + <td><s:property value="company" /></td> + <td><s:property value="start" /></td> + <td><s:property value="end" /></td> + </tr> + </s:iterator> + </tbody> + </table> </body> </html>