branch feature/7600-PS-VerifOperationSurObjetFlottant created (now e2b4792)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7600-PS-VerifOperationSurObjetFlottant in repository tutti. See http://git.codelutin.com/tutti.git at e2b4792 vider les champs au changement de type d'opération This branch includes the following new commits: new 832cacf Ajout de trace dans les appels des services. new 14ee8a4 Ajout des validateurs pour les bouées de transmissions new da003ec Ajout des traduction pour les typed'opération et les type de balise (reste à les faire fonctionner avec l'EnumEditor) new e2b4792 vider les champs au changement de type d'opération The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e2b4792b01ba0229868558a9455969289cb20f30 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Mar 7 15:10:51 2016 +0100 vider les champs au changement de type d'opération commit da003ec4d34f85dd2a617a49a798f0100242b5a5 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Mar 7 15:09:34 2016 +0100 Ajout des traduction pour les typed'opération et les type de balise (reste à les faire fonctionner avec l'EnumEditor) commit 14ee8a4455e91cda234c659cffecb6b97566bc12 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Mar 7 15:04:56 2016 +0100 Ajout des validateurs pour les bouées de transmissions commit 832cacf56342805ce47dc44852c72039f1ae6864 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Mar 7 15:03:23 2016 +0100 Ajout de trace dans les appels des services. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7600-PS-VerifOperationSurObjetFlottant in repository tutti. See http://git.codelutin.com/tutti.git commit 832cacf56342805ce47dc44852c72039f1ae6864 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Mar 7 15:03:23 2016 +0100 Ajout de trace dans les appels des services. --- .../service/seine/TransmittingBuoyOperationServiceTopia.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java index 8e29444..f236013 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java @@ -28,14 +28,21 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public class TransmittingBuoyOperationServiceTopia extends ObserveServiceTopia implements TransmittingBuoyOperationService { + private static final Log log = LogFactory.getLog(TransmittingBuoyOperationServiceTopia.class); + @Override public Form<FloatingObjectTransmittingBuoyDto> loadForm(String floatingObjectId) { + if (log.isTraceEnabled()) { + log.trace("loadForm(" + floatingObjectId + ")"); + } FloatingObject floatingObject = loadEntity(FloatingObjectTransmittingBuoyDto.class, floatingObjectId); @@ -52,6 +59,9 @@ public class TransmittingBuoyOperationServiceTopia extends ObserveServiceTopia i @Override public SaveResultDto save(FloatingObjectTransmittingBuoyDto dto) { + if (log.isTraceEnabled()) { + log.trace("save(" + dto.getId() + ")"); + } FloatingObject entity = loadOrCreateEntityAndCheckLastUpdate(dto); copyDataDtoToEntity(dto, entity); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7600-PS-VerifOperationSurObjetFlottant in repository tutti. See http://git.codelutin.com/tutti.git commit 14ee8a4455e91cda234c659cffecb6b97566bc12 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Mar 7 15:04:56 2016 +0100 Ajout des validateurs pour les bouées de transmissions --- ...nsmittingBuoyDto-n1-update-error-validation.xml | 75 ++++++++++++++++++++++ ...mittingBuoyDto-n1-update-warning-validation.xml | 38 +++++++++++ 2 files changed, 113 insertions(+) diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-n1-update-error-validation.xml new file mode 100644 index 0000000..59aaf76 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="transmittingBuoyType"> + + <!-- pas de type renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.transmittingBuoy.required.transmittingBuoyType</message> + </field-validator> + + <!-- type desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ transmittingBuoyType.enabled ]]> + </param> + <message>validator.transmittingBuoy.desactivated.transmittingBuoyType</message> + </field-validator> + + </field> + + <field name="transmittingBuoyOperation"> + + <!-- pas de transmittingBuoyOperation renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.transmittingBuoy.required.transmittingBuoyOperation</message> + </field-validator> + + <!-- transmittingBuoyOperation desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ transmittingBuoyOperation.enabled ]]> + </param> + <message>validator.transmittingBuoy.desactivated.transmittingBuoyOperation</message> + </field-validator> + + </field> + + <field name="country"> + + <!-- country desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ country == null || country.enabled ]]> + </param> + <message>validator.transmittingBuoy.desactivated.country</message> + </field-validator> + + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..fe4e653 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/TransmittingBuoyDto-n1-update-warning-validation.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- pas de code renseigne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.transmittingBuoy.null.code</message> + </field-validator> + + </field> + +</validators> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7600-PS-VerifOperationSurObjetFlottant in repository tutti. See http://git.codelutin.com/tutti.git commit da003ec4d34f85dd2a617a49a798f0100242b5a5 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Mar 7 15:09:34 2016 +0100 Ajout des traduction pour les typed'opération et les type de balise (reste à les faire fonctionner avec l'EnumEditor) --- .../fr/ird/observe/db/constants/ConstantsI18n.java | 21 +++++++++++++++++++++ .../i18n/observe-application-swing_en_GB.properties | 8 ++++++++ .../i18n/observe-application-swing_es_ES.properties | 8 ++++++++ .../i18n/observe-application-swing_fr_FR.properties | 8 ++++++++ 4 files changed, 45 insertions(+) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/constants/ConstantsI18n.java b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/ConstantsI18n.java index 529f6ce..7d97735 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/db/constants/ConstantsI18n.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/constants/ConstantsI18n.java @@ -1,6 +1,8 @@ package fr.ird.observe.db.constants; +import fr.ird.observe.services.dto.constants.seine.Ownership; import fr.ird.observe.services.dto.constants.seine.SchoolType; +import fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation; import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; @@ -14,10 +16,29 @@ public class ConstantsI18n { n("observe.schoolType.undefined"); n("observe.schoolType.objet"); n("observe.schoolType.libre"); + + n("observe.typeTransmittingBuoyOperation.pasDeBalise"); + n("observe.typeTransmittingBuoyOperation.visite"); + n("observe.typeTransmittingBuoyOperation.recuperation"); + n("observe.typeTransmittingBuoyOperation.pose"); + n("observe.typeTransmittingBuoyOperation.recuperationEtRemplacement"); + + n("observe.ownership.unknown"); + n("observe.ownership.ceVessel"); + n("observe.ownership.autreVessel"); + } public static String getLabel(SchoolType schoolType) { return t("observe.schoolType." + schoolType.name()); } + public static String getLabel(TypeTransmittingBuoyOperation typeTransmittingBuoyOperation) { + return t("observe.typeTransmittingBuoyOperation." + typeTransmittingBuoyOperation.name()); + } + + public static String getLabel(Ownership ownership) { + return t("observe.ownership." + ownership.name()); + } + } diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index edc7187..f5da3ec 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -1628,6 +1628,9 @@ observe.obstuna.action.security= observe.obstuna.action.security.description= observe.obstuna.action.update= observe.obstuna.action.update.description= +observe.ownership.autreVessel=Other vessel +observe.ownership.ceVessel=This vessel +observe.ownership.unknown=Unknown observe.person.country=Nationality observe.program.tab.general=General caracteristics observe.program.tab.observations=Observations @@ -2403,6 +2406,11 @@ observe.tripSeine.message.updating=Updating a trip observe.tripSeine.tab.general=Caracteristics observe.tripSeine.tab.map=Map observe.tripSeine.title=Trip +observe.typeTransmittingBuoyOperation.pasDeBalise=No Beacon +observe.typeTransmittingBuoyOperation.pose=Posing +observe.typeTransmittingBuoyOperation.recuperation=Grab +observe.typeTransmittingBuoyOperation.recuperationEtRemplacement=Grab and change +observe.typeTransmittingBuoyOperation.visite=Visit observe.validation.model.type.all= observe.validation.model.type.all.description= observe.validation.model.type.data= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index da2e158..b54b83a 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -1630,6 +1630,9 @@ observe.obstuna.action.security=Actualización de seguridad de Obstuna observe.obstuna.action.security.description=Actualización de securidad de una base remota Obstuna observe.obstuna.action.update=Actualización de Obstuna observe.obstuna.action.update.description=Actualización de una base remota Obstuna +observe.ownership.autreVessel=Barco ajeno +observe.ownership.ceVessel=Este barco o un barco del mismo armador +observe.ownership.unknown=Desconocido observe.person.country=Nacionalidad observe.program.tab.general= observe.program.tab.observations= @@ -2405,6 +2408,11 @@ observe.tripSeine.message.updating= observe.tripSeine.tab.general= observe.tripSeine.tab.map=Mapa observe.tripSeine.title= +observe.typeTransmittingBuoyOperation.pasDeBalise=DCP sin balizar +observe.typeTransmittingBuoyOperation.pose=Colocación de nueva baliza +observe.typeTransmittingBuoyOperation.recuperation=Recogida de baliza sin regreso al agua +observe.typeTransmittingBuoyOperation.recuperationEtRemplacement=Recuperación y colocación de una nueva baliza +observe.typeTransmittingBuoyOperation.visite=Visita a la baliza observe.validation.model.type.all=Datos y referenciales observe.validation.model.type.all.description=Datos y referenciales observe.validation.model.type.data=Datos del observador diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 73dc619..f0b5e51 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -1615,6 +1615,9 @@ observe.obstuna.action.security=Mise à jour de la sécurité d'obstuna observe.obstuna.action.security.description=Mise à jour de la sécurité d'une base distante obstuna observe.obstuna.action.update=Mise à jour d'obstuna observe.obstuna.action.update.description=Mise à jour d'une base distante obstuna +observe.ownership.autreVessel=Navire d'un autre armement +observe.ownership.ceVessel=Ce navire ou cet armement +observe.ownership.unknown=Inconnue observe.person.country=Nationalité observe.program.tab.general=Caractértistiques générales observe.program.tab.observations=Observations @@ -2395,6 +2398,11 @@ observe.tripSeine.message.updating=La maréee est en cours de modification. observe.tripSeine.tab.general=Caractéristiques observe.tripSeine.tab.map=Carte observe.tripSeine.title=Marée +observe.typeTransmittingBuoyOperation.pasDeBalise=Pas de balise liée au DCP +observe.typeTransmittingBuoyOperation.pose=Pose d'une nouvelle balise +observe.typeTransmittingBuoyOperation.recuperation=Récupération d'une balise sans remise à l'eau +observe.typeTransmittingBuoyOperation.recuperationEtRemplacement=Récupération et pose d'une nouvelle balise +observe.typeTransmittingBuoyOperation.visite=observe.typeTransmittingBuoyOperation.visite\= observe.validation.model.type.all=Données et référentiels observe.validation.model.type.all.description=Données et référentiels observe.validation.model.type.data=Données observées -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7600-PS-VerifOperationSurObjetFlottant in repository tutti. See http://git.codelutin.com/tutti.git commit e2b4792b01ba0229868558a9455969289cb20f30 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Mar 7 15:10:51 2016 +0100 vider les champs au changement de type d'opération --- .../FloatingObjectTransmittingBuoyOperationUIHandler.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java index bd40ea3..0d4681c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java @@ -274,10 +274,10 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH case 1: - //FIXME transmittingBuoy = reset ? null : objets.get(0); objectOperation = reset ? getObjectOperation(operations, codeOperations[0]) : null; + bindEditBalise(ui.getTransmittingBuoy1(), objectOperation, transmittingBuoy); editorPanel.setLayout(new GridLayout(1, 0)); @@ -289,7 +289,7 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH break; case 2: - //FIXME + transmittingBuoy = reset ? null : objets.get(0); objectOperation = reset ? getObjectOperation(operations, codeOperations[0]) : null; bindEditBalise(ui.getTransmittingBuoy1(), objectOperation, transmittingBuoy); @@ -323,11 +323,10 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH ReferentialReference<TransmittingBuoyOperationDto> transmittingBuoyOperation, TransmittingBuoyDto transmittingBuoy) { - //FIXME -// getModel().getChildLoador().load(transmittingBuoy, editBean, false); - if (transmittingBuoy == null) { + TransmittingBuoyDtos.copyTransmittingBuoyDto(new TransmittingBuoyDto(), editBean); + editBean.setTransmittingBuoyOperation(transmittingBuoyOperation); if (log.isDebugEnabled()) { @@ -341,6 +340,11 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH // toujours appartient au navire editBean.setOwnership(Ownership.ceVessel); } + + } else { + + TransmittingBuoyDtos.copyTransmittingBuoyDto(editBean, transmittingBuoy); + } FloatingObjectTransmittingBuoyDto bean = getBean(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm