Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
03f87627
by tchemit at 2019-07-19T13:00:11Z
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:
| ... | ... | @@ -543,6 +543,10 @@ public class ClientConfig extends GeneratedClientConfig implements NavigationTre |
| 543 | 543 |
}
|
| 544 | 544 |
}
|
| 545 | 545 |
|
| 546 |
+ public boolean isVersionSnapshot() {
|
|
| 547 |
+ return getBuildVersion().isSnapshot();
|
|
| 548 |
+ }
|
|
| 549 |
+ |
|
| 546 | 550 |
//////////////////////////////////////////////////
|
| 547 | 551 |
// Toutes les étapes d'actions
|
| 548 | 552 |
//////////////////////////////////////////////////
|
| ... | ... | @@ -127,7 +127,7 @@ public abstract class ObserveRunner extends ApplicationRunner { |
| 127 | 127 |
|
| 128 | 128 |
Path i18nDirectory = config.getI18nDirectory().toPath();
|
| 129 | 129 |
|
| 130 |
- if (config.getBuildVersion().isSnapshot() && Files.exists(i18nDirectory)) {
|
|
| 130 |
+ if (config.isVersionSnapshot() && Files.exists(i18nDirectory)) {
|
|
| 131 | 131 |
// always regenerate i18n
|
| 132 | 132 |
try {
|
| 133 | 133 |
Files.walk(i18nDirectory)
|
| ... | ... | @@ -407,14 +407,14 @@ public abstract class ObserveRunner extends ApplicationRunner { |
| 407 | 407 |
|
| 408 | 408 |
// 5 - application ui
|
| 409 | 409 |
|
| 410 |
- File file = ObserveResourceManager.Resource.ui.getFile(resourcesDirectory);
|
|
| 410 |
+// File file = ObserveResourceManager.Resource.ui.getFile(resourcesDirectory);
|
|
| 411 | 411 |
|
| 412 |
- if (!file.exists()) {
|
|
| 413 |
- |
|
| 414 |
- String message = t("observe.runner.copy.default.ui.file", file);
|
|
| 415 |
- |
|
| 416 |
- resourceManager.copyResource(ObserveResourceManager.Resource.ui, file, message);
|
|
| 417 |
- }
|
|
| 412 |
+// if (!file.exists()) {
|
|
| 413 |
+//
|
|
| 414 |
+// String message = t("observe.runner.copy.default.ui.file", file);
|
|
| 415 |
+//
|
|
| 416 |
+// resourceManager.copyResource(ObserveResourceManager.Resource.ui, file, message);
|
|
| 417 |
+// }
|
|
| 418 | 418 |
|
| 419 | 419 |
// 6 - resources log configuration file
|
| 420 | 420 |
|
| ... | ... | @@ -432,7 +432,7 @@ public abstract class ObserveRunner extends ApplicationRunner { |
| 432 | 432 |
|
| 433 | 433 |
File reportDirectory = resourceManager.createDirectory(config, REPORT_DIRECTORY);
|
| 434 | 434 |
|
| 435 |
- file = ObserveResourceManager.Resource.report.getFile(reportDirectory);
|
|
| 435 |
+ File file = ObserveResourceManager.Resource.report.getFile(reportDirectory);
|
|
| 436 | 436 |
|
| 437 | 437 |
if (!file.exists()) {
|
| 438 | 438 |
|
| ... | ... | @@ -504,7 +504,7 @@ public abstract class ObserveRunner extends ApplicationRunner { |
| 504 | 504 |
File dir = config.getResourcesDirectory();
|
| 505 | 505 |
File file = ObserveResourceManager.Resource.ui.getFile(dir);
|
| 506 | 506 |
|
| 507 |
- if (!file.exists()) {
|
|
| 507 |
+ if (!file.exists() || config.isVersionSnapshot()) {
|
|
| 508 | 508 |
|
| 509 | 509 |
String message = t("observe.runner.copy.default.ui.file", file);
|
| 510 | 510 |
|
| ... | ... | @@ -343,8 +343,8 @@ |
| 343 | 343 |
</field>
|
| 344 | 344 |
<field name="totalHooksCount">
|
| 345 | 345 |
<field-validator type="boundNumber" short-circuit="true">
|
| 346 |
- <param name="min">500.0</param>
|
|
| 347 |
- <param name="max">5500.0</param>
|
|
| 346 |
+ <param name="min">10.0</param>
|
|
| 347 |
+ <param name="max">10000.0</param>
|
|
| 348 | 348 |
<message/>
|
| 349 | 349 |
</field-validator>
|
| 350 | 350 |
</field>
|
| ... | ... | @@ -343,8 +343,8 @@ |
| 343 | 343 |
</field>
|
| 344 | 344 |
<field name="totalHooksCount">
|
| 345 | 345 |
<field-validator type="boundNumber" short-circuit="true">
|
| 346 |
- <param name="min">500.0</param>
|
|
| 347 |
- <param name="max">5500.0</param>
|
|
| 346 |
+ <param name="min">10.0</param>
|
|
| 347 |
+ <param name="max">10000.0</param>
|
|
| 348 | 348 |
<message/>
|
| 349 | 349 |
</field-validator>
|
| 350 | 350 |
</field>
|