August 2012 - Chorem-commits - mailman.cloud.codelutin.com

r222 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org 03 Aug '12

03 Aug '12

Author: bpoussin Date: 2012-08-03 14:00:52 +0200 (Fri, 03 Aug 2012) New Revision: 222 Url: http://chorem.org/repositories/revision/chorem/222 Log: Anomalie #662: Cancel button redirection ? Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp 2012-08-03 09:50:14 UTC (rev 221) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp 2012-08-03 12:00:52 UTC (rev 222) @@ -30,7 +30,7 @@ <input type="hidden" name="id" value="${wikitty.id}"/> <p> <button class="btn btn-success" type="submit"><i class="icon-ok icon-white"></i> Save</button> - <a class="btn btn-info" href="/wikitty/view/${wikitty.id}"><i class="icon-remove icon-white"></i> Cancel</a> + <a class="btn btn-info" href="<c:url value="/wikitty/view/${wikitty.id}"/>"><i class="icon-remove icon-white"></i> Cancel</a> </p> <c:forEach var="ext" items="${extensions}">

1 0

r221 - trunk/chorem-entities/src/main/xmi
by bpoussin＠users.chorem.org 03 Aug '12

03 Aug '12

Author: bpoussin Date: 2012-08-03 11:50:14 +0200 (Fri, 03 Aug 2012) New Revision: 221 Url: http://chorem.org/repositories/revision/chorem/221 Log: ajout quelque tag help d'exemple Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties =================================================================== --- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-08-03 09:48:46 UTC (rev 220) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-08-03 09:50:14 UTC (rev 221) @@ -83,7 +83,7 @@ org.chorem.entities.Vacation.class.tagvalue.preload=Vacation.employee org.chorem.entities.Vacation.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate,Vacation.type org.chorem.entities.Vacation.attribute.status.tagvalue.allowed=DRAFT,ASKED,REJECTED,ACCEPTED -org.chorem.entities.Touch.class.tagvalue.version=7.0 +org.chorem.entities.Touch.class.tagvalue.version=8.0 org.chorem.entities.Touch.class.tagvalue.preload=Touch.participant org.chorem.entities.Touch.class.tagvalue.toString=%Interval.beginDate$tF - %Touch.type$s - %Touch.goal|nogoal$s org.chorem.entities.Touch.class.tagvalue.sortOrder=Interval.beginDate desc,Touch.type,Touch.goal @@ -95,7 +95,7 @@ org.chorem.entities.Attachment.class.tagvalue.version=7.0 org.chorem.entities.Attachment.class.tagvalue.toString=%Attachment.name|noname$s (%Attachment.mimetype|notype$s) %Attachment.date$tF org.chorem.entities.Attachment.class.tagvalue.sortOrder=Attachment.name,Attachment.mimetype,Attachment.date -org.chorem.entities.Quotation.class.tagvalue.version=11.0 +org.chorem.entities.Quotation.class.tagvalue.version=12.0 org.chorem.entities.Quotation.class.tagvalue.preload=Quotation.project;Quotation.customer;Quotation.supplier;Quotation.category org.chorem.entities.Quotation.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF %Quotation.reference|noref$s(%Quotation.category|noCategory$s) %Quotation.description|nodescription$s org.chorem.entities.Quotation.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate,Quotation.reference,Quotation.type,Quotation.description

1 0

r220 - in trunk: chorem-entities/src/main/xmi chorem-webmotion/src/main/java/org/wikitty/web/jsptag
by bpoussin＠users.chorem.org 03 Aug '12

03 Aug '12

Author: bpoussin Date: 2012-08-03 11:48:46 +0200 (Fri, 03 Aug 2012) New Revision: 220 Url: http://chorem.org/repositories/revision/chorem/220 Log: ajout de la possibilite de mettre un tag help sur les champs qui sera affiche lors de la saisie. Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties =================================================================== --- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-08-03 09:33:09 UTC (rev 219) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-08-03 09:48:46 UTC (rev 220) @@ -87,7 +87,9 @@ org.chorem.entities.Touch.class.tagvalue.preload=Touch.participant org.chorem.entities.Touch.class.tagvalue.toString=%Interval.beginDate$tF - %Touch.type$s - %Touch.goal|nogoal$s org.chorem.entities.Touch.class.tagvalue.sortOrder=Interval.beginDate desc,Touch.type,Touch.goal +org.chorem.entities.Touch.attribute.goal.tagvalue.help=But de la prise de contact org.chorem.entities.Touch.attribute.goal.tagvalue.subtype=text/rst +org.chorem.entities.Touch.attribute.digest.tagvalue.help=R\u00e9sum\u00e9 de l'\u00e9change durant la prise de contact org.chorem.entities.Touch.attribute.digest.tagvalue.subtype=text/rst org.chorem.entities.Touch.attribute.type.tagvalue.choiceQuery=SELECT Touch.type WHERE extension=Touch org.chorem.entities.Attachment.class.tagvalue.version=7.0 @@ -98,6 +100,7 @@ org.chorem.entities.Quotation.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF %Quotation.reference|noref$s(%Quotation.category|noCategory$s) %Quotation.description|nodescription$s org.chorem.entities.Quotation.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate,Quotation.reference,Quotation.type,Quotation.description org.chorem.entities.Quotation.attribute.status.tagvalue.allowed=LEAD,DRAFT,SENT,REJECTED,ACCEPTED,STARTED,DELIVERED,RSV,WARRANTY,CLOSED +org.chorem.entities.Quotation.attribute.conversionHope.tagvalue.help=Pourcentage de r\u00e9ussite du projet org.chorem.entities.Quotation.attribute.conversionHope.tagvalue.min=0 org.chorem.entities.Quotation.attribute.conversionHope.tagvalue.max=100 org.chorem.entities.Invoice.class.tagvalue.version=9.0 Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-08-03 09:33:09 UTC (rev 219) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-08-03 09:48:46 UTC (rev 220) @@ -133,6 +133,10 @@ } break; } + String help = field.getTagValue("help"); + if (StringUtils.isNotBlank(help)) { + /*{<i class="icon-question-sign" title="<%=help%>"></i>}*/ + } } else { /*{<div class="alert alert-error"><%=wikitty.getId()%> doesn't have field '<%=fqfield%>'</div>}*/ }

1 0

r219 - trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag
by bpoussin＠users.chorem.org 03 Aug '12

03 Aug '12

Author: bpoussin Date: 2012-08-03 11:33:09 +0200 (Fri, 03 Aug 2012) New Revision: 219 Url: http://chorem.org/repositories/revision/chorem/219 Log: debut de formatage un peu plus humain des chiffres Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java 2012-08-03 09:03:34 UTC (rev 218) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java 2012-08-03 09:33:09 UTC (rev 219) @@ -163,15 +163,16 @@ throws JspException, IOException { BigDecimal value = wikitty.getFieldAsBigDecimal(extName, fieldName); + NumberFormat formatter; if (field.hasPattern()) { String pattern = field.getPattern(); //TODO ymartel 2012-05-02 : manage localization - NumberFormat formatter = new DecimalFormat(pattern); - String formattedValue = formatter.format(value); - /*{<%=label%> : <%=formattedValue%> }*/ + formatter = new DecimalFormat(pattern); } else { - /*{<%=label%> : <%=value%>}*/ + formatter = new DecimalFormat(); } + String formattedValue = formatter.format(value); + /*{<%=label%> : <%=formattedValue%> }*/ } protected void viewCollectionString(JspWriter output, String contextPath, String label,

1 0

r218 - in trunk: . chorem-entities/src/main/xmi
by bpoussin＠users.chorem.org 03 Aug '12

03 Aug '12

Author: bpoussin Date: 2012-08-03 11:03:34 +0200 (Fri, 03 Aug 2012) New Revision: 218 Url: http://chorem.org/repositories/revision/chorem/218 Log: modification de toutes les versions pour regenerer les extensions avec le nouveau tag de la version 3.8 de wikitty TAG_FIELD_ORDER Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties trunk/pom.xml Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties =================================================================== --- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-08-02 15:15:41 UTC (rev 217) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-08-03 09:03:34 UTC (rev 218) @@ -20,91 +20,91 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -org.chorem.entities.Configuration.class.tagvalue.version=2.0 -org.chorem.entities.Category.class.tagvalue.version=3.0 +org.chorem.entities.Configuration.class.tagvalue.version=3.0 +org.chorem.entities.Category.class.tagvalue.version=4.0 org.chorem.entities.Category.class.tagvalue.toString=%WikittyTreeNode.name|noname$s -org.chorem.entities.Project.class.tagvalue.version=5.0 +org.chorem.entities.Project.class.tagvalue.version=6.0 org.chorem.entities.Project.class.tagvalue.toString=%Project.name|noname$s org.chorem.entities.Project.class.tagvalue.sortOrder=Project.name -org.chorem.entities.Task.class.tagvalue.version=8.0 +org.chorem.entities.Task.class.tagvalue.version=9.0 org.chorem.entities.Task.class.tagvalue.toString=%Task.name|noname$s - %Task.quotation$s org.chorem.entities.Task.class.tagvalue.sortOrder=Task.name org.chorem.entities.Task.class.tagvalue.preload=Task.quotation org.chorem.entities.Task.attribute.status.tagvalue.allowed=SCHEDULED,STARTED,FINISHED,CLOSED -org.chorem.entities.Worker.class.tagvalue.version=6.0 +org.chorem.entities.Worker.class.tagvalue.version=7.0 org.chorem.entities.Worker.class.tagvalue.toString=%Worker.person$s - %Worker.task$s - %Worker.percentage|nopercentage$s org.chorem.entities.Worker.class.tagvalue.sortOrder=Worker.percentage org.chorem.entities.Worker.class.tagvalue.preload=Worker.person;Work.task -org.chorem.entities.Person.class.tagvalue.version=5.0 +org.chorem.entities.Person.class.tagvalue.version=6.0 org.chorem.entities.Person.class.tagvalue.toString=%Person.lastName$s %Person.firstName|noname$s org.chorem.entities.Person.class.tagvalue.sortOrder=Person.lastName,Person.firstName -org.chorem.entities.Interval.class.tagvalue.version=7.0 +org.chorem.entities.Interval.class.tagvalue.version=8.0 org.chorem.entities.Interval.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF org.chorem.entities.Interval.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate org.chorem.entities.Interval.attribute.beginDate.tagvalue.subtype=datetime org.chorem.entities.Interval.attribute.endDate.tagvalue.subtype=datetime -org.chorem.entities.Company.class.tagvalue.version=5.0 +org.chorem.entities.Company.class.tagvalue.version=6.0 org.chorem.entities.Company.class.tagvalue.toString=%Company.name|noname$s org.chorem.entities.Company.class.tagvalue.sortOrder=Company.name -org.chorem.entities.ContactDetails.class.tagvalue.version=5.0 +org.chorem.entities.ContactDetails.class.tagvalue.version=6.0 org.chorem.entities.ContactDetails.class.tagvalue.toString=%ContactDetails.type|notype$s %ContactDetails.name|noname$s %ContactDetails.value$s org.chorem.entities.ContactDetails.class.tagvalue.sortOrder=ContactDetails.type, ContactDetails.name,ContactDetails.value -org.chorem.entities.Time.class.tagvalue.version=7.0 +org.chorem.entities.Time.class.tagvalue.version=8.0 org.chorem.entities.Time.class.tagvalue.preload=Time.task;Time.employee org.chorem.entities.Time.class.tagvalue.toString=%Time.employee$s - %Time.task$s - %Interval.beginDate$tF-%Interval.endDate$tF -org.chorem.entities.Employee.class.tagvalue.version=7.0 +org.chorem.entities.Employee.class.tagvalue.version=8.0 org.chorem.entities.Employee.class.tagvalue.preload=Employee.company;Employee.person org.chorem.entities.Employee.class.tagvalue.toString=%Employee.person$s (%Employee.company$s) org.chorem.entities.Employee.class.tagvalue.sortOrder=Employee.company,Employee.person -org.chorem.entities.Goal.class.tagvalue.version=5.0 +org.chorem.entities.Goal.class.tagvalue.version=6.0 org.chorem.entities.Goal.class.tagvalue.toString=%Goal.name|noname$s org.chorem.entities.Goal.class.tagvalue.sortOrder=Goal.name -org.chorem.entities.PersonSkill.class.tagvalue.version=6.0 +org.chorem.entities.PersonSkill.class.tagvalue.version=7.0 org.chorem.entities.PersonSkill.class.tagvalue.toString=%PersonSkill.person$s %Evaluation.level|nolevel$s org.chorem.entities.PersonSkill.class.tagvalue.sortOrder=Evaluation.level org.chorem.entities.PersonSkill.class.tagvalue.preload=PersonSkill.person -org.chorem.entities.Skill.class.tagvalue.version=6.0 +org.chorem.entities.Skill.class.tagvalue.version=70 org.chorem.entities.Skill.class.tagvalue.toString=%WikittyTreeNode$s %Skill.description|nodescription$s org.chorem.entities.Skill.class.tagvalue.sortOrder=Skill.description -org.chorem.entities.Interview.class.tagvalue.version=6.0 +org.chorem.entities.Interview.class.tagvalue.version=7.0 org.chorem.entities.Interview.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF %Interview.type|notype$s %Interview.interviewee$s org.chorem.entities.Interview.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate,Interview.type org.chorem.entities.Interview.class.tagvalue.preload=Interval.interviewee -org.chorem.entities.Mission.class.tagvalue.version=6.0 +org.chorem.entities.Mission.class.tagvalue.version=7.0 org.chorem.entities.Mission.class.tagvalue.toString=%Mission.name|noname$s %Mission.employee$s (%Mission.role$s) org.chorem.entities.Mission.class.tagvalue.sortOrder=Mission.name,Mission.role org.chorem.entities.Mission.class.tagvalue.preload=Mission.employee -org.chorem.entities.Evaluation.class.tagvalue.version=6.0 +org.chorem.entities.Evaluation.class.tagvalue.version=7.0 org.chorem.entities.Evaluation.class.tagvalue.toString=%PersonSkill.evaluator$s %Evaluation.level|nolevel$s org.chorem.entities.Evaluation.class.tagvalue.sortOrder=Evaluation.level org.chorem.entities.Evaluation.class.tagvalue.preload=Evaluation.evaluator -org.chorem.entities.Vacation.class.tagvalue.version=8.0 +org.chorem.entities.Vacation.class.tagvalue.version=9.0 org.chorem.entities.Vacation.class.tagvalue.toString=%Interval.employee$s %Interval.beginDate$tF-%Interval.endDate$tF %Vacation.type|notype$s org.chorem.entities.Vacation.class.tagvalue.preload=Vacation.employee org.chorem.entities.Vacation.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate,Vacation.type org.chorem.entities.Vacation.attribute.status.tagvalue.allowed=DRAFT,ASKED,REJECTED,ACCEPTED -org.chorem.entities.Touch.class.tagvalue.version=6.0 +org.chorem.entities.Touch.class.tagvalue.version=7.0 org.chorem.entities.Touch.class.tagvalue.preload=Touch.participant org.chorem.entities.Touch.class.tagvalue.toString=%Interval.beginDate$tF - %Touch.type$s - %Touch.goal|nogoal$s org.chorem.entities.Touch.class.tagvalue.sortOrder=Interval.beginDate desc,Touch.type,Touch.goal org.chorem.entities.Touch.attribute.goal.tagvalue.subtype=text/rst org.chorem.entities.Touch.attribute.digest.tagvalue.subtype=text/rst org.chorem.entities.Touch.attribute.type.tagvalue.choiceQuery=SELECT Touch.type WHERE extension=Touch -org.chorem.entities.Attachment.class.tagvalue.version=6.0 +org.chorem.entities.Attachment.class.tagvalue.version=7.0 org.chorem.entities.Attachment.class.tagvalue.toString=%Attachment.name|noname$s (%Attachment.mimetype|notype$s) %Attachment.date$tF org.chorem.entities.Attachment.class.tagvalue.sortOrder=Attachment.name,Attachment.mimetype,Attachment.date -org.chorem.entities.Quotation.class.tagvalue.version=10.0 +org.chorem.entities.Quotation.class.tagvalue.version=11.0 org.chorem.entities.Quotation.class.tagvalue.preload=Quotation.project;Quotation.customer;Quotation.supplier;Quotation.category org.chorem.entities.Quotation.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF %Quotation.reference|noref$s(%Quotation.category|noCategory$s) %Quotation.description|nodescription$s org.chorem.entities.Quotation.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate,Quotation.reference,Quotation.type,Quotation.description org.chorem.entities.Quotation.attribute.status.tagvalue.allowed=LEAD,DRAFT,SENT,REJECTED,ACCEPTED,STARTED,DELIVERED,RSV,WARRANTY,CLOSED org.chorem.entities.Quotation.attribute.conversionHope.tagvalue.min=0 org.chorem.entities.Quotation.attribute.conversionHope.tagvalue.max=100 -org.chorem.entities.Invoice.class.tagvalue.version=8.0 +org.chorem.entities.Invoice.class.tagvalue.version=9.0 org.chorem.entities.Invoice.class.tagvalue.preload=Invoice.target;Invoice.customer;Invoice.supplier org.chorem.entities.Invoice.class.tagvalue.toString=%Invoice.reference|noref$s %Invoice.amount|noamount$s %Invoice.postedDate$tF %Invoice.expectedDate$tF %Invoice.paymentDate$tF org.chorem.entities.Invoice.class.tagvalue.sortOrder=Invoice.postedDate,Invoice.expectedDate,Invoice.paymentDate,Invoice.reference,Invoice.amount -org.chorem.entities.Invoiceable.class.tagvalue.version=8.0 +org.chorem.entities.Invoiceable.class.tagvalue.version=9.0 org.chorem.entities.Invoiceable.class.tagvalue.preload=Invoiceable.category org.chorem.entities.Invoiceable.class.tagvalue.toString=%Invoiceable.name|noname$s org.chorem.entities.Invoiceable.class.tagvalue.sortOrder=Invoiceable.name Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-02 15:15:41 UTC (rev 217) +++ trunk/pom.xml 2012-08-03 09:03:34 UTC (rev 218) @@ -98,7 +98,7 @@ <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> <nuitonWebVersion>1.7</nuitonWebVersion> <nuitonI18nVersion>2.3.1</nuitonI18nVersion> - <wikittyVersion>3.7</wikittyVersion> + <wikittyVersion>3.8-SNAPSHOT</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <struts2Version>2.2.3</struts2Version> <struts2jqueryVersion>3.2.0</struts2jqueryVersion>

1 0

r217 - trunk/chorem-entities/src/main/xmi
by bpoussin＠users.chorem.org 02 Aug '12

02 Aug '12

Author: bpoussin Date: 2012-08-02 17:15:41 +0200 (Thu, 02 Aug 2012) New Revision: 217 Url: http://chorem.org/repositories/revision/chorem/217 Log: Anomalie #670: Spelling mistake on quotation attributes (correction de RSV) Evolution #727: Add the ability to track leads Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties =================================================================== --- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-08-02 14:20:50 UTC (rev 216) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-08-02 15:15:41 UTC (rev 217) @@ -97,7 +97,7 @@ org.chorem.entities.Quotation.class.tagvalue.preload=Quotation.project;Quotation.customer;Quotation.supplier;Quotation.category org.chorem.entities.Quotation.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF %Quotation.reference|noref$s(%Quotation.category|noCategory$s) %Quotation.description|nodescription$s org.chorem.entities.Quotation.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate,Quotation.reference,Quotation.type,Quotation.description -org.chorem.entities.Quotation.attribute.status.tagvalue.allowed=DRAFT,SENT,REJECTED,ACCEPTED,STARTED,DELIVERED,VSR,WARRANTY,CLOSED +org.chorem.entities.Quotation.attribute.status.tagvalue.allowed=LEAD,DRAFT,SENT,REJECTED,ACCEPTED,STARTED,DELIVERED,RSV,WARRANTY,CLOSED org.chorem.entities.Quotation.attribute.conversionHope.tagvalue.min=0 org.chorem.entities.Quotation.attribute.conversionHope.tagvalue.max=100 org.chorem.entities.Invoice.class.tagvalue.version=8.0

1 0

r216 - trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag
by bpoussin＠users.chorem.org 02 Aug '12

02 Aug '12

Author: bpoussin Date: 2012-08-02 16:20:50 +0200 (Thu, 02 Aug 2012) New Revision: 216 Url: http://chorem.org/repositories/revision/chorem/216 Log: Anomalie #728: Quotation status is not put in edit mode Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-08-02 11:54:50 UTC (rev 215) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-08-02 14:20:50 UTC (rev 216) @@ -231,14 +231,18 @@ throws JspException, IOException { String id = wikitty.getId() + "-" + extName + "-" + fieldName; String value = wikitty.getFieldAsString(extName, fieldName); - /*{<select id="text-<%=id%>" type="text" name="<%=name%>" value="<%=value%>"<%=getDynamicAttribute()%> }*/ + /*{<select id="text-<%=id%>" name="<%=name%>" <%=getDynamicAttribute()%> }*/ if (field.isCollection()) { /*{ multiple="multiple" }*/ } /*{ >}*/ List<String> allowedValues = field.getAllowedAsList(); for (String allowedValue : allowedValues) { - /*{<option value="<%=allowedValue%>"<%=getDynamicAttribute()%> ><%=allowedValue%></option>}*/ + String selected = ""; + if (allowedValue.equals(value)) { + selected = "selected"; + } + /*{<option value="<%=allowedValue%>" <%=selected%>><%=allowedValue%></option>}*/ } /*{</select>}*/ }

1 0

r215 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp
by jcouteau＠users.chorem.org 02 Aug '12

02 Aug '12

Author: jcouteau Date: 2012-08-02 13:54:50 +0200 (Thu, 02 Aug 2012) New Revision: 215 Url: http://chorem.org/repositories/revision/chorem/215 Log: Spelling mistakes on dashboards Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp 2012-08-02 10:42:22 UTC (rev 214) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp 2012-08-02 11:54:50 UTC (rev 215) @@ -38,7 +38,7 @@ <th>Posted date</th> <th>Expected date</th> <th>Payment date</th> - <th>Attchment</th> + <th>Attachment</th> </tr> </thead> <c:forEach var="q" items="${invoices}"> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp 2012-08-02 10:42:22 UTC (rev 214) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp 2012-08-02 11:54:50 UTC (rev 215) @@ -31,7 +31,7 @@ <th>Project</th> <th>Category</th> <th>Description</th> - <th>estimated days</th> + <th>Estimated days</th> <th>Amount</th> <th>working days</th> <th>Hoped price day</th> @@ -39,7 +39,7 @@ <th>Hoped profit</th> <th>Real profit</th> <th>Status</th> - <th>Attchment</th> + <th>Attachment</th> </tr> </thead> <c:forEach var="q" items="${quotations}"> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp 2012-08-02 10:42:22 UTC (rev 214) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp 2012-08-02 11:54:50 UTC (rev 215) @@ -33,13 +33,13 @@ <th>Description</th> <th>Customer</th> <th>Supplier</th> - <th>estimated days</th> - <th>working days</th> - <th>task opened</th> - <th>task closed</th> + <th>Estimated days</th> + <th>Working days</th> + <th>Task opened</th> + <th>Task closed</th> <th>Amount</th> <th>Status</th> - <th>Attchment</th> + <th>Attachment</th> </tr> </thead> <c:forEach var="q" items="${quotations}"> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp 2012-08-02 10:42:22 UTC (rev 214) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp 2012-08-02 11:54:50 UTC (rev 215) @@ -33,12 +33,12 @@ <th>Description</th> <th>Customer</th> <th>Supplier</th> - <th>estimated days</th> - <th>convsersion hope</th> - <th>hoped price day</th> + <th>Estimated days</th> + <th>Conversion hope</th> + <th>Hoped price day</th> <th>Amount</th> <th>Status</th> - <th>Attchment</th> + <th>Attachment</th> </tr> </thead> <c:forEach var="q" items="${quotations}"> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp 2012-08-02 10:42:22 UTC (rev 214) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp 2012-08-02 11:54:50 UTC (rev 215) @@ -23,7 +23,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<h1>Vacances par employe</h1> +<h1>Vacances par employé</h1> <ul> <c:forEach var="q" items="${vacationByEmployee.keySet()}"> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp 2012-08-02 10:42:22 UTC (rev 214) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp 2012-08-02 11:54:50 UTC (rev 215) @@ -23,7 +23,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<h1>Jour de travail sur des projets client par employe</h1> +<h1>Jour de travail sur des projets client par employé</h1> <ul> <c:forEach var="q" items="${workingProjectDaysByEmployee.keySet()}">

1 0

r214 - trunk/chorem-entities/src/main/xmi
by jcouteau＠users.chorem.org 02 Aug '12

02 Aug '12

Author: jcouteau Date: 2012-08-02 12:42:22 +0200 (Thu, 02 Aug 2012) New Revision: 214 Url: http://chorem.org/repositories/revision/chorem/214 Log: fixes #733 : change string representation of an employee Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties =================================================================== --- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-08-02 10:41:15 UTC (rev 213) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-08-02 10:42:22 UTC (rev 214) @@ -52,9 +52,9 @@ org.chorem.entities.Time.class.tagvalue.version=7.0 org.chorem.entities.Time.class.tagvalue.preload=Time.task;Time.employee org.chorem.entities.Time.class.tagvalue.toString=%Time.employee$s - %Time.task$s - %Interval.beginDate$tF-%Interval.endDate$tF -org.chorem.entities.Employee.class.tagvalue.version=6.0 +org.chorem.entities.Employee.class.tagvalue.version=7.0 org.chorem.entities.Employee.class.tagvalue.preload=Employee.company;Employee.person -org.chorem.entities.Employee.class.tagvalue.toString=%Employee.company$s %Employee.person$s +org.chorem.entities.Employee.class.tagvalue.toString=%Employee.person$s (%Employee.company$s) org.chorem.entities.Employee.class.tagvalue.sortOrder=Employee.company,Employee.person org.chorem.entities.Goal.class.tagvalue.version=5.0 org.chorem.entities.Goal.class.tagvalue.toString=%Goal.name|noname$s @@ -97,7 +97,7 @@ org.chorem.entities.Quotation.class.tagvalue.preload=Quotation.project;Quotation.customer;Quotation.supplier;Quotation.category org.chorem.entities.Quotation.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF %Quotation.reference|noref$s(%Quotation.category|noCategory$s) %Quotation.description|nodescription$s org.chorem.entities.Quotation.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate,Quotation.reference,Quotation.type,Quotation.description -org.chorem.entities.Quotation.attribute.status.tagvalue.allowed=DRAFT,SEND,REJECTED,ACCEPTED,STARTED,DELIVERED,VRS,WARRANTY,CLOSED +org.chorem.entities.Quotation.attribute.status.tagvalue.allowed=DRAFT,SENT,REJECTED,ACCEPTED,STARTED,DELIVERED,VSR,WARRANTY,CLOSED org.chorem.entities.Quotation.attribute.conversionHope.tagvalue.min=0 org.chorem.entities.Quotation.attribute.conversionHope.tagvalue.max=100 org.chorem.entities.Invoice.class.tagvalue.version=8.0

1 0

r213 - trunk
by jcouteau＠users.chorem.org 02 Aug '12

02 Aug '12

Author: jcouteau Date: 2012-08-02 12:41:15 +0200 (Thu, 02 Aug 2012) New Revision: 213 Url: http://chorem.org/repositories/revision/chorem/213 Log: stable mavenpom4redmine Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-01 16:08:48 UTC (rev 212) +++ trunk/pom.xml 2012-08-02 10:41:15 UTC (rev 213) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.4-SNAPSHOT</version> + <version>3.3.4</version> </parent> <groupId>org.chorem</groupId>

1 0