Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a817585f by tchemit at 2020-04-04T15:26:04+02:00 [SFA] Système de recopie de champs lors de la création d'une nouvelle activité de pêche - Closes #1454 - - - - - 1e6321fb by tchemit at 2020-04-04T15:26:06+02:00 [V8] Form marée, espèces ciblées - Closes #1426 - - - - - 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: ===================================== 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 ===================================== @@ -84,6 +84,8 @@ class TripUIHandler extends ContentOpenableUIHandler<TripDto, TripReference, Tri public void afterInit(TripUI ui) { super.afterInit(ui); + //FIXME in jaxx (tabInfo is modified before registred in JTabbedPane...) + ui.getMainTabbedPane().setTitleAt(1, ui.getSpeciesTab().getTitle()); tripUIHelper = new TripUIHelper<TripUI>(ui, prefix) { @Override protected TripMapDto getMap(TripMapConfigDto tripMapConfig) { ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetServiceLocal.java ===================================== @@ -120,10 +120,34 @@ public class SetServiceLocal extends ObserveServiceLocal implements SetService { entity.fromDto(getReferentialLocale(), globalCompositionToCopy); entity.fromDto(getReferentialLocale(), dto); + // caracteristics tab + + entity.setSettingVesselSpeed(entityToCopy.getSettingVesselSpeed()); + entity.setTimeBetweenHooks(entityToCopy.getTimeBetweenHooks()); entity.setTotalLineLength(entityToCopy.getTotalLineLength()); entity.setBasketLineLength(entityToCopy.getBasketLineLength()); entity.setLengthBetweenBranchlines(entityToCopy.getLengthBetweenBranchlines()); + entity.setShooterUsed(entityToCopy.getShooterUsed()); + entity.setShooterSpeed(entityToCopy.getShooterSpeed()); + entity.setMaxDepthTargeted(entityToCopy.getMaxDepthTargeted()); + entity.setTotalSectionsCount(entityToCopy.getTotalSectionsCount()); + entity.setBasketsPerSectionCount(entityToCopy.getBasketsPerSectionCount()); + entity.setTotalBasketsCount(entityToCopy.getTotalBasketsCount()); + entity.setBranchlinesPerBasketCount(entityToCopy.getBranchlinesPerBasketCount()); + entity.setTotalHooksCount(entityToCopy.getTotalHooksCount()); entity.setLineType(entityToCopy.getLineType()); + entity.setWeightedSwivel(entityToCopy.getWeightedSwivel()); + entity.setSwivelWeight(entityToCopy.getSwivelWeight()); + entity.setWeightedSnap(entityToCopy.getWeightedSnap()); + entity.setSnapWeight(entityToCopy.getSnapWeight()); + entity.setMonitored(entityToCopy.getMonitored()); + + // lightsticks tab + + entity.setLightsticksUsed(entityToCopy.getLightsticksUsed()); + entity.setTotalLightsticksCount(entityToCopy.getTotalLightsticksCount()); + entity.setLightsticksType(entityToCopy.getLightsticksType()); + entity.setLightsticksColor(entityToCopy.getLightsticksColor()); SaveResultDto result = saveEntity(entity); if (dto.isNotPersisted()) { @@ -153,6 +177,8 @@ public class SetServiceLocal extends ObserveServiceLocal implements SetService { Set otherSetLongline = activityLongline.getSet(); if (otherSetLongline != null && !setLongline.equals(otherSetLongline)) { SetStubDto otherSetDto = new SetStubDto(); + setLongline.toDto(getReferentialLocale(), otherSetDto); + otherSetDto.setId(otherSetLongline.getTopiaId()); otherSetDto.setHomeId(otherSetLongline.getHomeId()); otherSetDto.setNumber(otherSetLongline.getNumber()); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/adc1bf761060c0f5d0d8f23f4... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/adc1bf761060c0f5d0d8f23f4... You're receiving this email because of your account on gitlab.com.