- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] Update changelog after release of milestone 7.0
by Tony CHEMIT June 20, 2017

June 20, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 679ab738 by Tony CHEMIT at 2017-06-20T19:26:03+02:00 Update changelog after release of milestone 7.0 - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== The diff for this file was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/679ab73830f7c92925497d6a7b8… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/679ab73830f7c92925497d6a7b8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] add missing license headers
by Tony CHEMIT June 20, 2017

June 20, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4360fae9 by Tony CHEMIT at 2017-06-20T18:32:04+02:00 add missing license headers - - - - - 4 changed files: - application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/ReferentialCodeValidator.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CopyFloatingObjectPartToLeftAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CopyFloatingObjectPartToRightAction.java - services/src/main/java/fr/ird/observe/services/dto/referential/seine/ObjectMaterialHelper.java Changes: ===================================== application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/ReferentialCodeValidator.java ===================================== --- a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/ReferentialCodeValidator.java +++ b/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/ReferentialCodeValidator.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.validators; +/*- + * #%L + * ObServe :: Application Swing Validation + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * 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% + */ + import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; import fr.ird.observe.services.dto.reference.ReferentialReference; ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CopyFloatingObjectPartToLeftAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CopyFloatingObjectPartToLeftAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CopyFloatingObjectPartToLeftAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.content; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * 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% + */ + import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CopyFloatingObjectPartToRightAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CopyFloatingObjectPartToRightAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CopyFloatingObjectPartToRightAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.content; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * 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% + */ + import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; ===================================== services/src/main/java/fr/ird/observe/services/dto/referential/seine/ObjectMaterialHelper.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/dto/referential/seine/ObjectMaterialHelper.java +++ b/services/src/main/java/fr/ird/observe/services/dto/referential/seine/ObjectMaterialHelper.java @@ -1,5 +1,27 @@ package fr.ird.observe.services.dto.referential.seine; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * 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% + */ + import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4360fae9caaa386c046b00131b6… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4360fae9caaa386c046b00131b6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Insérer dans un ordre précis les ObjectMaterial
by Tony CHEMIT June 20, 2017

June 20, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 48db4da9 by Tony CHEMIT at 2017-06-20T18:21:02+02:00 Insérer dans un ordre précis les ObjectMaterial - - - - - 2 changed files: - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java - + services/src/main/java/fr/ird/observe/services/dto/referential/seine/ObjectMaterialHelper.java Changes: ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java @@ -23,12 +23,15 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.legacy */ import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.services.binder.BinderEngine; import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.*; +import fr.ird.observe.services.dto.referential.seine.ObjectMaterialDto; +import fr.ird.observe.services.dto.referential.seine.ObjectMaterialHelper; import fr.ird.observe.services.service.LastUpdateDateService; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalService; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeRequest; @@ -116,7 +119,14 @@ public class UnidirectionalReferentialSynchronizeLocalServiceTopia extends Obser if (request.withReferentialToAdd()) { InsertSqlStatementGenerator<R> sqlStatementGenerator = new InsertSqlStatementGenerator<>(metadataEntity, dtoType); - for (R referentialDto : request.getReferentialToAdd()) { + ImmutableSet<R> referentialToAdd = request.getReferentialToAdd(); + if (ObjectMaterialDto.class.equals(dtoType)) { + + // must reorder to be sure to insert parent before sons + referentialToAdd = (ImmutableSet)ObjectMaterialHelper.reorder((ImmutableSet)referentialToAdd); + + } + for (R referentialDto : referentialToAdd) { ImmutableList<String> sql = sqlStatementGenerator.generateSql(referentialDto); result.addAll(sql); } ===================================== services/src/main/java/fr/ird/observe/services/dto/referential/seine/ObjectMaterialHelper.java ===================================== --- /dev/null +++ b/services/src/main/java/fr/ird/observe/services/dto/referential/seine/ObjectMaterialHelper.java @@ -0,0 +1,37 @@ +package fr.ird.observe.services.dto.referential.seine; + +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Multimap; +import java.util.Collection; +import java.util.LinkedHashSet; +import java.util.Set; + +public class ObjectMaterialHelper extends GeneratedObjectMaterialHelper { + + public static ImmutableSet<ObjectMaterialDto> reorder(ImmutableSet<ObjectMaterialDto> incoming) { + + Set<ObjectMaterialDto> roots = new LinkedHashSet<>(); + Multimap<String, ObjectMaterialDto> map = ArrayListMultimap.create(); + for (ObjectMaterialDto objectMaterialDto : incoming) { + if (objectMaterialDto.getParent() == null) { + roots.add(objectMaterialDto); + } else { + map.put(objectMaterialDto.getParent().getId(), objectMaterialDto); + } + } + ImmutableSet.Builder<ObjectMaterialDto> result = ImmutableSet.builder(); + for (ObjectMaterialDto root : roots) { + fill(root, result, map); + } + return result.build(); + } + + private static void fill(ObjectMaterialDto root, ImmutableSet.Builder<ObjectMaterialDto> result, Multimap<String, ObjectMaterialDto> map) { + result.add(root); + Collection<ObjectMaterialDto> objectMaterialDtos = map.get(root.getId()); + for (ObjectMaterialDto objectMaterialDto : objectMaterialDtos) { + fill(objectMaterialDto, result, map); + } + } +} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/48db4da990f329219fa2953c855… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/48db4da990f329219fa2953c855… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajout des actions de recopie (See #577)
by Tony CHEMIT June 20, 2017

June 20, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cf893a62 by Tony CHEMIT at 2017-06-20T12:09:14+02:00 Ajout des actions de recopie (See #577) - - - - - 14 changed files: - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CopyFloatingObjectPartToLeftAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CopyFloatingObjectPartToRightAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/GotoActionSupport.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectPartsTreeNode.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java Changes: ===================================== application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties ===================================== --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties @@ -139,7 +139,7 @@ observe.type.maturityStatuses=Maturidades observe.type.mitigationType=Tipo de medida de atenuación observe.type.mitigationTypes=Tipos de medida de atenuación observe.type.nonTargetCatch=Fauna accesoria conservada o descartada -observe.type.nonTargetCatchRelease=Faune accessoire libérée \#TODO +observe.type.nonTargetCatchRelease=Faune accessoire sensible libérée \#TODO observe.type.nonTargetCatchReleaseStatus=État d'une faune accessoire libérée \#TODO observe.type.nonTargetCatchReleaseStatuses=États d'une faune accessoire libérée \#TODO observe.type.nonTargetCatchReleases=Faunes accessoires libérées \#TODO @@ -203,7 +203,7 @@ observe.type.setLonglineTdrs=Registradores observe.type.setLonglines=Operaciones de pesca observe.type.setSeine=Lance observe.type.setSeineNonTargetCatch=Captura de fauna accesoria -observe.type.setSeineNonTargetCatchRelease=Faune accessoire libérée \#TODO +observe.type.setSeineNonTargetCatchRelease=Faune accessoire sensible libérée \#TODO observe.type.setSeineNonTargetCatchReleases=Faunes accessoires libérées \#TODO observe.type.setSeineNonTargetCatches=Capturas de fauna accesoria observe.type.setSeineSchoolEstimate=Estimación de banco ===================================== application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties ===================================== --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties @@ -139,7 +139,7 @@ observe.type.maturityStatuses=Maturités observe.type.mitigationType=Type de mesure d'atténuation observe.type.mitigationTypes=Types de mesure d'atténuation observe.type.nonTargetCatch=Faune accessoire conservée ou rejetée -observe.type.nonTargetCatchRelease=Faune accessoire libérée +observe.type.nonTargetCatchRelease=Faune accessoire sensible libérée observe.type.nonTargetCatchReleaseStatus=État d'une faune accessoire libérée observe.type.nonTargetCatchReleaseStatuses=États d'une faune accessoire libérée observe.type.nonTargetCatchReleases=Faunes accessoires libérées @@ -203,7 +203,7 @@ observe.type.setLonglineTdrs=Enregistreurs observe.type.setLonglines=Opérations de pêche observe.type.setSeine=Calée observe.type.setSeineNonTargetCatch=Capture de faune accessoire -observe.type.setSeineNonTargetCatchRelease=Faune accessoire libérée +observe.type.setSeineNonTargetCatchRelease=Faune accessoire sensible libérée observe.type.setSeineNonTargetCatchReleases=Faunes accessoires libérées observe.type.setSeineNonTargetCatches=Captures de faune accessoire observe.type.setSeineSchoolEstimate=Estimation de banc ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java @@ -94,6 +94,8 @@ public abstract class ObserveKeyStrokes { public static final KeyStroke KEY_STROKE_GO_TAB_4 = KeyStroke.getKeyStroke("ctrl pressed F8"); public static final KeyStroke KEY_STROKE_GO_TAB_5 = KeyStroke.getKeyStroke("ctrl pressed F9"); public static final KeyStroke KEY_STROKE_GO_TAB_6 = KeyStroke.getKeyStroke("ctrl pressed F10"); + public static final KeyStroke KEY_STROKE_COPY_FLOATING_OBJECT_PART_TO_RIGHT = KeyStroke.getKeyStroke("ctrl R"); + public static final KeyStroke KEY_STROKE_COPY_FLOATING_OBJECT_PART_TO_LEFT = KeyStroke.getKeyStroke("ctrl L"); public static final KeyStroke KEY_STROKE_GO_SUB_TAB_1 = KeyStroke.getKeyStroke("shift ctrl pressed F5"); public static final KeyStroke KEY_STROKE_GO_SUB_TAB_2 = KeyStroke.getKeyStroke("shift ctrl pressed F6"); ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CopyFloatingObjectPartToLeftAction.java ===================================== --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CopyFloatingObjectPartToLeftAction.java @@ -0,0 +1,62 @@ +package fr.ird.observe.application.swing.ui.actions.content; + +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; +import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.application.swing.ui.content.ContentUI; +import fr.ird.observe.application.swing.ui.content.impl.seine.FloatingObjectPartsTreeNode; +import fr.ird.observe.application.swing.ui.content.impl.seine.FloatingObjectUI; +import java.util.Enumeration; +import javax.swing.SwingUtilities; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXTreeTable; +import org.jdesktop.swingx.treetable.DefaultMutableTreeTableNode; +import org.jdesktop.swingx.treetable.DefaultTreeTableModel; +import org.jdesktop.swingx.treetable.MutableTreeTableNode; + + +import static org.nuiton.i18n.I18n.t; + +/** + * Created by tchemit on 20/06/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class CopyFloatingObjectPartToLeftAction extends AbstractContentUIAction { + + public static final String ACTION_NAME = CopyFloatingObjectPartToLeftAction.class.getSimpleName(); + + /** Logger. */ + private static final Log log = LogFactory.getLog(CopyFloatingObjectPartToLeftAction.class); + + public CopyFloatingObjectPartToLeftAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, t("observe.action.copyFloatingObjectPartToLeft"), + t("observe.action.copyFloatingObjectPartToLeft.tip"), "copyToLeft", ObserveKeyStrokes.KEY_STROKE_COPY_FLOATING_OBJECT_PART_TO_LEFT); + } + + @Override + protected void actionPerformed(ContentUI<?, ?> contentUI) { + + FloatingObjectUI ui = (FloatingObjectUI) contentUI; + JXTreeTable table = ui.getSubTabbedPane().getModel().getSelectedIndex() == 0 ? ui.getSimpleTable() : ui.getDetailedTable(); + log.info("Start action from " + table); + DefaultTreeTableModel treeTableModel = (DefaultTreeTableModel) table.getTreeTableModel(); + DefaultMutableTreeTableNode root = (DefaultMutableTreeTableNode) treeTableModel.getRoot(); + Enumeration<? extends MutableTreeTableNode> children = root.children(); + while (children.hasMoreElements()) { + FloatingObjectPartsTreeNode mutableTreeTableNode = (FloatingObjectPartsTreeNode) children.nextElement(); + move(treeTableModel, mutableTreeTableNode); + } + } + + private void move(DefaultTreeTableModel treeTableModel, FloatingObjectPartsTreeNode node) { + + boolean newValue = (boolean) node.getValueAt(2); + treeTableModel.setValueAt(newValue, node, 1); + + for (FloatingObjectPartsTreeNode childNode : node) { + move(treeTableModel, childNode); + } + + } +} ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CopyFloatingObjectPartToRightAction.java ===================================== --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CopyFloatingObjectPartToRightAction.java @@ -0,0 +1,63 @@ +package fr.ird.observe.application.swing.ui.actions.content; + +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; +import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.application.swing.ui.content.ContentUI; +import fr.ird.observe.application.swing.ui.content.impl.seine.FloatingObjectPartsTreeNode; +import fr.ird.observe.application.swing.ui.content.impl.seine.FloatingObjectUI; +import java.util.Enumeration; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXTreeTable; +import org.jdesktop.swingx.treetable.DefaultMutableTreeTableNode; +import org.jdesktop.swingx.treetable.DefaultTreeTableModel; +import org.jdesktop.swingx.treetable.MutableTreeTableNode; + + +import static org.nuiton.i18n.I18n.t; + +/** + * Created by tchemit on 20/06/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class CopyFloatingObjectPartToRightAction extends AbstractContentUIAction { + + public static final String ACTION_NAME = CopyFloatingObjectPartToRightAction.class.getSimpleName(); + + /** Logger. */ + private static final Log log = LogFactory.getLog(CopyFloatingObjectPartToRightAction.class); + + public CopyFloatingObjectPartToRightAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, t("observe.action.copyFloatingObjectPartToRight"), + t("observe.action.copyFloatingObjectPartToRight.tip"), "copyToRight", ObserveKeyStrokes.KEY_STROKE_COPY_FLOATING_OBJECT_PART_TO_RIGHT); + } + + @Override + protected void actionPerformed(ContentUI<?, ?> contentUI) { + + FloatingObjectUI ui = (FloatingObjectUI) contentUI; + JXTreeTable table = ui.getSubTabbedPane().getModel().getSelectedIndex() == 0 ? ui.getSimpleTable() : ui.getDetailedTable(); + log.info("Start action from " + table); + + DefaultTreeTableModel treeTableModel = (DefaultTreeTableModel) table.getTreeTableModel(); + DefaultMutableTreeTableNode root = (DefaultMutableTreeTableNode) treeTableModel.getRoot(); + Enumeration<? extends MutableTreeTableNode> children = root.children(); + while (children.hasMoreElements()) { + FloatingObjectPartsTreeNode mutableTreeTableNode = (FloatingObjectPartsTreeNode) children.nextElement(); + move(treeTableModel, mutableTreeTableNode); + } + table.revalidate(); + } + + private void move(DefaultTreeTableModel treeTableModel, FloatingObjectPartsTreeNode node) { + + boolean newValue = (boolean) node.getValueAt(1); + treeTableModel.setValueAt(newValue, node, 2); + + for (FloatingObjectPartsTreeNode childNode : node) { + move(treeTableModel, childNode); + } + + } +} ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/GotoActionSupport.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/GotoActionSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/navigation/GotoActionSupport.java @@ -76,9 +76,7 @@ public abstract class GotoActionSupport extends AbstractUIAction { DataContext dataContext = ObserveSwingApplicationContext.get().getDataContext(); boolean open = computeIsOpen(dataContext); - if (log.isInfoEnabled()) { - log.info("Action [" + getValue(ACTION_COMMAND_KEY) + "] - open? " + open); - } + log.debug("Action [" + getValue(ACTION_COMMAND_KEY) + "] - open? " + open); setEnabled(open); } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java @@ -88,7 +88,7 @@ public class ObserveActionMap extends ActionMap { // action globale Class<AbstractGlobalUIAction> globalActionType = (Class) actionType; if (log.isInfoEnabled()) { - log.info("Register global action: " + actionId + " - type: " + globalActionType.getName()); + log.debug("Register global action: " + actionId + " - type: " + globalActionType.getName()); } Optional<AbstractGlobalUIAction> globalUIAction = newAction(actionId, globalActionType); if (globalUIAction.isPresent()) { @@ -101,7 +101,7 @@ public class ObserveActionMap extends ActionMap { // action simple if (log.isInfoEnabled()) { - log.info("Register action: " + actionId + " - type: " + actionType.getName()); + log.debug("Register simple action: " + actionId + " - type: " + actionType.getName()); } mappingBuilder.put(actionId, actionType); @@ -112,6 +112,8 @@ public class ObserveActionMap extends ActionMap { mapping = mappingBuilder.build(); globalActions = globalActionsBuilder.build(); + log.info(String.format("Load %d simple action(s).", mapping.size())); + log.info(String.format("Load %d global action(s).", globalActions.size())); } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectPartsTreeNode.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectPartsTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectPartsTreeNode.java @@ -24,6 +24,7 @@ package fr.ird.observe.application.swing.ui.content.impl.seine; import fr.ird.observe.services.dto.referential.seine.ObjectMaterialDto; import fr.ird.observe.services.dto.seine.ObjectMaterialHierarchyDto; +import java.util.Iterator; import org.jdesktop.swingx.treetable.AbstractMutableTreeTableNode; import org.nuiton.decorator.Decorator; @@ -32,7 +33,7 @@ import org.nuiton.decorator.Decorator; * * @author Tony Chemit - dev(a)tchemit.fr */ -public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode { +public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode implements Iterable<FloatingObjectPartsTreeNode> { private final FloatingObjectUIModel model; private final Decorator<ObjectMaterialDto> decorator; @@ -85,4 +86,9 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode { public int getColumnCount() { return 3; } + + @Override + public Iterator<FloatingObjectPartsTreeNode> iterator() { + return (Iterator) children.iterator(); + } } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx @@ -28,6 +28,8 @@ fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.seine.ObjectOperationDto fr.ird.observe.services.dto.referential.seine.ObjectTypeDto + fr.ird.observe.application.swing.ui.actions.content.CopyFloatingObjectPartToLeftAction + fr.ird.observe.application.swing.ui.actions.content.CopyFloatingObjectPartToRightAction fr.ird.observe.application.swing.ui.actions.content.DeleteDataUIAction fr.ird.observe.application.swing.ui.actions.content.ResetEditUIAction fr.ird.observe.application.swing.ui.actions.content.SaveEditUIAction @@ -62,60 +64,69 @@  <JPanel id="body" layout='{new BorderLayout()}'> <Table insets="0" fill="both" constraints='BorderLayout.CENTER'> - <row> - <cell anchor="north" weightx="1" weighty="1"> - <JTabbedPane id='mainTabbedPane'> - <tab id='generalTab'> - <Table fill='both'> - <row> - <cell anchor='west'> - <JLabel id='objectOperationLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='objectOperation' constructorParams='this' _entityClass='ObjectOperationDto.class' - genericType='ReferentialReference<ObjectOperationDto>'/> - </cell> - </row> - <row> - <cell anchor='west'> - <JLabel id='objectTypeLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='objectType' constructorParams='this' genericType='ReferentialReference<ObjectTypeDto>' - _entityClass='ObjectTypeDto.class'/> - </cell> - </row> - <row> - <cell columns='2' fill="both" weighty="0.7"> - <JComment id="comment"/> - </cell> - </row> - </Table> - </tab> - <tab id='materialsTab'> - <Table insets="0" fill="both"> - <row> - <cell anchor="north" weightx="1" weighty="1"> - <JTabbedPane id='subTabbedPane'> - <tab id='simpleFormTab'> - <JScrollPane id='simpleTableScroll'> - <JXTreeTable id='simpleTable'/> - </JScrollPane> - </tab> - <tab id='detailedFormTab'> - <JScrollPane id='detailedTableScroll'> - <JXTreeTable id='detailedTable'/> - </JScrollPane> - </tab> - </JTabbedPane> - </cell> - </row> - </Table> - </tab> - </JTabbedPane> - </cell> - </row> - </Table> + <row> + <cell anchor="north" weightx="1" weighty="1"> + <JTabbedPane id='mainTabbedPane'> + <tab id='generalTab'> + <Table fill='both'> + <row> + <cell anchor='west'> + <JLabel id='objectOperationLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BeanComboBox id='objectOperation' constructorParams='this' _entityClass='ObjectOperationDto.class' + genericType='ReferentialReference<ObjectOperationDto>'/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel id='objectTypeLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <BeanComboBox id='objectType' constructorParams='this' + genericType='ReferentialReference<ObjectTypeDto>' + _entityClass='ObjectTypeDto.class'/> + </cell> + </row> + <row> + <cell columns='2' fill="both" weighty="0.7"> + <JComment id="comment"/> + </cell> + </row> + </Table> + </tab> + <tab id='materialsTab'> + <Table insets="0" fill="both"> + <row> + <cell anchor="north" weightx="1" weighty="1"> + <JTabbedPane id='subTabbedPane'> + <tab id='simpleFormTab'> + <JScrollPane id='simpleTableScroll'> + <JXTreeTable id='simpleTable'/> + </JScrollPane> + </tab> + <tab id='detailedFormTab'> + <JScrollPane id='detailedTableScroll'> + <JXTreeTable id='detailedTable'/> + </JScrollPane> + </tab> + </JTabbedPane> + </cell> + </row> + <row> + <cell> + <JPanel layout="{new GridLayout(1,0)}"> + <JButton id="fromLeftToRight"/> + <JButton id="fromRightToLeft"/> + </JPanel> + </cell> + </row> + </Table> + </tab> + </JTabbedPane> + </cell> + </row> + </Table> </JPanel>  ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss @@ -47,6 +47,16 @@ BeanComboBox { icon:{getHandler().getErrorIconIfFalse(model.isSimpleFormTabValid())}; } +#fromLeftToRight { + _observeAction:{CopyFloatingObjectPartToRightAction.ACTION_NAME}; + focusable:false; +} + +#fromRightToLeft { + _observeAction:{CopyFloatingObjectPartToLeftAction.ACTION_NAME}; + focusable:false; +} + #detailedFormTab { title:{t("observe.content.floatingObject.tab.detailedForm")}; icon:{getHandler().getErrorIconIfFalse(model.isDetailedFormTabValid())}; ===================================== application-swing/src/main/resources/i18n/application-swing_en_GB.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -60,6 +60,10 @@ observe.action.copy.column.headers.tip=Add in result column headers observe.action.copy.row.headers=Copy row header observe.action.copy.row.headers.tip=Add in result row headers observe.action.copy.to.clipBoard=Copy in clipboard +observe.action.copyFloatingObjectPartToLeft=Copy values from leaving to arriving +observe.action.copyFloatingObjectPartToLeft.tip=Copy values from leaving to arriving +observe.action.copyFloatingObjectPartToRight=Copy values from arriving to leaving +observe.action.copyFloatingObjectPartToRight.tip=Copy values from arriving to leaving observe.action.create=Create observe.action.delete=Delete observe.action.delete.activity.tip=Delete activity ===================================== application-swing/src/main/resources/i18n/application-swing_es_ES.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -60,6 +60,10 @@ observe.action.copy.column.headers.tip=Añadir al resultado las cabeceras de col observe.action.copy.row.headers=Copiar las cabeceras de linea observe.action.copy.row.headers.tip=Añadir al resultado las cabeceras de linea (ej. la primera columna) observe.action.copy.to.clipBoard=Copiar el contenido en el portapapeles +observe.action.copyFloatingObjectPartToLeft=Copy values from leaving to arriving \#TODO +observe.action.copyFloatingObjectPartToLeft.tip=Copy values from leaving to arriving \#TODO +observe.action.copyFloatingObjectPartToRight=Copy values from arriving to leaving \#TODO +observe.action.copyFloatingObjectPartToRight.tip=Copy values from arriving to leaving \#TODO observe.action.create=Crear observe.action.delete=Eliminar observe.action.delete.activity.tip=Eliminar la actividad ===================================== application-swing/src/main/resources/i18n/application-swing_fr_FR.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -61,6 +61,10 @@ observe.action.copy.column.headers.tip=Ajoute dans le résultat les entêtes de observe.action.copy.row.headers=Copier les entêtes de ligne observe.action.copy.row.headers.tip=Ajoute dans le résultat les entêtes de ligne (i.e la première colonne) observe.action.copy.to.clipBoard=Copier le contenu dans le presse-papier +observe.action.copyFloatingObjectPartToLeft=Recopier les valeurs du départ vers l'arrivée +observe.action.copyFloatingObjectPartToLeft.tip=Recopier les valeurs du départ vers l'arrivée +observe.action.copyFloatingObjectPartToRight=Recopier les valeurs de l'arrivée vers de départ +observe.action.copyFloatingObjectPartToRight.tip=Recopier les valeurs de l'arrivée vers de départ observe.action.create=Créer observe.action.db.locale.es.tip=Changer la langue du référentiel en espagnol observe.action.db.locale.fr.tip=Changer la langue du référentiel en français @@ -474,7 +478,7 @@ observe.common.nextFpaZone=Zone FPA pénétrée observe.common.no.balise=Aucune balise lue observe.common.nonCoupSenne=Non coup de senne observe.common.nonTargetCatch=Faune accessoire conservée ou rejetée -observe.common.nonTargetCatchRelease=Faune accessoire libérée +observe.common.nonTargetCatchRelease=Faune accessoire sensible libérée observe.common.nonTargetObservation=Faune associée observe.common.nonTargetSample=Echantillon faune accessoire observe.common.objectFate=Devenir de l'objet ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java @@ -246,7 +246,7 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F private ObjectMaterialHierarchyDto fillHierarchyDtos(Multimap<String, ObjectMaterial> childrenByParent, ReferentialLocale referentialLocale, ReferentialBinderSupport<ObserveReferentialEntity, ObjectMaterialDto> referentialBinder, ObjectMaterialDto topLevelMaterial, Set<String> idsDone) { - Collection<ObjectMaterial> childrenEntities = childrenByParent.get(topLevelMaterial.getCode()); + Collection<ObjectMaterial> childrenEntities = childrenByParent.get(topLevelMaterial.getId()); List<ObjectMaterialDto> children = childrenEntities.stream().map(d -> referentialBinder.toDto(referentialLocale, d)).collect(Collectors.toList()); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/cf893a629493ab0feb78311f8ab… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/cf893a629493ab0feb78311f8ab… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] remove uri validation + reformat ui validation
by Tony CHEMIT June 19, 2017

June 19, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 96128850 by Tony CHEMIT at 2017-06-20T00:06:41+02:00 remove uri validation + reformat ui validation - - - - - 30 changed files: - application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/ReferentialCodeValidator.java - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineEncounterDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineSensorUsedDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BaitsCompositionDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BasketDto-ui-update-table-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-catchLongline-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-table-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlinesCompositionDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-ui-update-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-ui-update-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/FloatlinesCompositionDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/GearUseFeaturesLonglineDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/HooksCompositionDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SectionDto-ui-update-table-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SensorUsedDto-ui-update-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-create-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineDto-ui-update-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-baitsComposition-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto-ui-update-branchlinesComposition-error-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/96128850289f14ab6a042161f4b… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/96128850289f14ab6a042161f4b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] review referential code validation
by Tony CHEMIT June 19, 2017

June 19, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ee7fbe48 by Tony CHEMIT at 2017-06-19T22:55:04+02:00 review referential code validation - - - - - 30 changed files: - application-swing-configuration/src/main/resources/validators.xml - + application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/ReferentialCodeValidator.java - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthLengthParameterDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ShipOwnerDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ShipOwnerDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SizeMeasureTypeDto-ui-create-error-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ee7fbe48c63f8e03c92d5ccc681… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ee7fbe48c63f8e03c92d5ccc681… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Amélioration de l'ui de changement de source
by Tony CHEMIT June 19, 2017

June 19, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 48cc0695 by Tony CHEMIT at 2017-06-19T16:16:03+02:00 Amélioration de l'ui de changement de source - - - - - 0a016149 by Tony CHEMIT at 2017-06-19T16:17:06+02:00 Revue de ObjectMaterial (See #577) - - - - - 3ee580ec by Tony CHEMIT at 2017-06-19T19:15:28+02:00 fix referential validation - - - - - 5071235d by Tony CHEMIT at 2017-06-19T21:10:33+02:00 revue de la validation i18n sur les référentiels + validation parentCode - - - - - 30 changed files: - application-swing-validation/src/main/java/validators/AbstractSpeciesFieldDtoValidator.java → application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/AbstractSpeciesFieldDtoValidator.java - application-swing-validation/src/main/java/validators/ActivityFinDeVeilleExistsDtoValidator.java → application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/ActivityFinDeVeilleExistsDtoValidator.java - application-swing-validation/src/main/java/validators/ActivitySimpleSpeedDtoValidator.java → application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/ActivitySimpleSpeedDtoValidator.java - application-swing-validation/src/main/java/validators/ActivitySpeedDtoValidator.java → application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/ActivitySpeedDtoValidator.java - application-swing-validation/src/main/java/validators/CollectionUniqueKeyDtoValidator.java → application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/CollectionUniqueKeyDtoValidator.java - application-swing-validation/src/main/java/validators/CoordinateLatitudeDtoFieldValidator.java → application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/CoordinateLatitudeDtoFieldValidator.java - application-swing-validation/src/main/java/validators/CoordinateLongitudeDtoFieldValidator.java → application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/CoordinateLongitudeDtoFieldValidator.java - application-swing-validation/src/main/java/validators/ObserveCollectionUniqueKeyDtoValidator.java → application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/ObserveCollectionUniqueKeyDtoValidator.java - application-swing-validation/src/main/java/validators/OpenableDtoFieldValidator.java → application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/OpenableDtoFieldValidator.java - application-swing-validation/src/main/java/validators/QuadrantFieldDtoValidator.java → application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/QuadrantFieldDtoValidator.java - application-swing-validation/src/main/java/validators/SetLonglineUniqueHomeIdDtoValidator.java → application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueHomeIdDtoValidator.java - application-swing-validation/src/main/java/validators/SetLonglineUniqueNumberDtoValidator.java → application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueNumberDtoValidator.java - application-swing-validation/src/main/java/validators/SpeciesLengthFieldDtoValidator.java → application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/SpeciesLengthFieldDtoValidator.java - application-swing-validation/src/main/java/validators/SpeciesWeightFieldDtoValidator.java → application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/SpeciesWeightFieldDtoValidator.java - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthLengthParameterDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-ui-create-error-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/de2af7c5e734b76bcac64adb9b… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/de2af7c5e734b76bcac64adb9b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Correction du nom d'un onglet
by Tony CHEMIT June 19, 2017

June 19, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4fa278c4 by Tony CHEMIT at 2017-06-19T10:34:01+02:00 Correction du nom d'un onglet - - - - - 2a31f5a4 by Tony CHEMIT at 2017-06-19T10:49:34+02:00 Amélioration des controles des heures de remises à l'eau - - - - - 99b915ce by Tony CHEMIT at 2017-06-19T10:49:46+02:00 Focus sur Sex au changement de species - - - - - de2af7c5 by Tony CHEMIT at 2017-06-19T10:52:39+02:00 fix i18n - - - - - 8 changed files: - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchReleaseDto-ui-update-error-validation.xml - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleaseUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - services-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatchRelease-service-error-validation.xml Changes: ===================================== application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchReleaseDto-ui-update-error-validation.xml ===================================== --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchReleaseDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchReleaseDto-ui-update-error-validation.xml @@ -119,7 +119,7 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ currentSetSeine.endPursingTime.time <= detectionTime.time ]]> + <![CDATA[ currentSetSeine.endPursingTime.time < detectionTime.time ]]> </param> <message>validator.ui.nonTargetCatchRelease.detectionTime.after.endPursingTimeStamp</message> </field-validator> @@ -132,7 +132,7 @@ </field-validator> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ detectionTime == null || detectionTime.time <= releaseTime.time ]]> + <![CDATA[ detectionTime == null || detectionTime.time < releaseTime.time ]]> </param> <message>validator.ui.nonTargetCatchRelease.detectionTime.after.releaseTime</message> </field-validator> ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java @@ -41,7 +41,7 @@ public class ActivitySeineUIModel extends ContentOpenableUIModel<ActivitySeineDt public static final String PROPERTY_GENERAL_TAB_VALID = "generalTabValid"; - public static final String PROPERTY_MEASUREMENTS_TAB_VALID = "materialsTabValid"; + public static final String PROPERTY_MEASUREMENTS_TAB_VALID = "measurementsTabValid"; public static final String PROPERTY_OBSERVED_SYSTEM_TAB_VALID = "observedSystemTabValid"; ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleaseUI.jcss ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleaseUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleaseUI.jcss @@ -58,7 +58,7 @@ } #lengthLabel { - text:"observe.common.length"; + text:"observe.common.length2"; labelFor:{length}; } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java @@ -91,11 +91,11 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei private Map<String, SpeciesGroupDto> speciesGroupDtoMap; - protected boolean toogleTimeEditorSliderIsChanging; + private boolean toogleTimeEditorSliderIsChanging; // Change toogle target visible on all TimeEditors - protected final PropertyChangeListener onToogleTimeEditorSliderChangedListener; + private final PropertyChangeListener onToogleTimeEditorSliderChangedListener; - public NonTargetCatchReleaseUIHandler() { + NonTargetCatchReleaseUIHandler() { super(DataContextType.SetSeine); speciesChanged = evt -> { if (!getTableModel().isAdjusting()) { @@ -111,12 +111,14 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei private void updateSpecies(ReferentialReference<SpeciesDto> species, List<NonTargetCatchReleaseStatusDto> states) { + ReferentialReference<SpeciesDto> oldSpecies = getTableEditBean().getSpecies(); JPanel statesContent = getUi().getStatesContent(); statesContent.removeAll(); if (species == null) { getModel().setStates(Collections.emptyList(), states); getUi().getSpeciesGroupReleaseMode().setData(Collections.emptyList()); + UIHelper.askFocus(getUi().getSpecies()); return; } String speciesGroupId = (String) species.getPropertyValue(SpeciesDto.PROPERTY_SPECIES_GROUP + "Id"); @@ -137,6 +139,8 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei statesContent.add(u); } SwingUtilities.invokeLater(getUi()::revalidate); + + UIHelper.askFocus(getUi().getSex()); } @Override @@ -177,7 +181,6 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei } ui.getSpecies().setData(availableEspeces); - UIHelper.askFocus(requestFocus); Date releaseTime; Date detectionTime; @@ -201,6 +204,9 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei bean.removePropertyChangeListener(NonTargetCatchReleaseDto.PROPERTY_SPECIES, speciesChanged); bean.addPropertyChangeListener(NonTargetCatchReleaseDto.PROPERTY_SPECIES, speciesChanged); + + log.info("Focus to "+requestFocus.getName()); + UIHelper.askFocus(requestFocus); } private static final List<String> SPECIES_GROUP_IDS = Arrays.asList( @@ -341,10 +347,10 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei private final NonTargetCatchReleaseUI ui; - public CatchLonglinesAutotSelectRowAndShowPopupAction(NonTargetCatchReleaseUI ui, - JScrollPane pane, - JTable table, - JPopupMenu popup) { + CatchLonglinesAutotSelectRowAndShowPopupAction(NonTargetCatchReleaseUI ui, + JScrollPane pane, + JTable table, + JPopupMenu popup) { super(pane, table, popup); this.ui = ui; } ===================================== application-swing/src/main/resources/i18n/application-swing_en_GB.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -439,6 +439,7 @@ observe.common.lastName=Last name observe.common.lastUpdateDate=Last update date observe.common.latitude=Latitude observe.common.length=Length +observe.common.length2=Length (cm) observe.common.length.computed.tip=Length was computed observe.common.length.inf=Length (cm inf.) observe.common.length.observed.tip=Length was observed ===================================== application-swing/src/main/resources/i18n/application-swing_es_ES.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -439,6 +439,7 @@ observe.common.lastName=Nombre observe.common.lastUpdateDate=Last update date observe.common.latitude=Latitud observe.common.length=Longitud eslora total +observe.common.len2gth=Longitud eslora total (cm) #TODO observe.common.length.computed.tip=Longitud calculada observe.common.length.inf=Longitud (cm inf.) observe.common.length.observed.tip=Longitud observada ===================================== application-swing/src/main/resources/i18n/application-swing_fr_FR.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -444,6 +444,7 @@ observe.common.lastName=Nom observe.common.lastUpdateDate=Date de dernière mise à jour observe.common.latitude=Latitude observe.common.length=Longueur hors tout +observe.common.length2=Taille (cm) observe.common.length.computed.tip=La longueur a été calculée observe.common.length.inf=Longueur (cm inf.) observe.common.length.observed.tip=La longueur a été observée ===================================== services-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatchRelease-service-error-validation.xml ===================================== --- a/services-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatchRelease-service-error-validation.xml +++ b/services-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatchRelease-service-error-validation.xml @@ -118,7 +118,7 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ setSeineEntity.endPursingTime.time <= detectionTime.time ]]> + <![CDATA[ setSeineEntity.endPursingTime.time < detectionTime.time ]]> </param> <message>validator.service.nonTargetCatchRelease.detectionTime.after.endPursingTimeStamp</message> </field-validator> @@ -132,7 +132,7 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ detectionTime == null || detectionTime.time <= releaseTime.time ]]> + <![CDATA[ detectionTime == null || detectionTime.time < releaseTime.time ]]> </param> <message>validator.service.nonTargetCatchRelease.detectionTime.after.releaseTime</message> </field-validator> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ed9b9af6eaa65a0ab2631a1186… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ed9b9af6eaa65a0ab2631a1186… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajout d'un icone manquant pour la sauvegarde d'un formulaire (See #785)
by Tony CHEMIT June 19, 2017

June 19, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ed9b9af6 by Tony CHEMIT at 2017-06-19T09:13:59+02:00 Ajout d'un icone manquant pour la sauvegarde d'un formulaire (See #785) - - - - - 3 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveEditUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveTableEntryUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jcss Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveEditUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveEditUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveEditUIAction.java @@ -45,7 +45,7 @@ public class SaveEditUIAction extends AbstractContentUIAction { ACTION_NAME, n("observe.action.save"), n("observe.action.save.tip"), - ACTION_NAME, + "save", null ); } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveTableEntryUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveTableEntryUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveTableEntryUIAction.java @@ -38,7 +38,7 @@ public class SaveTableEntryUIAction extends AbstractContentUIAction { public static final String ACTION_NAME = SaveTableEntryUIAction.class.getName(); public SaveTableEntryUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, "", "", "revert", ObserveKeyStrokes.KEY_STROKE_SAVE_TABLE_ENTRY); + super(mainUI, ACTION_NAME, "", "", "save", ObserveKeyStrokes.KEY_STROKE_SAVE_TABLE_ENTRY); } @Override ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jcss ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jcss @@ -84,7 +84,6 @@ _observeAction:{ResetTableEntryUIAction.ACTION_NAME}; _text:{t(getResetEntryText())}; _toolTipText:{t(getResetEntryTip())}; - actionIcon:"revert"; enabled:{tableModel.isCreate() || model.isCanResetRow()}; visible:{tableModel.isEditable() && (tableModel.isCreate() || !tableModel.isEmpty())}; } @@ -100,7 +99,6 @@ _globalAction:{DeleteDataGlobalUIAction.ACTION_NAME}; _text:{t(getDeleteEntryText())}; _toolTipText:{t(getDeleteEntryTip())}; - actionIcon:"delete"; visible:{tableModel.isEditable() && !tableModel.isEmpty() && !tableModel.isCreate()}; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ed9b9af6eaa65a0ab2631a1186d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ed9b9af6eaa65a0ab2631a1186d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Vérifier s'il y a des remises à l'eau avant de supprimer une capture (See #612)
by Tony CHEMIT June 19, 2017

June 19, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1bda758d by Tony CHEMIT at 2017-06-19T08:19:51+02:00 Vérifier s'il y a des remises à l'eau avant de supprimer une capture (See #612) - - - - - 5 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetCatchServiceTopia.java - services/src/main/xmi/observe-services-dto-seine.zargo Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -310,6 +310,19 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa } } + if (nonTargetCatchDto.isHasRelease()) { + + ReferentialReference<SpeciesDto> species = nonTargetCatchDto.getSpecies(); + + Iterable<NonTargetCatchDto> currentTargetCatchSpecies = NonTargetCatchHelper.filterBySpecies(objets, species); + + if (Iterables.isEmpty(currentTargetCatchSpecies)) { + + speciesToDelete.add(species); + + } + } + } if (!speciesToDelete.isEmpty()) { ===================================== application-swing/src/main/resources/i18n/application-swing_en_GB.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -1039,7 +1039,7 @@ observe.content.measurement.delete.message=Delete selected measurement observe.content.mode.create.tip=Object is in create mode observe.content.mode.read.tip=Object is not editable observe.content.mode.update.tip=Object is in editing mode -observe.content.nonTargetCatch.message.table.will.delete.nonTargetSample=If you confirm save, some data could be deleted\!\n\nFollowing species won't be useable in samples\:\n%1$s\nAll samples of those species will be deleted. +observe.content.nonTargetCatch.message.table.will.delete.nonTargetSample=If you confirm save, some data could be deleted\!\n\nFollowing species won't be useable in samples nor in releases \:\n%1$s\nAll samples or releases of those species will be deleted. observe.content.nonTargetCatch.table.catchWeight=Weight observe.content.nonTargetCatch.table.catchWeight.tip=Weight estimated (in t) observe.content.nonTargetCatch.table.comment=Com ===================================== application-swing/src/main/resources/i18n/application-swing_fr_FR.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -1046,7 +1046,7 @@ observe.content.measurement.delete.message=Supprimer la caractéristique sélect observe.content.mode.create.tip=L'objet est en cours de création observe.content.mode.read.tip=L'objet n'est pas éditable observe.content.mode.update.tip=L'objet est en cours d'édition -observe.content.nonTargetCatch.message.table.will.delete.nonTargetSample=En confirmant la sauvegarde des objets vont être supprimés\!\n\nLes espèces suivantes ne seront plus utilisables dans des échantillonages \:\n%1$s\nCela entrainera la suppression des échantillonages des ces espèces +observe.content.nonTargetCatch.message.table.will.delete.nonTargetSample=En confirmant la sauvegarde des objets vont être supprimés\!\n\nLes espèces suivantes ne seront plus utilisables dans des échantillonages ou les espèces libérées \:\n%1$s\nCela entrainera la suppression des données saisies liées à ces espèces observe.content.nonTargetCatch.table.catchWeight=Poids observe.content.nonTargetCatch.table.catchWeight.tip=Poids estimé (en t) observe.content.nonTargetCatch.table.comment=Com ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetCatchServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetCatchServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetCatchServiceTopia.java @@ -22,25 +22,24 @@ package fr.ird.observe.services.topia.service.data.seine; * #L% */ -import com.google.common.collect.Iterables; import fr.ird.observe.entities.referentiel.Species; +import fr.ird.observe.entities.seine.NonTargetCatchRelease; import fr.ird.observe.entities.seine.NonTargetLength; import fr.ird.observe.entities.seine.NonTargetSample; import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.services.service.data.seine.NonTargetCatchService; -import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.ObserveFormRequests; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - +import fr.ird.observe.services.service.data.seine.NonTargetCatchService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import java.util.List; import java.util.Set; import java.util.stream.Collectors; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * @author Sylvain Bavencoff - bavencoff(a)codelutin.com @@ -68,7 +67,7 @@ public class NonTargetCatchServiceTopia extends ObserveServiceTopia implements N // on cherche si il y a des échantillons sur les captures if (setSeine.isNonTargetSampleNotEmpty()) { - NonTargetSample nonTargetSample = Iterables.get(setSeine.getNonTargetSample(), 0); + NonTargetSample nonTargetSample = setSeine.getNonTargetSample().iterator().next(); Set<String> speciesSampleIds = nonTargetSample.getNonTargetLength() .stream() @@ -85,6 +84,24 @@ public class NonTargetCatchServiceTopia extends ObserveServiceTopia implements N } + // on cherche si il y a des libérations d'espèce sensibles + if (setSeine.isNonTargetCatchReleaseNotEmpty()) { + + Set<String> speciesSampleIds = setSeine.getNonTargetCatchRelease() + .stream() + .map(NonTargetCatchRelease::getSpecies) + .map(Species::getTopiaId) + .collect(Collectors.toSet()); + + for (NonTargetCatchDto nonTargetCatchDto : setSeineNonTargetCatchDto.getNonTargetCatch()) { + + boolean hasRelease = speciesSampleIds.contains(nonTargetCatchDto.getSpecies().getId()); + nonTargetCatchDto.setHasRelease(hasRelease); + + } + + } + return form; } ===================================== services/src/main/xmi/observe-services-dto-seine.zargo ===================================== Binary files a/services/src/main/xmi/observe-services-dto-seine.zargo and b/services/src/main/xmi/observe-services-dto-seine.zargo differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1bda758d9a8231b006949683b08… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1bda758d9a8231b006949683b08… You're receiving this email because of your account on gitlab.com.

1 0