Author: mble Date: 2012-11-30 19:41:13 +0100 (Fri, 30 Nov 2012) New Revision: 279 Url: http://chorem.org/projects/chorem/repository/revisions/279 Log: M chorem-entities/src/main/xmi/chorem-model.properties M chorem-entities/src/main/xmi/chorem-model.zargo M chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java M chorem-entities/src/main/java/org/chorem/ChoremAction.java M chorem-entities/src/main/java/org/chorem/ChoremClient.java M chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java Modified: trunk/chorem-entities/pom.xml trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java trunk/chorem-entities/src/main/xmi/chorem-model.properties trunk/chorem-entities/src/main/xmi/chorem-model.zargo Modified: trunk/chorem-entities/pom.xml =================================================================== --- trunk/chorem-entities/pom.xml 2012-11-09 13:09:49 UTC (rev 278) +++ trunk/chorem-entities/pom.xml 2012-11-30 18:41:13 UTC (rev 279) @@ -106,6 +106,12 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> + <dependency> + <groupId>org.chorem.chorem</groupId> + <artifactId>chorem-entities</artifactId> + <version>0.3-SNAPSHOT</version> + <type>jar</type> + </dependency> </dependencies> <build> Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java 2012-11-09 13:09:49 UTC (rev 278) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java 2012-11-30 18:41:13 UTC (rev 279) @@ -25,6 +25,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.query.WikittyQueryResult; @@ -92,4 +95,14 @@ static public void help() { System.out.println("Chorem Main Help"); } + + /* + * Migre les champs de l'entitité Employee vers EmployeeHR (intégralité des données) + * champs : type, paidLeave, rtt, salary, workingtime + */ +// static public void migrateEmployeeHR(WikittyService service, Wikitty wikitty, +// WikittyExtension oldExt, WikittyExtension newExt) { +// +// } + } Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2012-11-09 13:09:49 UTC (rev 278) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2012-11-30 18:41:13 UTC (rev 279) @@ -33,11 +33,19 @@ import org.chorem.entities.ConfigurationImpl; import org.chorem.entities.ContactDetails; import org.chorem.entities.Employee; +import org.chorem.entities.EmployeeMigration; +import org.chorem.entities.Invoice; +import org.chorem.entities.InvoiceMigration; +import org.chorem.entities.Quotation; +import org.chorem.entities.QuotationMigration; +import org.chorem.entities.Vacation; +import org.chorem.entities.VacationMigration; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyClient; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyServiceFactory; import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; @@ -53,6 +61,10 @@ protected ChoremClient(ApplicationConfig config, WikittyService ws) { super(config, ws); + this.getMigrationRegistry().put(Invoice.EXT_INVOICE, new InvoiceMigration()); + this.getMigrationRegistry().put(Quotation.EXT_QUOTATION, new QuotationMigration()); + //this.getMigrationRegistry().put(Vacation.EXT_VACATION, new VacationMigration()); + //this.getMigrationRegistry().put(Employee.EXT_EMPLOYEE, new EmployeeMigration()); } /** @@ -151,6 +163,7 @@ exts.addAll(org.chorem.entities.ConfigurationAbstract.extensions); exts.addAll(org.chorem.entities.ContactDetailsAbstract.extensions); exts.addAll(org.chorem.entities.EmployeeAbstract.extensions); + exts.addAll(org.chorem.entities.EmployeeHRAbstract.extensions); exts.addAll(org.chorem.entities.EvaluationAbstract.extensions); exts.addAll(org.chorem.entities.GoalAbstract.extensions); exts.addAll(org.chorem.entities.IntervalAbstract.extensions); @@ -163,13 +176,19 @@ exts.addAll(org.chorem.entities.PersonSkillAbstract.extensions); exts.addAll(org.chorem.entities.ProjectAbstract.extensions); exts.addAll(org.chorem.entities.QuotationAbstract.extensions); + exts.addAll(org.chorem.entities.ReferenceYearAbstract.extensions); exts.addAll(org.chorem.entities.SkillAbstract.extensions); exts.addAll(org.chorem.entities.TaskAbstract.extensions); exts.addAll(org.chorem.entities.TimeAbstract.extensions); exts.addAll(org.chorem.entities.TouchAbstract.extensions); exts.addAll(org.chorem.entities.VacationAbstract.extensions); + exts.addAll(org.chorem.entities.VacationRequestAbstract.extensions); exts.addAll(org.chorem.entities.WorkerAbstract.extensions); + + + + exts.addAll(org.nuiton.wikitty.entities.WikittyAuthorisationAbstract.extensions); exts.addAll(org.nuiton.wikitty.entities.WikittyGroupAbstract.extensions); exts.addAll(org.nuiton.wikitty.entities.WikittyHookAbstract.extensions); @@ -193,6 +212,7 @@ } } } + return ws; } Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java 2012-11-09 13:09:49 UTC (rev 278) +++ trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java 2012-11-30 18:41:13 UTC (rev 279) @@ -22,10 +22,14 @@ */ package org.chorem; +import org.chorem.entities.Invoice; +import org.chorem.entities.InvoiceMigration; +import org.chorem.entities.Quotation; +import org.chorem.entities.QuotationMigration; +import static org.nuiton.i18n.I18n._; import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyConfigOption; -import static org.nuiton.i18n.I18n._; - /** * Chorem option definition. * @@ -35,6 +39,16 @@ CONFIG_FILE(ApplicationConfig.CONFIG_FILE_NAME, _("chorem.config.configFileName.description"), "chorem.properties", String.class, false, false), +// CHOREM_MIGRATION_INVOICE( +// WikittyConfigOption.WIKITTY_MIGRATION_CLASS + Invoice.EXT_INVOICE, +// _("Classe de migration de l'extension Invoice"), +// InvoiceMigration.class.getName(), +// Class.class, false, false), +// CHOREM_MIGRATION_QUOTATION( +// WikittyConfigOption.WIKITTY_MIGRATION_CLASS + Quotation.EXT_QUOTATION, +// _("Classe de migration de l'extension Quotation"), +// QuotationMigration.class.getName(), +// Class.class, false, false), CHOREM_EXTENSION_SEARCH_EXCLUSION( "chorem.extension.search.exclusion", _("Liste des extensions qui ne doivent pas apparaitre dans les resultats"), Modified: trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java 2012-11-09 13:09:49 UTC (rev 278) +++ trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java 2012-11-30 18:41:13 UTC (rev 279) @@ -436,8 +436,9 @@ employee.setBeginDate(parseDate(beginDate)); employee.setEndDate(parseDate(endDate)); - employee.setSalary(Float.parseFloat(salary)); - employee.setType(contractType.get(typeId)); + // 2012-11-14 ble : salary and type are now in entity employeeHR + //employee.setSalary(Float.parseFloat(salary)); + //employee.setType(contractType.get(typeId)); } } reader.close(); Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties =================================================================== --- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-11-09 13:09:49 UTC (rev 278) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-11-30 18:41:13 UTC (rev 279) @@ -35,16 +35,6 @@ 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/...) # -# ChoremUser -# -org.chorem.entities.ChoremUser.class.tagvalue.version=1.0 -org.chorem.entities.ChoremUser.class.tagvalue.toString=%WikittyUser.login|nologin$s -org.chorem.entities.ChoremUser.class.tagvalue.sortOrder=WikittyUser.login -# -# Configuration -# -org.chorem.entities.Configuration.class.tagvalue.version=3.0 -# # category # org.chorem.entities.Category.class.tagvalue.version=5.0 @@ -55,6 +45,12 @@ 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 # +# ChoremUser +# +org.chorem.entities.ChoremUser.class.tagvalue.version=1.0 +org.chorem.entities.ChoremUser.class.tagvalue.toString=%WikittyUser.login|nologin$s +org.chorem.entities.ChoremUser.class.tagvalue.sortOrder=WikittyUser.login +# # Company # org.chorem.entities.Company.class.tagvalue.version=7.0 @@ -64,6 +60,10 @@ 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 # +# Configuration +# +org.chorem.entities.Configuration.class.tagvalue.version=3.0 +# # ContactDetails # org.chorem.entities.ContactDetails.class.tagvalue.version=7.0 @@ -78,24 +78,47 @@ # # Employee # -org.chorem.entities.Employee.class.tagvalue.version=9.0 +org.chorem.entities.Employee.class.tagvalue.version=10.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 # +# EmployeeHR +# +org.chorem.entities.EmployeeHR.class.tagvalue.version=1.0 +org.chorem.entities.EmployeeHR.class.tagvalue.toString=%Employee.person$s (%Employee.company$s) HR +org.chorem.entities.EmployeeHR.attribute.type.tagvalue.help=Le type de contrat de travail (CDI, CDD, Stage, ...) +org.chorem.entities.EmployeeHR.attribute.type.tagvalue.choiceQuery=SELECT EmployeeHR.type WHERE extension=EmployeeHR +org.chorem.entities.EmployeeHR.attribute.paidLeave.tagvalue.help=Le nombre de jours de cong\u00e9s pay\u00e9s +org.chorem.entities.EmployeeHR.attribute.rtt.tagvalue.help=Le nombre de jours de RTT +org.chorem.entities.EmployeeHR.attribute.otherLeave.tagvalue.help=Le nombre de jours de cong\u00e9s de diverses natures attribu\u00e9s (maternit\u00e9s, anciennet\u00e9s, sans-solde, autres...) +org.chorem.entities.EmployeeHR.attribute.salary.tagvalue.help=Le salaire brut mensuel +org.chorem.entities.EmployeeHR.attribute.workingTime.tagvalue.help=Le temps de travail mensuel +# +# Evaluation (a mettre ici) +# +# +# Goal (a mettre ici) +# +# +# 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 +# +# Interview (a mettre ici) +# +# # Invoice # -org.chorem.entities.Invoice.class.tagvalue.version=14.0 +org.chorem.entities.Invoice.class.tagvalue.version=15.0 org.chorem.entities.Invoice.class.tagvalue.preload=Invoice.customer;Invoice.supplier org.chorem.entities.Invoice.class.tagvalue.toString=%Invoice.reference|noref$s - %Invoice.description|nodescription$s - %Invoice.amount|noamount$s org.chorem.entities.Invoice.class.tagvalue.sortOrder=Invoice.postedDate desc,Invoice.expectedDate,Invoice.paymentDate,Invoice.reference,Invoice.amount @@ -104,7 +127,7 @@ 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.VAT.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 @@ -130,13 +153,8 @@ 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 +# Mission (a mettre ici) # -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 # @@ -156,6 +174,9 @@ 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 # +# PersonSkill (a mettre ici) +# +# # Project # org.chorem.entities.Project.class.tagvalue.version=7.0 @@ -168,7 +189,7 @@ # # Quotation # -org.chorem.entities.Quotation.class.tagvalue.version=17.0 +org.chorem.entities.Quotation.class.tagvalue.version=18.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 @@ -179,8 +200,8 @@ 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.VAT.tagvalue.help=Taxe a appliquer au montant +org.chorem.entities.Quotation.attribute.VAT.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 @@ -199,6 +220,15 @@ 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 # +# ReferenceYear +# +org.chorem.entities.ReferenceYear.class.tagvalue.version=1.0 +org.chorem.entities.ReferenceYear.attribute.leavePaidDays.tagvalue.help=Nombre de cong\u00e9s pay\u00e9s par an +org.chorem.entities.ReferenceYear.attribute.differLeave.tagvalue.help=Cong\u00e9s pay\u00e9s differ\u00e9s=oui-non +# +# Skill (a mettre ici) +# +# # Task # org.chorem.entities.Task.class.tagvalue.version=10.0 @@ -239,6 +269,29 @@ 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 # +# Vacation +# +org.chorem.entities.Vacation.class.tagvalue.version=10.0 +org.chorem.entities.Vacation.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate,Vacation.typeLeave +org.chorem.entities.Vacation.attribute.amount.tagvalue.help=Le nombre r\u00e9el de jours de cong\u00e9s pour cette p\u00e9riode +org.chorem.entities.Vacation.attribute.typeLeave.tagvalue.help=Type de cong\u00e9s (cong\u00e9s annuels, rtt, sans-solde...) +org.chorem.entities.Vacation.attribute.typeLeave.tagvalue.allowed=CONGES ANNUELS,RTT,SANS-SOLDE,MATERNITE,DIVERS +org.chorem.entities.Vacation.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF %Vacation.typeLeave|notypeLeave$s +# +# VacationRequest +# +org.chorem.entities.VacationRequest.class.tagvalue.version=1.0 +org.chorem.entities.VacationRequest.class.tagvalue.toString=Request %VacationRequest.employeeRequest$s %VacationRequest.statusRequest|nostatusRequest$s +org.chorem.entities.VacationRequest.attribute.dateRequest.tagvalue.help=Date de demande des cong\u00e9s +org.chorem.entities.VacationRequest.attribute.commentRequest.tagvalue.help=Commentaires du salari\u00e9 demandeur +org.chorem.entities.VacationRequest.attribute.dateAnswer.tagvalue.help=Date de r\u00e9ponse (d\u00e9cision du salari\u00e9 d\u00e9cideur) +org.chorem.entities.VacationRequest.attribute.commentAnswer.tagvalue.help=Commenatires du d\u00e9cideur +org.chorem.entities.VacationRequest.attribute.statusRequest.tagvalue.help=Etat de la demande (en pr\u00e9vision, en demande, accept\u00e9e, refus\u00e9e ...) +org.chorem.entities.VacationRequest.attribute.employeeRequest.tagvalue.help=Employ\u00e9 demandeur +org.chorem.entities.VacationRequest.attribute.employeeWriter.tagvalue.help=Employ\u00e9 qui effectue la saisie de la demande +org.chorem.entities.VacationRequest.attribute.employeeAnswer.tagvalue.help=Employ\u00e9 d\u00e9cideur (acceptation ou refus) +org.chorem.entities.VacationRequest.attribute.statusRequest.tagvalue.allowed=EN PREVISION,EN DEMANDE,ACCEPTEE,REFUSEE,FERMETURE ANNUELLE +# # Worker # org.chorem.entities.Worker.class.tagvalue.version=8.0 @@ -277,8 +330,3 @@ 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=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 Modified: trunk/chorem-entities/src/main/xmi/chorem-model.zargo =================================================================== (Binary files differ)