Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
23767579
by tchemit at 2020-04-04T15:29:58+02:00
3 changed files:
- client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUI.jaxx
- client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUI.jcss
- client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUIHandler.java
Changes:
| ... | ... | @@ -222,13 +222,6 @@ |
| 222 | 222 |
</cell>
|
| 223 | 223 |
</row>
|
| 224 | 224 |
|
| 225 |
- <!-- species -->
|
|
| 226 |
- <row>
|
|
| 227 |
- <cell columns="2" weighty="1" weightx="1">
|
|
| 228 |
- <FilterableDoubleList id='species' genericType='SpeciesReference' styleClass="skipI18n"/>
|
|
| 229 |
- </cell>
|
|
| 230 |
- </row>
|
|
| 231 |
- |
|
| 232 | 225 |
<!-- generalComment -->
|
| 233 | 226 |
<row>
|
| 234 | 227 |
<cell columns='2' fill='both' weighty="1">
|
| ... | ... | @@ -238,7 +231,11 @@ |
| 238 | 231 |
</Table>
|
| 239 | 232 |
</JScrollPane>
|
| 240 | 233 |
</tab>
|
| 241 |
- |
|
| 234 |
+ <tab id='speciesTab' i18nProperty="skip">
|
|
| 235 |
+ <JPanel layout="{new BorderLayout()}">
|
|
| 236 |
+ <FilterableDoubleList id='species' genericType='SpeciesReference' styleClass="skipI18n"/>
|
|
| 237 |
+ </JPanel>
|
|
| 238 |
+ </tab>
|
|
| 242 | 239 |
<tab id='observationsTab' i18nProperty="">
|
| 243 | 240 |
<Table fill="both">
|
| 244 | 241 |
|
| ... | ... | @@ -43,9 +43,17 @@ |
| 43 | 43 |
text:{getStringValue(bean.getNoOfDays())};
|
| 44 | 44 |
}
|
| 45 | 45 |
|
| 46 |
+/* ***************************************************************************** */
|
|
| 47 |
+/* SPECIES TAB **************************************************************** */
|
|
| 48 |
+/* ***************************************************************************** */
|
|
| 49 |
+ |
|
| 50 |
+#speciesTab {
|
|
| 51 |
+ title:{t("observe.data.ll.common.Trip.species")};
|
|
| 52 |
+}
|
|
| 53 |
+ |
|
| 46 | 54 |
#species {
|
| 47 |
- showListLabel:true;
|
|
| 48 |
- label:{t("observe.data.ll.common.Trip.species")};
|
|
| 55 |
+ /*showListLabel:true;
|
|
| 56 |
+ label:{t("observe.data.ll.common.Trip.species")};*/
|
|
| 49 | 57 |
universeLabel:{t("observe.data.ll.common.Trip.species.universe")};
|
| 50 | 58 |
selectedLabel:{t("observe.data.ll.common.Trip.species.selected")};
|
| 51 | 59 |
}
|
| ... | ... | @@ -82,6 +82,8 @@ class TripUIHandler extends ContentOpenableUIHandler<TripDto, TripReference, Tri |
| 82 | 82 |
|
| 83 | 83 |
@Override
|
| 84 | 84 |
public void afterInit(TripUI ui) {
|
| 85 |
+ //FIXME in jaxx (tabInfo is modified before registred in JTabbedPane...)
|
|
| 86 |
+ ui.getMainTabbedPane().setTitleAt(1, ui.getSpeciesTab().getTitle());
|
|
| 85 | 87 |
super.afterInit(ui);
|
| 86 | 88 |
|
| 87 | 89 |
tripUIHelper = new TripUIHelper<TripUI>(ui, prefix) {
|