October 2018 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop-7.x] Lacune de migration sur liste des systèmes observés - Closes #1151
by Tony CHEMIT 15 Oct '18

15 Oct '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: e4bebda4 by Tony CHEMIT at 2018-10-15T16:07:16Z Lacune de migration sur liste des systèmes observés - Closes #1151 - - - - - 1 changed file: - persistence/src/main/resources/db/migration/6.5/07_update_observed_system-common.sql Changes: ===================================== persistence/src/main/resources/db/migration/6.5/07_update_observed_system-common.sql ===================================== @@ -20,6 +20,9 @@ -- #L% --- +UPDATE observe_seine.observedsystem SET schoolType = 1 WHERE topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.0'; +UPDATE observe_seine.observedsystem SET schoolType = 1 WHERE topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.1'; +UPDATE observe_seine.observedsystem SET schoolType = 1 WHERE topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.2'; UPDATE observe_seine.observedsystem SET status = 0 WHERE code = '5'; UPDATE observe_seine.observedsystem SET status = 0 WHERE code = '6'; UPDATE observe_seine.observedsystem SET status = 0 WHERE code = '7'; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e4bebda41c6965cac0ee8d2a4ad… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e4bebda41c6965cac0ee8d2a4ad… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Calcul de l'activité d'observation sur l'écran de l'activité logbook - See #1150…
by Tony CHEMIT 15 Oct '18

15 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 49a5d602 by Tony CHEMIT at 2018-10-15T13:37:37Z Calcul de l'activité d'observation sur l'écran de l'activité logbook - See #1150 - Amélioration de l'api sur les activités LL et ajout de l'api pour faire le calcul de l'appairement - - - - - a6be5a2c by Tony CHEMIT at 2018-10-15T13:40:28Z Calcul de l'activité d'observation sur l'écran de l'activité logbook - See #1150 - Début d'ajout dans l'écran d'une activité Logbook + quelques correctoins sur cet écran. - - - - - 30 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties - client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties - client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties - client/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/spi/ContentUIReferenceCache.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUIModel.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/ActivityLonglineLogbookListNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/obs/ActivityLonglineObsListNavigationTreeNode.java - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties - + dto/src/main/java/fr/ird/observe/dto/data/longline/ActivityLonglineAware.java - dto/src/main/java/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto.java - + dto/src/main/java/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookReference.java - dto/src/main/java/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto.java - + dto/src/main/java/fr/ird/observe/dto/data/longline/ActivityLonglineObsReference.java - + dto/src/main/java/fr/ird/observe/dto/data/pairing/ActivityLonglinePairingResult.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/a80db01fb1aed5e63151c66acd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/a80db01fb1aed5e63151c66acd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Finish referential forms refactor
by Tony CHEMIT 15 Oct '18

15 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a80db01f by Tony CHEMIT at 2018-10-15T03:56:32Z Finish referential forms refactor - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/ShowTechnicalInformationsAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/BackToReferentialListUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/DeleteReferentialUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/SaveReferentialUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/ShowReferentialUniqueKeyUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/ShowReferentialUsageUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/CopyValuesAndSaveSetLonglineLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentI18nReferenceUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentI18nReferenceUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeUIHandler.java - − client/src/main/java/fr/ird/observe/client/ui/content/ref/CommonI18nReferential.jcss - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/CompagniesUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/CountryUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/DataQualityUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/FpaZoneUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/GearCaracteristicTypeUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/GearCaracteristicUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/GearUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/HarbourUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthMeasureMethodUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/OceanUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/OrganismUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/ProgramUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/SexUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/SizeMeasureTypeUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a80db01fb1aed5e63151c66acdb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a80db01fb1aed5e63151c66acdb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Opération de pêche : recopie de propriétés - Closes #1125
by Tony CHEMIT 14 Oct '18

14 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f1d57b9c by Tony CHEMIT at 2018-10-14T23:31:38Z [LL] Opération de pêche : recopie de propriétés - Closes #1125 - - - - - 18 changed files: - client/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/edit/SaveEditDataUIActionSupport.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/CopyValuesAndSaveSetLonglineLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/SaveSetLonglineLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/edit/ContentEditUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/api/data/edit/ContentEditUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUIModel.java - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties - dto/src/main/java/fr/ird/observe/dto/data/longline/SetLonglineLogbookGlobalCompositionDto.java - dto/src/main/models/Observe-06-data-longline-logbook.model - persistence/src/main/java/fr/ird/observe/binder/data/longline/SetLonglineLogbookStubEntityDtoBinder.java - server/src/main/filtered-resources/mapping - services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/SetLonglineLogbookServiceLocal.java - services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineLogbookService.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java ===================================== @@ -74,6 +74,7 @@ public abstract class ObserveKeyStrokes { public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_FROM_RIGHT = KeyStroke.getKeyStroke("ctrl pressed B"); public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_FROM_BOTH = KeyStroke.getKeyStroke("ctrl pressed C"); + public static final KeyStroke KEY_STROKE_COPY_VALUES_AND_SAVE = KeyStroke.getKeyStroke("ctrl pressed T"); public static final KeyStroke KEY_STROKE_SELECT_TRANSSHIPMENT = KeyStroke.getKeyStroke("ctrl pressed T"); public static final KeyStroke KEY_STROKE_SAVE_TABLE_ENTRY = KeyStroke.getKeyStroke("ctrl pressed S"); public static final KeyStroke KEY_STROKE_PRESSED_ENTER = KeyStroke.getKeyStroke("pressed ENTER"); ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/edit/SaveEditDataUIActionSupport.java ===================================== @@ -57,8 +57,12 @@ public abstract class SaveEditDataUIActionSupport<D extends DataDto, R extends D private static final long serialVersionUID = 1L; - protected SaveEditDataUIActionSupport(ObserveMainUI mainUI, String name, KeyStroke keyStroke) { - super(mainUI, name, n("observe.action.save"), n("observe.action.save.tip"), "save", keyStroke); + protected SaveEditDataUIActionSupport(ObserveMainUI mainUI, String actionKey, String text, String tip, KeyStroke keyStroke) { + super(mainUI, actionKey, text, tip, "save", keyStroke); + } + + protected SaveEditDataUIActionSupport(ObserveMainUI mainUI, String actionKey, KeyStroke keyStroke) { + super(mainUI, actionKey, n("observe.action.save"), n("observe.action.save.tip"), "save", keyStroke); } protected abstract boolean doSave(U ui, D bean, ObserveEditNode<?> parentEditNode, boolean notPersisted); ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/CopyValuesAndSaveSetLonglineLogbookUIAction.java ===================================== @@ -0,0 +1,38 @@ +package fr.ird.observe.client.ui.actions.content.data.longline.save; + +import fr.ird.observe.client.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.content.data.longline.logbook.SetLonglineLogbookUI; +import fr.ird.observe.client.ui.content.data.longline.logbook.SetLonglineLogbookUIModel; +import fr.ird.observe.dto.data.longline.SetLonglineLogbookDto; +import fr.ird.observe.dto.result.SaveResultDto; +import fr.ird.observe.navigation.model.edit.ObserveEditNode; + +import java.util.Objects; + +import static org.nuiton.i18n.I18n.n; + +/** + * Created by tchemit on 14/10/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class CopyValuesAndSaveSetLonglineLogbookUIAction extends SaveSetLonglineLogbookUIAction { + + public static final String ACTION_NAME = CopyValuesAndSaveSetLonglineLogbookUIAction.class.getName(); + + public CopyValuesAndSaveSetLonglineLogbookUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, n("observe.common.SetLonglineLogbookDto.action.copyValuesAndSave"), n("observe.common.SetLonglineLogbookDto.action.copyValuesAndSave"), ObserveKeyStrokes.KEY_STROKE_COPY_VALUES_AND_SAVE); + } + + @Override + protected boolean doSave(SetLonglineLogbookUI ui, SetLonglineLogbookDto bean, ObserveEditNode<?> parentEditNode, boolean notPersisted) { + String parentId = parentEditNode.getId(); + SetLonglineLogbookUIModel model = ui.getModel(); + String setIdToCopy = Objects.requireNonNull(model.getSetIdToCopy()); + SaveResultDto saveResult = getServicesProvider().getSetLonglineLogbookService().saveAndCopyProperties(parentId, setIdToCopy, bean); + saveResult.toDto(bean); + return true; + } + +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/SaveSetLonglineLogbookUIAction.java ===================================== @@ -31,6 +31,8 @@ import fr.ird.observe.dto.data.longline.SetLonglineLogbookReference; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.navigation.model.edit.ObserveEditNode; +import javax.swing.KeyStroke; + /** * Created by tchemit on 28/09/2018. * @@ -40,6 +42,10 @@ public class SaveSetLonglineLogbookUIAction extends SaveEditDataUIActionSupport< public static final String ACTION_NAME = SaveSetLonglineLogbookUIAction.class.getName(); + public SaveSetLonglineLogbookUIAction(ObserveMainUI mainUI, String actionKey, String text, String tip, KeyStroke keyStroke) { + super(mainUI, actionKey, text, tip, keyStroke); + } + public SaveSetLonglineLogbookUIAction(ObserveMainUI mainUI) { super(mainUI, ACTION_NAME, ObserveKeyStrokes.KEY_STROKE_SAVE_DATA); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/api/data/edit/ContentEditUI.jaxx ===================================== @@ -62,5 +62,11 @@ <JButton id='delete'/> </cell> </row> + <row insets='0'> + <cell fill='both' columns="3"> + <Table id='extraActions' fill="both" weightx="1" insets='2'/> + </cell> + </row> + </Table> </fr.ird.observe.client.ui.content.api.ContentUI> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/api/data/edit/ContentEditUI.jcss ===================================== @@ -30,7 +30,9 @@ #actions { visible:{model.isCanWrite()}; } - +#extraActions { + visible:false; +} #reset { _observeAction:{ResetEditUIAction.ACTION_NAME}; _globalAction:{ResetDataGlobalUIAction.ACTION_NAME}; ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUI.jaxx ===================================== @@ -34,6 +34,7 @@ fr.ird.observe.dto.referential.longline.LightsticksColorReference fr.ird.observe.client.ui.actions.content.data.longline.delete.DeleteSetLonglineLogbookUIAction + fr.ird.observe.client.ui.actions.content.data.longline.save.CopyValuesAndSaveSetLonglineLogbookUIAction fr.ird.observe.client.ui.actions.content.data.longline.save.SaveSetLonglineLogbookUIAction fr.ird.observe.client.ui.content.api.ContentUIModel @@ -427,5 +428,11 @@ <JButton id='reset'/> <JButton id='save'/> <JButton id='delete'/> - + <Table id='extraActions' fill="both" weightx="1" insets='2'> + <row> + <cell fill="both"> + <JButton id='copyValuesAndSave'/> + </cell> + </row> + </Table> </fr.ird.observe.client.ui.content.api.data.edit.ContentEditUI> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUI.jcss ===================================== @@ -28,6 +28,15 @@ _observeAction:{DeleteSetLonglineLogbookUIAction.ACTION_NAME}; } +#extraActions { + visible:{!model.isReadingMode()}; +} + +#copyValuesAndSave { + enabled:{model.getCopySetCandidate() != null && model.isValid()}; + _observeAction:{CopyValuesAndSaveSetLonglineLogbookUIAction.ACTION_NAME}; +} + /* ***************************************************************************** */ /* SETTING TAB **************************************************************** */ /* ***************************************************************************** */ ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUIModel.java ===================================== @@ -25,6 +25,13 @@ package fr.ird.observe.client.ui.content.data.longline.logbook; import fr.ird.observe.client.ui.content.api.data.edit.ContentEditUIModel; import fr.ird.observe.dto.data.longline.SetLonglineLogbookDto; import fr.ird.observe.dto.data.longline.SetLonglineLogbookReference; +import fr.ird.observe.dto.data.longline.SetLonglineLogbookStubDto; +import fr.ird.observe.dto.form.Form; + +import java.util.Comparator; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; /** * Created on 9/28/14. @@ -36,7 +43,48 @@ public class SetLonglineLogbookUIModel extends ContentEditUIModel<SetLonglineLog private static final long serialVersionUID = 1L; + private List<SetLonglineLogbookStubDto> copySetCandidates; + private SetLonglineLogbookStubDto copySetCandidate; + public SetLonglineLogbookUIModel() { super(SetLonglineLogbookDto.class); } + + @Override + public void openForm(Form<SetLonglineLogbookDto> form) { + super.openForm(form); + + copySetCandidates = form.getObject().getOtherSets().stream() + .sorted(Comparator.comparing(SetLonglineLogbookStubDto::getSettingStartTimeStamp)) + .collect(Collectors.toList()); + addPropertyChangeListener(SetLonglineLogbookDto.PROPERTY_SETTING_START_TIME_STAMP, e -> updateCopySetCandidate((Date) e.getNewValue())); + updateCopySetCandidate(getBean().getSettingStartTimeStamp()); + } + + private void updateCopySetCandidate(Date newValue) { + if (newValue == null) { + setCopySetCandidate(null); + } else { + List<SetLonglineLogbookStubDto> collect = copySetCandidates.stream().filter(e -> e.getSettingStartTimeStamp().before(newValue)).collect(Collectors.toList()); + if (collect.isEmpty()) { + setCopySetCandidate(null); + } else { + setCopySetCandidate(collect.get(collect.size() - 1)); + } + } + } + + public SetLonglineLogbookStubDto getCopySetCandidate() { + return copySetCandidate; + } + + public void setCopySetCandidate(SetLonglineLogbookStubDto copySetCandidate) { + SetLonglineLogbookStubDto oldValue = getCopySetCandidate(); + this.copySetCandidate = copySetCandidate; + firePropertyChange("copySetCandidate", oldValue, copySetCandidate); + } + + public String getSetIdToCopy() { + return copySetCandidate == null ? null : copySetCandidate.getId(); + } } ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== @@ -1091,6 +1091,7 @@ observe.common.SetDto.action.goToOpen.short=Open set observe.common.SetDto.action.goToOpen.tip=Open set observe.common.SetLogbookDto.action.goToOpen.short=Logbook - Open set observe.common.SetLogbookDto.action.goToOpen.tip=Go to open set (Logbook) +observe.common.SetLonglineLogbookDto.action.copyValuesAndSave=Copy values and save observe.common.SetLonglineLogbookDto.action.reset.homeId.tip=Reset home id observe.common.SetLonglineLogbookDto.basketLineLength=Bakset line length (m) observe.common.SetLonglineLogbookDto.haulingTab=Hauling ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== @@ -1091,6 +1091,7 @@ observe.common.SetDto.action.goToOpen.short=Lance abierto observe.common.SetDto.action.goToOpen.tip=Acceder al lance abierto observe.common.SetLogbookDto.action.goToOpen.short=Logbook - Open set \#TODO observe.common.SetLogbookDto.action.goToOpen.tip=Go to open set (Logbook) \#TODO +observe.common.SetLonglineLogbookDto.action.copyValuesAndSave=Copy values and save \#TODO observe.common.SetLonglineLogbookDto.action.reset.homeId.tip=Reiniciar el id de negocio observe.common.SetLonglineLogbookDto.basketLineLength=Bakset line length (m) \#TODO observe.common.SetLonglineLogbookDto.haulingTab=Arrastre ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== @@ -1091,6 +1091,7 @@ observe.common.SetDto.action.goToOpen.short=Calée ouverte observe.common.SetDto.action.goToOpen.tip=Accéder à la calée ouverte observe.common.SetLogbookDto.action.goToOpen.short=Livre de bord - Calée ouverte observe.common.SetLogbookDto.action.goToOpen.tip=Accéder à la calée ouverte (Livre de bord) +observe.common.SetLonglineLogbookDto.action.copyValuesAndSave=Recopier les propriétés et enregister observe.common.SetLonglineLogbookDto.action.reset.homeId.tip=Réinitialiser l'id métier observe.common.SetLonglineLogbookDto.basketLineLength=Longueur de la ligne par panier (m) observe.common.SetLonglineLogbookDto.haulingTab=Virage ===================================== dto/src/main/java/fr/ird/observe/dto/data/longline/SetLonglineLogbookGlobalCompositionDto.java ===================================== @@ -102,4 +102,11 @@ public class SetLonglineLogbookGlobalCompositionDto extends GeneratedSetLongline firePropertyChange(PROPERTY_BAITS_COMPOSITION_PROPORTION_SUM, 0, sum); } + public void removeIds() { + setId(null); + getBaitsComposition().forEach(e -> e.setId(null)); + getBranchlinesComposition().forEach(e -> e.setId(null)); + getFloatlinesComposition().forEach(e -> e.setId(null)); + getHooksComposition().forEach(e -> e.setId(null)); + } } ===================================== dto/src/main/models/Observe-06-data-longline-logbook.model ===================================== @@ -96,6 +96,7 @@ catchLongline {*} data.longline.CatchLonglineLogbook | ordered data.longline.SetLonglineLogbookStub > data.Data | mainDto=skip homeId + {*:1} String number + {*:1} Integer +settingStartTimeStamp + {*:1} Date activityLongline {*:1} fr.ird.observe.dto.data.longline.ActivityLonglineLogbookReference | unique ===================================== persistence/src/main/java/fr/ird/observe/binder/data/longline/SetLonglineLogbookStubEntityDtoBinder.java ===================================== @@ -50,6 +50,7 @@ public class SetLonglineLogbookStubEntityDtoBinder extends DataEntityDtoBinderSu dto.setHomeId(entity.getHomeId()); dto.setNumber(entity.getNumber()); + dto.setSettingStartTimeStamp(entity.getSettingStartTimeStamp()); dto.setActivityLongline(toDataReference(referentialLocale, null)); } ===================================== server/src/main/filtered-resources/mapping ===================================== @@ -131,6 +131,7 @@ GET /api/v1/data/longline/SetLonglineLogbookService/loadForm GET /api/v1/data/longline/SetLonglineLogbookService/loadReferenceToRead v1.data.longline.SetLonglineLogbookServiceRestApi.loadReferenceToRead GET /api/v1/data/longline/SetLonglineLogbookService/preCreate v1.data.longline.SetLonglineLogbookServiceRestApi.preCreate POST /api/v1/data/longline/SetLonglineLogbookService/save v1.data.longline.SetLonglineLogbookServiceRestApi.save +POST /api/v1/data/longline/SetLonglineLogbookService/saveAndCopyProperties v1.data.longline.SetLonglineLogbookServiceRestApi.saveAndCopyProperties GET /api/v1/data/longline/SetLonglineObsCatchService/loadForm v1.data.longline.SetLonglineObsCatchServiceRestApi.loadForm POST /api/v1/data/longline/SetLonglineObsCatchService/save v1.data.longline.SetLonglineObsCatchServiceRestApi.save GET /api/v1/data/longline/SetLonglineObsDetailCompositionService/canDeleteBasket v1.data.longline.SetLonglineObsDetailCompositionServiceRestApi.canDeleteBasket ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/SetLonglineLogbookServiceLocal.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.services.local.service.data.longline; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -28,6 +28,7 @@ import fr.ird.observe.dto.DataNotFoundException; import fr.ird.observe.dto.data.longline.ActivityLonglineLogbookDto; import fr.ird.observe.dto.data.longline.ActivityLonglineLogbookReference; import fr.ird.observe.dto.data.longline.SetLonglineLogbookDto; +import fr.ird.observe.dto.data.longline.SetLonglineLogbookGlobalCompositionDto; import fr.ird.observe.dto.data.longline.SetLonglineLogbookReference; import fr.ird.observe.dto.data.longline.SetLonglineLogbookStubDto; import fr.ird.observe.dto.form.Form; @@ -36,6 +37,7 @@ import fr.ird.observe.entities.longline.ActivityLonglineLogbook; import fr.ird.observe.entities.longline.SetLonglineLogbook; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.services.local.service.ObserveServiceLocal; +import fr.ird.observe.services.service.data.longline.SetLonglineLogbookGlobalCompositionService; import fr.ird.observe.services.service.data.longline.SetLonglineLogbookService; import org.apache.commons.lang3.time.DateUtils; @@ -107,6 +109,32 @@ public class SetLonglineLogbookServiceLocal extends ObserveServiceLocal implemen return result; } + @Override + public SaveResultDto saveAndCopyProperties(String activityLonglineId, String setToCopyId, SetLonglineLogbookDto dto) { + ActivityLonglineLogbook activityLongline = ACTIVITY_LONGLINE_LOGBOOK_SPI.loadEntity(getTopiaPersistenceContext(), activityLonglineId); + SetLonglineLogbook entityToCopy = SET_LONGLINE_LOGBOOK_SPI.loadEntity(getTopiaPersistenceContext(), setToCopyId); + SetLonglineLogbook entity = SET_LONGLINE_LOGBOOK_SPI.loadOrCreateEntityFromDataDto(getTopiaPersistenceContext(), dto); + checkLastUpdateDate(entity, dto); + + SetLonglineLogbookGlobalCompositionService globalCompositionService = serviceContext.newService(SetLonglineLogbookGlobalCompositionService.class); + SetLonglineLogbookGlobalCompositionDto globalCompositionToCopy = globalCompositionService.loadForm(setToCopyId).getObject(); + + globalCompositionToCopy.removeIds(); + SET_LONGLINE_LOGBOOK_GLOBAL_COMPOSITION_SPI.copyDataDtoToEntity(globalCompositionToCopy, entity, getReferentialLocale()); + SET_LONGLINE_LOGBOOK_SPI.copyDataDtoToEntity(dto, entity, getReferentialLocale()); + + entity.setTotalLineLength(entityToCopy.getTotalLineLength()); + entity.setBasketLineLength(entityToCopy.getBasketLineLength()); + entity.setLengthBetweenBranchlines(entityToCopy.getLengthBetweenBranchlines()); + entity.setLineType(entityToCopy.getLineType()); + + SaveResultDto result = saveEntity(entity); + if (dto.isNotPersisted()) { + activityLongline.setSetLongline(entity); + } + return result; + } + @Override public void delete(String activityLonglineId, String setLonglineId) { ActivityLonglineLogbook activityLongline = ACTIVITY_LONGLINE_LOGBOOK_SPI.loadEntity(getTopiaPersistenceContext(), activityLonglineId); @@ -128,6 +156,7 @@ public class SetLonglineLogbookServiceLocal extends ObserveServiceLocal implemen otherSetDto.setId(otherSetLongline.getTopiaId()); otherSetDto.setHomeId(otherSetLongline.getHomeId()); otherSetDto.setNumber(otherSetLongline.getNumber()); + otherSetDto.setSettingStartTimeStamp(otherSetLongline.getSettingStartTimeStamp()); ActivityLonglineLogbookReference reference = binder.toReference(getReferentialLocale(), activityLongline); otherSetDto.setActivityLongline(reference); result.add(otherSetDto); ===================================== services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineLogbookService.java ===================================== @@ -64,6 +64,11 @@ public interface SetLonglineLogbookService extends ObserveService { @Post SaveResultDto save(String activityLonglineId, SetLonglineLogbookDto dto); + @WriteDataPermission + @Write + @Post + SaveResultDto saveAndCopyProperties(String activityLonglineId, String setToCopyId, SetLonglineLogbookDto dto); + @Write @WriteDataPermission @Delete View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f1d57b9c63c0913884165a7aeb0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f1d57b9c63c0913884165a7aeb0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Marée : redondance des listes Type de marée - Closes #1135
by Tony CHEMIT 14 Oct '18

14 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8acf530a by Tony CHEMIT at 2018-10-14T21:12:45Z [LL] Marée : redondance des listes Type de marée - Closes #1135 - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/CatchLonglineObsUIHandler.java - − client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/LogbookTripTypeUI.jaxx - − client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationTripTypeUIHandler.java - − client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationTripTypeUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationTripTypeUI.jaxx → client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationsMethodUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/LogbookTripTypeUIHandler.java → client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationsMethodUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/LogbookTripTypeUIModel.java → client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationsMethodUIModel.java - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - dto/src/main/models/Observe-03-referential-longline.model - dto/src/main/models/Observe-07-data-longline.model - dto/src/main/resources/i18n/dto_en_GB.properties - dto/src/main/resources/i18n/dto_es_ES.properties - dto/src/main/resources/i18n/dto_fr_FR.properties - persistence/src/main/java/fr/ird/observe/binder/data/longline/TripLonglineEntityDtoBinder.java - − persistence/src/main/java/fr/ird/observe/binder/referential/longline/LogbookTripTypeEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/referential/longline/ObservationTripTypeEntityDtoBinder.java → persistence/src/main/java/fr/ird/observe/binder/referential/longline/ObservationsMethodEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/persistence/Entities.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_1.java - persistence/src/main/models/Observe-03-referential-longline.model - persistence/src/main/models/Observe-07-data-longline.model - persistence/src/main/resources/db/migration/7.1/05_rename_tripType-common.sql - − persistence/src/main/resources/db/migration/7.1/15_add_logbook_trip_type-common.sql - persistence/src/main/resources/db/migration/7.2/08_add_trip_type-common.sql - persistence/src/main/resources/db/migration/7.2/09_update_longline_trip-H2.sql - persistence/src/main/resources/db/migration/7.2/09_update_longline_trip-PG.sql - services-client/src/test/java/fr/ird/observe/services/client/service/actions/validate/ValidateServiceClientTest.java - services-local/src/test/java/fr/ird/observe/spi/DbModelHelperTest.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8acf530a6919a1ac19850f45a1f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8acf530a6919a1ac19850f45a1f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Marée : redondance des listes Type de marée - Closes #1135
by Tony CHEMIT 14 Oct '18

14 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9634f856 by Tony CHEMIT at 2018-10-14T21:05:16Z [LL] Marée : redondance des listes Type de marée - Closes #1135 - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/CatchLonglineObsUIHandler.java - − client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/LogbookTripTypeUI.jaxx - − client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationTripTypeUIHandler.java - − client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationTripTypeUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationTripTypeUI.jaxx → client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationsMethodUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/LogbookTripTypeUIHandler.java → client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationsMethodUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/LogbookTripTypeUIModel.java → client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationsMethodUIModel.java - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - dto/src/main/models/Observe-03-referential-longline.model - dto/src/main/models/Observe-07-data-longline.model - dto/src/main/resources/i18n/dto_en_GB.properties - dto/src/main/resources/i18n/dto_es_ES.properties - dto/src/main/resources/i18n/dto_fr_FR.properties - persistence/src/main/java/fr/ird/observe/binder/data/longline/TripLonglineEntityDtoBinder.java - − persistence/src/main/java/fr/ird/observe/binder/referential/longline/LogbookTripTypeEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/referential/longline/ObservationTripTypeEntityDtoBinder.java → persistence/src/main/java/fr/ird/observe/binder/referential/longline/ObservationsMethodEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/persistence/Entities.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_1.java - persistence/src/main/models/Observe-03-referential-longline.model - persistence/src/main/models/Observe-07-data-longline.model - persistence/src/main/resources/db/migration/7.1/05_rename_tripType-common.sql - − persistence/src/main/resources/db/migration/7.1/15_add_logbook_trip_type-common.sql - persistence/src/main/resources/db/migration/7.2/08_add_trip_type-common.sql - persistence/src/main/resources/db/migration/7.2/09_update_longline_trip-H2.sql - persistence/src/main/resources/db/migration/7.2/09_update_longline_trip-PG.sql - services-client/src/test/java/fr/ird/observe/services/client/service/actions/validate/ValidateServiceClientTest.java - services-local/src/test/java/fr/ird/observe/spi/DbModelHelperTest.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9634f85677a52c57841f4bdfe12… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9634f85677a52c57841f4bdfe12… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Marée : redondance des listes Type de marée - Closes #1135
by Tony CHEMIT 14 Oct '18

14 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7cb2f770 by Tony CHEMIT at 2018-10-14T20:50:08Z [LL] Marée : redondance des listes Type de marée - Closes #1135 - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/CatchLonglineObsUIHandler.java - − client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/LogbookTripTypeUI.jaxx - − client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationTripTypeUIHandler.java - − client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationTripTypeUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationTripTypeUI.jaxx → client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationsMethodUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/LogbookTripTypeUIHandler.java → client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationsMethodUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/LogbookTripTypeUIModel.java → client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationsMethodUIModel.java - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - dto/src/main/models/Observe-03-referential-longline.model - dto/src/main/models/Observe-07-data-longline.model - dto/src/main/resources/i18n/dto_en_GB.properties - dto/src/main/resources/i18n/dto_es_ES.properties - dto/src/main/resources/i18n/dto_fr_FR.properties - persistence/src/main/java/fr/ird/observe/binder/data/longline/TripLonglineEntityDtoBinder.java - − persistence/src/main/java/fr/ird/observe/binder/referential/longline/LogbookTripTypeEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/referential/longline/ObservationTripTypeEntityDtoBinder.java → persistence/src/main/java/fr/ird/observe/binder/referential/longline/ObservationsMethodEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/persistence/Entities.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_1.java - persistence/src/main/models/Observe-03-referential-longline.model - persistence/src/main/models/Observe-07-data-longline.model - persistence/src/main/resources/db/migration/7.1/05_rename_tripType-common.sql - − persistence/src/main/resources/db/migration/7.1/15_add_logbook_trip_type-common.sql - persistence/src/main/resources/db/migration/7.2/08_add_trip_type-common.sql - persistence/src/main/resources/db/migration/7.2/09_update_longline_trip-H2.sql - persistence/src/main/resources/db/migration/7.2/09_update_longline_trip-PG.sql - services-client/src/test/java/fr/ird/observe/services/client/service/actions/validate/ValidateServiceClientTest.java - services-local/src/test/java/fr/ird/observe/spi/DbModelHelperTest.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7cb2f770807935484f35c2faa03… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7cb2f770807935484f35c2faa03… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Marée : redondance des listes Type de marée - Closes #1135
by Tony CHEMIT 14 Oct '18

14 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 879cc1a8 by Tony CHEMIT at 2018-10-14T20:29:01Z [LL] Marée : redondance des listes Type de marée - Closes #1135 - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/CatchLonglineObsUIHandler.java - − client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/LogbookTripTypeUI.jaxx - − client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationTripTypeUIHandler.java - − client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationTripTypeUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationTripTypeUI.jaxx → client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationsMethodUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/LogbookTripTypeUIHandler.java → client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationsMethodUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/LogbookTripTypeUIModel.java → client/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ObservationsMethodUIModel.java - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - dto/src/main/models/Observe-03-referential-longline.model - dto/src/main/models/Observe-07-data-longline.model - dto/src/main/resources/i18n/dto_en_GB.properties - dto/src/main/resources/i18n/dto_es_ES.properties - dto/src/main/resources/i18n/dto_fr_FR.properties - persistence/src/main/java/fr/ird/observe/binder/data/longline/TripLonglineEntityDtoBinder.java - − persistence/src/main/java/fr/ird/observe/binder/referential/longline/LogbookTripTypeEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/referential/longline/ObservationTripTypeEntityDtoBinder.java → persistence/src/main/java/fr/ird/observe/binder/referential/longline/ObservationsMethodEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/persistence/Entities.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_1.java - persistence/src/main/models/Observe-03-referential-longline.model - persistence/src/main/models/Observe-07-data-longline.model - persistence/src/main/resources/db/migration/7.1/05_rename_tripType-common.sql - − persistence/src/main/resources/db/migration/7.1/15_add_logbook_trip_type-common.sql - persistence/src/main/resources/db/migration/7.2/08_add_trip_type-common.sql - persistence/src/main/resources/db/migration/7.2/09_update_longline_trip-H2.sql - persistence/src/main/resources/db/migration/7.2/09_update_longline_trip-PG.sql - services-client/src/test/java/fr/ird/observe/services/client/service/actions/validate/ValidateServiceClientTest.java - services-local/src/test/java/fr/ird/observe/spi/DbModelHelperTest.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/879cc1a8d3e8981d751392bcaa3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/879cc1a8d3e8981d751392bcaa3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Débarquements : petits ajustements 2 - Closes #1137
by Tony CHEMIT 14 Oct '18

14 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ebe44cac by Tony CHEMIT at 2018-10-14T18:52:58Z [LL] Débarquements : petits ajustements 2 - Closes #1137 - - - - - 14 changed files: - client/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/SelectTransshipmentLandingLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineLandingLogbookUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineLandingLogbookUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineLandingLogbookUIModel.java - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_4.java - − persistence/src/main/resources/db/migration/7.4/02_update_referential_common_harbour-common.sql - test/src/main/resources/db/7.4/dataForTestLongline.sql.gz - test/src/main/resources/db/7.4/dataForTestSeine.sql.gz - test/src/main/resources/db/7.4/referentiel.sql.gz - test/src/main/resources/fixtures/count-referential-common.properties Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java ===================================== @@ -74,6 +74,7 @@ public abstract class ObserveKeyStrokes { public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_FROM_RIGHT = KeyStroke.getKeyStroke("ctrl pressed B"); public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_FROM_BOTH = KeyStroke.getKeyStroke("ctrl pressed C"); + public static final KeyStroke KEY_STROKE_SELECT_TRANSSHIPMENT = KeyStroke.getKeyStroke("ctrl pressed T"); public static final KeyStroke KEY_STROKE_SAVE_TABLE_ENTRY = KeyStroke.getKeyStroke("ctrl pressed S"); public static final KeyStroke KEY_STROKE_PRESSED_ENTER = KeyStroke.getKeyStroke("pressed ENTER"); public static final KeyStroke KEY_STROKE_RESET = KeyStroke.getKeyStroke("ctrl pressed R"); ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/SelectTransshipmentLandingLogbookUIAction.java ===================================== @@ -0,0 +1,54 @@ +package fr.ird.observe.client.ui.actions.content.data.longline; + +/*- + * #%L + * ObServe :: Client + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.client.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.actions.content.api.AbstractContentUIAction; +import fr.ird.observe.client.ui.content.api.ContentUI; +import fr.ird.observe.client.ui.content.data.longline.logbook.TripLonglineLandingLogbookUI; +import fr.ird.observe.client.ui.content.data.longline.logbook.TripLonglineLandingLogbookUIModel; + +import static org.nuiton.i18n.I18n.n; + +/** + * Created by tchemit on 14/10/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class SelectTransshipmentLandingLogbookUIAction extends AbstractContentUIAction { + + public static final String ACTION_NAME = SelectTransshipmentLandingLogbookUIAction.class.getName(); + + public SelectTransshipmentLandingLogbookUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, n("observe.common.TripLonglineLandingLogbookDto.action.selectTransshipment"), n("observe.common.TripLonglineLandingLogbookDto.action.selectTransshipment"), "data-calcule", ObserveKeyStrokes.KEY_STROKE_SELECT_TRANSSHIPMENT); + } + + @Override + protected void actionPerformed(ContentUI contentUI) { + + TripLonglineLandingLogbookUI ui = (TripLonglineLandingLogbookUI) contentUI; + TripLonglineLandingLogbookUIModel model = ui.getModel(); + model.selectTransshipment(); + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineLandingLogbookUI.jaxx ===================================== @@ -39,6 +39,7 @@ fr.ird.observe.client.ui.actions.content.data.longline.delete.DeleteTripLonglineLandingLogbookUIAction fr.ird.observe.client.ui.actions.content.data.longline.move.MoveSingleTripLonglineLandingLogbookUIAction fr.ird.observe.client.ui.actions.content.data.longline.save.SaveTripLonglineLandingLogbookUIAction + fr.ird.observe.client.ui.actions.content.data.longline.SelectTransshipmentLandingLogbookUIAction fr.ird.observe.client.ui.util.JComment fr.ird.observe.client.ObserveSwingApplicationContext @@ -121,7 +122,10 @@ <JLabel id='harbourLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanFilterableComboBox id='harbour' constructorParams='this' genericType='HarbourReference'/> + <JPanel layout="{new BorderLayout()}"> + <BeanFilterableComboBox id='harbour' constructorParams='this' genericType='HarbourReference' constraints='BorderLayout.CENTER'/> + <JButton id='selectTransshipment' constraints='BorderLayout.EAST'/> + </JPanel> </cell> </row> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineLandingLogbookUI.jcss ===================================== @@ -99,3 +99,7 @@ #save { _observeAction:{SaveTripLonglineLandingLogbookUIAction.ACTION_NAME}; } + +#selectTransshipment { + _observeAction:{SelectTransshipmentLandingLogbookUIAction.ACTION_NAME}; +} ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineLandingLogbookUIModel.java ===================================== @@ -22,9 +22,12 @@ package fr.ird.observe.client.ui.content.data.longline.logbook; * #L% */ +import fr.ird.observe.client.ui.content.api.ContentUI; import fr.ird.observe.client.ui.content.api.data.open.ContentOpenableUIModel; import fr.ird.observe.dto.data.longline.LandingLogbookDto; import fr.ird.observe.dto.data.longline.LandingLogbookReference; +import fr.ird.observe.dto.referential.HarbourReference; +import fr.ird.observe.dto.referential.VesselReference; import org.nuiton.i18n.I18n; /** @@ -37,8 +40,27 @@ public class TripLonglineLandingLogbookUIModel extends ContentOpenableUIModel<La private static final long serialVersionUID = 1L; + //FIXME-PROTECTED-ID + private static final String LONGLINE_LANDING_LOGBOOK_TRANSSHIPMENT_VESSEL_ID = "fr.ird.observe.entities.referentiel.Vessel#1308214144311#0.8813727202637713"; + //FIXME-PROTECTED-ID + private static final String LONGLINE_LANDING_LOGBOOK_TRANSSHIPMENT_HARBOUR_ID = "fr.ird.observe.entities.referentiel.Harbour#11#0.38"; + + private HarbourReference transshipmentHarbour; + private VesselReference transshipmentVessel; + public TripLonglineLandingLogbookUIModel() { super(LandingLogbookDto.class, I18n.n("observe.common.TripLonglineLandingLogbookDto.message.not.open")); } + @Override + public void init(ContentUI ui) { + super.init(ui); + transshipmentHarbour = ui.getDataSource().getReferentialReferenceSet(HarbourReference.class).tryGetReferenceById(LONGLINE_LANDING_LOGBOOK_TRANSSHIPMENT_HARBOUR_ID).orElseThrow(IllegalStateException::new); + transshipmentVessel = ui.getDataSource().getReferentialReferenceSet(VesselReference.class).tryGetReferenceById(LONGLINE_LANDING_LOGBOOK_TRANSSHIPMENT_VESSEL_ID).orElseThrow(IllegalStateException::new); + } + + public void selectTransshipment() { + getBean().setHarbour(transshipmentHarbour); + getBean().setVessel(transshipmentVessel); + } } ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== @@ -1339,6 +1339,7 @@ observe.common.TripLonglineLandingLogbookDto.action.moves.tip=Move selected land observe.common.TripLonglineLandingLogbookDto.action.reopen.tip=Reopen landing observe.common.TripLonglineLandingLogbookDto.action.reopenSelected=Reopen landing observe.common.TripLonglineLandingLogbookDto.action.reopenSelected.tip=Reopen landing +observe.common.TripLonglineLandingLogbookDto.action.selectTransshipment=Transshipment at sea observe.common.TripLonglineLandingLogbookDto.comment=Comment observe.common.TripLonglineLandingLogbookDto.list=List of landings observe.common.TripLonglineLandingLogbookDto.list.message.none=< No landing for current trip > ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== @@ -1339,6 +1339,7 @@ observe.common.TripLonglineLandingLogbookDto.action.moves.tip=Move selected land observe.common.TripLonglineLandingLogbookDto.action.reopen.tip=Reopen landing observe.common.TripLonglineLandingLogbookDto.action.reopenSelected=Reopen landing observe.common.TripLonglineLandingLogbookDto.action.reopenSelected.tip=Reopen landing +observe.common.TripLonglineLandingLogbookDto.action.selectTransshipment=Transbordo en el mar observe.common.TripLonglineLandingLogbookDto.comment=Comment observe.common.TripLonglineLandingLogbookDto.list=List of landings observe.common.TripLonglineLandingLogbookDto.list.message.none=< No landing for current trip > ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== @@ -1339,6 +1339,7 @@ observe.common.TripLonglineLandingLogbookDto.action.moves.tip=Déplacer les déb observe.common.TripLonglineLandingLogbookDto.action.reopen.tip=Rouvrir le débarquement observe.common.TripLonglineLandingLogbookDto.action.reopenSelected=Rouvrir le débarquement observe.common.TripLonglineLandingLogbookDto.action.reopenSelected.tip=Rouvrir le débarquement sélectionné +observe.common.TripLonglineLandingLogbookDto.action.selectTransshipment=Transbordement en mer observe.common.TripLonglineLandingLogbookDto.comment=Commentaire de le débarquement observe.common.TripLonglineLandingLogbookDto.list=Liste des débarquements observe.common.TripLonglineLandingLogbookDto.list.message.none=< Aucun débarquement pour la marée courante > ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_4.java ===================================== @@ -42,7 +42,6 @@ public class DataSourceMigrationForVersion_7_4 extends MigrationVersionResource @Override public void generateSqlScript(MigrationVersionResourceExecutor executor) { executor.addScript("01", "update_referential_longline_conservation"); - executor.addScript("02", "update_referential_common_harbour"); executor.addScript("03", "update_referential_longline_line_type"); executor.addScript("04", "update_longline_set_logbook_field"); executor.addScript("05", "update_longline_activity_logbook_field"); ===================================== persistence/src/main/resources/db/migration/7.4/02_update_referential_common_harbour-common.sql deleted ===================================== @@ -1,23 +0,0 @@ ---- --- #%L --- ObServe :: Persistence --- %% --- Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io --- %% --- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU General Public License as --- published by the Free Software Foundation, either version 3 of the --- License, or (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public --- License along with this program. If not, see --- <http://www.gnu.org/licenses/gpl-3.0.html>. --- #L% ---- -INSERT INTO observe_common.Harbour(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, name) values ('fr.ird.observe.entities.referentiel.Harbour#11#0.100' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, '998', 'At sea transshipment'); -UPDATE observe_common.LASTUPDATEDATE SET lastupdatedate = CURRENT_TIMESTAMP WHERE topiaId = 'fr.ird.observe.entities.LastUpdateDate#1236861982132#0.06'; ===================================== test/src/main/resources/db/7.4/dataForTestLongline.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/7.4/dataForTestSeine.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/db/7.4/referentiel.sql.gz ===================================== The diff for this file was not included because it is too large. ===================================== test/src/main/resources/fixtures/count-referential-common.properties ===================================== @@ -27,7 +27,7 @@ observe_common.gear=26 observe_common.gear_gearcaracteristic=29 observe_common.gearcaracteristic=22 observe_common.gearcaracteristictype=6 -observe_common.harbour=75 +observe_common.harbour=74 observe_common.lastupdatedate=125 observe_common.lengthlengthparameter=0 observe_common.lengthmeasuremethod=4 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ebe44cac1a88981ba2c3d05a869… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ebe44cac1a88981ba2c3d05a869… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 11 commits: update changelog
by Tony CHEMIT 14 Oct '18

14 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a640b3f6 by Tony CHEMIT at 2018-10-14T13:49:34Z update changelog - - - - - 10ac78bf by Tony CHEMIT at 2018-10-14T14:59:39Z [PS] Calée / Captures accessoires : le numéro de cuve n'est plus éditable après le premier enregistrement - Closes #1143 - - - - - 514ffc6b by Tony CHEMIT at 2018-10-14T15:00:09Z Problème d'affichage dans l'UI référentiel relations taille-poids - Closes #1142 - - - - - f0eba373 by Tony CHEMIT at 2018-10-14T15:03:27Z Création de profils de connexions : cosmétique - Closes #1140 - - - - - 6851f554 by Tony CHEMIT at 2018-10-14T15:03:56Z Création de profils de connexions : cosmétique - Closes #1642 - - - - - 22362a2c by Tony CHEMIT at 2018-10-14T15:17:54Z Amélioration du composant de cartographie - Closes #901 - - - - - df297092 by Tony CHEMIT at 2018-10-14T16:23:56Z [PS][FOB] Plusieurs mappings anciens types FAD / Nouveaux matériaux sont erronés - Closes #1136 - - - - - 840b8d10 by Tony CHEMIT at 2018-10-14T16:24:02Z Revoir le rapport utilisation des dcp - Closes #1082 - - - - - 29cc0ae2 by Tony CHEMIT at 2018-10-14T16:24:03Z Realign database model version to 7.0 - - - - - b71a5868 by Tony CHEMIT at 2018-10-14T16:24:10Z Realign database model version to 7.0 - - - - - 592402c9 by Tony CHEMIT at 2018-10-14T17:44:10Z [LL] Débarquements : petits ajustements - Closes #1121 (validation poids et pas du nombre) - - - - - 30 changed files: - .mvn/gitlab-cache/milestones/532657-issues.json - .mvn/gitlab-cache/milestones/532657.json - + .mvn/gitlab-cache/milestones/655988-artifacts.json - .mvn/gitlab-cache/milestones/655988-issues.json - .mvn/gitlab-cache/milestones/655988.json - + .mvn/gitlab-cache/milestones/674086-issues.json - + .mvn/gitlab-cache/milestones/674086.json - CHANGELOG.md - client/pom.xml - client/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - + client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CancelRemoteUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CancelServerUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/CreatePresetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/SaveRemoteUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/SaveServerUIAction.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIManager.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchUI.jcss - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUI.jcss - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIModel.java - client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java - client/src/main/java/fr/ird/observe/client/ui/util/tripMap/ObserveMapPane.java - client/src/main/java/fr/ird/observe/client/ui/util/tripMap/TripMapUI.jcss - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties - persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_1.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_2.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/eed3e13c7c22f83b8bb3c26e03… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/eed3e13c7c22f83b8bb3c26e03… You're receiving this email because of your account on gitlab.com.

1 0