Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a0be7f0d by Tony CHEMIT at 2018-04-24T14:20:24Z Ajouter une nouvelle règle si un dcp présent alors le type de banc est obligatoirement Objet (changement de l'algorithme de consolidation) - Closes #938 - - - - - 1 changed file: - persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java Changes: ===================================== persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java +++ b/persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java @@ -123,10 +123,15 @@ public class ActivitySeines { */ public static SchoolType getSchoolType(ActivitySeine a) { + if (a.isFloatingObjectNotEmpty()) { + // see https://gitlab.com/ultreiaio/ird-observe/issues/938 + return SchoolType.objet; + } + // par defaut, on suppose que la set est sur BL SchoolType type = SchoolType.libre; - if (!a.isObservedSystemEmpty()) { + if (a.isObservedSystemNotEmpty()) { SchoolType boCode = SchoolType.objet; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a0be7f0db6298e8269b7e38e54bc... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a0be7f0db6298e8269b7e38e54bc... You're receiving this email because of your account on gitlab.com.