This is an automated email from the git hooks/post-receive script. New commit to branch struts2.5 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 29e69af2c0176c5eca51d2945af6a0ce9b68b15c Author: jcouteau <couteau@codelutin.com> Date: Thu Nov 14 13:14:30 2019 +0100 fixes #10230 : Les opérations ne sont pas associées au bon transect --- .../echobase/entities/data/TransitImpl.java | 15 +++++++++++++++ echobase-domain/src/main/xmi/echobase.zargo | Bin 100709 -> 100662 bytes .../VoyageOperationsOperationImportAction.java | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/TransitImpl.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/TransitImpl.java index 1762b939..6e5a2e18 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/TransitImpl.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/TransitImpl.java @@ -41,4 +41,19 @@ public class TransitImpl extends TransitAbstract { } return result; } + + @Override + public Transect getTransect(Vessel vessel, String gearCode) { + Preconditions.checkNotNull(vessel); + Transect result = null; + if (!isTransectEmpty()) { + for (Transect t : transect) { + if (vessel.equals(t.getVessel()) && gearCode.equals(t.getTransectAbstract())) { + result = t; + break; + } + } + } + return result; + } } //TransitImpl diff --git a/echobase-domain/src/main/xmi/echobase.zargo b/echobase-domain/src/main/xmi/echobase.zargo index c41ee24f..c5ee64c8 100644 Binary files a/echobase-domain/src/main/xmi/echobase.zargo and b/echobase-domain/src/main/xmi/echobase.zargo differ diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsOperationImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsOperationImportAction.java index c0c31471..75d7634d 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsOperationImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsOperationImportAction.java @@ -95,7 +95,7 @@ public class VoyageOperationsOperationImportAction extends VoyageOperationsImpor Transit transit = voyage.getTransit(startTime, endTime); - Transect transect = transit.getTransect(vessel); + Transect transect = transit.getTransect(vessel, operation.getGear().getGearCode()); Operation createdOperation = persistenceService.createOperation(operation); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.