Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 03f87627 by tchemit at 2019-07-19T13:00:11Z Assouplir un contrôle de saisie - Closes #1360 - - - - - 4 changed files: - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/src/main/java/fr/ird/observe/client/ObserveRunner.java - validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetLonglineLogbookDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetLonglineLogbookDto-update-error-validation.xml Changes: ===================================== client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -543,6 +543,10 @@ public class ClientConfig extends GeneratedClientConfig implements NavigationTre } } + public boolean isVersionSnapshot() { + return getBuildVersion().isSnapshot(); + } + ////////////////////////////////////////////////// // Toutes les étapes d'actions ////////////////////////////////////////////////// ===================================== client-core/src/main/java/fr/ird/observe/client/ObserveRunner.java ===================================== @@ -127,7 +127,7 @@ public abstract class ObserveRunner extends ApplicationRunner { Path i18nDirectory = config.getI18nDirectory().toPath(); - if (config.getBuildVersion().isSnapshot() && Files.exists(i18nDirectory)) { + if (config.isVersionSnapshot() && Files.exists(i18nDirectory)) { // always regenerate i18n try { Files.walk(i18nDirectory) @@ -407,14 +407,14 @@ public abstract class ObserveRunner extends ApplicationRunner { // 5 - application ui - File file = ObserveResourceManager.Resource.ui.getFile(resourcesDirectory); +// File file = ObserveResourceManager.Resource.ui.getFile(resourcesDirectory); - if (!file.exists()) { - - String message = t("observe.runner.copy.default.ui.file", file); - - resourceManager.copyResource(ObserveResourceManager.Resource.ui, file, message); - } +// if (!file.exists()) { +// +// String message = t("observe.runner.copy.default.ui.file", file); +// +// resourceManager.copyResource(ObserveResourceManager.Resource.ui, file, message); +// } // 6 - resources log configuration file @@ -432,7 +432,7 @@ public abstract class ObserveRunner extends ApplicationRunner { File reportDirectory = resourceManager.createDirectory(config, REPORT_DIRECTORY); - file = ObserveResourceManager.Resource.report.getFile(reportDirectory); + File file = ObserveResourceManager.Resource.report.getFile(reportDirectory); if (!file.exists()) { @@ -504,7 +504,7 @@ public abstract class ObserveRunner extends ApplicationRunner { File dir = config.getResourcesDirectory(); File file = ObserveResourceManager.Resource.ui.getFile(dir); - if (!file.exists()) { + if (!file.exists() || config.isVersionSnapshot()) { String message = t("observe.runner.copy.default.ui.file", file); ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetLonglineLogbookDto-create-error-validation.xml ===================================== @@ -343,8 +343,8 @@ </field> <field name="totalHooksCount"> <field-validator type="boundNumber" short-circuit="true"> - <param name="min">500.0</param> - <param name="max">5500.0</param> + <param name="min">10.0</param> + <param name="max">10000.0</param> <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetLonglineLogbookDto-update-error-validation.xml ===================================== @@ -343,8 +343,8 @@ </field> <field name="totalHooksCount"> <field-validator type="boundNumber" short-circuit="true"> - <param name="min">500.0</param> - <param name="max">5500.0</param> + <param name="min">10.0</param> + <param name="max">10000.0</param> <message/> </field-validator> </field> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/03f8762719a4b9a28f113ebe3e77... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/03f8762719a4b9a28f113ebe3e77... You're receiving this email because of your account on gitlab.com.