Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 23767579 by tchemit at 2020-04-04T15:29:58+02:00 [V8] Form marée, espèces ciblées - Closes #1426 - - - - - 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: ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUI.jaxx ===================================== @@ -222,13 +222,6 @@ </cell> </row> - <!-- species --> - <row> - <cell columns="2" weighty="1" weightx="1"> - <FilterableDoubleList id='species' genericType='SpeciesReference' styleClass="skipI18n"/> - </cell> - </row> - <!-- generalComment --> <row> <cell columns='2' fill='both' weighty="1"> @@ -238,7 +231,11 @@ </Table> </JScrollPane> </tab> - + <tab id='speciesTab' i18nProperty="skip"> + <JPanel layout="{new BorderLayout()}"> + <FilterableDoubleList id='species' genericType='SpeciesReference' styleClass="skipI18n"/> + </JPanel> + </tab> <tab id='observationsTab' i18nProperty=""> <Table fill="both"> ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUI.jcss ===================================== @@ -43,9 +43,17 @@ text:{getStringValue(bean.getNoOfDays())}; } +/* ***************************************************************************** */ +/* SPECIES TAB **************************************************************** */ +/* ***************************************************************************** */ + +#speciesTab { + title:{t("observe.data.ll.common.Trip.species")}; +} + #species { - showListLabel:true; - label:{t("observe.data.ll.common.Trip.species")}; + /*showListLabel:true; + label:{t("observe.data.ll.common.Trip.species")};*/ universeLabel:{t("observe.data.ll.common.Trip.species.universe")}; selectedLabel:{t("observe.data.ll.common.Trip.species.selected")}; } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUIHandler.java ===================================== @@ -82,6 +82,8 @@ class TripUIHandler extends ContentOpenableUIHandler<TripDto, TripReference, Tri @Override public void afterInit(TripUI ui) { + //FIXME in jaxx (tabInfo is modified before registred in JTabbedPane...) + ui.getMainTabbedPane().setTitleAt(1, ui.getSpeciesTab().getTitle()); super.afterInit(ui); tripUIHelper = new TripUIHelper<TripUI>(ui, prefix) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2376757940eaba9cfe8b74c75d... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2376757940eaba9cfe8b74c75d... You're receiving this email because of your account on gitlab.com.