Chorem-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- 545 discussions
r39 - in trunk/chorem-web/src/main: java/org/chorem/gepeto/action resources resources/i18n resources/org/chorem/gepeto/action webapp/WEB-INF/jsp/gepeto
by vbriand@users.chorem.org 24 Mar '11
by vbriand@users.chorem.org 24 Mar '11
24 Mar '11
Author: vbriand
Date: 2011-03-24 16:19:11 +0100 (Thu, 24 Mar 2011)
New Revision: 39
Url: http://chorem.org/repositories/revision/chorem/39
Log:
Added new user input controls when adding a task or a project order
Added:
trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java
trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-validation.xml
Modified:
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/org/chorem/gepeto/action/TaskAction-validation.xml
trunk/chorem-web/src/main/resources/struts.xml
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addTask.jsp
Added: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java
===================================================================
--- trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java (rev 0)
+++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java 2011-03-24 15:19:11 UTC (rev 39)
@@ -0,0 +1,168 @@
+package org.chorem.gepeto.action;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+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.ProjectOrderImpl;
+
+import static org.nuiton.i18n.I18n.n_;
+
+/**
+ * Project order management class
+ *
+ * @author vbriand
+ */
+public class ProjectOrderAction extends BaseAction {
+
+ private static final long serialVersionUID = -5469320345746533520L;
+
+ private static final Log log = LogFactory.getLog(ProjectOrderAction.class);
+
+ /**
+ * Adds a new project order
+ *
+ * @return INPUT if the mandatory fields haven't all been filled in
+ * @return SUCCESS if the project order has been added successfully
+ * @return ERROR if an error occurred
+ */
+ public String add() {
+ String result = INPUT;
+
+ if (type!= null && description != null &&
+ beginDate != null && estimatedEndDate != null) {
+ if (!type.isEmpty() && !description.isEmpty()) {
+ //If the project order has been added successfully
+ if (addProjectOrder()) {
+ result = SUCCESS;
+ } else {
+ result = ERROR;
+ }
+ }
+ }
+ return result;
+ }
+
+ protected String type;
+ protected String description;
+ protected String beginDate;
+ protected String estimatedEndDate;
+
+ /**
+ * Stores the new project order through the proxy
+ *
+ * @return true if the project order has been stored properly
+ * @return false if a problem occurred
+ */
+ protected boolean addProjectOrder() {
+ boolean result = true;
+
+ try {
+ ChoremProxy proxy = getChoremProxy();
+ ProjectOrderImpl newProjectOrder = new ProjectOrderImpl();
+ SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy");
+
+ newProjectOrder.setType(type);
+ newProjectOrder.setDescription(description);
+
+ //Lenient mode disabled because results may be very odd
+ formatter.setLenient(false);
+ try {
+ Calendar cal = Calendar.getInstance();
+
+ newProjectOrder.setBeginDate(formatter.parse(beginDate));
+ newProjectOrder.setEndDate(formatter.parse(estimatedEndDate));
+
+ //Subtracts 1 day to the current time so the next test willn't
+ //fail if the begin date is today's date, as the before() method
+ //is exclusive
+ cal.add(Calendar.DAY_OF_MONTH, -1);
+ //If the begin date is set before the current date
+ if (newProjectOrder.getBeginDate().before(cal.getTime())) {
+ result = false;
+ addFieldError("beginDate", getText(n_("chorem.beginDate.beforeToday")));
+ }
+
+ //If the estimated end date is before the begin date (...)
+ if (newProjectOrder.getEndDate().before(newProjectOrder.getBeginDate())) {
+ result = false;
+ addActionError(getText(n_("chorem.endDate.afterBegin")));
+ }
+ } catch (ParseException e) {
+ //If the date doesn't match the format above
+ result = false;
+ addActionError(getText(n_("chorem.date.wrongFormat")));
+ }
+
+ //If everything went smoothly
+ if (result) {
+ proxy.store(newProjectOrder);
+ }
+ } 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);
+ }
+ return result;
+ }
+
+ /**
+ * @return the type
+ */
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * @param type the type to set
+ */
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ /**
+ * @return the description
+ */
+ public String getDescription() {
+ return description;
+ }
+
+ /**
+ * @param description the description to set
+ */
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ /**
+ * @return the beginDate
+ */
+ public String getBeginDate() {
+ return beginDate;
+ }
+
+ /**
+ * @param beginDate the beginDate to set
+ */
+ public void setBeginDate(String beginDate) {
+ this.beginDate = beginDate;
+ }
+
+ /**
+ * @return the estimatedEndDate
+ */
+ public String getEstimatedEndDate() {
+ return estimatedEndDate;
+ }
+
+ /**
+ * @param estimatedEndDate the estimatedEndDate to set
+ */
+ public void setEstimatedEndDate(String estimatedEndDate) {
+ this.estimatedEndDate = estimatedEndDate;
+ }
+}
Property changes on: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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-24 10:30:02 UTC (rev 38)
+++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.java 2011-03-24 15:19:11 UTC (rev 39)
@@ -3,7 +3,9 @@
*/
package org.chorem.gepeto.action;
-import java.util.Date;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -34,9 +36,11 @@
public String add() {
String result = INPUT;
- if (name != null && description != null &&
- beginDate != null && estimatedEndDate != null) {
- if (!name.isEmpty() && !description.isEmpty()) {
+ if (name != null && description != null && price != null &&
+ estimatedDays != null && beginDate != null &&
+ estimatedEndDate != null) {
+ if (!name.isEmpty() && !description.isEmpty() &&
+ !price.isEmpty() && !estimatedDays.isEmpty()) {
//If the task has been added successfully
if (addTask()) {
result = SUCCESS;
@@ -52,8 +56,8 @@
protected String description;
protected String price;
protected String estimatedDays;
- protected Date beginDate;
- protected Date estimatedEndDate;
+ protected String beginDate;
+ protected String estimatedEndDate;
/**
* Stores the new task through the proxy
@@ -67,14 +71,50 @@
try {
ChoremProxy proxy = getChoremProxy();
TaskImpl newTask = new TaskImpl();
+ SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy");
newTask.setDescription(description);
newTask.setName(name);
- newTask.setBeginDate(beginDate);
- newTask.setEndDate(estimatedEndDate);
+
+ //Lenient mode disabled because results may be very odd
+ formatter.setLenient(false);
+ try {
+ Calendar cal = Calendar.getInstance();
+
+ newTask.setBeginDate(formatter.parse(beginDate));
+ newTask.setEndDate(formatter.parse(estimatedEndDate));
+
+ //Subtracts 1 day to the current time so the next test willn't
+ //fail if the begin date is today's date, as the before() method
+ //is exclusive
+ cal.add(Calendar.DAY_OF_MONTH, -1);
+ //If the begin date is set before the current date
+ if (newTask.getBeginDate().before(cal.getTime())) {
+ result = false;
+ addFieldError("beginDate", getText(n_("chorem.beginDate.beforeToday")));
+ }
+
+ //If the estimated end date is before the begin date (...)
+ if (newTask.getEndDate().before(newTask.getBeginDate())) {
+ result = false;
+ addActionError(getText(n_("chorem.endDate.afterBegin")));
+ }
+ } catch (ParseException e) {
+ //If the date doesn't match the format above
+ result = false;
+ addActionError(getText(n_("chorem.date.wrongFormat")));
+ }
+
newTask.setEstimatedDays(Integer.parseInt(estimatedDays));
+ //Replaces the (possible) comma by a dot, so the string can be
+ //parsed successfully as a float
+ price = price.replace(',', '.');
newTask.setPrice(Float.parseFloat(price));
- proxy.store(newTask);
+
+ //If everything went smoothly
+ if (result) {
+ proxy.store(newTask);
+ }
} catch (Exception e) {
result = false;
addActionError(getText(n_("chorem.gepeto.task.create.error")));
@@ -142,28 +182,28 @@
/**
* @return the beginDate
*/
- public Date getBeginDate() {
+ public String getBeginDate() {
return beginDate;
}
/**
* @param beginDate the beginDate to set
*/
- public void setBeginDate(Date beginDate) {
+ public void setBeginDate(String beginDate) {
this.beginDate = beginDate;
}
/**
* @return the estimatedEndDate
*/
- public Date getEstimatedEndDate() {
+ public String getEstimatedEndDate() {
return estimatedEndDate;
}
/**
* @param estimatedEndDate the estimatedEndDate to set
*/
- public void setEstimatedEndDate(Date estimatedEndDate) {
+ public void setEstimatedEndDate(String estimatedEndDate) {
this.estimatedEndDate = estimatedEndDate;
}
}
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-24 10:30:02 UTC (rev 38)
+++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-03-24 15:19:11 UTC (rev 39)
@@ -1,3 +1,4 @@
+chorem.beginDate.beforeToday=The date cannot be set before today''s date
chorem.bonzoms.company=Company {0}
chorem.bonzoms.company.add=Add a new company
chorem.bonzoms.company.name=Company name
@@ -14,6 +15,8 @@
chorem.bonzoms.person.firstName=First name
chorem.bonzoms.person.lastName=Last name
chorem.config.configFileName.description=chorem''s configuration filename
+chorem.date.wrongFormat=The date must be in the following format \: dd/mm/yyyy
+chorem.endDate.afterBegin=The end date cannot be before the begin date
chorem.error.internal=An internal error occurred
chorem.gepeto.home=Home
chorem.gepeto.project=Project {0}
@@ -27,9 +30,14 @@
chorem.gepeto.projectOrder=Project order
chorem.gepeto.projectOrder.add=Add a new project order
chorem.gepeto.projectOrder.beginDate=Begin date
+chorem.gepeto.projectOrder.beginDate.required=You must provide a begin date for this project order
+chorem.gepeto.projectOrder.create.error=An error occurred while creating your new project order, please try again. If the problem persists, please contact an administrator
chorem.gepeto.projectOrder.description=Description
+chorem.gepeto.projectOrder.description.required=You must describe the project order
chorem.gepeto.projectOrder.estimatedEndDate=Estimated end date
+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.title=Projects of year {0}
chorem.gepeto.results.title=Results by year
chorem.gepeto.task=Task {0}
@@ -37,7 +45,6 @@
chorem.gepeto.task.beginDate=Begin date
chorem.gepeto.task.beginDate.required=You must enter the begin date for this task
chorem.gepeto.task.create.error=An error occurred while creating your new task, please try again. If the problem persists, please contact an administrator
-chorem.gepeto.task.date.wrongFormat=The date must be in the following format \: XX/YY/ZZZZ
chorem.gepeto.task.description=Description
chorem.gepeto.task.description.required=You must describe the task
chorem.gepeto.task.estimatedDays=Estimated days
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-24 10:30:02 UTC (rev 38)
+++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-03-24 15:19:11 UTC (rev 39)
@@ -1,3 +1,4 @@
+chorem.beginDate.beforeToday=La date entr\u00E9e ne peut \u00EAtre inf\u00E9rieure \u00E0 la date du jour
chorem.bonzoms.company=Soci\u00E9t\u00E9
chorem.bonzoms.company.add=Ajouter une nouvelle soci\u00E9t\u00E9
chorem.bonzoms.company.name=Nom de la soci\u00E9t\u00E9
@@ -14,6 +15,8 @@
chorem.bonzoms.person.firstName=Pr\u00E9nom
chorem.bonzoms.person.lastName=Nom
chorem.config.configFileName.description=Nom du fichier de configuration de chorem
+chorem.date.wrongFormat=La date doit respecter le format suivant \: jj/mm/yyyy
+chorem.endDate.afterBegin=La date de fin ne doit pas pas \u00EAtre inf\u00E9rieure \u00E0 la date de d\u00E9but
chorem.error.internal=Une erreur interne s''est produite
chorem.gepeto.home=Accueil
chorem.gepeto.project=Projet {0}
@@ -27,9 +30,14 @@
chorem.gepeto.projectOrder=Contrat de commande d''un projet
chorem.gepeto.projectOrder.add=Ajouter le contrat d''un projet
chorem.gepeto.projectOrder.beginDate=Date de d\u00E9but
+chorem.gepeto.projectOrder.beginDate.required=Vous devez renseigner une date de d\u00E9but pour le contrat
+chorem.gepeto.projectOrder.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouveau contrat de projet, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur
chorem.gepeto.projectOrder.description=Description
+chorem.gepeto.projectOrder.description.required=Vous devez d\u00E9crire le contrat
chorem.gepeto.projectOrder.estimatedEndDate=Date de fin estim\u00E9e
+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.title=Projets de l''ann\u00E9e {0}
chorem.gepeto.results.title=R\u00E9sultats par ann\u00E0e
chorem.gepeto.task=T\u00E2che {0}
@@ -37,7 +45,6 @@
chorem.gepeto.task.beginDate=Date de d\u00E9but
chorem.gepeto.task.beginDate.required=Vous devez renseigner la date de d\u00E9but de la t\u00E2che
chorem.gepeto.task.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouvelle t\u00E2che, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur
-chorem.gepeto.task.date.wrongFormat=La date doit respecter le format suivant \: XX/YY/ZZZZ
chorem.gepeto.task.description=Description
chorem.gepeto.task.description.required=Vous devez d\u00E9crire la t\u00E2che
chorem.gepeto.task.estimatedDays=Nombre de jours estim\u00E9s
Added: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-validation.xml
===================================================================
--- trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-validation.xml (rev 0)
+++ trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-validation.xml 2011-03-24 15:19:11 UTC (rev 39)
@@ -0,0 +1,34 @@
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+
+<validators>
+ <field name="type">
+ <field-validator type="requiredstring">
+ <message key="chorem.gepeto.projectOrder.type.required" />
+ </field-validator>
+ </field>
+ <field name="description">
+ <field-validator type="requiredstring">
+ <message key="chorem.gepeto.projectOrder.description.required" />
+ </field-validator>
+ </field>
+ <field name="beginDate">
+ <field-validator type="requiredstring">
+ <message key="chorem.gepeto.projectOrder.beginDate.required" />
+ </field-validator>
+ <field-validator type="regex">
+ <param name="expression"><![CDATA[([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})]]></param>
+ <message key="chorem.date.wrongFormat" />
+ </field-validator>
+ </field>
+ <field name="estimatedEndDate">
+ <field-validator type="requiredstring">
+ <message key="chorem.gepeto.projectOrder.estimatedEndDate.required" />
+ </field-validator>
+ <field-validator type="regex">
+ <param name="expression"><![CDATA[([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})]]></param>
+ <message key="chorem.date.wrongFormat" />
+ </field-validator>
+ </field>
+</validators>
Property changes on: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-validation.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-validation.xml
===================================================================
--- trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-validation.xml 2011-03-24 10:30:02 UTC (rev 38)
+++ trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-validation.xml 2011-03-24 15:19:11 UTC (rev 39)
@@ -32,21 +32,21 @@
</field-validator>
</field>
<field name="beginDate">
- <field-validator type="required">
+ <field-validator type="requiredstring">
<message key="chorem.gepeto.task.beginDate.required" />
</field-validator>
<field-validator type="regex">
<param name="expression"><![CDATA[([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})]]></param>
- <message key="chorem.gepeto.task.date.wrongFormat" />
+ <message key="chorem.date.wrongFormat" />
</field-validator>
</field>
<field name="estimatedEndDate">
- <field-validator type="required">
+ <field-validator type="requiredstring">
<message key="chorem.gepeto.task.estimatedEndDate.required" />
</field-validator>
<field-validator type="regex">
<param name="expression"><![CDATA[([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})]]></param>
- <message key="chorem.gepeto.task.date.wrongFormat" />
+ <message key="chorem.date.wrongFormat" />
</field-validator>
</field>
</validators>
Modified: trunk/chorem-web/src/main/resources/struts.xml
===================================================================
--- trunk/chorem-web/src/main/resources/struts.xml 2011-03-24 10:30:02 UTC (rev 38)
+++ trunk/chorem-web/src/main/resources/struts.xml 2011-03-24 15:19:11 UTC (rev 39)
@@ -52,8 +52,10 @@
<result name="error">/WEB-INF/jsp/gepeto/addTask.jsp</result>
<result type="redirectAction">home</result>
</action>
- <action name="addProjectOrder">
- <result>/WEB-INF/jsp/gepeto/addProjectOrder.jsp</result>
+ <action name="addProjectOrder" class="org.chorem.gepeto.action.ProjectOrderAction" method="add">
+ <result name="input">/WEB-INF/jsp/gepeto/addProjectOrder.jsp</result>
+ <result name="error">/WEB-INF/jsp/gepeto/addProjectOrder.jsp</result>
+ <result type="redirectAction">home</result>
</action>
</package>
Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp
===================================================================
--- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp 2011-03-24 10:30:02 UTC (rev 38)
+++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp 2011-03-24 15:19:11 UTC (rev 39)
@@ -9,6 +9,7 @@
</head>
<body>
<h2><s:text name="chorem.gepeto.projectOrder.add" /></h2>
+ <s:actionerror />
<s:form action="addProjectOrder" method="post">
<fieldset>
<legend><s:text name="chorem.gepeto.projectOrder" /></legend>
Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addTask.jsp
===================================================================
--- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addTask.jsp 2011-03-24 10:30:02 UTC (rev 38)
+++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addTask.jsp 2011-03-24 15:19:11 UTC (rev 39)
@@ -9,6 +9,7 @@
</head>
<body>
<h2><s:text name="chorem.gepeto.task.add" /></h2>
+ <s:actionerror />
<s:form action="addTask" method="post">
<fieldset>
<legend>
1
0
r38 - in trunk/chorem-web/src/main: java/org/chorem/gepeto/action resources/i18n resources/org/chorem/gepeto/action
by vbriand@users.chorem.org 24 Mar '11
by vbriand@users.chorem.org 24 Mar '11
24 Mar '11
Author: vbriand
Date: 2011-03-24 11:30:02 +0100 (Thu, 24 Mar 2011)
New Revision: 38
Url: http://chorem.org/repositories/revision/chorem/38
Log:
Implemented TaskAction's add method
Modified:
trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.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/org/chorem/gepeto/action/TaskAction-validation.xml
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-24 09:47:31 UTC (rev 37)
+++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-03-24 10:30:02 UTC (rev 38)
@@ -5,6 +5,7 @@
import org.chorem.ChoremProxy;
import org.chorem.action.BaseAction;
import org.chorem.entities.ProjectImpl;
+
import static org.nuiton.i18n.I18n.n_;
/**
@@ -17,39 +18,8 @@
private static final long serialVersionUID = 498267854350348906L;
private static final Log log = LogFactory.getLog(ProjectAction.class);
-
- protected String name;
- protected String description;
/**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name: the project name
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * @return the project description
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * @param description: the project description
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
* Adds a new project
*
* @return INPUT if the mandatory fields haven't all been filled in
@@ -79,8 +49,40 @@
* @return
*/
public String remove() {
+ //TODO: implement
return SUCCESS;
}
+
+ protected String name;
+ protected String description;
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @param name: the project name
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * @return the project description
+ */
+ public String getDescription() {
+ return description;
+ }
+
+ /**
+ * @param description: the project description
+ */
+ public void setDescription(String description) {
+ this.description = description;
+ }
/**
* Stores the new project through the proxy
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-24 09:47:31 UTC (rev 37)
+++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.java 2011-03-24 10:30:02 UTC (rev 38)
@@ -3,10 +3,16 @@
*/
package org.chorem.gepeto.action;
+import java.util.Date;
+
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.TaskImpl;
+import static org.nuiton.i18n.I18n.n_;
+
/**
* Task management class
*
@@ -18,14 +24,66 @@
private static final Log log = LogFactory.getLog(TaskAction.class);
+ /**
+ * Adds a new task
+ *
+ * @return INPUT if the mandatory fields haven't all been filled in
+ * @return SUCCESS if the task has been added successfully
+ * @return ERROR if an error occurred
+ */
+ public String add() {
+ String result = INPUT;
+
+ if (name != null && description != null &&
+ beginDate != null && estimatedEndDate != null) {
+ if (!name.isEmpty() && !description.isEmpty()) {
+ //If the task has been added successfully
+ if (addTask()) {
+ result = SUCCESS;
+ } else {
+ result = ERROR;
+ }
+ }
+ }
+ return result;
+ }
+
protected String name;
protected String description;
protected String price;
protected String estimatedDays;
- protected String beginDate;
- protected String estimatedEndDate;
+ protected Date beginDate;
+ protected Date estimatedEndDate;
/**
+ * Stores the new task through the proxy
+ *
+ * @return true if the task has been stored properly
+ * @return false if a problem occurred
+ */
+ protected boolean addTask() {
+ boolean result = true;
+
+ try {
+ ChoremProxy proxy = getChoremProxy();
+ TaskImpl newTask = new TaskImpl();
+
+ newTask.setDescription(description);
+ newTask.setName(name);
+ newTask.setBeginDate(beginDate);
+ newTask.setEndDate(estimatedEndDate);
+ newTask.setEstimatedDays(Integer.parseInt(estimatedDays));
+ newTask.setPrice(Float.parseFloat(price));
+ proxy.store(newTask);
+ } catch (Exception e) {
+ result = false;
+ addActionError(getText(n_("chorem.gepeto.task.create.error")));
+ log.error("An error occured while creating a new task", e);
+ }
+ return result;
+ }
+
+ /**
* @return the name
*/
public String getName() {
@@ -84,40 +142,28 @@
/**
* @return the beginDate
*/
- public String getBeginDate() {
+ public Date getBeginDate() {
return beginDate;
}
/**
* @param beginDate the beginDate to set
*/
- public void setBeginDate(String beginDate) {
+ public void setBeginDate(Date beginDate) {
this.beginDate = beginDate;
}
/**
* @return the estimatedEndDate
*/
- public String getEstimatedEndDate() {
+ public Date getEstimatedEndDate() {
return estimatedEndDate;
}
/**
* @param estimatedEndDate the estimatedEndDate to set
*/
- public void setEstimatedEndDate(String estimatedEndDate) {
+ public void setEstimatedEndDate(Date estimatedEndDate) {
this.estimatedEndDate = estimatedEndDate;
}
-
- /**
- * Adds a new task
- *
- * @return INPUT if the mandatory fields haven't all been filled in
- * @return SUCCESS if the task has been added successfully
- * @return ERROR if an error occurred
- */
- public String add() {
- //TODO: implement
- return SUCCESS;
- }
}
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-24 09:47:31 UTC (rev 37)
+++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-03-24 10:30:02 UTC (rev 38)
@@ -36,6 +36,7 @@
chorem.gepeto.task.add=Add a new task
chorem.gepeto.task.beginDate=Begin date
chorem.gepeto.task.beginDate.required=You must enter the begin date for this task
+chorem.gepeto.task.create.error=An error occurred while creating your new task, please try again. If the problem persists, please contact an administrator
chorem.gepeto.task.date.wrongFormat=The date must be in the following format \: XX/YY/ZZZZ
chorem.gepeto.task.description=Description
chorem.gepeto.task.description.required=You must describe the task
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-24 09:47:31 UTC (rev 37)
+++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-03-24 10:30:02 UTC (rev 38)
@@ -36,6 +36,7 @@
chorem.gepeto.task.add=Ajouter une nouvelle t\u00E2che
chorem.gepeto.task.beginDate=Date de d\u00E9but
chorem.gepeto.task.beginDate.required=Vous devez renseigner la date de d\u00E9but de la t\u00E2che
+chorem.gepeto.task.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouvelle t\u00E2che, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur
chorem.gepeto.task.date.wrongFormat=La date doit respecter le format suivant \: XX/YY/ZZZZ
chorem.gepeto.task.description=Description
chorem.gepeto.task.description.required=Vous devez d\u00E9crire la t\u00E2che
Modified: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-validation.xml
===================================================================
--- trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-validation.xml 2011-03-24 09:47:31 UTC (rev 37)
+++ trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-validation.xml 2011-03-24 10:30:02 UTC (rev 38)
@@ -32,7 +32,7 @@
</field-validator>
</field>
<field name="beginDate">
- <field-validator type="requiredstring">
+ <field-validator type="required">
<message key="chorem.gepeto.task.beginDate.required" />
</field-validator>
<field-validator type="regex">
@@ -41,7 +41,7 @@
</field-validator>
</field>
<field name="estimatedEndDate">
- <field-validator type="requiredstring">
+ <field-validator type="required">
<message key="chorem.gepeto.task.estimatedEndDate.required" />
</field-validator>
<field-validator type="regex">
1
0
r37 - in trunk/chorem-web/src/main/resources: i18n org/chorem/gepeto/action
by vbriand@users.chorem.org 24 Mar '11
by vbriand@users.chorem.org 24 Mar '11
24 Mar '11
Author: vbriand
Date: 2011-03-24 10:47:31 +0100 (Thu, 24 Mar 2011)
New Revision: 37
Url: http://chorem.org/repositories/revision/chorem/37
Log:
Added validation for TaskAction
Modified:
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/org/chorem/gepeto/action/TaskAction-validation.xml
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-18 17:09:22 UTC (rev 36)
+++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-03-24 09:47:31 UTC (rev 37)
@@ -36,14 +36,17 @@
chorem.gepeto.task.add=Add a new task
chorem.gepeto.task.beginDate=Begin date
chorem.gepeto.task.beginDate.required=You must enter the begin date for this task
+chorem.gepeto.task.date.wrongFormat=The date must be in the following format \: XX/YY/ZZZZ
chorem.gepeto.task.description=Description
chorem.gepeto.task.description.required=You must describe the task
chorem.gepeto.task.estimatedDays=Estimated days
chorem.gepeto.task.estimatedDays.required=You must enter the estimated number of days for this task
+chorem.gepeto.task.estimatedDays.wrongFormat=The estimated days must be a positive integer
chorem.gepeto.task.estimatedEndDate=Estimated end date
chorem.gepeto.task.estimatedEndDate.required=You must enter the estimated end date for this task
chorem.gepeto.task.name=Task name
chorem.gepeto.task.name.required=You must enter the task name
chorem.gepeto.task.price=Price
chorem.gepeto.task.price.required=You must enter the task price
+chorem.gepeto.task.price.wrongFormat=The price must be a positive integer or floating point number (the decimal mark may be either a dot or a comma)
chorem.home=Home
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-18 17:09:22 UTC (rev 36)
+++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-03-24 09:47:31 UTC (rev 37)
@@ -36,14 +36,17 @@
chorem.gepeto.task.add=Ajouter une nouvelle t\u00E2che
chorem.gepeto.task.beginDate=Date de d\u00E9but
chorem.gepeto.task.beginDate.required=Vous devez renseigner la date de d\u00E9but de la t\u00E2che
+chorem.gepeto.task.date.wrongFormat=La date doit respecter le format suivant \: XX/YY/ZZZZ
chorem.gepeto.task.description=Description
chorem.gepeto.task.description.required=Vous devez d\u00E9crire la t\u00E2che
chorem.gepeto.task.estimatedDays=Nombre de jours estim\u00E9s
chorem.gepeto.task.estimatedDays.required=Vous devez renseigner le nombre de jours estim\u00E9s
+chorem.gepeto.task.estimatedDays.wrongFormat=Le nombre de jours estim\u00E9 doit \u00EAtre un entier positif
chorem.gepeto.task.estimatedEndDate=Date de fin estim\u00E9e
chorem.gepeto.task.estimatedEndDate.required=Vous devez renseigner la date de fin de la t\u00E2che
chorem.gepeto.task.name=Nom de la t\u00E2che
chorem.gepeto.task.name.required=Vous devez donner un nom \u00E0 cette t\u00E2che
chorem.gepeto.task.price=Prix
chorem.gepeto.task.price.required=Vous devez donner un prix \u00E0 cette t\u00E2che
+chorem.gepeto.task.price.wrongFormat=Le prix doit \u00EAtre un entier positif ou un nombre \u00E0 virgule flottante positif (le s\u00E9parateur d\u00E9cimal peut \u00EAtre un point ou une virgule)
chorem.home=Accueil
Modified: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-validation.xml
===================================================================
--- trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-validation.xml 2011-03-18 17:09:22 UTC (rev 36)
+++ trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-validation.xml 2011-03-24 09:47:31 UTC (rev 37)
@@ -17,20 +17,36 @@
<field-validator type="requiredstring">
<message key="chorem.gepeto.task.price.required" />
</field-validator>
+ <field-validator type="regex">
+ <param name="expression"><![CDATA[([0-9]+)([\.,][0-9]+)?]]></param>
+ <message key="chorem.gepeto.task.price.wrongFormat" />
+ </field-validator>
</field>
<field name="estimatedDays">
<field-validator type="requiredstring">
<message key="chorem.gepeto.task.estimatedDays.required" />
</field-validator>
+ <field-validator type="regex">
+ <param name="expression"><![CDATA[([0-9]+)]]></param>
+ <message key="chorem.gepeto.task.estimatedDays.wrongFormat" />
+ </field-validator>
</field>
<field name="beginDate">
<field-validator type="requiredstring">
<message key="chorem.gepeto.task.beginDate.required" />
</field-validator>
+ <field-validator type="regex">
+ <param name="expression"><![CDATA[([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})]]></param>
+ <message key="chorem.gepeto.task.date.wrongFormat" />
+ </field-validator>
</field>
<field name="estimatedEndDate">
<field-validator type="requiredstring">
<message key="chorem.gepeto.task.estimatedEndDate.required" />
</field-validator>
+ <field-validator type="regex">
+ <param name="expression"><![CDATA[([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})]]></param>
+ <message key="chorem.gepeto.task.date.wrongFormat" />
+ </field-validator>
</field>
</validators>
1
0
r36 - in trunk/chorem-web/src/main: java/org/chorem/gepeto/action resources resources/i18n resources/org/chorem/gepeto/action
by vbriand@users.chorem.org 18 Mar '11
by vbriand@users.chorem.org 18 Mar '11
18 Mar '11
Author: vbriand
Date: 2011-03-18 18:09:22 +0100 (Fri, 18 Mar 2011)
New Revision: 36
Url: http://chorem.org/repositories/revision/chorem/36
Log:
New class with validation for adding a task
Added:
trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.java
trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-validation.xml
Modified:
trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.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
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-18 16:04:03 UTC (rev 35)
+++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-03-18 17:09:22 UTC (rev 36)
@@ -10,6 +10,7 @@
/**
* Project management class
*
+ * @author vbriand
*/
public class ProjectAction extends BaseAction {
@@ -53,6 +54,7 @@
*
* @return INPUT if the mandatory fields haven't all been filled in
* @return SUCCESS if the project has been added
+ * @return ERROR if an error occurred
*/
public String add() {
String result = INPUT;
Added: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.java
===================================================================
--- trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.java (rev 0)
+++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.java 2011-03-18 17:09:22 UTC (rev 36)
@@ -0,0 +1,123 @@
+/**
+ *
+ */
+package org.chorem.gepeto.action;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.chorem.action.BaseAction;
+
+/**
+ * Task management class
+ *
+ * @author vbriand
+ */
+public class TaskAction extends BaseAction {
+
+ private static final long serialVersionUID = -3938480897148282089L;
+
+ private static final Log log = LogFactory.getLog(TaskAction.class);
+
+ protected String name;
+ protected String description;
+ protected String price;
+ protected String estimatedDays;
+ protected String beginDate;
+ protected String estimatedEndDate;
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @param name the name to set
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * @return the description
+ */
+ public String getDescription() {
+ return description;
+ }
+
+ /**
+ * @param description the description to set
+ */
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ /**
+ * @return the price
+ */
+ public String getPrice() {
+ return price;
+ }
+
+ /**
+ * @param price the price to set
+ */
+ public void setPrice(String price) {
+ this.price = price;
+ }
+
+ /**
+ * @return the estimatedDays
+ */
+ public String getEstimatedDays() {
+ return estimatedDays;
+ }
+
+ /**
+ * @param estimatedDays the estimatedDays to set
+ */
+ public void setEstimatedDays(String estimatedDays) {
+ this.estimatedDays = estimatedDays;
+ }
+
+ /**
+ * @return the beginDate
+ */
+ public String getBeginDate() {
+ return beginDate;
+ }
+
+ /**
+ * @param beginDate the beginDate to set
+ */
+ public void setBeginDate(String beginDate) {
+ this.beginDate = beginDate;
+ }
+
+ /**
+ * @return the estimatedEndDate
+ */
+ public String getEstimatedEndDate() {
+ return estimatedEndDate;
+ }
+
+ /**
+ * @param estimatedEndDate the estimatedEndDate to set
+ */
+ public void setEstimatedEndDate(String estimatedEndDate) {
+ this.estimatedEndDate = estimatedEndDate;
+ }
+
+ /**
+ * Adds a new task
+ *
+ * @return INPUT if the mandatory fields haven't all been filled in
+ * @return SUCCESS if the task has been added successfully
+ * @return ERROR if an error occurred
+ */
+ public String add() {
+ //TODO: implement
+ return SUCCESS;
+ }
+}
Property changes on: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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-18 16:04:03 UTC (rev 35)
+++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-03-18 17:09:22 UTC (rev 36)
@@ -35,9 +35,15 @@
chorem.gepeto.task=Task {0}
chorem.gepeto.task.add=Add a new task
chorem.gepeto.task.beginDate=Begin date
+chorem.gepeto.task.beginDate.required=You must enter the begin date for this task
chorem.gepeto.task.description=Description
+chorem.gepeto.task.description.required=You must describe the task
chorem.gepeto.task.estimatedDays=Estimated days
+chorem.gepeto.task.estimatedDays.required=You must enter the estimated number of days for this task
chorem.gepeto.task.estimatedEndDate=Estimated end date
+chorem.gepeto.task.estimatedEndDate.required=You must enter the estimated end date for this task
chorem.gepeto.task.name=Task name
+chorem.gepeto.task.name.required=You must enter the task name
chorem.gepeto.task.price=Price
+chorem.gepeto.task.price.required=You must enter the task price
chorem.home=Home
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-18 16:04:03 UTC (rev 35)
+++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-03-18 17:09:22 UTC (rev 36)
@@ -35,9 +35,15 @@
chorem.gepeto.task=T\u00E2che {0}
chorem.gepeto.task.add=Ajouter une nouvelle t\u00E2che
chorem.gepeto.task.beginDate=Date de d\u00E9but
+chorem.gepeto.task.beginDate.required=Vous devez renseigner la date de d\u00E9but de la t\u00E2che
chorem.gepeto.task.description=Description
+chorem.gepeto.task.description.required=Vous devez d\u00E9crire la t\u00E2che
chorem.gepeto.task.estimatedDays=Nombre de jours estim\u00E9s
+chorem.gepeto.task.estimatedDays.required=Vous devez renseigner le nombre de jours estim\u00E9s
chorem.gepeto.task.estimatedEndDate=Date de fin estim\u00E9e
+chorem.gepeto.task.estimatedEndDate.required=Vous devez renseigner la date de fin de la t\u00E2che
chorem.gepeto.task.name=Nom de la t\u00E2che
+chorem.gepeto.task.name.required=Vous devez donner un nom \u00E0 cette t\u00E2che
chorem.gepeto.task.price=Prix
+chorem.gepeto.task.price.required=Vous devez donner un prix \u00E0 cette t\u00E2che
chorem.home=Accueil
Added: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-validation.xml
===================================================================
--- trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-validation.xml (rev 0)
+++ trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-validation.xml 2011-03-18 17:09:22 UTC (rev 36)
@@ -0,0 +1,36 @@
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+
+<validators>
+ <field name="name">
+ <field-validator type="requiredstring">
+ <message key="chorem.gepeto.task.name.required" />
+ </field-validator>
+ </field>
+ <field name="description">
+ <field-validator type="requiredstring">
+ <message key="chorem.gepeto.task.description.required" />
+ </field-validator>
+ </field>
+ <field name="price">
+ <field-validator type="requiredstring">
+ <message key="chorem.gepeto.task.price.required" />
+ </field-validator>
+ </field>
+ <field name="estimatedDays">
+ <field-validator type="requiredstring">
+ <message key="chorem.gepeto.task.estimatedDays.required" />
+ </field-validator>
+ </field>
+ <field name="beginDate">
+ <field-validator type="requiredstring">
+ <message key="chorem.gepeto.task.beginDate.required" />
+ </field-validator>
+ </field>
+ <field name="estimatedEndDate">
+ <field-validator type="requiredstring">
+ <message key="chorem.gepeto.task.estimatedEndDate.required" />
+ </field-validator>
+ </field>
+</validators>
Property changes on: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-validation.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/chorem-web/src/main/resources/struts.xml
===================================================================
--- trunk/chorem-web/src/main/resources/struts.xml 2011-03-18 16:04:03 UTC (rev 35)
+++ trunk/chorem-web/src/main/resources/struts.xml 2011-03-18 17:09:22 UTC (rev 36)
@@ -44,9 +44,14 @@
<action name="removeProject" class="org.chorem.gepeto.action.ProjectAction" method="delete">
<result type="redirectAction">home</result>
</action>
- <action name="addTaskPage">
+ <action name="addTask_input">
<result>/WEB-INF/jsp/gepeto/addTask.jsp</result>
</action>
+ <action name="addTask" class="org.chorem.gepeto.action.TaskAction" method="add">
+ <result name="input">/WEB-INF/jsp/gepeto/addTask.jsp</result>
+ <result name="error">/WEB-INF/jsp/gepeto/addTask.jsp</result>
+ <result type="redirectAction">home</result>
+ </action>
<action name="addProjectOrder">
<result>/WEB-INF/jsp/gepeto/addProjectOrder.jsp</result>
</action>
1
0
r35 - in trunk/chorem-web: . src/main/java/org/chorem/gepeto/action src/main/resources src/main/resources/i18n src/main/webapp/WEB-INF/jsp/gepeto
by vbriand@users.chorem.org 18 Mar '11
by vbriand@users.chorem.org 18 Mar '11
18 Mar '11
Author: vbriand
Date: 2011-03-18 17:04:03 +0100 (Fri, 18 Mar 2011)
New Revision: 35
Url: http://chorem.org/repositories/revision/chorem/35
Log:
It is now possible to add a project for real
Modified:
trunk/chorem-web/
trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.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/gepeto/addProject.jsp
Property changes on: trunk/chorem-web
___________________________________________________________________
Modified: svn:ignore
- .settings
.classpath
.project
target
+ .settings
.classpath
.project
target
PutObjectStoreDirHere
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-18 15:01:37 UTC (rev 34)
+++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-03-18 16:04:03 UTC (rev 35)
@@ -2,7 +2,10 @@
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.ProjectImpl;
+import static org.nuiton.i18n.I18n.n_;
/**
* Project management class
@@ -55,8 +58,14 @@
String result = INPUT;
if (name != null && description != null) {
+ //If the mandatory fields have been filled in
if (!name.isEmpty() && !description.isEmpty()) {
- result = SUCCESS;
+ //If the project has been created successfully
+ if (addProject()) {
+ result = SUCCESS;
+ } else {
+ result = ERROR;
+ }
}
}
return result;
@@ -70,4 +79,28 @@
public String remove() {
return SUCCESS;
}
+
+ /**
+ * Stores the new project through the proxy
+ *
+ * @return true if the project has been stored properly
+ * @return false if a problem occurred
+ */
+ protected boolean addProject() {
+ boolean result = true;
+
+ try {
+ ChoremProxy proxy = getChoremProxy();
+ ProjectImpl newProject = new ProjectImpl();
+
+ newProject.setDescription(description);
+ newProject.setName(name);
+ proxy.store(newProject);
+ } catch (Exception e) {
+ result = false;
+ addActionError(getText(n_("chorem.gepeto.project.create.error")));
+ log.error("An error occured while creating a new project", 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-18 15:01:37 UTC (rev 34)
+++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-03-18 16:04:03 UTC (rev 35)
@@ -18,6 +18,7 @@
chorem.gepeto.home=Home
chorem.gepeto.project=Project {0}
chorem.gepeto.project.add=Add a new project
+chorem.gepeto.project.create.error=An error occurred while creating your new project, please try again. If the problem persists, please contact an administrator
chorem.gepeto.project.description=Description
chorem.gepeto.project.description.required=You must describe the project
chorem.gepeto.project.name=Project name
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-18 15:01:37 UTC (rev 34)
+++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-03-18 16:04:03 UTC (rev 35)
@@ -18,6 +18,7 @@
chorem.gepeto.home=Accueil
chorem.gepeto.project=Projet {0}
chorem.gepeto.project.add=Ajouter un nouveau projet
+chorem.gepeto.project.create.error=Une erreur s''est produite lors de la cr\u00E9ation de votre nouveau projet, merci d''essayer \u00E0 nouveau. Si le probl\u00E8me se reproduit, merci de contacter un administrateur
chorem.gepeto.project.description=Description
chorem.gepeto.project.description.required=Vous devez d\u00E9crire le projet
chorem.gepeto.project.name=Nom du projet
Modified: trunk/chorem-web/src/main/resources/struts.xml
===================================================================
--- trunk/chorem-web/src/main/resources/struts.xml 2011-03-18 15:01:37 UTC (rev 34)
+++ trunk/chorem-web/src/main/resources/struts.xml 2011-03-18 16:04:03 UTC (rev 35)
@@ -38,6 +38,7 @@
</action>
<action name="addProject" class="org.chorem.gepeto.action.ProjectAction" method="add">
<result name="input">/WEB-INF/jsp/gepeto/addProject.jsp</result>
+ <result name="error">/WEB-INF/jsp/gepeto/addProject.jsp</result>
<result type="redirectAction">home</result>
</action>
<action name="removeProject" class="org.chorem.gepeto.action.ProjectAction" method="delete">
Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProject.jsp
===================================================================
--- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProject.jsp 2011-03-18 15:01:37 UTC (rev 34)
+++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProject.jsp 2011-03-18 16:04:03 UTC (rev 35)
@@ -9,6 +9,7 @@
</head>
<body>
<h2><s:text name="chorem.gepeto.project.add" /></h2>
+ <s:actionerror />
<s:form action="addProject" method="post">
<fieldset>
<legend>
1
0
r34 - in trunk/chorem-web/src/main: java/org/chorem java/org/chorem/gepeto/action resources resources/org/chorem/gepeto/action webapp/WEB-INF/jsp/bonzoms webapp/WEB-INF/jsp/gepeto
by vbriand@users.chorem.org 18 Mar '11
by vbriand@users.chorem.org 18 Mar '11
18 Mar '11
Author: vbriand
Date: 2011-03-18 16:01:37 +0100 (Fri, 18 Mar 2011)
New Revision: 34
Url: http://chorem.org/repositories/revision/chorem/34
Log:
Removed admin package
Added:
trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java
trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-validation.xml
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addCompany.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addContactDetails.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addPerson.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProject.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addTask.jsp
Removed:
trunk/chorem-web/src/main/java/org/chorem/gepeto/action/admin/
trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/admin/
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/
Modified:
trunk/chorem-web/src/main/java/org/chorem/ChoremProxy.java
trunk/chorem-web/src/main/resources/struts.xml
Modified: trunk/chorem-web/src/main/java/org/chorem/ChoremProxy.java
===================================================================
--- trunk/chorem-web/src/main/java/org/chorem/ChoremProxy.java 2011-03-18 14:45:06 UTC (rev 33)
+++ trunk/chorem-web/src/main/java/org/chorem/ChoremProxy.java 2011-03-18 15:01:37 UTC (rev 34)
@@ -1,5 +1,10 @@
package org.chorem;
+import java.util.List;
+
+import org.chorem.entities.Attachment;
+import org.chorem.entities.ContactDetails;
+
import org.nuiton.util.ApplicationConfig;
import org.nuiton.wikitty.WikittyProxy;
import org.nuiton.wikitty.WikittyService;
@@ -48,4 +53,26 @@
}
return ws;
}
+
+ /**
+ * Returns the attachments linked with a wikitty id ordered by date
+ *
+ * @param wikittyId
+ * @return the list of attachments
+ */
+ static public List<Attachment> getAttachments(String wikittyId) {
+ //TODO: implement
+ return null;
+ }
+
+ /**
+ * Returns the contact details linked with a wikitty id
+ *
+ * @param wikittyId
+ * @return the list of contact details
+ */
+ static public List<ContactDetails> getContactDetails(String wikittyId) {
+ //TODO: implement
+ return null;
+ }
}
Copied: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java (from rev 33, trunk/chorem-web/src/main/java/org/chorem/gepeto/action/admin/ProjectAction.java)
===================================================================
--- trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java (rev 0)
+++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-03-18 15:01:37 UTC (rev 34)
@@ -0,0 +1,73 @@
+package org.chorem.gepeto.action;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.chorem.action.BaseAction;
+
+/**
+ * Project management class
+ *
+ */
+public class ProjectAction extends BaseAction {
+
+ private static final long serialVersionUID = 498267854350348906L;
+
+ private static final Log log = LogFactory.getLog(ProjectAction.class);
+
+ protected String name;
+ protected String description;
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @param name: the project name
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * @return the project description
+ */
+ public String getDescription() {
+ return description;
+ }
+
+ /**
+ * @param description: the project description
+ */
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ /**
+ * Adds a new project
+ *
+ * @return INPUT if the mandatory fields haven't all been filled in
+ * @return SUCCESS if the project has been added
+ */
+ public String add() {
+ String result = INPUT;
+
+ if (name != null && description != null) {
+ if (!name.isEmpty() && !description.isEmpty()) {
+ result = SUCCESS;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Removes a project
+ *
+ * @return
+ */
+ public String remove() {
+ return SUCCESS;
+ }
+}
Property changes on: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-validation.xml (from rev 33, trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/admin/ProjectAction-validation.xml)
===================================================================
--- trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-validation.xml (rev 0)
+++ trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-validation.xml 2011-03-18 15:01:37 UTC (rev 34)
@@ -0,0 +1,16 @@
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+
+<validators>
+ <field name="name">
+ <field-validator type="requiredstring">
+ <message key="chorem.gepeto.project.name.required" />
+ </field-validator>
+ </field>
+ <field name="description">
+ <field-validator type="requiredstring">
+ <message key="chorem.gepeto.project.description.required" />
+ </field-validator>
+ </field>
+</validators>
Property changes on: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-validation.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/chorem-web/src/main/resources/struts.xml
===================================================================
--- trunk/chorem-web/src/main/resources/struts.xml 2011-03-18 14:45:06 UTC (rev 33)
+++ trunk/chorem-web/src/main/resources/struts.xml 2011-03-18 15:01:37 UTC (rev 34)
@@ -18,13 +18,13 @@
<result>/WEB-INF/jsp/bonzoms/home.jsp</result>
</action>
<action name="addCompanyPage">
- <result>/WEB-INF/jsp/bonzoms/admin/addCompany.jsp</result>
+ <result>/WEB-INF/jsp/bonzoms/addCompany.jsp</result>
</action>
<action name="addPersonPage">
- <result>/WEB-INF/jsp/bonzoms/admin/addPerson.jsp</result>
+ <result>/WEB-INF/jsp/bonzoms/addPerson.jsp</result>
</action>
<action name="addContactDetails">
- <result>/WEB-INF/jsp/bonzoms/admin/addContactDetails.jsp</result>
+ <result>/WEB-INF/jsp/bonzoms/addContactDetails.jsp</result>
</action>
</package>
@@ -34,20 +34,20 @@
<result>/WEB-INF/jsp/gepeto/home.jsp</result>
</action>
<action name="addProject_input">
- <result>/WEB-INF/jsp/gepeto/admin/addProject.jsp</result>
+ <result>/WEB-INF/jsp/gepeto/addProject.jsp</result>
</action>
- <action name="addProject" class="org.chorem.gepeto.action.admin.ProjectAction" method="add">
- <result name="input">/WEB-INF/jsp/gepeto/admin/addProject.jsp</result>
+ <action name="addProject" class="org.chorem.gepeto.action.ProjectAction" method="add">
+ <result name="input">/WEB-INF/jsp/gepeto/addProject.jsp</result>
<result type="redirectAction">home</result>
</action>
- <action name="removeProject" class="org.chorem.gepeto.action.admin.ProjectAction" method="delete">
+ <action name="removeProject" class="org.chorem.gepeto.action.ProjectAction" method="delete">
<result type="redirectAction">home</result>
</action>
<action name="addTaskPage">
- <result>/WEB-INF/jsp/gepeto/admin/addTask.jsp</result>
+ <result>/WEB-INF/jsp/gepeto/addTask.jsp</result>
</action>
<action name="addProjectOrder">
- <result>/WEB-INF/jsp/gepeto/admin/addProjectOrder.jsp</result>
+ <result>/WEB-INF/jsp/gepeto/addProjectOrder.jsp</result>
</action>
</package>
Copied: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addCompany.jsp (from rev 30, trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addCompany.jsp)
===================================================================
--- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addCompany.jsp (rev 0)
+++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addCompany.jsp 2011-03-18 15:01:37 UTC (rev 34)
@@ -0,0 +1,27 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@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.company.add" /></title>
+ <s:head />
+ </head>
+ <body>
+ <h2><s:text name="chorem.bonzoms.company.add" /></h2>
+ <s:form action="addCompany" method="post">
+ <fieldset>
+ <legend>
+ <s:text name="chorem.bonzoms.company">
+ <s:param></s:param>
+ </s:text>
+ </legend>
+ <s:textfield key="chorem.bonzoms.company.name" name="name" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.bonzoms.company.type" name="type" labelSeparator=": " />
+ <br />
+ <s:submit key="chorem.bonzoms.company.add" name="submit" />
+ </fieldset>
+ </s:form>
+ </body>
+</html>
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addCompany.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addContactDetails.jsp (from rev 31, trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addContactDetails.jsp)
===================================================================
--- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addContactDetails.jsp (rev 0)
+++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addContactDetails.jsp 2011-03-18 15:01:37 UTC (rev 34)
@@ -0,0 +1,25 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@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.contactDetails.add" /></title>
+ <s:head />
+ </head>
+ <body>
+ <h2><s:text name="chorem.bonzoms.contactDetails.add" /></h2>
+ <s:form action="addContactDetails" method="post">
+ <fieldset>
+ <legend><s:text name="chorem.bonzoms.contactDetails" /></legend>
+ <s:textfield key="chorem.bonzoms.contactDetails.name" name="name" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.bonzoms.contactDetails.type" name="type" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.bonzoms.contactDetails.value" name="value" labelSeparator=": " />
+ <br />
+ <s:submit key="chorem.bonzoms.contactDetails.add" name="submit" />
+ </fieldset>
+ </s:form>
+ </body>
+</html>
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addContactDetails.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addPerson.jsp (from rev 31, trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addPerson.jsp)
===================================================================
--- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addPerson.jsp (rev 0)
+++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addPerson.jsp 2011-03-18 15:01:37 UTC (rev 34)
@@ -0,0 +1,27 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@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.person.add" /></title>
+ <s:head />
+ </head>
+ <body>
+ <h2><s:text name="chorem.bonzoms.person.add" /></h2>
+ <s:form action="addPerson" method="post">
+ <fieldset>
+ <legend><s:text name="chorem.bonzoms.person" /></legend>
+ <s:textfield key="chorem.bonzoms.person.firstName" name="firstName" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.bonzoms.person.lastName" name="lastName" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.bonzoms.person.email" name="email" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.bonzoms.person.birthDate" name="birthDate" labelSeparator=": " />
+ <br />
+ <s:submit key="chorem.bonzoms.person.add" name="submit" />
+ </fieldset>
+ </s:form>
+ </body>
+</html>
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addPerson.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProject.jsp (from rev 33, trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProject.jsp)
===================================================================
--- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProject.jsp (rev 0)
+++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProject.jsp 2011-03-18 15:01:37 UTC (rev 34)
@@ -0,0 +1,28 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@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.gepeto.project.add" /></title>
+ <s:head />
+ </head>
+ <body>
+ <h2><s:text name="chorem.gepeto.project.add" /></h2>
+ <s:form action="addProject" method="post">
+ <fieldset>
+ <legend>
+ <s:text name="chorem.gepeto.project">
+ <s:param></s:param>
+ </s:text>
+ </legend>
+ <s:textfield key="chorem.gepeto.project.name" name="name" labelSeparator=": " labelposition="top" />
+ <br />
+ <br />
+ <s:textarea key="chorem.gepeto.project.description" name="description" cols="50" rows="10" labelposition="top" />
+ <br />
+ <s:submit key="chorem.gepeto.project.add" name="submit" />
+ </fieldset>
+ </s:form>
+ </body>
+</html>
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProject.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp (from rev 31, trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProjectOrder.jsp)
===================================================================
--- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp (rev 0)
+++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp 2011-03-18 15:01:37 UTC (rev 34)
@@ -0,0 +1,27 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@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.gepeto.projectOrder.add" /></title>
+ <s:head />
+ </head>
+ <body>
+ <h2><s:text name="chorem.gepeto.projectOrder.add" /></h2>
+ <s:form action="addProjectOrder" method="post">
+ <fieldset>
+ <legend><s:text name="chorem.gepeto.projectOrder" /></legend>
+ <s:textfield key="chorem.gepeto.projectOrder.type" name="type" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.gepeto.projectOrder.description" name="description" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.gepeto.projectOrder.beginDate" name="beginDate" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.gepeto.projectOrder.estimatedEndDate" name="estimatedEndDate" labelSeparator=": " />
+ <br />
+ <s:submit key="chorem.gepeto.projectOrder.add" name="submit" />
+ </fieldset>
+ </s:form>
+ </body>
+</html>
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addTask.jsp (from rev 31, trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addTask.jsp)
===================================================================
--- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addTask.jsp (rev 0)
+++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addTask.jsp 2011-03-18 15:01:37 UTC (rev 34)
@@ -0,0 +1,38 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@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.gepeto.task.add" /></title>
+ <s:head />
+ </head>
+ <body>
+ <h2><s:text name="chorem.gepeto.task.add" /></h2>
+ <s:form action="addTask" method="post">
+ <fieldset>
+ <legend>
+ <s:text name="chorem.gepeto.task">
+ <s:param></s:param>
+ </s:text>
+ </legend>
+ <s:textfield key="chorem.gepeto.task.name" name="name" labelSeparator=": " />
+ <br />
+ <br />
+ <s:textarea key="chorem.gepeto.task.description" name="description" cols="50" rows="10" labelposition="top" />
+ <br />
+ <br />
+ <s:textfield key="chorem.gepeto.task.price" name="price" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.gepeto.task.estimatedDays" name="estimatedDays" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.gepeto.task.beginDate" name="beginDate" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.gepeto.task.estimatedEndDate" name="estimatedEndDate" labelSeparator=": " />
+ <br />
+ <br />
+ <s:submit key="chorem.gepeto.task.add" name="submit" />
+ </fieldset>
+ </s:form>
+ </body>
+</html>
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addTask.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
1
0
r33 - in trunk/chorem-web/src/main: java/org/chorem/action java/org/chorem/gepeto/action/admin resources resources/i18n resources/org resources/org/chorem resources/org/chorem/gepeto resources/org/chorem/gepeto/action resources/org/chorem/gepeto/action/admin webapp/WEB-INF/jsp/gepeto/admin
by vbriand@users.chorem.org 18 Mar '11
by vbriand@users.chorem.org 18 Mar '11
18 Mar '11
Author: vbriand
Date: 2011-03-18 15:45:06 +0100 (Fri, 18 Mar 2011)
New Revision: 33
Url: http://chorem.org/repositories/revision/chorem/33
Log:
Added validation and very basic action class for project
Added:
trunk/chorem-web/src/main/java/org/chorem/gepeto/action/admin/ProjectAction.java
trunk/chorem-web/src/main/resources/org/
trunk/chorem-web/src/main/resources/org/chorem/
trunk/chorem-web/src/main/resources/org/chorem/gepeto/
trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/
trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/admin/
trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/admin/ProjectAction-validation.xml
Modified:
trunk/chorem-web/src/main/java/org/chorem/action/BaseAction.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/gepeto/admin/addProject.jsp
Modified: trunk/chorem-web/src/main/java/org/chorem/action/BaseAction.java
===================================================================
--- trunk/chorem-web/src/main/java/org/chorem/action/BaseAction.java 2011-03-18 13:46:51 UTC (rev 32)
+++ trunk/chorem-web/src/main/java/org/chorem/action/BaseAction.java 2011-03-18 14:45:06 UTC (rev 33)
@@ -18,13 +18,14 @@
* Overrides the Struts2 methods to render text in order to explicitly show
* the missing i18n translations
*/
-public class BaseAction extends ActionSupport implements SessionAware {
+public class BaseAction extends ActionSupport implements SessionAware {
private static final long serialVersionUID = 6360393466153765988L;
private static final Log log = LogFactory.getLog(BaseAction.class);
final static protected String CONTEXT_ACTION_KEY = "action";
+
public static final String UNTRANSLATED_MARKER = "???";
protected Map<String, Object> session;
Added: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/admin/ProjectAction.java
===================================================================
--- trunk/chorem-web/src/main/java/org/chorem/gepeto/action/admin/ProjectAction.java (rev 0)
+++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/admin/ProjectAction.java 2011-03-18 14:45:06 UTC (rev 33)
@@ -0,0 +1,73 @@
+package org.chorem.gepeto.action.admin;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.chorem.action.BaseAction;
+
+/**
+ * Project management class
+ *
+ */
+public class ProjectAction extends BaseAction {
+
+ private static final long serialVersionUID = 498267854350348906L;
+
+ private static final Log log = LogFactory.getLog(ProjectAction.class);
+
+ protected String name;
+ protected String description;
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @param name: the project name
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * @return the project description
+ */
+ public String getDescription() {
+ return description;
+ }
+
+ /**
+ * @param description: the project description
+ */
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ /**
+ * Adds a new project
+ *
+ * @return INPUT if the mandatory fields haven't all been filled in
+ * @return SUCCESS if the project has been added
+ */
+ public String add() {
+ String result = INPUT;
+
+ if (name != null && description != null) {
+ if (!name.isEmpty() && !description.isEmpty()) {
+ result = SUCCESS;
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Removes a project
+ *
+ * @return
+ */
+ public String remove() {
+ return SUCCESS;
+ }
+}
Property changes on: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/admin/ProjectAction.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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-18 13:46:51 UTC (rev 32)
+++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-03-18 14:45:06 UTC (rev 33)
@@ -1,12 +1,12 @@
chorem.bonzoms.company=Company {0}
chorem.bonzoms.company.add=Add a new company
-chorem.bonzoms.company.name=Company''s name
-chorem.bonzoms.company.type=Company''s type
+chorem.bonzoms.company.name=Company name
+chorem.bonzoms.company.type=Company type
chorem.bonzoms.contactDetails=Contact details
chorem.bonzoms.contactDetails.add=Add a new contact details
-chorem.bonzoms.contactDetails.name=Contact details'' name
-chorem.bonzoms.contactDetails.type=Contact details'' type
-chorem.bonzoms.contactDetails.value=Contact details'' value
+chorem.bonzoms.contactDetails.name=Contact details name
+chorem.bonzoms.contactDetails.type=Contact details type
+chorem.bonzoms.contactDetails.value=Contact details value
chorem.bonzoms.person=Person
chorem.bonzoms.person.add=Add a new person
chorem.bonzoms.person.birthDate=Birth date
@@ -19,7 +19,9 @@
chorem.gepeto.project=Project {0}
chorem.gepeto.project.add=Add a new project
chorem.gepeto.project.description=Description
-chorem.gepeto.project.name=Project''s name
+chorem.gepeto.project.description.required=You must describe the project
+chorem.gepeto.project.name=Project name
+chorem.gepeto.project.name.required=You must enter the project name
chorem.gepeto.projectDetails.title=Details of project {0}
chorem.gepeto.projectOrder=Project order
chorem.gepeto.projectOrder.add=Add a new project order
@@ -35,6 +37,6 @@
chorem.gepeto.task.description=Description
chorem.gepeto.task.estimatedDays=Estimated days
chorem.gepeto.task.estimatedEndDate=Estimated end date
-chorem.gepeto.task.name=Task''s name
+chorem.gepeto.task.name=Task name
chorem.gepeto.task.price=Price
chorem.home=Home
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-18 13:46:51 UTC (rev 32)
+++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-03-18 14:45:06 UTC (rev 33)
@@ -19,7 +19,9 @@
chorem.gepeto.project=Projet {0}
chorem.gepeto.project.add=Ajouter un nouveau projet
chorem.gepeto.project.description=Description
+chorem.gepeto.project.description.required=Vous devez d\u00E9crire le projet
chorem.gepeto.project.name=Nom du projet
+chorem.gepeto.project.name.required=Vous devez renseigner un nom pour le projet
chorem.gepeto.projectDetails.title=D\u00E9tails du projet {0}
chorem.gepeto.projectOrder=Contrat de commande d''un projet
chorem.gepeto.projectOrder.add=Ajouter le contrat d''un projet
Added: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/admin/ProjectAction-validation.xml
===================================================================
--- trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/admin/ProjectAction-validation.xml (rev 0)
+++ trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/admin/ProjectAction-validation.xml 2011-03-18 14:45:06 UTC (rev 33)
@@ -0,0 +1,16 @@
+<!DOCTYPE validators PUBLIC
+ "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+
+<validators>
+ <field name="name">
+ <field-validator type="requiredstring">
+ <message key="chorem.gepeto.project.name.required" />
+ </field-validator>
+ </field>
+ <field name="description">
+ <field-validator type="requiredstring">
+ <message key="chorem.gepeto.project.description.required" />
+ </field-validator>
+ </field>
+</validators>
Property changes on: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/admin/ProjectAction-validation.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/chorem-web/src/main/resources/struts.xml
===================================================================
--- trunk/chorem-web/src/main/resources/struts.xml 2011-03-18 13:46:51 UTC (rev 32)
+++ trunk/chorem-web/src/main/resources/struts.xml 2011-03-18 14:45:06 UTC (rev 33)
@@ -33,9 +33,16 @@
<action name="home">
<result>/WEB-INF/jsp/gepeto/home.jsp</result>
</action>
- <action name="addProjectPage">
+ <action name="addProject_input">
<result>/WEB-INF/jsp/gepeto/admin/addProject.jsp</result>
</action>
+ <action name="addProject" class="org.chorem.gepeto.action.admin.ProjectAction" method="add">
+ <result name="input">/WEB-INF/jsp/gepeto/admin/addProject.jsp</result>
+ <result type="redirectAction">home</result>
+ </action>
+ <action name="removeProject" class="org.chorem.gepeto.action.admin.ProjectAction" method="delete">
+ <result type="redirectAction">home</result>
+ </action>
<action name="addTaskPage">
<result>/WEB-INF/jsp/gepeto/admin/addTask.jsp</result>
</action>
Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProject.jsp
===================================================================
--- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProject.jsp 2011-03-18 13:46:51 UTC (rev 32)
+++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProject.jsp 2011-03-18 14:45:06 UTC (rev 33)
@@ -16,7 +16,7 @@
<s:param></s:param>
</s:text>
</legend>
- <s:textfield key="chorem.gepeto.project.name" name="name" labelSeparator=": " />
+ <s:textfield key="chorem.gepeto.project.name" name="name" labelSeparator=": " labelposition="top" />
<br />
<br />
<s:textarea key="chorem.gepeto.project.description" name="description" cols="50" rows="10" labelposition="top" />
1
0
Author: vbriand
Date: 2011-03-18 14:46:51 +0100 (Fri, 18 Mar 2011)
New Revision: 32
Url: http://chorem.org/repositories/revision/chorem/32
Log:
Added new details about model
Modified:
trunk/chorem-entities/src/site/rst/dataModel.rst
Modified: trunk/chorem-entities/src/site/rst/dataModel.rst
===================================================================
--- trunk/chorem-entities/src/site/rst/dataModel.rst 2011-03-18 10:22:55 UTC (rev 31)
+++ trunk/chorem-entities/src/site/rst/dataModel.rst 2011-03-18 13:46:51 UTC (rev 32)
@@ -6,6 +6,8 @@
=======
- Attachment: permet de mettre un fichier (pdf, image, odt, ...)
+ Peut par exemple être lié avec un projet pour y attacher le cahier des
+ charges
Gepeto
======
@@ -54,8 +56,16 @@
Billy
=====
-- quotation: devis envoyé à un client en rapport avec un projet
-- invoice: facture envoyée à un client en rapport avec un contrat
+- Quotation: devis envoyé à un client en rapport avec un projet
+- Invoice: facture envoyée à un client en rapport avec un contrat
Un devis accepté engendre un ProjectOrder. Un ProjectOrder engendre des
Invoices.
+À une facture et un devis sont liés deux ContactDetails qui représentent les
+adresses du client et du prestataire. Ainsi, si une personne change d'adresse
+ou quitte la société par exemple, les adresses d'origine sont sauvegardées afin
+de garantir une bonne traçabilité
+À la base, un projet (Project) est défini. Un ou plusieurs devis (Quotation)
+peuvent être réalisés selon les remarques formulées par le client. Ensuite, un
+contrat (ProjectOrder) est signé et une ou plusieurs factures (Invoice) sont
+liées à ce contrat.
\ No newline at end of file
1
0
r31 - in trunk/chorem-web/src/main: resources resources/i18n webapp/WEB-INF/jsp/bonzoms/admin webapp/WEB-INF/jsp/gepeto/admin
by vbriand@users.chorem.org 18 Mar '11
by vbriand@users.chorem.org 18 Mar '11
18 Mar '11
Author: vbriand
Date: 2011-03-18 11:22:55 +0100 (Fri, 18 Mar 2011)
New Revision: 31
Url: http://chorem.org/repositories/revision/chorem/31
Log:
Added pages for adding contact details and project order
Modified wrong textfield keys
Added:
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addContactDetails.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProjectOrder.jsp
Modified:
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/admin/addPerson.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addTask.jsp
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-18 09:39:33 UTC (rev 30)
+++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-03-18 10:22:55 UTC (rev 31)
@@ -2,6 +2,11 @@
chorem.bonzoms.company.add=Add a new company
chorem.bonzoms.company.name=Company''s name
chorem.bonzoms.company.type=Company''s type
+chorem.bonzoms.contactDetails=Contact details
+chorem.bonzoms.contactDetails.add=Add a new contact details
+chorem.bonzoms.contactDetails.name=Contact details'' name
+chorem.bonzoms.contactDetails.type=Contact details'' type
+chorem.bonzoms.contactDetails.value=Contact details'' value
chorem.bonzoms.person=Person
chorem.bonzoms.person.add=Add a new person
chorem.bonzoms.person.birthDate=Birth date
@@ -16,14 +21,20 @@
chorem.gepeto.project.description=Description
chorem.gepeto.project.name=Project''s name
chorem.gepeto.projectDetails.title=Details of project {0}
+chorem.gepeto.projectOrder=Project order
+chorem.gepeto.projectOrder.add=Add a new project order
+chorem.gepeto.projectOrder.beginDate=Begin date
+chorem.gepeto.projectOrder.description=Description
+chorem.gepeto.projectOrder.estimatedEndDate=Estimated end date
+chorem.gepeto.projectOrder.type=Type
chorem.gepeto.projectsByYear.title=Projects of year {0}
chorem.gepeto.results.title=Results by year
chorem.gepeto.task=Task {0}
chorem.gepeto.task.add=Add a new task
+chorem.gepeto.task.beginDate=Begin date
chorem.gepeto.task.description=Description
-chorem.gepeto.task.estimatedBeginDate=Estimated begin date
chorem.gepeto.task.estimatedDays=Estimated days
chorem.gepeto.task.estimatedEndDate=Estimated end date
-chorem.gepeto.task.name=Task name
+chorem.gepeto.task.name=Task''s name
chorem.gepeto.task.price=Price
chorem.home=Home
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-18 09:39:33 UTC (rev 30)
+++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-03-18 10:22:55 UTC (rev 31)
@@ -2,6 +2,11 @@
chorem.bonzoms.company.add=Ajouter une nouvelle soci\u00E9t\u00E9
chorem.bonzoms.company.name=Nom de la soci\u00E9t\u00E9
chorem.bonzoms.company.type=Type de la soci\u00E9t\u00E9
+chorem.bonzoms.contactDetails=M\u00E9thode de contact
+chorem.bonzoms.contactDetails.add=Ajouter une nouvelle m\u00E9thode de contact
+chorem.bonzoms.contactDetails.name=Nom de la m\u00E9thode de contact
+chorem.bonzoms.contactDetails.type=Type de la m\u00E9thode de contact
+chorem.bonzoms.contactDetails.value=Valeur de la m\u00E9thode de contact
chorem.bonzoms.person=Personne
chorem.bonzoms.person.add=Ajouter une nouvelle personne
chorem.bonzoms.person.birthDate=Date de naissance
@@ -16,12 +21,18 @@
chorem.gepeto.project.description=Description
chorem.gepeto.project.name=Nom du projet
chorem.gepeto.projectDetails.title=D\u00E9tails du projet {0}
+chorem.gepeto.projectOrder=Contrat de commande d''un projet
+chorem.gepeto.projectOrder.add=Ajouter le contrat d''un projet
+chorem.gepeto.projectOrder.beginDate=Date de d\u00E9but
+chorem.gepeto.projectOrder.description=Description
+chorem.gepeto.projectOrder.estimatedEndDate=Date de fin estim\u00E9e
+chorem.gepeto.projectOrder.type=Type
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}
chorem.gepeto.task.add=Ajouter une nouvelle t\u00E2che
+chorem.gepeto.task.beginDate=Date de d\u00E9but
chorem.gepeto.task.description=Description
-chorem.gepeto.task.estimatedBeginDate=Date de d\u00E9but estim\u00E9e
chorem.gepeto.task.estimatedDays=Nombre de jours estim\u00E9s
chorem.gepeto.task.estimatedEndDate=Date de fin estim\u00E9e
chorem.gepeto.task.name=Nom de la t\u00E2che
Modified: trunk/chorem-web/src/main/resources/struts.xml
===================================================================
--- trunk/chorem-web/src/main/resources/struts.xml 2011-03-18 09:39:33 UTC (rev 30)
+++ trunk/chorem-web/src/main/resources/struts.xml 2011-03-18 10:22:55 UTC (rev 31)
@@ -23,6 +23,9 @@
<action name="addPersonPage">
<result>/WEB-INF/jsp/bonzoms/admin/addPerson.jsp</result>
</action>
+ <action name="addContactDetails">
+ <result>/WEB-INF/jsp/bonzoms/admin/addContactDetails.jsp</result>
+ </action>
</package>
<package name="gepeto" namespace="/gepeto" extends="struts-default">
@@ -36,6 +39,9 @@
<action name="addTaskPage">
<result>/WEB-INF/jsp/gepeto/admin/addTask.jsp</result>
</action>
+ <action name="addProjectOrder">
+ <result>/WEB-INF/jsp/gepeto/admin/addProjectOrder.jsp</result>
+ </action>
</package>
<!--<package name="billy" namespace="/billy" extends="struts-default">
Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addContactDetails.jsp
===================================================================
--- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addContactDetails.jsp (rev 0)
+++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addContactDetails.jsp 2011-03-18 10:22:55 UTC (rev 31)
@@ -0,0 +1,25 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@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.contactDetails.add" /></title>
+ <s:head />
+ </head>
+ <body>
+ <h2><s:text name="chorem.bonzoms.contactDetails.add" /></h2>
+ <s:form action="addContactDetails" method="post">
+ <fieldset>
+ <legend><s:text name="chorem.bonzoms.contactDetails" /></legend>
+ <s:textfield key="chorem.bonzoms.contactDetails.name" name="name" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.bonzoms.contactDetails.type" name="type" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.bonzoms.contactDetails.value" name="value" labelSeparator=": " />
+ <br />
+ <s:submit key="chorem.bonzoms.contactDetails.add" name="submit" />
+ </fieldset>
+ </s:form>
+ </body>
+</html>
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addContactDetails.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addPerson.jsp
===================================================================
--- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addPerson.jsp 2011-03-18 09:39:33 UTC (rev 30)
+++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addPerson.jsp 2011-03-18 10:22:55 UTC (rev 31)
@@ -20,7 +20,7 @@
<br />
<s:textfield key="chorem.bonzoms.person.birthDate" name="birthDate" labelSeparator=": " />
<br />
- <s:submit key="chorem.bonzoms.company.add" name="submit" />
+ <s:submit key="chorem.bonzoms.person.add" name="submit" />
</fieldset>
</s:form>
</body>
Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProjectOrder.jsp
===================================================================
--- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProjectOrder.jsp (rev 0)
+++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProjectOrder.jsp 2011-03-18 10:22:55 UTC (rev 31)
@@ -0,0 +1,27 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@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.gepeto.projectOrder.add" /></title>
+ <s:head />
+ </head>
+ <body>
+ <h2><s:text name="chorem.gepeto.projectOrder.add" /></h2>
+ <s:form action="addProjectOrder" method="post">
+ <fieldset>
+ <legend><s:text name="chorem.gepeto.projectOrder" /></legend>
+ <s:textfield key="chorem.gepeto.projectOrder.type" name="type" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.gepeto.projectOrder.description" name="description" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.gepeto.projectOrder.beginDate" name="beginDate" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.gepeto.projectOrder.estimatedEndDate" name="estimatedEndDate" labelSeparator=": " />
+ <br />
+ <s:submit key="chorem.gepeto.projectOrder.add" name="submit" />
+ </fieldset>
+ </s:form>
+ </body>
+</html>
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProjectOrder.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addTask.jsp
===================================================================
--- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addTask.jsp 2011-03-18 09:39:33 UTC (rev 30)
+++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addTask.jsp 2011-03-18 10:22:55 UTC (rev 31)
@@ -26,7 +26,7 @@
<br />
<s:textfield key="chorem.gepeto.task.estimatedDays" name="estimatedDays" labelSeparator=": " />
<br />
- <s:textfield key="chorem.gepeto.task.estimatedBeginDate" name="estimatedBeginDate" labelSeparator=": " />
+ <s:textfield key="chorem.gepeto.task.beginDate" name="beginDate" labelSeparator=": " />
<br />
<s:textfield key="chorem.gepeto.task.estimatedEndDate" name="estimatedEndDate" labelSeparator=": " />
<br />
1
0
r30 - in trunk/chorem-web/src/main: resources resources/i18n webapp/WEB-INF/jsp webapp/WEB-INF/jsp/bonzoms webapp/WEB-INF/jsp/bonzoms/admin webapp/WEB-INF/jsp/gepeto/admin
by vbriand@users.chorem.org 18 Mar '11
by vbriand@users.chorem.org 18 Mar '11
18 Mar '11
Author: vbriand
Date: 2011-03-18 10:39:33 +0100 (Fri, 18 Mar 2011)
New Revision: 30
Url: http://chorem.org/repositories/revision/chorem/30
Log:
Added new pages in bonzoms for adding a new company or person
Completed page for adding a task
Added:
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addCompany.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addPerson.jsp
Modified:
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/gepeto/admin/addTask.jsp
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-17 16:40:52 UTC (rev 29)
+++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-03-18 09:39:33 UTC (rev 30)
@@ -1,3 +1,13 @@
+chorem.bonzoms.company=Company {0}
+chorem.bonzoms.company.add=Add a new company
+chorem.bonzoms.company.name=Company''s name
+chorem.bonzoms.company.type=Company''s type
+chorem.bonzoms.person=Person
+chorem.bonzoms.person.add=Add a new person
+chorem.bonzoms.person.birthDate=Birth date
+chorem.bonzoms.person.email=Email
+chorem.bonzoms.person.firstName=First name
+chorem.bonzoms.person.lastName=Last name
chorem.config.configFileName.description=chorem''s configuration filename
chorem.error.internal=An internal error occurred
chorem.gepeto.home=Home
@@ -4,12 +14,16 @@
chorem.gepeto.project=Project {0}
chorem.gepeto.project.add=Add a new project
chorem.gepeto.project.description=Description
-chorem.gepeto.project.name=Project name
+chorem.gepeto.project.name=Project''s name
chorem.gepeto.projectDetails.title=Details of project {0}
chorem.gepeto.projectsByYear.title=Projects of year {0}
chorem.gepeto.results.title=Results by year
chorem.gepeto.task=Task {0}
chorem.gepeto.task.add=Add a new task
chorem.gepeto.task.description=Description
+chorem.gepeto.task.estimatedBeginDate=Estimated begin date
+chorem.gepeto.task.estimatedDays=Estimated days
+chorem.gepeto.task.estimatedEndDate=Estimated end date
chorem.gepeto.task.name=Task name
+chorem.gepeto.task.price=Price
chorem.home=Home
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-17 16:40:52 UTC (rev 29)
+++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-03-18 09:39:33 UTC (rev 30)
@@ -1,3 +1,13 @@
+chorem.bonzoms.company=Soci\u00E9t\u00E9
+chorem.bonzoms.company.add=Ajouter une nouvelle soci\u00E9t\u00E9
+chorem.bonzoms.company.name=Nom de la soci\u00E9t\u00E9
+chorem.bonzoms.company.type=Type de la soci\u00E9t\u00E9
+chorem.bonzoms.person=Personne
+chorem.bonzoms.person.add=Ajouter une nouvelle personne
+chorem.bonzoms.person.birthDate=Date de naissance
+chorem.bonzoms.person.email=Email
+chorem.bonzoms.person.firstName=Pr\u00E9nom
+chorem.bonzoms.person.lastName=Nom
chorem.config.configFileName.description=Nom du fichier de configuration de chorem
chorem.error.internal=Une erreur interne s''est produite
chorem.gepeto.home=Accueil
@@ -11,5 +21,9 @@
chorem.gepeto.task=T\u00E2che {0}
chorem.gepeto.task.add=Ajouter une nouvelle t\u00E2che
chorem.gepeto.task.description=Description
+chorem.gepeto.task.estimatedBeginDate=Date de d\u00E9but estim\u00E9e
+chorem.gepeto.task.estimatedDays=Nombre de jours estim\u00E9s
+chorem.gepeto.task.estimatedEndDate=Date de fin estim\u00E9e
chorem.gepeto.task.name=Nom de la t\u00E2che
+chorem.gepeto.task.price=Prix
chorem.home=Accueil
Modified: trunk/chorem-web/src/main/resources/struts.xml
===================================================================
--- trunk/chorem-web/src/main/resources/struts.xml 2011-03-17 16:40:52 UTC (rev 29)
+++ trunk/chorem-web/src/main/resources/struts.xml 2011-03-18 09:39:33 UTC (rev 30)
@@ -12,12 +12,18 @@
<result>/WEB-INF/jsp/home.jsp</result>
</action>
</package>
-<!--
+
<package name="bonzoms" namespace="/bonzoms" extends="struts-default">
<action name="home">
<result>/WEB-INF/jsp/bonzoms/home.jsp</result>
</action>
- </package>-->
+ <action name="addCompanyPage">
+ <result>/WEB-INF/jsp/bonzoms/admin/addCompany.jsp</result>
+ </action>
+ <action name="addPersonPage">
+ <result>/WEB-INF/jsp/bonzoms/admin/addPerson.jsp</result>
+ </action>
+ </package>
<package name="gepeto" namespace="/gepeto" extends="struts-default">
<default-action-ref name="home" />
Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addCompany.jsp
===================================================================
--- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addCompany.jsp (rev 0)
+++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addCompany.jsp 2011-03-18 09:39:33 UTC (rev 30)
@@ -0,0 +1,27 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@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.company.add" /></title>
+ <s:head />
+ </head>
+ <body>
+ <h2><s:text name="chorem.bonzoms.company.add" /></h2>
+ <s:form action="addCompany" method="post">
+ <fieldset>
+ <legend>
+ <s:text name="chorem.bonzoms.company">
+ <s:param></s:param>
+ </s:text>
+ </legend>
+ <s:textfield key="chorem.bonzoms.company.name" name="name" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.bonzoms.company.type" name="type" labelSeparator=": " />
+ <br />
+ <s:submit key="chorem.bonzoms.company.add" name="submit" />
+ </fieldset>
+ </s:form>
+ </body>
+</html>
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addCompany.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addPerson.jsp
===================================================================
--- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addPerson.jsp (rev 0)
+++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addPerson.jsp 2011-03-18 09:39:33 UTC (rev 30)
@@ -0,0 +1,27 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@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.person.add" /></title>
+ <s:head />
+ </head>
+ <body>
+ <h2><s:text name="chorem.bonzoms.person.add" /></h2>
+ <s:form action="addPerson" method="post">
+ <fieldset>
+ <legend><s:text name="chorem.bonzoms.person" /></legend>
+ <s:textfield key="chorem.bonzoms.person.firstName" name="firstName" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.bonzoms.person.lastName" name="lastName" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.bonzoms.person.email" name="email" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.bonzoms.person.birthDate" name="birthDate" labelSeparator=": " />
+ <br />
+ <s:submit key="chorem.bonzoms.company.add" name="submit" />
+ </fieldset>
+ </s:form>
+ </body>
+</html>
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addPerson.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addTask.jsp
===================================================================
--- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addTask.jsp 2011-03-17 16:40:52 UTC (rev 29)
+++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addTask.jsp 2011-03-18 09:39:33 UTC (rev 30)
@@ -21,6 +21,16 @@
<br />
<s:textarea key="chorem.gepeto.task.description" name="description" cols="50" rows="10" labelposition="top" />
<br />
+ <br />
+ <s:textfield key="chorem.gepeto.task.price" name="price" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.gepeto.task.estimatedDays" name="estimatedDays" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.gepeto.task.estimatedBeginDate" name="estimatedBeginDate" labelSeparator=": " />
+ <br />
+ <s:textfield key="chorem.gepeto.task.estimatedEndDate" name="estimatedEndDate" labelSeparator=": " />
+ <br />
+ <br />
<s:submit key="chorem.gepeto.task.add" name="submit" />
</fieldset>
</s:form>
1
0