Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
f3977cee
by Tony Chemit at 2021-01-22T10:54:34+01:00
-
65848f2e
by Tony Chemit at 2021-01-22T10:54:54+01:00
6 changed files:
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jaxx
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jcss
- client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetGlobalCompositionUINavigationNode.scope
- client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUINavigationNode.scope
- client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/observation/SetGlobalCompositionUINavigationNode.scope
- client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/simple/GenerateContentSimpleUINavigationScope.java
Changes:
| ... | ... | @@ -231,9 +231,7 @@ |
| 231 | 231 |
<!-- predator -->
|
| 232 | 232 |
<row>
|
| 233 | 233 |
<cell columns="2" fill="both" weighty="0.7">
|
| 234 |
- <JScrollPane id='predatorPane'>
|
|
| 235 |
- <DoubleList id='predator' genericType='SpeciesReference'/>
|
|
| 236 |
- </JScrollPane>
|
|
| 234 |
+ <DoubleList id='predator' genericType='SpeciesReference'/>
|
|
| 237 | 235 |
</cell>
|
| 238 | 236 |
</row>
|
| 239 | 237 |
|
| ... | ... | @@ -63,12 +63,9 @@ |
| 63 | 63 |
title:"observe.data.ll.logbook.Catch.comment";
|
| 64 | 64 |
}
|
| 65 | 65 |
|
| 66 |
-#predatorPane {
|
|
| 67 |
- minimumSize:{new Dimension(10,150)};
|
|
| 68 |
-}
|
|
| 69 |
- |
|
| 70 | 66 |
#predator {
|
| 71 |
- showListLabel: true;
|
|
| 67 |
+ minimumSize:{new Dimension(10,150)};
|
|
| 68 |
+ showListLabel: false;
|
|
| 72 | 69 |
universeLabel:{t("observe.data.ll.logbook.Catch.availablePredator")};
|
| 73 | 70 |
selectedLabel:{t("observe.data.ll.logbook.Catch.selectedPredator")};
|
| 74 | 71 |
}
|
| 1 | 1 |
{
|
| 2 | 2 |
"properties": {
|
| 3 | 3 |
"model.permission": "WRITE_DATA",
|
| 4 |
- "ui.iconPath": "navigation.ll.data.logbook.SetGlobalComposition"
|
|
| 4 |
+ "ui.iconPath": "navigation.ll.data.logbook.SetGlobalComposition",
|
|
| 5 |
+ "ui.subNode": "true"
|
|
| 5 | 6 |
},
|
| 6 | 7 |
"i18nMapping": {
|
| 7 | 8 |
"type": "observe.data.ll.logbook.SetGlobalComposition.type"
|
| 1 | 1 |
{
|
| 2 | 2 |
"properties": {
|
| 3 | 3 |
"model.permission": "WRITE_DATA",
|
| 4 |
- "ui.iconPath": "navigation.ll.data.observation.SetDetailComposition"
|
|
| 4 |
+ "ui.iconPath": "navigation.ll.data.observation.SetDetailComposition",
|
|
| 5 |
+ "ui.subNode": "true"
|
|
| 5 | 6 |
},
|
| 6 | 7 |
"i18nMapping": {
|
| 7 | 8 |
"type": "observe.data.ll.observation.SetDetailComposition.type"
|
| 1 | 1 |
{
|
| 2 | 2 |
"properties": {
|
| 3 | 3 |
"model.permission": "WRITE_DATA",
|
| 4 |
- "ui.iconPath": "navigation.ll.data.observation.SetGlobalComposition"
|
|
| 4 |
+ "ui.iconPath": "navigation.ll.data.observation.SetGlobalComposition",
|
|
| 5 |
+ "ui.subNode": "true"
|
|
| 5 | 6 |
},
|
| 6 | 7 |
"i18nMapping": {
|
| 7 | 8 |
"type": "observe.data.ll.observation.SetGlobalComposition.type"
|
| ... | ... | @@ -51,6 +51,7 @@ public class GenerateContentSimpleUINavigationScope extends GenerateContentSimpl |
| 51 | 51 |
String selectTypeName = generator.detectCapabilities.parentRelations.get(generator.packageName + "." + nodeType).replace(generator.packageName, generator.dtoPackage).replace("UINavigationNode", "Dto");
|
| 52 | 52 |
return newBuilder(contentUiType, nodeType)
|
| 53 | 53 |
.setModule()
|
| 54 |
+ .setSubNode()
|
|
| 54 | 55 |
.setDtoTypeFromNodeType()
|
| 55 | 56 |
.setMainDtoTypeFromDtoType()
|
| 56 | 57 |
.setDtoReferenceTypeFromMainDtoType()
|