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

r226 - 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 17:36:56 +0200 (Fri, 03 Aug 2012) New Revision: 226 Url: http://chorem.org/repositories/revision/chorem/226 Log: Utilisation des objets preloaded pour l'affichage Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.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-03 15:12:53 UTC (rev 225) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp 2012-08-03 15:36:56 UTC (rev 226) @@ -44,7 +44,7 @@ <c:forEach var="q" items="${invoices}"> <tbody> <tr> - <td><a href="<c:url value="/wikitty/view/${q.target}"/>">${q.getTarget()}</a></td> + <td><a href="<c:url value="/wikitty/view/${q.target}"/>">${q.getTarget(false)}</a></td> <td><a href="<c:url value="/wikitty/Invoice/view/${q.wikittyId}"/>">${q.reference}</a></td> <td>${q.description}</td> <td><a href="<c:url value="/wikitty/Employee/view/${q.customer}"/>">${q.getCustomer(false)}</a></td> 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-03 15:12:53 UTC (rev 225) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp 2012-08-03 15:36:56 UTC (rev 226) @@ -45,8 +45,8 @@ <c:forEach var="q" items="${quotations}"> <tbody> <tr> - <td><a href="<c:url value="/wikitty/Project/view/${q.project}"/>">${q.getProject(false).getName()}</a></td> - <td>${q.category}</td> + <td><a href="<c:url value="/wikitty/Project/view/${q.project}"/>">${q.getProject(false)}</a></td> + <td>${q.getCategory(false)}</td> <td><a href="<c:url value="/wikitty/Quotation/view/${q.wikittyId}"/>">${q.description}</a></td> <td>${q.estimatedDays}</td> <td>${q.amount}</td>

1 0

r225 - in trunk/chorem-webmotion/src/main: java/org/chorem/webmotion/actions resources webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org 03 Aug '12

03 Aug '12

Author: bpoussin Date: 2012-08-03 17:12:53 +0200 (Fri, 03 Aug 2012) New Revision: 225 Url: http://chorem.org/repositories/revision/chorem/225 Log: Evolution #723: Be able to create linked objects from an object page remise a plat de la facon de faire d'ajout d'action specifique pour des extensions suppression des mapping ne servant plus et des actions associees Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionEmployee.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionProject.jsp Removed: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/LinkAction.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employee/ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/footerPerson.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/person/ Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java trunk/chorem-webmotion/src/main/resources/mapping trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.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-08-03 13:56:02 UTC (rev 224) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-08-03 15:12:53 UTC (rev 225) @@ -46,15 +46,20 @@ import org.nuiton.wikitty.query.WikittyQueryResult; import java.io.ByteArrayInputStream; +import java.net.MalformedURLException; 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.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.servlet.ServletContext; import org.debux.webmotion.server.mapping.Config; /** @@ -375,7 +380,8 @@ return map; } - public Render view(ChoremClient client, String id, String[] extension, Config config) { + public Render view(ChoremClient client, String id, String[] extension, + Config config, ServletContext servletContext) { log.debug("view: " + id); Wikitty w = client.restore(id, ".*"); @@ -393,11 +399,27 @@ // recherche de footer specifique aux extensions String pathView = config.getPackageViews(); + if (pathView == null) { + pathView = ""; + } + pathView = "/" + pathView + "/"; + pathView = StringUtils.replace(pathView, "\\", "/"); + pathView = StringUtils.replace(pathView, "//", "/"); + + // recherche des JSP d'action specifique pour les extensions + List<String> viewActions = new LinkedList<String>(); for (WikittyExtension e : exts) { - + String viewAction = pathView + "footer" + e.getName() + ".jsp"; + try { + if (servletContext.getResource(viewAction) != null) { + viewActions.add(viewAction); + } + } catch (MalformedURLException eee) { + log.warn(String.format("Bad url '%s'", viewAction), eee); + } } - return renderView("view.jsp", "wikitty", w, "extensions", exts); + return renderView("view.jsp", "wikitty", w, "extensions", exts, "viewActions", viewActions); } public Render extensionView(ChoremClient client, String id, String extension) { Deleted: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/LinkAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/LinkAction.java 2012-08-03 13:56:02 UTC (rev 224) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/LinkAction.java 2012-08-03 15:12:53 UTC (rev 225) @@ -1,81 +0,0 @@ -package org.chorem.webmotion.actions; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.ChoremClient; -import org.chorem.entities.Attachment; -import org.chorem.entities.ContactDetails; -import org.debux.webmotion.server.WebMotionController; -import org.debux.webmotion.server.render.Render; -import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.entities.WikittyExtension; -import org.nuiton.wikitty.entities.WikittyImpl; - -import java.util.Arrays; -import java.util.LinkedHashSet; -import java.util.List; - -/** - * Regroup the action that links an object with an other - * - * @author ymartel <martel(a)codelutin.com> - */ -public class LinkAction extends WebMotionController { - - static private Log log = LogFactory.getLog(LinkAction.class); - - public Render addAttachment(ChoremClient client, String wikittyId) { - if (log.isDebugEnabled()) { - log.debug("add attachment for : " + wikittyId); - } - - // Prepare attachment - Wikitty attachment = new WikittyImpl(); - - // Load Attachment extension, and potential dependencies - List<String> extensionNames = Arrays.asList(Attachment.EXT_ATTACHMENT); - List<WikittyExtension> newExts = - client.restoreExtensionAndDependenciesLastVesion(extensionNames); - attachment.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 - LinkedHashSet<WikittyExtension> exts = new LinkedHashSet<WikittyExtension>(); - exts.addAll(newExts); - // Show all wikitty if no extension were mentioned - exts.addAll(attachment.getExtensions()); - - // Link target Wikitty - Wikitty linkedWikitty = client.restore(wikittyId, ".*"); - attachment.setField(Attachment.EXT_ATTACHMENT, Attachment.FIELD_ATTACHMENT_TARGET, linkedWikitty); - - return renderView("edit.jsp", "wikitty", attachment, "extensions", exts); - } - - public Render addContactDetails(ChoremClient client, String wikittyId) { - if (log.isDebugEnabled()) { - log.debug("add contact drtails for : " + wikittyId); - } - Wikitty w = client.restore(wikittyId, ".*"); - - Wikitty attachment = new WikittyImpl(); - - LinkedHashSet<WikittyExtension> exts = new LinkedHashSet<WikittyExtension>(); - - // Load Attachment extension, and potential dependencies - List<String> extensionNames = Arrays.asList(ContactDetails.EXT_CONTACTDETAILS); - List<WikittyExtension> newExts = - client.restoreExtensionAndDependenciesLastVesion(extensionNames); - attachment.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); - // Show all wikitty if no extension were mentioned - exts.addAll(attachment.getExtensions()); - - attachment.setField(ContactDetails.EXT_CONTACTDETAILS, ContactDetails.FIELD_CONTACTDETAILS_TARGET, w); - return renderView("edit.jsp", "wikitty", attachment, "extensions", exts); - } - -} Modified: trunk/chorem-webmotion/src/main/resources/mapping =================================================================== --- trunk/chorem-webmotion/src/main/resources/mapping 2012-08-03 13:56:02 UTC (rev 224) +++ trunk/chorem-webmotion/src/main/resources/mapping 2012-08-03 15:12:53 UTC (rev 225) @@ -14,8 +14,6 @@ [actions] * / view:index.jsp * /wikitty/{extension}/search action:GenericAction.search -* /wikitty/Employee/view/{id} action:GenericAction.extensionView extension=Employee -* /wikitty/Person/view/{id} action:GenericAction.extensionView extension=Person * /wikitty/{extension}/view/{id} action:GenericAction.view * /wikitty/{extension}/edit/{id} action:GenericAction.edit * /wikitty/{extension}/delete/{id} action:GenericAction.delete Deleted: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/footerPerson.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/footerPerson.jsp 2012-08-03 13:56:02 UTC (rev 224) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/footerPerson.jsp 2012-08-03 15:12:53 UTC (rev 225) @@ -1,26 +0,0 @@ -<%-- - #%L - Chorem webmotion - $Id:$ - $HeadURL:$ - %% - Copyright (C) 2011 - 2012 CodeLutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> -<%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> - -<jsp:include page="/wikitty/search?query=${wikitty.id} id!=${wikitty.id}"/> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp 2012-08-03 13:56:02 UTC (rev 224) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp 2012-08-03 15:12:53 UTC (rev 225) @@ -42,22 +42,17 @@ </dl> </c:forEach> - +<div class="container"> <c:if test="${not empty wikitty}"> - - <a class="btn btn-success" href="<c:url value="/wikitty/Attachment/edit/new?Attachment.target=${wikitty.id}"/>"> Add Attachment</a> - - - <a class="btn btn-success" href="<c:url value="/wikitty/Note/edit/new?Note.target=${wikitty.id}"/>"> Add Note</a> - + <a class="btn btn-success" href="<c:url value="/wikitty/Attachment/edit/new?Attachment.target=${wikitty.id}"/>"> Add Attachment</a> + <a class="btn btn-success" href="<c:url value="/wikitty/Note/edit/new?Note.target=${wikitty.id}"/>"> Add Note</a> </c:if> - + <c:forEach var="viewAction" items="${viewActions}"> + <jsp:include page="${viewAction}"/> + </c:forEach> +</div> + <div class="container"> <jsp:include page="/wikitty/searchRelated?id=${wikitty.id}"/> -<%-- - <c:forEach var="ext" items="${extensions}"> - <jsp:include page="footer${ext.name}.jsp"/> - </c:forEach> ---%> </div> Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp 2012-08-03 15:12:53 UTC (rev 225) @@ -0,0 +1,26 @@ +<%-- + #%L + Chorem webmotion + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2011 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + +<a class="btn btn-success" href="<c:url value="/wikitty/ContactDetails/edit/new?ContactDetails.target=${wikitty.id}"/>"> Add Contact Details</a> Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionEmployee.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionEmployee.jsp (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionEmployee.jsp 2012-08-03 15:12:53 UTC (rev 225) @@ -0,0 +1,26 @@ +<%-- + #%L + Chorem webmotion + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2011 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + +<a class="btn btn-success" href="<c:url value="/wikitty/ContactDetails/edit/new?ContactDetails.target=${wikitty.id}"/>"> Add Contact Details</a> Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp 2012-08-03 15:12:53 UTC (rev 225) @@ -0,0 +1,26 @@ +<%-- + #%L + Chorem webmotion + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2011 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + +<a class="btn btn-success" href="<c:url value="/wikitty/ContactDetails/edit/new?ContactDetails.target=${wikitty.id}"/>"> Add Contact Details</a> Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionProject.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionProject.jsp (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionProject.jsp 2012-08-03 15:12:53 UTC (rev 225) @@ -0,0 +1,26 @@ +<%-- + #%L + Chorem webmotion + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2011 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + +<a class="btn btn-success" href="<c:url value="/wikitty/Quotation/edit/new?Quotation.project=${wikitty.id}"/>"> Add Quotation</a>

1 0

r224 - in trunk: chorem-entities/src/main/java/org/chorem chorem-entities/src/main/java/org/chorem/entities chorem-entities/src/main/xmi chorem-webmotion/src/main/java/org/chorem/webmotion/actions chorem-webmotion/src/main/resources chorem-webmotion/src/main/webapp/WEB-INF/jsp chorem-webmotion/src/main/webapp/WEB-INF/jsp/employee chorem-webmotion/src/main/webapp/WEB-INF/jsp/person
by bpoussin＠users.chorem.org 03 Aug '12

03 Aug '12

Author: bpoussin Date: 2012-08-03 15:56:02 +0200 (Fri, 03 Aug 2012) New Revision: 224 Url: http://chorem.org/repositories/revision/chorem/224 Log: Evolution #734: Be able to add comment on objects Suppression de l'ancienne facon de faire pour les Attachments et les ContactDetails (qui n'etait pas la bonne) Utilisation de la nouvelle facon pour les Notes Devrait etre facilement reutilisable pour precharge d'autre type d'objet: exemple, un addEmployee a partir d'une societe; un addQuotation sur un Project, ... suppression de la company/view.jsp qui ne servait qu'a ordonner les champs (mauvaise facon de faire)[A Removed: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/company/ Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationStatus.java trunk/chorem-entities/src/main/xmi/chorem-model.properties trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java trunk/chorem-webmotion/src/main/resources/mapping trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employee/view.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/person/view.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2012-08-03 13:49:37 UTC (rev 223) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2012-08-03 13:56:02 UTC (rev 224) @@ -118,6 +118,7 @@ exts.addAll(org.chorem.entities.ConfigurationAbstract.extensions); exts.addAll(org.chorem.entities.CategoryAbstract.extensions); exts.addAll(org.chorem.entities.AttachmentAbstract.extensions); + exts.addAll(org.chorem.entities.NoteAbstract.extensions); exts.addAll(org.chorem.entities.CompanyAbstract.extensions); exts.addAll(org.chorem.entities.ContactDetailsAbstract.extensions); exts.addAll(org.chorem.entities.EmployeeAbstract.extensions); Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationStatus.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationStatus.java 2012-08-03 13:49:37 UTC (rev 223) +++ trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationStatus.java 2012-08-03 13:56:02 UTC (rev 224) @@ -32,13 +32,14 @@ */ public enum QuotationStatus { + LEAD, // piste possible DRAFT, // en cours de redaction - SEND, // envoye + SENT, // envoye REJECTED, // refuse par le client ACCEPTED, // accepte par le client (on peut envoyer la facture de debut) STARTED, // developpement commence - DELIVERED, // developpement fini et livre (on peut envoyer la facture de fin) - VRS, // l'application est en verification en service regulier chez le client (~1 mois) + DELIVERED, // developpement fini et livre (on peut envoyer la facture de fin) + RSV, // l'application est en verification en service regulier chez le client (~1 mois) WARRANTY, // fin de la vsr, on passe en garantie et on peut facture le reste (s'il reste encore des choses) CLOSED // tout est fini et clos, plus rien a faire Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties =================================================================== --- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-08-03 13:49:37 UTC (rev 223) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-08-03 13:56:02 UTC (rev 224) @@ -95,6 +95,10 @@ 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.Note.class.tagvalue.version=2.0 +org.chorem.entities.Note.class.tagvalue.toString=(%Note.date$tF) %Note.title|noname$s +org.chorem.entities.Note.class.tagvalue.sortOrder=Note.date +org.chorem.entities.Note.Attachment.content.tagvalue.subtype=text/rst 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 Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-08-03 13:49:37 UTC (rev 223) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2012-08-03 13:56:02 UTC (rev 224) @@ -395,14 +395,14 @@ } public Render quotation(ChoremClient client, String query) { - EnumSet<QuotationStatus> status = EnumSet.range(QuotationStatus.DRAFT, QuotationStatus.SEND); + EnumSet<QuotationStatus> status = EnumSet.range(QuotationStatus.LEAD, QuotationStatus.SENT); String jsp = "dashboardQuotation.jsp"; String title = "Les propositions en attente de réponse"; return quotationFilter(client, query, status, jsp, title, false); } public Render projectOpen(ChoremClient client, String query) { - EnumSet<QuotationStatus> status = EnumSet.range(QuotationStatus.ACCEPTED, QuotationStatus.VRS); + EnumSet<QuotationStatus> status = EnumSet.range(QuotationStatus.ACCEPTED, QuotationStatus.RSV); String jsp = "dashboardProject.jsp"; String title = "Les projets en cours"; return quotationFilter(client, query, status, jsp, title, true); 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-08-03 13:49:37 UTC (rev 223) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-08-03 13:56:02 UTC (rev 224) @@ -55,6 +55,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.debux.webmotion.server.mapping.Config; /** * @@ -374,7 +375,7 @@ return map; } - public Render view(ChoremClient client, String id, String[] extension) { + public Render view(ChoremClient client, String id, String[] extension, Config config) { log.debug("view: " + id); Wikitty w = client.restore(id, ".*"); @@ -389,7 +390,13 @@ exts.addAll(wikittyExtensions); } } + + // recherche de footer specifique aux extensions + String pathView = config.getPackageViews(); + for (WikittyExtension e : exts) { + } + return renderView("view.jsp", "wikitty", w, "extensions", exts); } @@ -408,18 +415,22 @@ return renderView(StringUtils.lowerCase(extension) +"/view.jsp", "wikitty", w, "extensions", exts); } - public Render edit(ChoremClient client, String id, String[] extension) { + public Render edit(ChoremClient client, String id, String[] extension, Call call) { log.debug("edit: " + id); - Wikitty w = client.restore(id, ".*"); + // on preload rien, le preload sera fait a la fin + Wikitty w = client.restore(id, ""); + // si on ne retrouve pas l'objet demande, on en edit un nouveau 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) { + if (extension == null) { + // Show all wikitty if no extension were mentioned + exts.addAll(w.getExtensions()); + } else { // Be sure that the wikitty has good extension if wanted and their requirements List<String> extensionNames = Arrays.asList(extension); List<WikittyExtension> newExts = @@ -431,37 +442,59 @@ exts.addAll(newExts); } - if (extension == null) { - // Show all wikitty if no extension were mentioned - exts.addAll(w.getExtensions()); - } + // si des nouvelles valeurs sont en parametre, on change les valeurs + // actuel du wikitty + Map<String, Object> params = call.getExtractParameters(); + String error = setWikittyField(w, params); + // on recharge des entites qui ont pu apparaitre, pour pouvoir les afficher comme il faut + client.preload(Collections.singleton(w), ".*"); + getContext().addInfoMessage("message", "Warning: Can't put some value in object" + error); + return renderView("edit.jsp", "wikitty", w, "extensions", exts); } - public Render extensionEdit(ChoremClient client, String id, String extension) { - log.debug("edit: " + id); - Wikitty w = client.restore(id, ".*"); - if (w == null) { - w = new WikittyImpl(); - } + // A SUPPRIMER, ne sert a rien, pas la bonne methode (pour reordonner les champs) +// /** +// * Edit une extension et les extensions requisent de l'objet +// * +// * @param client +// * @param id +// * @param extension +// * @param call +// * @return +// */ +// public Render extensionEdit(ChoremClient client, String id, String extension, Call call) { +// log.debug("edit: " + id); +// Wikitty w = client.restore(id, ".*"); +// +// if (w == null) { +// w = new WikittyImpl(); +// } +// +// LinkedHashSet<WikittyExtension> exts = new LinkedHashSet<WikittyExtension>(); +// +// // If extension is not null, load all required extensions too +// List<String> extensionNames = Arrays.asList(extension); +// List<WikittyExtension> newExts = +// 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); +// +// // si des nouvelles valeurs sont en parametre, on change les valeurs +// // actuel du wikitty +// Map<String, Object> params = call.getExtractParameters(); +// String error = setWikittyField(w, params); +// +// getContext().addInfoMessage("message", "Warning: Can't put some value in object" + error); +// +// return renderView(StringUtils.lowerCase(extension) + "/edit.jsp", "wikitty", w); +// } - LinkedHashSet<WikittyExtension> exts = new LinkedHashSet<WikittyExtension>(); - - // If extension is not null, load all required extensions too - List<String> extensionNames = Arrays.asList(extension); - List<WikittyExtension> newExts = - 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); - - return renderView(StringUtils.lowerCase(extension) + "/edit.jsp", "wikitty", w); - } - public Render save(ChoremClient client, String id, String[] extension, Call call) { log.debug("save: " + id); Wikitty w = client.restore(id); @@ -472,6 +505,23 @@ client.restoreExtensionAndDependenciesLastVesion(Arrays.asList(extension)); w.addExtension(exts); Map<String, Object> params = call.getExtractParameters(); + String error = setWikittyField(w, params); + client.store(w); + + getContext().addInfoMessage("message", "Object saved" + error); + + return renderURL("/wikitty/view/"+w.getId()); + } + + /** + * Modifie les valeurs de l'objet passe en parametre avec les valeurs de + * champs que l'on arrive a retrouver dans le params. + * + * @param w Le wikitty a mettre a jour + * @param params les parametres dans lequel on peut trouver des valeurs + * @return une chaine representant toutes les erreurs rencontrees + */ + protected String setWikittyField(Wikitty w, Map<String, Object> params) { String error = ""; for (String fqfield : params.keySet()) { if (w.hasField(fqfield)) { @@ -482,13 +532,17 @@ v = file.getFile(); } else { String[] values = (String[]) params.get(fqfield); - System.out.println("ZZZZ fqfield:"+fqfield+" values: " + Arrays.toString(values) + " size:" + values.length); + if (log.isDebugEnabled()) { + log.debug("ZZZZ fqfield:"+fqfield+" values: " + Arrays.toString(values) + " size:" + values.length); + } if (w.getFieldType(fqfield).isCollection()) { if (values.length == 1 && w.getFieldType(fqfield).getType() == WikittyTypes.WIKITTY) { // petit hack si l'editeur utilise n'est pas un select, // mais un input (et donc des valeurs separees par des ',' values = StringUtils.split(values[0], ","); - System.out.println("YYYY " + Arrays.toString(values) + " size: " + values.length); + if (log.isDebugEnabled()) { + log.debug("YYYY " + Arrays.toString(values) + " size: " + values.length); + } } v = values; } else { @@ -497,7 +551,10 @@ } try { w.setFqField(fqfield, v); - System.out.println("XXX after field: " + w.getFqField(fqfield) + "(" + ClassUtils.getSimpleName(w.getFqField(fqfield), "NULLclasse!!!") + ")"); + if (log.isDebugEnabled()) { + log.debug("XXX after field: " + w.getFqField(fqfield) + + "(" + ClassUtils.getSimpleName(w.getFqField(fqfield), "NULLclasse!!!") + ")"); + } } catch (Exception eee) { String msg = String.format("Can't put value '%s' in field '%s'", v, fqfield); error += "\n<li>" + msg + "</li>"; @@ -505,11 +562,7 @@ } } } - client.store(w); - - getContext().addInfoMessage("message", "Object saved" + error); - - return renderURL("/wikitty/view/"+w.getId()); + return error; } public Render delete(ChoremClient client, String id, String[] extension) { Modified: trunk/chorem-webmotion/src/main/resources/mapping =================================================================== --- trunk/chorem-webmotion/src/main/resources/mapping 2012-08-03 13:49:37 UTC (rev 223) +++ trunk/chorem-webmotion/src/main/resources/mapping 2012-08-03 13:56:02 UTC (rev 224) @@ -15,12 +15,9 @@ * / view:index.jsp * /wikitty/{extension}/search action:GenericAction.search * /wikitty/Employee/view/{id} action:GenericAction.extensionView extension=Employee -* /wikitty/Person/view/{id} action:GenericAction.extensionView extension=Person +* /wikitty/Person/view/{id} action:GenericAction.extensionView extension=Person * /wikitty/{extension}/view/{id} action:GenericAction.view -* /wikitty/Company/edit/{id} action:GenericAction.extensionEdit extension=Company * /wikitty/{extension}/edit/{id} action:GenericAction.edit -* /wikitty/{wikittyId}/Attachment/edit/new action:LinkAction.addAttachment -* /wikitty/{wikittyId}/ContactDetails/edit/new action:LinkAction.addContactDetails * /wikitty/{extension}/delete/{id} action:GenericAction.delete * /wikitty/search action:GenericAction.search * /wikitty/searchRelated?id={query} action:GenericAction.search Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employee/view.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employee/view.jsp 2012-08-03 13:49:37 UTC (rev 223) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employee/view.jsp 2012-08-03 13:56:02 UTC (rev 224) @@ -51,10 +51,10 @@ </dl> - <a class="btn btn-success" href="<c:url value="/wikitty/${wikitty.id}/Attachment/edit/new"/>"> Add Attachment</a> + <a class="btn btn-success" href="<c:url value="/wikitty/Attachment/edit/new?Attachment.target=${wikitty.id}"/>"> Add Attachment</a> - <a class="btn btn-success" href="<c:url value="/wikitty/${wikitty.id}/ContactDetails/edit/new"/>"> Add Contact Details</a> + <a class="btn btn-success" href="<c:url value="/wikitty/ContactDetails/edit/new?ContactDetails.target=${wikitty.id}"/>"> Add Contact Details</a> <div class="container"> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/person/view.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/person/view.jsp 2012-08-03 13:49:37 UTC (rev 223) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/person/view.jsp 2012-08-03 13:56:02 UTC (rev 224) @@ -42,10 +42,10 @@ </dl> - <a class="btn btn-success" href="<c:url value="/wikitty/${wikitty.id}/Attachment/edit/new"/>"> Add Attachment</a> + <a class="btn btn-success" href="<c:url value="/wikitty/Attachment/edit/new?Attachment.target=${wikitty.id}"/>"> Add Attachment</a> - <a class="btn btn-success" href="<c:url value="/wikitty/${wikitty.id}/ContactDetails/edit/new"/>"> Add Contact Details</a> + <a class="btn btn-success" href="<c:url value="/wikitty/ContactDetails/edit/new?ContactDetails.target=${wikitty.id}"/>"> Add Contact Details</a> <div class="container"> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp 2012-08-03 13:49:37 UTC (rev 223) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp 2012-08-03 13:56:02 UTC (rev 224) @@ -45,8 +45,11 @@ <c:if test="${not empty wikitty}"> - <a class="btn btn-success" href="<c:url value="/wikitty/${wikitty.id}/Attachment/edit/new"/>"> Add Attachment</a> + <a class="btn btn-success" href="<c:url value="/wikitty/Attachment/edit/new?Attachment.target=${wikitty.id}"/>"> Add Attachment</a> + + <a class="btn btn-success" href="<c:url value="/wikitty/Note/edit/new?Note.target=${wikitty.id}"/>"> Add Note</a> + </c:if>

1 0

r223 - trunk/src/site/rst
by bpoussin＠users.chorem.org 03 Aug '12

03 Aug '12

Author: bpoussin Date: 2012-08-03 15:49:37 +0200 (Fri, 03 Aug 2012) New Revision: 223 Url: http://chorem.org/repositories/revision/chorem/223 Log: ajout d'un fichier de doc pour les developpeurs, le but est d'y mettre comment faire les choses et comment sont faites les choses. Added: trunk/src/site/rst/doc-devel.rst Added: trunk/src/site/rst/doc-devel.rst =================================================================== --- trunk/src/site/rst/doc-devel.rst (rev 0) +++ trunk/src/site/rst/doc-devel.rst 2012-08-03 13:49:37 UTC (rev 223) @@ -0,0 +1,16 @@ +========================= +Documentation développeur +========================= + +Ajout d'une entité +================== + +* Modifier le fichier ArgoUML chorem-model.zargo +* Modifier le fichier chorem-model.properties pour ajouter les informations de version et autre pour cette entité +* Ajouter cette entité dans la liste des entités qui doivent exister dans le système dans le fichier ChoremClient.java + +Modification d'une list de choix possible pour un attribut +========================================================== + +* Modifier le fichier chorem-model.properties pour ajouter l'enumeration sur le champs choisi +* Modifier ou créer le l'enumeration Java correspondante pour la manipuler dans le code Java (chorem-entities - org.chorem.entities.XXXX)

1 0

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}"/> <button class="btn btn-success" type="submit"> Save</button> - <a class="btn btn-info" href="/wikitty/view/${wikitty.id}"> Cancel</a> + <a class="btn btn-info" href="<c:url value="/wikitty/view/${wikitty.id}"/>"> Cancel</a> <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)) { + /*{">}*/ + } } 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