Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 00213e9a by Tony Chemit at 2020-11-25T15:47:50+01:00 Fix isValidId method (Possibilité de forcer le topiaid sur tous les écrans de création des référentiels - See #1328) - - - - - be2566af by Tony Chemit at 2021-01-14T21:43:47+01:00 Souci de gestion sur 12h du champ 'Temps depuis déclenchement' - Closes #1757 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIHandler.java - common-persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaIdFactory.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIHandler.java ===================================== @@ -270,7 +270,7 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, Branchl Calendar calendar = Calendar.getInstance(); calendar.setTime(getModel().getTimeSinceContact()); int minutes = calendar.get(Calendar.MINUTE); - int hours = calendar.get(Calendar.HOUR); + int hours = calendar.get(Calendar.HOUR_OF_DAY); beanToSave.setTimeSinceContact(minutes + 60L * hours); } else { beanToSave.setTimeSinceContact(null); ===================================== common-persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaIdFactory.java ===================================== @@ -29,6 +29,8 @@ import org.apache.logging.log4j.Logger; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory; +import java.util.Objects; + /** * Created on 21/08/15. * @@ -54,10 +56,10 @@ public class ObserveTopiaIdFactory extends LegacyTopiaIdFactory { if (str != null && !str.endsWith(getSeparator())) { String[] split = str.split(getSeparator()); if (split.length == 3) { - String className = split[0]; - isTopiaId = entityClass.getName().equals(className); - for (int index = 1; index < split.length; index++) { - isTopiaId &= StringUtils.isNumeric(split[index]); + isTopiaId = Objects.equals(entityClass, getClassName(str)); + for (int index = 1; isTopiaId && index < split.length; index++) { + String part = split[index]; + isTopiaId = !part.endsWith(".") && StringUtils.isNumeric(part.replace(".", "")); } } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/021cbd030baeb134001a34be5... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/021cbd030baeb134001a34be5... You're receiving this email because of your account on gitlab.com.