This is an automated email from the git hooks/post-receive script. New commit to branch feature/8086 in repository tutti. See http://git.codelutin.com/tutti.git commit 60a9018425e47b9666157631d91fd0bda8c63666 Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 9 16:09:57 2016 +0100 ajout des caracteristiques de maturité dans le datacontext (refs #8086) --- .../ifremer/tutti/service/PersistenceService.java | 29 ++++++++++++++++++++++ .../fr/ifremer/tutti/service/TuttiDataContext.java | 15 +++++++++++ 2 files changed, 44 insertions(+) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java index 0c43d42..b100d18 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java @@ -534,6 +534,35 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer return result; } + public List<Caracteristic> getMaturityCaracteristics(List<Caracteristic> caracteristics) { + + // get loaded protocol + TuttiProtocol protocol = getProtocol(); + + List<Caracteristic> result; + if (protocol != null) { + + result = Lists.newArrayListWithCapacity( + protocol.sizeMaturityPmfmId()); + + Map<String, Caracteristic> allCaractericsById = + TuttiEntities.splitById(caracteristics); + + if (!protocol.isMaturityPmfmIdEmpty()) { + for (String id : protocol.getMaturityPmfmId()) { + result.add(allCaractericsById.get(id)); + } + } + } else { + // no default caracteristics to use + result = Lists.newArrayList(); + } + + + result = Collections.unmodifiableList(result); + return result; + } + /** * Return the speciesProtocol corresponding to the species of the given protocol. * diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java index b496b89..67ff958 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java @@ -134,6 +134,8 @@ public class TuttiDataContext extends AbstractBean implements Closeable { protected List<Caracteristic> lengthStepCaracteristics; + protected List<Caracteristic> maturityCaracteristics; + protected List<CaracteristicQualitativeValue> genderValues; protected List<CaracteristicQualitativeValue> deadOrAliveValues; @@ -579,6 +581,18 @@ public class TuttiDataContext extends AbstractBean implements Closeable { return lengthStepCaracteristics; } + public List<Caracteristic> getMaturityCaracteristics() { + checkOpened(); + if (maturityCaracteristics == null) { + + if (log.isInfoEnabled()) { + log.info("Loading maturityCaracteristics"); + } + maturityCaracteristics = service.getMaturityCaracteristics(getCaracteristics()); + } + return maturityCaracteristics; + } + /** * Get the best possible first sample category for the given benthos. * @@ -868,6 +882,7 @@ public class TuttiDataContext extends AbstractBean implements Closeable { service.setProtocol(null); } lengthStepCaracteristics = null; + maturityCaracteristics = null; defaultIndividualObservationCaracteristics = null; // survey code must be refresh resetSpecies(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.