Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f6b5e80c by tchemit at 2020-04-04T16:40:21+02:00 [SFA] Système de recopie de champs lors de la création d'une nouvelle activité de pêche - Closes #1454 - - - - - 4e952eea by tchemit at 2020-04-04T16:40:23+02:00 [V8] Form marée, espèces ciblées - Closes #1426 - - - - - 7 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 - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - 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 ===================================== @@ -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) { ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1188,7 +1188,7 @@ observe.data.ll.logbook.SamplePart.types=Sample parts observe.data.ll.logbook.SamplePart.weight=Weight (kg) observe.data.ll.logbook.SamplePart.weightMeasureMethod=Weight measure method observe.data.ll.logbook.SamplePart.weightMeasureType=Weight measure type -observe.data.ll.logbook.Set.action.copyValuesAndSave=Copy values and save +observe.data.ll.logbook.Set.action.copyValuesAndSave=Copy values from last fishing operation and save observe.data.ll.logbook.Set.action.reset.homeId.tip=Reset home id observe.data.ll.logbook.Set.basketLineLength=Bakset line length (m) observe.data.ll.logbook.Set.basketsPerSectionCount=Baskets per section count ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1188,7 +1188,7 @@ observe.data.ll.logbook.SamplePart.types=Sample parts \#TODO observe.data.ll.logbook.SamplePart.weight=Peso (kg) observe.data.ll.logbook.SamplePart.weightMeasureMethod=Méthode de measure de poids \#TODO observe.data.ll.logbook.SamplePart.weightMeasureType=Type de mesure de poids \#TODO -observe.data.ll.logbook.Set.action.copyValuesAndSave=Copy values and save \#TODO +observe.data.ll.logbook.Set.action.copyValuesAndSave=Copy values from last fishing operation and save \#TODO observe.data.ll.logbook.Set.action.reset.homeId.tip=Reiniciar el id de negocio observe.data.ll.logbook.Set.basketLineLength=Bakset line length (m) \#TODO observe.data.ll.logbook.Set.basketsPerSectionCount=Número de cestas por sección ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1188,7 +1188,7 @@ observe.data.ll.logbook.SamplePart.types=Échantillons observe.data.ll.logbook.SamplePart.weight=Poids (kg) observe.data.ll.logbook.SamplePart.weightMeasureMethod=Méthode de mesure de poids observe.data.ll.logbook.SamplePart.weightMeasureType=Type de mesure de poids -observe.data.ll.logbook.Set.action.copyValuesAndSave=Recopier les propriétés et enregister +observe.data.ll.logbook.Set.action.copyValuesAndSave=Recopier les propriétés de la dernière opération de pêche et enregister observe.data.ll.logbook.Set.action.reset.homeId.tip=Réinitialiser l'id métier observe.data.ll.logbook.Set.basketLineLength=Longueur de la ligne par panier (m) observe.data.ll.logbook.Set.basketsPerSectionCount=Nombre de paniers par section ===================================== 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/2376757940eaba9cfe8b74c75... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2376757940eaba9cfe8b74c75... You're receiving this email because of your account on gitlab.com.