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

r146 - in trunk/chorem-webmotion/src/main: java/org/chorem/webmotion/actions webapp/WEB-INF/jsp
by ymartel＠users.chorem.org May 10, 2012

May 10, 2012

Author: ymartel Date: 2012-05-10 18:03:28 +0200 (Thu, 10 May 2012) New Revision: 146 Url: http://chorem.org/repositories/revision/chorem/146 Log: when create or edit a wikitty from a given extension, should edit the required extensions too Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-05-10 09:59:57 UTC (rev 145) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-05-10 16:03:28 UTC (rev 146) @@ -1,24 +1,13 @@ package org.chorem.webmotion.actions; import com.google.common.collect.LinkedHashMultimap; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.ChoremClient; import org.debux.webmotion.server.WebMotionController; import org.debux.webmotion.server.render.Render; -import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.Element; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; @@ -30,6 +19,15 @@ import org.nuiton.wikitty.query.WikittyQueryParser; import org.nuiton.wikitty.query.WikittyQueryResult; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; + /** * * @author poussin @@ -43,43 +41,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(GenericAction.class); - // ANCIENNE IMLANTATION A SUPPRIMER - public Render search2(ChoremClient client, String[] extension, String query) { - WikittyQuery q = null; - if (StringUtils.isNotBlank(query)) { - q = new WikittyQueryParser().parseQuery(query); - } - if (extension != null) { - WikittyQueryMaker maker = new WikittyQueryMaker().or(); - for(String extName : extension) { - if (StringUtils.isNotBlank(extName)) { - maker.exteq(extName); - } - } - - if (q == null) { - q = maker.end(); - } else { - q = new WikittyQueryMaker(q).and() - .condition(q.getCondition()) - .condition(maker.getCondition()).end(); - } - } - LinkedHashMultimap<String, Wikitty> map = LinkedHashMultimap.create(); - if (q != null) { - WikittyQueryResult<Wikitty> result = client.findAllByQuery(Wikitty.class, q); - for (Wikitty w : result) { - for (String ext : w.getExtensionNames()) { - String ts = w.getExtension(ext).getTagValue(WikittyTagValue.TAG_TO_STRING); - if (StringUtils.isNotBlank(ts)) { - map.put(ext, w); - } - } - } - } - return renderView("search.jsp", "result", map); - } - // FIXME poussin 20120418 cette methode est-elle vraiment utilise ? // si oui searchJson ne peut-elle pas la remplacer ? public Render searchFieldJson(ChoremClient client, String query) { @@ -329,22 +290,25 @@ if (w == null) { w = new WikittyImpl(); } + + LinkedHashSet<WikittyExtension> exts = new LinkedHashSet<WikittyExtension>(); + + // If extension is not null, load all required extensions too if (extension != null) { + // Be sure that the wikitty has good extension if wanted and their requirements + List<String> extensionNames = Arrays.asList(extension); List<WikittyExtension> newExts = - client.restoreExtensionAndDependenciesLastVesion(Arrays.asList(extension)); + client.restoreExtensionAndDependenciesLastVesion(extensionNames); w.addExtension(newExts); + + // As we want to edit a wikitty by its extensions, we should edit the required extensions too + // Add the extension and required ones in the list of extensions to display + exts.addAll(newExts); } - LinkedHashSet<WikittyExtension> exts = new LinkedHashSet<WikittyExtension>(); - if (w != null) { - if (extension == null) { - exts.addAll(w.getExtensions()); - } else { - for (String extName : extension) { - exts.addAll(w.getExtensionDependencies(extName, true)); - exts.add(w.getExtension(extName)); - } - } + if (extension == null) { + // Show all wikitty if no extension were mentioned + exts.addAll(w.getExtensions()); } return renderView("edit.jsp", "wikitty", w, "extensions", exts); Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-05-10 09:59:57 UTC (rev 145) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-05-10 16:03:28 UTC (rev 146) @@ -54,17 +54,18 @@ <li><a href="<c:url value="/wikitty/Company/search"/>"> All company</a></li> <li><a href="<c:url value="/wikitty/Company/edit/new"/>"> Add company</a></li> <li class="divider"></li> + <li><a href="<c:url value="/wikitty/Person/search"/>"> All person</a></li> + <li><a href="<c:url value="/wikitty/Person/edit/new"/>"> Add person</a></li> + <li class="divider"></li> <li><a href="<c:url value="/wikitty/Employee/search"/>"> All employee</a></li> <li><a href="<c:url value="/wikitty/Employee/edit/new"/>"> Add employee</a></li> <li class="divider"></li> - <li><a href="<c:url value="/wikitty/Person/search"/>"> All person</a></li> - <li><a href="<c:url value="/wikitty/Person/edit/new"/>"> Add person</a></li> - <li class="divider"></li> <li><a href="<c:url value="/wikitty/Touch/search"/>"> All touch</a></li> <li><a href="<c:url value="/wikitty/Touch/edit/new"/>"> Add touch</a></li> </ul> </li> <li class="dropdown nav-group"> +  <a href="<c:url value="/wikitty/search?extension=Quotation&extension=ProjectOrder&extension=Task"/>">Project</a> <a href="#" class="dropdown-toggle" data-toggle="dropdown"> @@ -85,15 +86,21 @@ </ul> </li> <li class="dropdown nav-group"> - <a href="/financial">Financial</a> - <a href="#" - class="dropdown-toggle" - data-toggle="dropdown"> +  + <a href="<c:url value="/wikitty/search?extension=Invoice&extension=Quotation&extension=Invoiceable"/>">Financial</a> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> </a> <ul class="dropdown-menu"> - <li><a href="/financial/projected">Projected</a></li> - <li><a href="/wikitty/search?query=extension=Invoice">Invoice</a></li> + <li>Projected</li> + <li><a href="<c:url value="/wikitty/Quotation/search"/>"> All quotations</a></li> + <li><a href="<c:url value="/wikitty/Quotation/edit/new"/>"> Add quotation</a></li> + <li class="divider"></li> + <li>Invoice</li> + <li><a href="<c:url value="/wikitty/Invoice/search"/>"> All invoices</a></li> + <li><a href="<c:url value="/wikitty/Invoice/edit/new"/>"> Add invoice</a></li> + <li class="divider"></li> + <li>Other</li> <li><a href="/wikitty/search?query=extension=Accounting">Accounting</a></li> </ul> </li>

1 0

r145 - trunk/chorem-entities/src/main/xmi
by ymartel＠users.chorem.org May 10, 2012

May 10, 2012

Author: ymartel Date: 2012-05-10 11:59:57 +0200 (Thu, 10 May 2012) New Revision: 145 Url: http://chorem.org/repositories/revision/chorem/145 Log: fully rename model name Added: trunk/chorem-entities/src/main/xmi/chorem-model.zargo Removed: trunk/chorem-entities/src/main/xmi/chorem-model.zargo Deleted: trunk/chorem-entities/src/main/xmi/chorem-model.zargo =================================================================== (Binary files differ) Added: trunk/chorem-entities/src/main/xmi/chorem-model.zargo =================================================================== (Binary files differ) Property changes on: trunk/chorem-entities/src/main/xmi/chorem-model.zargo ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r144 - trunk/chorem-entities/src/main/xmi
by ymartel＠users.chorem.org May 2, 2012

May 2, 2012

Author: ymartel Date: 2012-05-02 17:00:03 +0200 (Wed, 02 May 2012) New Revision: 144 Url: http://chorem.org/repositories/revision/chorem/144 Log: rename model zargo and properties files, to avoid confusion with application properties file Added: trunk/chorem-entities/src/main/xmi/chorem-model.properties trunk/chorem-entities/src/main/xmi/chorem-model.zargo Removed: trunk/chorem-entities/src/main/xmi/chorem.properties trunk/chorem-entities/src/main/xmi/chorem.zargo Copied: trunk/chorem-entities/src/main/xmi/chorem-model.properties (from rev 142, trunk/chorem-entities/src/main/xmi/chorem.properties) =================================================================== --- trunk/chorem-entities/src/main/xmi/chorem-model.properties (rev 0) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-05-02 15:00:03 UTC (rev 144) @@ -0,0 +1,68 @@ +org.chorem.entities.Project.class.tagvalue.version=5.0 +org.chorem.entities.Project.class.tagvalue.toString=%Project.name|noname$s +org.chorem.entities.Project.class.tagvalue.sortOrder=Project.name +org.chorem.entities.ProjectOrder.class.tagvalue.version=5.0 +org.chorem.entities.ProjectOrder.class.tagvalue.toString=%ProjectOrder.description|noname$s +org.chorem.entities.ProjectOrder.class.tagvalue.sortOrder=ProjectOrder.description +org.chorem.entities.Task.class.tagvalue.version=5.0 +org.chorem.entities.Task.class.tagvalue.toString=%Task.name|noname$s +org.chorem.entities.Task.class.tagvalue.sortOrder=Task.name +org.chorem.entities.Worker.class.tagvalue.version=5.0 +org.chorem.entities.Worker.class.tagvalue.toString=%Worker.percentage|nopercentage$s +org.chorem.entities.Worker.class.tagvalue.sortOrder=Worker.percentage +org.chorem.entities.Person.class.tagvalue.version=5.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=5.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.Company.class.tagvalue.version=5.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.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=5.0 +org.chorem.entities.Employee.class.tagvalue.version=5.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 %Employee.type|notype$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 +org.chorem.entities.Goal.class.tagvalue.sortOrder=Goal.name +org.chorem.entities.PersonSkill.class.tagvalue.version=5.0 +org.chorem.entities.PersonSkill.class.tagvalue.toString=%Evaluation.level|nolevel$s +org.chorem.entities.PersonSkill.class.tagvalue.sortOrder=Evaluation.level +org.chorem.entities.Skill.class.tagvalue.version=5.0 +org.chorem.entities.Skill.class.tagvalue.toString=%Skill.description|nodescription$s +org.chorem.entities.Skill.class.tagvalue.sortOrder=Skill.description +org.chorem.entities.Interview.class.tagvalue.version=5.0 +org.chorem.entities.Interview.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF %Interview.type|notype$s +org.chorem.entities.Interview.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate,Interview.type +org.chorem.entities.Mission.class.tagvalue.version=5.0 +org.chorem.entities.Mission.class.tagvalue.toString=%Mission.name|noname$s (%Mission.role$s) +org.chorem.entities.Mission.class.tagvalue.sortOrder=Mission.name,Mission.role +org.chorem.entities.Evaluation.class.tagvalue.version=5.0 +org.chorem.entities.Evaluation.class.tagvalue.toString=%Evaluation.level|nolevel$s +org.chorem.entities.Evaluation.class.tagvalue.sortOrder=Evaluation.level +org.chorem.entities.Vacation.class.tagvalue.version=5.0 +org.chorem.entities.Vacation.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF %Vacation.type|notype$s +org.chorem.entities.Vacation.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate,Vacation.type +org.chorem.entities.Touch.class.tagvalue.version=6.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.type.tagvalue.choiceQuery=SELECT Touch.type WHERE extension=Touch +org.chorem.entities.Attachment.class.tagvalue.version=5.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=5.0 +org.chorem.entities.Quotation.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF %Quotation.reference|noref$s(%Quotation.type|notype$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.Invoice.class.tagvalue.version=5.0 +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=5.0 +org.chorem.entities.Invoiceable.class.tagvalue.toString=%Invoiceable.name|noname$s +org.chorem.entities.Invoiceable.class.tagvalue.sortOrder=Invoiceable.name Property changes on: trunk/chorem-entities/src/main/xmi/chorem-model.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/chorem-entities/src/main/xmi/chorem-model.zargo (from rev 142, trunk/chorem-entities/src/main/xmi/chorem.zargo) =================================================================== (Binary files differ) Property changes on: trunk/chorem-entities/src/main/xmi/chorem-model.zargo ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/chorem-entities/src/main/xmi/chorem.properties =================================================================== --- trunk/chorem-entities/src/main/xmi/chorem.properties 2012-05-02 14:49:06 UTC (rev 143) +++ trunk/chorem-entities/src/main/xmi/chorem.properties 2012-05-02 15:00:03 UTC (rev 144) @@ -1,68 +0,0 @@ -org.chorem.entities.Project.class.tagvalue.version=5.0 -org.chorem.entities.Project.class.tagvalue.toString=%Project.name|noname$s -org.chorem.entities.Project.class.tagvalue.sortOrder=Project.name -org.chorem.entities.ProjectOrder.class.tagvalue.version=5.0 -org.chorem.entities.ProjectOrder.class.tagvalue.toString=%ProjectOrder.description|noname$s -org.chorem.entities.ProjectOrder.class.tagvalue.sortOrder=ProjectOrder.description -org.chorem.entities.Task.class.tagvalue.version=5.0 -org.chorem.entities.Task.class.tagvalue.toString=%Task.name|noname$s -org.chorem.entities.Task.class.tagvalue.sortOrder=Task.name -org.chorem.entities.Worker.class.tagvalue.version=5.0 -org.chorem.entities.Worker.class.tagvalue.toString=%Worker.percentage|nopercentage$s -org.chorem.entities.Worker.class.tagvalue.sortOrder=Worker.percentage -org.chorem.entities.Person.class.tagvalue.version=5.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=5.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.Company.class.tagvalue.version=5.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.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=5.0 -org.chorem.entities.Employee.class.tagvalue.version=5.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 %Employee.type|notype$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 -org.chorem.entities.Goal.class.tagvalue.sortOrder=Goal.name -org.chorem.entities.PersonSkill.class.tagvalue.version=5.0 -org.chorem.entities.PersonSkill.class.tagvalue.toString=%Evaluation.level|nolevel$s -org.chorem.entities.PersonSkill.class.tagvalue.sortOrder=Evaluation.level -org.chorem.entities.Skill.class.tagvalue.version=5.0 -org.chorem.entities.Skill.class.tagvalue.toString=%Skill.description|nodescription$s -org.chorem.entities.Skill.class.tagvalue.sortOrder=Skill.description -org.chorem.entities.Interview.class.tagvalue.version=5.0 -org.chorem.entities.Interview.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF %Interview.type|notype$s -org.chorem.entities.Interview.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate,Interview.type -org.chorem.entities.Mission.class.tagvalue.version=5.0 -org.chorem.entities.Mission.class.tagvalue.toString=%Mission.name|noname$s (%Mission.role$s) -org.chorem.entities.Mission.class.tagvalue.sortOrder=Mission.name,Mission.role -org.chorem.entities.Evaluation.class.tagvalue.version=5.0 -org.chorem.entities.Evaluation.class.tagvalue.toString=%Evaluation.level|nolevel$s -org.chorem.entities.Evaluation.class.tagvalue.sortOrder=Evaluation.level -org.chorem.entities.Vacation.class.tagvalue.version=5.0 -org.chorem.entities.Vacation.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF %Vacation.type|notype$s -org.chorem.entities.Vacation.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate,Vacation.type -org.chorem.entities.Touch.class.tagvalue.version=6.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.type.tagvalue.choiceQuery=SELECT Touch.type WHERE extension=Touch -org.chorem.entities.Attachment.class.tagvalue.version=5.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=5.0 -org.chorem.entities.Quotation.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF %Quotation.reference|noref$s(%Quotation.type|notype$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.Invoice.class.tagvalue.version=5.0 -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=5.0 -org.chorem.entities.Invoiceable.class.tagvalue.toString=%Invoiceable.name|noname$s -org.chorem.entities.Invoiceable.class.tagvalue.sortOrder=Invoiceable.name Deleted: trunk/chorem-entities/src/main/xmi/chorem.zargo =================================================================== (Binary files differ)

1 0

r143 - in trunk/chorem-webmotion/src/main: java/org/wikitty/web/jsptag webapp/WEB-INF webapp/WEB-INF/jsp
by ymartel＠users.chorem.org May 2, 2012

May 2, 2012

Author: ymartel Date: 2012-05-02 16:49:06 +0200 (Wed, 02 May 2012) New Revision: 143 Url: http://chorem.org/repositories/revision/chorem/143 Log: enable tag support to display wikitty fields Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/wikitty.tld 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-04-26 16:04:03 UTC (rev 142) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java 2012-05-02 14:49:06 UTC (rev 143) @@ -1,6 +1,7 @@ package org.wikitty.web.jsptag; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.Wikitty; @@ -12,6 +13,8 @@ import javax.servlet.jsp.tagext.SimpleTagSupport; import java.io.IOException; import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.text.NumberFormat; import java.util.Date; import java.util.List; @@ -99,7 +102,8 @@ protected void viewBinary(JspWriter output, String contextPath, String name, Wikitty wikitty, FieldType field, String extName , String fieldName) throws JspException, IOException { - /*{<%=name%> : <c:out value=<%=wikitty.getFieldAsString(extName, fieldName)%>" />}*/ + String value = wikitty.getFieldAsString(extName, fieldName); + /*{<%=name%> : <%=value%>}*/ } protected void viewBoolean(JspWriter output, String contextPath, String name, @@ -114,13 +118,15 @@ throws JspException, IOException { Date date = wikitty.getFieldAsDate(extName, fieldName); - if (field.hasPattern()) { + String value = ""; + + if (field.hasPattern() && date != null) { String pattern = field.getPattern(); - /*{<%=fieldName%> : <fmt:formatDate value="<%=date%>" pattern="<%=pattern%>" />}*/ - } else { - /*{<%=fieldName%> : <fmt:formatDate value="<%=date%>" />}*/ - + value = DateFormatUtils.format(date, pattern); + } else if (date != null) { + value = DateFormatUtils.format(date, "dd/MM/yyyy"); } + /*{<%=fieldName%> : <%=value%> }*/ } protected void viewNumeric(JspWriter output, String contextPath, String name, @@ -130,9 +136,12 @@ if (field.hasPattern()) { String pattern = field.getPattern(); - /*{<%=fieldName%> : <fmt:formatNumber value="<%=value%>" pattern="<%=pattern%>" />}*/ + //TODO ymartel 2012-05-02 : manage localization + NumberFormat formatter = new DecimalFormat(pattern); + String formattedValue = formatter.format(value); + /*{<%=fieldName%> : <%=formattedValue%> }*/ } else { - /*{<%=fieldName%> : <%=value%> />}*/ + /*{<%=fieldName%> : <%=value%>}*/ } } @@ -151,18 +160,18 @@ protected void viewString(JspWriter output, String contextPath, String name, Wikitty wikitty, FieldType field, String extName , String fieldName) throws JspException, IOException { - boolean value = wikitty.getFieldAsBoolean(extName, fieldName); + String value = wikitty.getFieldAsString(extName, fieldName); /*{<%=fieldName%> : <%=value%>}*/ } protected void viewCollectionWikitty(JspWriter output, String contextPath, String name, Wikitty wikitty, FieldType field, String extName , String fieldName) throws JspException, IOException { - String id = wikitty.getId() + "-" + extName + "-" + fieldName; List<Wikitty> values = wikitty.getFieldAsWikittyList(extName, fieldName, false); /*{<%=fieldName%> : <ul>}*/ for (Wikitty value : values) { - /*{<li><a href="<c:url value="/wikitty/view/<%=value.getId()%>"/>"><c:out value="<%=value%>"/></a></li>}*/ + String url = contextPath + "/wikitty/view/" + value.getId(); + /*{<li><a href="<%=url%>"><%=value%></a></li>}*/ } /*{</ul>}*/ @@ -171,12 +180,11 @@ protected void viewWikitty(JspWriter output, String contextPath, String name, Wikitty wikitty, FieldType field, String extName , String fieldName) throws JspException, IOException { - String id = wikitty.getId() + "-" + extName + "-" + fieldName; String value = wikitty.getFieldAsWikitty(extName, fieldName); Wikitty wikittyValue = wikitty.getFieldAsWikitty(extName, fieldName, false); - String url = contextPath + "/wikitty-json/search?extension=" + field.getAllowed(); + String url = contextPath + "/wikitty/view/" + value; if (wikittyValue != null) { - /*{<%=fieldName%>: <a href="<c:url value="/wikitty/view/<%=wikittyValue.getId()%>"/>"><c:out value="<%=wikittyValue%>"/></a>}*/ + /*{<%=fieldName%>: <a href="<%=url%>"><%=wikittyValue%></a>}*/ } } Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp 2012-04-26 16:04:03 UTC (rev 142) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp 2012-05-02 14:49:06 UTC (rev 143) @@ -1,5 +1,6 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%> <c:if test="${not empty wikitty}"> @@ -14,8 +15,7 @@ <a class="btn btn-success btn-mini" href="<c:url value="/wikitty/edit/${wikitty.id}?extension=${ext.name}"/>"> Edit</a> <a class="btn btn-danger btn-mini" href="<c:url value="/wikitty/delete/${wikitty.id}?extension=${ext.name}&wmDecoratorNo=true"/>"> Delete</a></dt> <c:forEach var="fieldName" items="${ext.fieldNames}"> - <dd><%@ include file="wikittyFieldView.jsp"%></dd> -  + <dd><w:display wikitty="${wikitty}" fqfield="${ext.name}.${fieldName}"/></dd> </c:forEach> </dl> </c:forEach> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/wikitty.tld =================================================================== (Binary files differ)

1 0