Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
4 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
- services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetServiceLocal.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 |
}
|
| ... | ... | @@ -84,6 +84,8 @@ class TripUIHandler extends ContentOpenableUIHandler<TripDto, TripReference, Tri |
| 84 | 84 |
public void afterInit(TripUI ui) {
|
| 85 | 85 |
super.afterInit(ui);
|
| 86 | 86 |
|
| 87 |
+ //FIXME in jaxx (tabInfo is modified before registred in JTabbedPane...)
|
|
| 88 |
+ ui.getMainTabbedPane().setTitleAt(1, ui.getSpeciesTab().getTitle());
|
|
| 87 | 89 |
tripUIHelper = new TripUIHelper<TripUI>(ui, prefix) {
|
| 88 | 90 |
@Override
|
| 89 | 91 |
protected TripMapDto getMap(TripMapConfigDto tripMapConfig) {
|
| ... | ... | @@ -120,10 +120,34 @@ public class SetServiceLocal extends ObserveServiceLocal implements SetService { |
| 120 | 120 |
entity.fromDto(getReferentialLocale(), globalCompositionToCopy);
|
| 121 | 121 |
entity.fromDto(getReferentialLocale(), dto);
|
| 122 | 122 |
|
| 123 |
+ // caracteristics tab
|
|
| 124 |
+ |
|
| 125 |
+ entity.setSettingVesselSpeed(entityToCopy.getSettingVesselSpeed());
|
|
| 126 |
+ entity.setTimeBetweenHooks(entityToCopy.getTimeBetweenHooks());
|
|
| 123 | 127 |
entity.setTotalLineLength(entityToCopy.getTotalLineLength());
|
| 124 | 128 |
entity.setBasketLineLength(entityToCopy.getBasketLineLength());
|
| 125 | 129 |
entity.setLengthBetweenBranchlines(entityToCopy.getLengthBetweenBranchlines());
|
| 130 |
+ entity.setShooterUsed(entityToCopy.getShooterUsed());
|
|
| 131 |
+ entity.setShooterSpeed(entityToCopy.getShooterSpeed());
|
|
| 132 |
+ entity.setMaxDepthTargeted(entityToCopy.getMaxDepthTargeted());
|
|
| 133 |
+ entity.setTotalSectionsCount(entityToCopy.getTotalSectionsCount());
|
|
| 134 |
+ entity.setBasketsPerSectionCount(entityToCopy.getBasketsPerSectionCount());
|
|
| 135 |
+ entity.setTotalBasketsCount(entityToCopy.getTotalBasketsCount());
|
|
| 136 |
+ entity.setBranchlinesPerBasketCount(entityToCopy.getBranchlinesPerBasketCount());
|
|
| 137 |
+ entity.setTotalHooksCount(entityToCopy.getTotalHooksCount());
|
|
| 126 | 138 |
entity.setLineType(entityToCopy.getLineType());
|
| 139 |
+ entity.setWeightedSwivel(entityToCopy.getWeightedSwivel());
|
|
| 140 |
+ entity.setSwivelWeight(entityToCopy.getSwivelWeight());
|
|
| 141 |
+ entity.setWeightedSnap(entityToCopy.getWeightedSnap());
|
|
| 142 |
+ entity.setSnapWeight(entityToCopy.getSnapWeight());
|
|
| 143 |
+ entity.setMonitored(entityToCopy.getMonitored());
|
|
| 144 |
+ |
|
| 145 |
+ // lightsticks tab
|
|
| 146 |
+ |
|
| 147 |
+ entity.setLightsticksUsed(entityToCopy.getLightsticksUsed());
|
|
| 148 |
+ entity.setTotalLightsticksCount(entityToCopy.getTotalLightsticksCount());
|
|
| 149 |
+ entity.setLightsticksType(entityToCopy.getLightsticksType());
|
|
| 150 |
+ entity.setLightsticksColor(entityToCopy.getLightsticksColor());
|
|
| 127 | 151 |
|
| 128 | 152 |
SaveResultDto result = saveEntity(entity);
|
| 129 | 153 |
if (dto.isNotPersisted()) {
|
| ... | ... | @@ -153,6 +177,8 @@ public class SetServiceLocal extends ObserveServiceLocal implements SetService { |
| 153 | 177 |
Set otherSetLongline = activityLongline.getSet();
|
| 154 | 178 |
if (otherSetLongline != null && !setLongline.equals(otherSetLongline)) {
|
| 155 | 179 |
SetStubDto otherSetDto = new SetStubDto();
|
| 180 |
+ setLongline.toDto(getReferentialLocale(), otherSetDto);
|
|
| 181 |
+ |
|
| 156 | 182 |
otherSetDto.setId(otherSetLongline.getTopiaId());
|
| 157 | 183 |
otherSetDto.setHomeId(otherSetLongline.getHomeId());
|
| 158 | 184 |
otherSetDto.setNumber(otherSetLongline.getNumber());
|