branch develop updated (26b3b39 -> b786680)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 26b3b39 Ne pas conserve en cache le modèle de catégorisation (termine #7253) new 873f1ab Corrige la perte des rôles enregistrés sur les traits dès qu'on modifie une campagne (refs #7283) new b786680 [CAMPAGNE] si je modifie l'heure de fin de la campagne, je perds tous les saisisseurs des traits !!! (fixes #7283) Merge branch 'feature/7283' into develop The 2 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 b78668080d315f4bdef94501b0d58bdd2758bdb6 Merge: 26b3b39 873f1ab Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 24 15:49:32 2015 +0200 [CAMPAGNE] si je modifie l'heure de fin de la campagne, je perds tous les saisisseurs des traits !!! (fixes #7283) Merge branch 'feature/7283' into develop commit 873f1ab15c1f997f229f193b0268843e9690e1a4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 24 15:49:29 2015 +0200 Corrige la perte des rôles enregistrés sur les traits dès qu'on modifie une campagne (refs #7283) Summary of changes: .../service/CruisePersistenceServiceImpl.java | 24 ++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) -- 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 develop in repository tutti. See http://git.codelutin.com/tutti.git commit 873f1ab15c1f997f229f193b0268843e9690e1a4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 24 15:49:29 2015 +0200 Corrige la perte des rôles enregistrés sur les traits dès qu'on modifie une campagne (refs #7283) --- .../service/CruisePersistenceServiceImpl.java | 24 ++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java index 7fa8b8c..3c2e576 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java @@ -775,14 +775,34 @@ public class CruisePersistenceServiceImpl extends AbstractPersistenceService imp } } - Map<Integer, VesselPersonFeatures> vesselPersonFeaturesMap = Maps.newLinkedHashMap(); - VesselPersonRole scientificCruiseManagerRole = vesselPersonFeaturesPersistenceHelper.getScientificCruiseManagerRole(); VesselPersonRole sortRoomManagerRole = vesselPersonFeaturesPersistenceHelper.getSortRoomManagerRole(); + Map<Integer, VesselPersonFeatures> vesselPersonFeaturesMap = Maps.newLinkedHashMap(); + + // On ajoute au dictionnaire les vesselPersonFeatures avec d'autres rôles que les deux gérés par cet écran + // On fait ça car il y a un effet de bord, en faisant un clear sur fishingTrip.getVesselPersonFeatures() + // on supprime du coup tous rôles autres (ceux par exemple du rôle saissiseur utilisé sur un trait) + + if (fishingTrip.getVesselPersonFeatures() != null) { + for (VesselPersonFeatures vesselPersonFeatures : fishingTrip.getVesselPersonFeatures()) { + Collection<VesselPersonRole> vesselPersonRoles = vesselPersonFeatures.getVesselPersonRoles(); + vesselPersonRoles.remove(scientificCruiseManagerRole); + vesselPersonRoles.remove(sortRoomManagerRole); + if (!vesselPersonRoles.isEmpty()) { + + // On doit conserver ce vesselPersonFeatures, il utilise d'autre rôles + Integer personId = vesselPersonFeatures.getPerson().getId(); + vesselPersonFeaturesMap.put(personId, vesselPersonFeatures); + + } + } + + } + short personRankOrder = 1; // Head of Mission Managers (act as rankOrder 0) -- 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 develop in repository tutti. See http://git.codelutin.com/tutti.git commit b78668080d315f4bdef94501b0d58bdd2758bdb6 Merge: 26b3b39 873f1ab Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 24 15:49:32 2015 +0200 [CAMPAGNE] si je modifie l'heure de fin de la campagne, je perds tous les saisisseurs des traits !!! (fixes #7283) Merge branch 'feature/7283' into develop .../service/CruisePersistenceServiceImpl.java | 24 ++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm