r234 - in trunk: chorem-entities/src/main/xmi chorem-webmotion/src/main/java/org/chorem/webmotion/actions chorem-webmotion/src/main/java/org/wikitty/web/jsptag chorem-webmotion/src/main/webapp/WEB-INF/jsp - Chorem-commits

8 Aug 2012

Author: bpoussin
Date: 2012-08-08 19:26:01 +0200 (Wed, 08 Aug 2012)
New Revision: 234

Url: http://chorem.org/repositories/revision/chorem/234

Log:
- gros travail de description des entit?\195?\169s
- petite correction de bug sur les viewAction


Added:
   trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionQuotation.jsp
   trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionTask.jsp
Modified:
   trunk/chorem-entities/src/main/xmi/chorem-model.properties
   trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java
   trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java
   trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java
   trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp
   trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp

Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties
===================================================================

--- trunk/chorem-entities/src/main/xmi/chorem-model.properties	2012-08-08 15:58:13 UTC (rev 233)
+++ trunk/chorem-entities/src/main/xmi/chorem-model.properties	2012-08-08 17:26:01 UTC (rev 234)
@@ -20,42 +20,231 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # #L%
 ###
+
+#
+# Attachment
+#
+org.chorem.entities.Attachment.class.tagvalue.version=9.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.Attachment.attribute.name.tagvalue.help=Le nom de la pi\u00e8ce attach\u00e9e (souvent le nom du fichier)
+org.chorem.entities.Attachment.attribute.target.tagvalue.help=L'objet auquel attacher cette pi\u00e8ce (ex: un devis, une facture, ...)
+org.chorem.entities.Attachment.attribute.date.tagvalue.help=La date d'ajout de cette pi\u00e8ce
+org.chorem.entities.Attachment.attribute.mimetype.tagvalue.help=Le type mime de la pi\u00e8ce attach\u00e9e (ex: application/pdf)
+org.chorem.entities.Attachment.attribute.mimetype.tagvalue.choiceQuery=SELECT Attachment.mimetype WHERE extension=Attachment
+org.chorem.entities.Attachment.attribute.content.tagvalue.help=Le fichier \u00e0 importer
+org.chorem.entities.Attachment.attribute.contentUrl.tagvalue.help=Si on ne souhaite pas importer le fichier, on peut indiquer ici sont URL (ex: http://commun.codelutin.home/Clients/...)
+#
+# Configuration
+#
 org.chorem.entities.Configuration.class.tagvalue.version=3.0
-org.chorem.entities.Category.class.tagvalue.version=4.0
+#
+# category
+#
+org.chorem.entities.Category.class.tagvalue.version=5.0
 org.chorem.entities.Category.class.tagvalue.toString=%WikittyTreeNode.name|noname$s
-org.chorem.entities.Project.class.tagvalue.version=6.0
+org.chorem.entities.Category.attribute.index.tagvalue.help=La position de cette cat\u00e9gorie dans son niveau
+org.chorem.entities.WikittyTreeNode.attribute.name.tagvalue.help=Le nom pour cette cat\u00e9gorie (ex: d\u00e9pense, Salaire, ...)
+org.chorem.entities.WikittyTreeNode.attribute.attachment.tagvalue.visible=false
+org.chorem.entities.WikittyTreeNode.attribute.parent.tagvalue.help=La cat\u00e9gorie Parente de celle-ci (ex: d\u00e9pense pour Loyer)
+org.chorem.entities.WikittyTreeNode.attribute.parent.tagvalue.allowed=Category
+#
+# Company
+#
+org.chorem.entities.Company.class.tagvalue.version=7.0
+org.chorem.entities.Company.class.tagvalue.toString=%Company.name|noname$s
+org.chorem.entities.Company.class.tagvalue.sortOrder=Company.name
+org.chorem.entities.Company.attribute.name.tagvalue.help=Nom de la soci\u00e9t\u00e9
+org.chorem.entities.Company.attribute.type.tagvalue.help=type de la soci\u00e9t\u00e9 (SARL, SA, SAS, ...)
+org.chorem.entities.Company.attribute.type.tagvalue.choiceQuery=SELECT Company.type WHERE extension=Company
+#
+# ContactDetails
+#
+org.chorem.entities.ContactDetails.class.tagvalue.version=7.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.ContactDetails.attribute.name.tagvalue.help=Le nom utiliser pour cette adresse (ex: domicile, bureau, ...)
+org.chorem.entities.ContactDetails.attribute.name.tagvalue.choiceQuery=SELECT ContactDetails.name WHERE extension=ContactDetails
+org.chorem.entities.ContactDetails.attribute.type.tagvalue.help=Le type d'adresse (ex: mail, phone, im, web, ...)
+org.chorem.entities.ContactDetails.attribute.type.tagvalue.choiceQuery=SELECT ContactDetails.type WHERE extension=ContactDetails
+org.chorem.entities.ContactDetails.attribute.value.tagvalue.help=L'adresse en elle m\u00eame
+org.chorem.entities.ContactDetails.attribute.target.tagvalue.help=L'objet sur lequel porte cette adresse
+#
+# Employee
+#
+org.chorem.entities.Employee.class.tagvalue.version=9.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.Employee.attribute.type.tagvalue.help=Le type de contrat de travail (CDI, CDD, Stage, ...)
+org.chorem.entities.Employee.attribute.type.tagvalue.choiceQuery=SELECT Employee.type WHERE extension=Employee
+org.chorem.entities.Employee.attribute.paidLeave.tagvalue.help=Le nombre de jours de cong\u00e9s pay\u00e9s
+org.chorem.entities.Employee.attribute.rtt.tagvalue.help=Le nombre de jours de RTT
+org.chorem.entities.Employee.attribute.salary.tagvalue.help=Le salaire brut mensuel
+org.chorem.entities.Employee.attribute.workingTime.tagvalue.help=Le temps de travail mensuel
+org.chorem.entities.Employee.attribute.description.tagvalue.help=Description du poste
+org.chorem.entities.Employee.attribute.description.tagvalue.subtype=text/rst
+org.chorem.entities.Employee.attribute.person.tagvalue.help=Autocompl\u00e8tion possible
+org.chorem.entities.Employee.attribute.company.tagvalue.help=Autocompl\u00e8tion possible
+#
+# Invoice
+#
+org.chorem.entities.Invoice.class.tagvalue.version=12.0
+org.chorem.entities.Invoice.class.tagvalue.preload=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 desc,Invoice.expectedDate,Invoice.paymentDate,Invoice.reference,Invoice.amount
+org.chorem.entities.Invoice.attribute.reference.tagvalue.help=La r\u00e9f\u00e9rence de la facture
+org.chorem.entities.Invoice.attribute.description.tagvalue.help=la description de la facture (ce sur quoi elle porte)
+org.chorem.entities.Invoice.attribute.description.tagvalue.subtype=text/rst
+org.chorem.entities.Invoice.attribute.amount.tagvalue.help=Le montant HT de la facture
+org.chorem.entities.Invoice.attribute.amount.tagvalue.subtype=currency
+org.chorem.entities.Invoice.attribute.VTA.tagvalue.help=La TVA \u00e0 appliquer \u00e0 la facture
+org.chorem.entities.Invoice.attribute.postedDate.tagvalue.help=La date d'envoi au client
+org.chorem.entities.Invoice.attribute.expectedDate.tagvalue.help=La date souhait\u00e9e de paiement
+org.chorem.entities.Invoice.attribute.paymentDate.tagvalue.help=La date de paiement r\u00e9elle
+org.chorem.entities.Invoice.attribute.supplier.tagvalue.help=La personne chez Code Lutin qui g\u00e8re la facturation
+org.chorem.entities.Invoice.attribute.supplier.tagvalue.allowedQuery=SELECT id WHERE Employee.company="1628bcf9-82ea-440d-ab8d-ea93498af2d9"
+org.chorem.entities.Invoice.attribute.customer.tagvalue.help=La personne chez le client \u00e0 qui ont a envoyer la facture
+#
+# Invoiceable
+#
+org.chorem.entities.Invoiceable.class.tagvalue.version=11.0
+org.chorem.entities.Invoiceable.class.tagvalue.preload=Invoiceable.target;Invoiceable.category
+org.chorem.entities.Invoiceable.class.tagvalue.toString=%Invoiceable.name|noname$s
+org.chorem.entities.Invoiceable.class.tagvalue.sortOrder=Invoiceable.name
+org.chorem.entities.Invoiceable.attribute.name.tagvalue.help=Nom de ce facturable (si n\u00e9cessaire) ex: "facture VSR"
+org.chorem.entities.Invoiceable.attribute.target.tagvalue.help=L'objet sur lequel la facture s'appliquera
+org.chorem.entities.Invoiceable.attribute.condition.tagvalue.help=Script qui lorsqu'il est \u00e9valu\u00e9 \u00e0 TRUE cr\u00e9e la facture
+org.chorem.entities.Invoiceable.attribute.value.tagvalue.help=Script qui permet de calculer le montant de la facture
+org.chorem.entities.Invoiceable.attribute.recurrence.tagvalue.help=Script qui permet de calculer la r\u00e9currence de cette facture
+org.chorem.entities.Invoiceable.attribute.mimetype.tagvalue.help=Langage utilis\u00e9 pour les scripts (ex: application/javascript)
+org.chorem.entities.Invoiceable.attribute.category.tagvalue.help=La cat\u00e9gorie de cette facture
+#
+# Interval
+#
+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
+#
+# Note
+#
+org.chorem.entities.Note.class.tagvalue.version=3.0
+org.chorem.entities.Note.class.tagvalue.toString=(%Note.date$tF) %Note.title|noname$s
+org.chorem.entities.Note.class.tagvalue.sortOrder=Note.date desc
+org.chorem.entities.Note.attribute.date.tagvalue.help=La date de cr\u00e9ation de cette note
+org.chorem.entities.Note.attribute.title.tagvalue.help=Le titre de la note
+org.chorem.entities.Note.attribute.content.tagvalue.help=Le contenu de la note
+org.chorem.entities.Note.attribute.content.tagvalue.subtype=text/rst
+org.chorem.entities.Note.attribute.target.tagvalue.help=L'objet sur lequel porte la note (ex: un projet, une personne, ...)
+#
+# Person
+#
+org.chorem.entities.Person.class.tagvalue.version=7.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.Person.attribute.diploma.tagvalue.help=Le plus haut dipl\u00f4me obtenu
+#
+# Project
+#
+org.chorem.entities.Project.class.tagvalue.version=7.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=9.0
+org.chorem.entities.Project.attribute.name.tagvalue.help=Le nom du projet
+org.chorem.entities.Project.attribute.name.tagvalue.fieldIndex=0
+org.chorem.entities.Project.attribute.description.tagvalue.help=La description du projet
+org.chorem.entities.Project.attribute.description.tagvalue.subtype=text/rst
+#
+# Quotation
+#
+org.chorem.entities.Quotation.class.tagvalue.version=15.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 desc,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.reference.tagvalue.help=R\u00e9f\u00e9rence du devis
+org.chorem.entities.Quotation.attribute.description.tagvalue.help=R\u00e9sum\u00e9 du devis (en quelque mot)
+org.chorem.entities.Quotation.attribute.description.tagvalue.subtype=text/rst
+org.chorem.entities.Quotation.attribute.estimatedDays.tagvalue.help=Le nombre de jour estim\u00e9 pour ce devis
+org.chorem.entities.Quotation.attribute.amount.tagvalue.help=Montant du devis HT
+org.chorem.entities.Quotation.attribute.amount.tagvalue.subtype=currency
+org.chorem.entities.Quotation.attribute.VTA.tagvalue.help=Taxe a appliquer au montant
+org.chorem.entities.Quotation.attribute.VTA.tagvalue.subtype=percent
+org.chorem.entities.Quotation.attribute.postedDate.tagvalue.help=Date d'envoi du devis au client
+org.chorem.entities.Quotation.attribute.conversionHope.tagvalue.help=Pourcentage de r\u00e9ussite du projet
+org.chorem.entities.Quotation.attribute.conversionHope.tagvalue.subtype=percent
+org.chorem.entities.Quotation.attribute.conversionHope.tagvalue.min=0
+org.chorem.entities.Quotation.attribute.conversionHope.tagvalue.max=1
+org.chorem.entities.Quotation.attribute.status.tagvalue.help=\u00c9tat d'avancement de ce devis
+org.chorem.entities.Quotation.attribute.vrsPeriod.tagvalue.help=Nombre de jour de VSR (Validation en Service R\u00e9gulier)
+org.chorem.entities.Quotation.attribute.vrsPeriod.tagvalue.subtype=integer
+org.chorem.entities.Quotation.attribute.warrantyPeriod.tagvalue.help=Nombre de jour de garantie
+org.chorem.entities.Quotation.attribute.warrantyPeriod.tagvalue.subtype=integer
+org.chorem.entities.Quotation.attribute.vrsStart.tagvalue.help=Date de d\u00e9but de la VSR (Validation en Service R\u00e9gulier)
+org.chorem.entities.Quotation.attribute.warrantyStart.tagvalue.help=Date de d\u00e9but de la garantie
+org.chorem.entities.Quotation.attribute.supplier.tagvalue.help=La personne en charge du dossier chez Code Lutin
+org.chorem.entities.Quotation.attribute.supplier.tagvalue.allowedQuery=SELECT id WHERE Employee.company="1628bcf9-82ea-440d-ab8d-ea93498af2d9"
+org.chorem.entities.Quotation.attribute.customer.tagvalue.help=La personne en charge du dossier chez le client
+org.chorem.entities.Quotation.attribute.project.tagvalue.help=Le projet auquel se rapport ce devis
+org.chorem.entities.Quotation.attribute.category.tagvalue.help=La cat\u00e9gorie de ce devis
+#
+# Task
+#
+org.chorem.entities.Task.class.tagvalue.version=10.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.description.tagvalue.help=R\u00e9sum\u00e9 de ce qu'il devra \u00eatre fait durant cette t\u00e2che
+org.chorem.entities.Task.attribute.description.tagvalue.subtype=text/rst
+org.chorem.entities.Task.attribute.price.tagvalue.help=Montant HT de cette t\u00e2che
+org.chorem.entities.Task.attribute.reestimatedEnd.tagvalue.help=Date estim\u00e9e de fin de t\u00e2che
+org.chorem.entities.Task.attribute.estimatedDays.tagvalue.help=Le nombre de jours estim\u00e9s pour cette t\u00e2che
+org.chorem.entities.Task.attribute.name.tagvalue.help=Nom de la t\u00e2che ou N\u00b0 dans le devis
+org.chorem.entities.Task.attribute.status.tagvalue.help=\u00c9tat actuel de la t\u00e2che
 org.chorem.entities.Task.attribute.status.tagvalue.allowed=SCHEDULED,STARTED,FINISHED,CLOSED
-org.chorem.entities.Worker.class.tagvalue.version=7.0
+org.chorem.entities.Task.attribute.quotation.tagvalue.help=Devis auquel appartient cette t\u00e2che
+#
+# Time
+#
+org.chorem.entities.Time.class.tagvalue.version=9.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.Time.attribute.task.tagvalue.help=La ta\u0109he auquel il faut assigner du temps
+org.chorem.entities.Time.attribute.task.tagvalue.fieldIndex=0
+org.chorem.entities.Time.attribute.employee.tagvalue.help=L'employer qui a pass\u00e9 du temps sur la t\u00e2che
+#
+# Touch
+#
+org.chorem.entities.Touch.class.tagvalue.version=9.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.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.help=Le type de contact (t\u00e9l\u00e9phone, visio, physique, ...)
+org.chorem.entities.Touch.attribute.type.tagvalue.choiceQuery=SELECT Touch.type WHERE extension=Touch
+org.chorem.entities.Touch.attribute.link.tagvalue.help=Sur quoi portait le contact (un projet, un devis, ...)
+org.chorem.entities.Touch.attribute.participant.tagvalue.help=Liste des personnes qui \u00e9taient pr\u00e9sentes
+#
+# Worker
+#
+org.chorem.entities.Worker.class.tagvalue.version=8.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=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=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=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=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=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=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.Worker.attribute.task.tagvalue.help=La t\u00e2che auquel on assigne quelqu'un
+org.chorem.entities.Worker.attribute.person.tagvalue.help=La personne \u00e0 ajouter en tant que travaillant sur cette t\u00e2che
+org.chorem.entities.Worker.attribute.percentage.tagvalue.help=Le pourcentage de temps de la personne sur cette t\u00e2che
+org.chorem.entities.Worker.attribute.percentage.tagvalue.fieldIndex=10
+org.chorem.entities.Worker.attribute.percentage.tagvalue.subtype=percent
+#
+# Les objets suivant n'ont pas encore ete complete.
+# Lorsqu'il le seront, il faudra les remettre dans l'ordre alphabetique avec les
+# autres
+#
 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
@@ -83,38 +272,3 @@
 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=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
-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
-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=14.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 desc,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.subtype=percent
-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=11.0
-org.chorem.entities.Invoice.class.tagvalue.preload=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 desc,Invoice.expectedDate,Invoice.paymentDate,Invoice.reference,Invoice.amount
-org.chorem.entities.Invoice.attribute.amount.tagvalue.subtype=currency
-org.chorem.entities.Invoice.attribute.description.tagvalue.subtype=text/rst
-org.chorem.entities.Invoiceable.class.tagvalue.version=10.0
-org.chorem.entities.Invoiceable.class.tagvalue.preload=Invoiceable.target;Invoiceable.category
-org.chorem.entities.Invoiceable.class.tagvalue.toString=%Invoiceable.name|noname$s
-org.chorem.entities.Invoiceable.class.tagvalue.sortOrder=Invoiceable.name

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-08 15:58:13 UTC (rev 233)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java	2012-08-08 17:26:01 UTC (rev 234)
@@ -411,7 +411,7 @@
         // 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";
+            String viewAction = pathView + "viewAction" + e.getName() + ".jsp";
             try {
                 if (servletContext.getResource(viewAction) != null) {
                     viewActions.add(viewAction);

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-08 15:58:13 UTC (rev 233)
+++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java	2012-08-08 17:26:01 UTC (rev 234)
@@ -110,6 +110,12 @@
             String fieldName = WikittyUtil.getFieldNameFromFQFieldName(fqfield);
             FieldType field = wikitty.getFieldType(fqfield);
 
+            String visible = field.getTagValue("visible");
+            if ("false".equals(visible)) {
+                // on affiche rien pour ce champs
+                return;
+            }
+
             // par defaut si pas de label on utilise le nom du field
             if (null == label) {
                 label = fieldName;

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-08 15:58:13 UTC (rev 233)
+++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java	2012-08-08 17:26:01 UTC (rev 234)
@@ -102,6 +102,12 @@
         String fieldName = WikittyUtil.getFieldNameFromFQFieldName(fqfield);
         FieldType field = wikitty.getFieldType(fqfield);
 
+        String visible = field.getTagValue("visible");
+        if ("false".equals(visible)) {
+            // on affiche rien pour ce champs
+            return;
+        }
+
         if (field != null) {
             switch(field.getType()) {
                 case BINARY:

Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp	2012-08-08 15:58:13 UTC (rev 233)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp	2012-08-08 17:26:01 UTC (rev 234)
@@ -24,3 +24,4 @@
 <%@ 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}"/>"><i class="icon-plus icon-white"></i> Add Contact Details</a>
+<a class="btn btn-success" href="<c:url value="/wikitty/Employee/edit/new?Employee.company=${wikitty.id}"/>"><i class="icon-plus icon-white"></i> Add Employee</a>

Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp	2012-08-08 15:58:13 UTC (rev 233)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp	2012-08-08 17:26:01 UTC (rev 234)
@@ -24,3 +24,4 @@
 <%@ 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}"/>"><i class="icon-plus icon-white"></i> Add Contact Details</a>
+<a class="btn btn-success" href="<c:url value="/wikitty/Employee/edit/new?Employee.person=${wikitty.id}"/>"><i class="icon-plus icon-white"></i> Add Employee</a>

Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionQuotation.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionQuotation.jsp	                        (rev 0)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionQuotation.jsp	2012-08-08 17:26:01 UTC (rev 234)
@@ -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/Task/edit/new?Task.quotation=${wikitty.id}"/>"><i class="icon-plus icon-white"></i> Add Task</a>

Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionTask.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionTask.jsp	                        (rev 0)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionTask.jsp	2012-08-08 17:26:01 UTC (rev 234)
@@ -0,0 +1,27 @@
+<%--
+  #%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/Worker/edit/new?Worker.task=${wikitty.id}"/>"><i class="icon-plus icon-white"></i> Add Worker</a>
+<a class="btn btn-success" href="<c:url value="/wikitty/Time/edit/new?Time.task=${wikitty.id}"/>"><i class="icon-plus icon-white"></i> Add Time</a>

    

r234 - in trunk: chorem-entities/src/main/xmi chorem-webmotion/src/main/java/org/chorem/webmotion/actions chorem-webmotion/src/main/java/org/wikitty/web/jsptag chorem-webmotion/src/main/webapp/WEB-INF/jsp

bpoussin＠users.chorem.org

tags

participants (1)