Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3
Commits:
-
05b939e3
by Tony CHEMIT at 2018-03-19T21:20:04Z
5 changed files:
- t3-actions/src/main/java/fr/ird/t3/actions/io/input/ImportInputSourceConfiguration.java
- t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.ftl
- t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction_en.ftl
- t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction.ftl
- t3-actions/src/main/resources/ftl/fr/ird/t3/actions/io/input/ImportInputSourceAction_en.ftl
Changes:
| ... | ... | @@ -73,6 +73,7 @@ public class ImportInputSourceConfiguration implements InputSourceConfiguration |
| 73 | 73 |
result.setTripType(analyzeConfiguration.getTripType());
|
| 74 | 74 |
result.setCanCreateVessel(analyzeConfiguration.isCanCreateVessel());
|
| 75 | 75 |
result.setCreateVirtualVessel(analyzeConfiguration.isCanCreateVessel());
|
| 76 |
+ result.setCanCreateVirtualActivity(analyzeConfiguration.isCanCreateVirtualActivity());
|
|
| 76 | 77 |
return result;
|
| 77 | 78 |
}
|
| 78 | 79 |
|
| ... | ... | @@ -23,7 +23,7 @@ |
| 23 | 23 |
Pilote d'acquisition de données : ${configuration.inputProvider.label}
|
| 24 | 24 |
Source de données : ${configuration.inputFile.name}
|
| 25 | 25 |
Utilisation des plans de cuves : ${configuration.useWells?string}
|
| 26 |
-Type de marées : ${configuration.tripType.label}
|
|
| 26 |
+Autoriser à créer des activités : ${configuration.canCreateVirtualActivity?string}
|
|
| 27 | 27 |
Autoriser à créer des bateaux : ${configuration.canCreateVessel?string}
|
| 28 | 28 |
<#if configuration.canCreateVessel>
|
| 29 | 29 |
Créer des bateaux virtuels : ${configuration.createVirtualVessel?string}
|
| ... | ... | @@ -23,7 +23,7 @@ |
| 23 | 23 |
Input Pilot: ${configuration.inputProvider.label}
|
| 24 | 24 |
Input file: ${configuration.inputFile.name}
|
| 25 | 25 |
Use wells: ${configuration.useWells?string}
|
| 26 |
-Trip type: ${configuration.tripType.label}
|
|
| 26 |
+Authorise to create activities: ${configuration.canCreateVirtualActivity?string}
|
|
| 27 | 27 |
Authorise to create vessels: ${configuration.canCreateVessel?string}
|
| 28 | 28 |
<#if configuration.canCreateVessel>
|
| 29 | 29 |
Create virtual vessels: ${configuration.createVirtualVessel?string}
|
| ... | ... | @@ -23,7 +23,7 @@ |
| 23 | 23 |
Pilote d'acquisition de données : ${configuration.inputProvider.label}
|
| 24 | 24 |
Source de données : ${configuration.inputFile.name}
|
| 25 | 25 |
Utilisation des plans de cuves : ${configuration.useWells?string}
|
| 26 |
-Type de marées : ${configuration.tripType.label}
|
|
| 26 |
+Autoriser à créer des activités : ${configuration.canCreateVirtualActivity?string}
|
|
| 27 | 27 |
Autoriser à créer des bateaux : ${configuration.canCreateVessel?string}
|
| 28 | 28 |
<#if configuration.canCreateVessel>
|
| 29 | 29 |
Créer des bateaux virtuels : ${configuration.createVirtualVessel?string}
|
| ... | ... | @@ -23,7 +23,7 @@ |
| 23 | 23 |
Input Pilot: ${configuration.inputProvider.label}
|
| 24 | 24 |
Input file: ${configuration.inputFile.name}
|
| 25 | 25 |
Use wells: ${configuration.useWells?string}
|
| 26 |
-Trip type: ${configuration.tripType.label}
|
|
| 26 |
+Authorise to create activities: ${configuration.canCreateVirtualActivity?string}
|
|
| 27 | 27 |
Authorise to create vessels: ${configuration.canCreateVessel?string}
|
| 28 | 28 |
<#if configuration.canCreateVessel>
|
| 29 | 29 |
Create virtual vessels: ${configuration.createVirtualVessel?string}
|