May 2019 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] Pas d'accès aux informations techniques immédiatement après la création d'un...
by Tony CHEMIT 31 May '19

31 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e7590f4a by tchemit at 2019-05-31T01:26:35Z Pas d'accès aux informations techniques immédiatement après la création d'un référentiel - Closes #1306 - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/SaveReferentialUIAction.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/SaveReferentialUIAction.java ===================================== @@ -25,6 +25,7 @@ package fr.ird.observe.client.ui.actions.content.api.ref; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ui.ObserveKeyStrokes; import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.content.api.ContentMode; import fr.ird.observe.client.ui.content.api.ref.ContentReferenceUI; import fr.ird.observe.client.ui.content.api.ref.ContentReferenceUIModel; import fr.ird.observe.client.ui.content.ref.usage.UsageForDesactivateUIHandler; @@ -94,7 +95,7 @@ public class SaveReferentialUIAction<D extends ReferentialDto, R extends Referen log.info("Create referentiel " + bean); SaveResultDto saveResult = getServicesProvider().getReferentialService().save(bean); saveResult.toDto(bean); - afterSave(ui, bean, notPersisted); +// afterSave(ui, bean, notPersisted); return true; } @@ -152,7 +153,7 @@ public class SaveReferentialUIAction<D extends ReferentialDto, R extends Referen // sauvegarde du bean d'edition dans le bean de la base SaveResultDto saveResult = getServicesProvider().getReferentialService().save(bean); saveResult.toDto(bean); - afterSave(ui, bean, notPersisted); +// afterSave(ui, bean, notPersisted); return true; } @@ -187,6 +188,21 @@ public class SaveReferentialUIAction<D extends ReferentialDto, R extends Referen FormDefinition<D> formDefinition = formDefinitionOptional.get(); model.getReferenceCache().loadReferentialReferenceSetsInModel(formDefinition, true); } + + if (notPersisted) { + ui.getModel().setMode(ContentMode.UPDATE); + } + ui.getModel().updateUiWithReferenceSetsFromModel(); + int size = ui.getList().getModel().getSize(); + R selectedValue = null; + for (int i = 0; i < size; i++) { + R elementAt = ui.getList().getModel().getElementAt(i); + if (elementAt.getId().equals(bean.getId())) { + selectedValue = elementAt; + break; + } + } + ui.getList().setSelectedValue(selectedValue, false); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e7590f4a3d1a662e8e2b4af7506… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e7590f4a3d1a662e8e2b4af7506… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: [TREE] Parfois un affichage tronqué sans raison - See #1269
by Tony CHEMIT 28 May '19

28 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: df964e91 by tchemit at 2019-05-28T11:06:31Z [TREE] Parfois un affichage tronqué sans raison - See #1269 - - - - - f403408e by tchemit at 2019-05-28T11:06:52Z Make some adjustments on TripLongline form - - - - - e2ee500f by tchemit at 2019-05-28T11:50:09Z Improve landing form - - - - - 16 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripLonglineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripLonglineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripLonglineUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/TripSeineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/TripSeineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/TripSeineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeCellRenderer.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 - validation/src/main/i18n/getters/validation-messages.getter - validation/src/main/resources/fr/ird/observe/dto/data/ll/landing/LandingLonglineDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/ll/landing/LandingLonglineDto-update-error-validation.xml Changes: ===================================== client-core/src/main/i18n/getters/java.getter ===================================== @@ -730,6 +730,10 @@ observe.common.TripDto.action.goToOpen.tip observe.common.TripDto.action.moves observe.common.TripDto.action.moves.tip observe.common.TripLonglineDto.message.not.open +observe.common.TripLonglineDto.with.logbooks.message +observe.common.TripLonglineDto.with.logbooks.title +observe.common.TripLonglineDto.with.observations.message +observe.common.TripLonglineDto.with.observations.title observe.common.TripLonglineLandingDto.action.delete.tip observe.common.TripLonglineLandingDto.action.goToOpen.short observe.common.TripLonglineLandingDto.action.goToOpen.tip ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripLonglineUI.jaxx ===================================== @@ -69,16 +69,6 @@ <field name='activityLonglineObs' component='{actionDown}'/> </BeanValidator> - <script><![CDATA[ - -protected boolean canEditOcean(java.util.LinkedHashSet<TripLonglineActivityObsDto> activities) { - return activities == null || activities.isEmpty(); -} - -]]> - </script> - -  <JPanel id="body" layout='{new BorderLayout()}'> <JScrollPane id='bodyScrollPane' constraints='BorderLayout.CENTER'> <JTabbedPane id='mainTabbedPane'> @@ -226,7 +216,7 @@ protected boolean canEditOcean(java.util.LinkedHashSet<TripLonglineActivityObsDt <JLabel id='availableDataLabel'/> </cell> <cell anchor='west' weightx="0.5"> - <JPanel layout="{new GridLayout(1,0)}"> + <JPanel layout="{new GridLayout(1,0)}" beanScope="model"> <BeanCheckBox id='observationsAvailability'/> <BeanCheckBox id='logbookAvailability'/> </JPanel> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripLonglineUI.jcss ===================================== @@ -46,13 +46,9 @@ } /* ***************************************************************************** */ -/* CARACTERISTICS TAB ********************************************************* */ +/* GENERAL TAB **************************************************************** */ /* ***************************************************************************** */ -#ocean { - enabled:{canEditOcean(bean.getActivityLonglineObs())}; -} - #totalFishingOperationsNumber { font-weight:bold; text:{getStringValue(bean.getTotalFishingOperationsNumber())}; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripLonglineUIHandler.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.content.data.ll.common; * 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.client.ui.content.api.data.open.ContentOpenableUIHandler; import fr.ird.observe.client.ui.content.api.spi.ContentUIReferenceCache; import fr.ird.observe.client.ui.content.api.spi.ReferentialReferencesFilter; import fr.ird.observe.client.ui.content.api.ui.ObserveLayoutFocusTraversalPolicy; +import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.client.ui.util.tripMap.TripMapUI; import fr.ird.observe.dto.data.TripMapDto; import fr.ird.observe.dto.data.ll.common.TripLonglineDto; @@ -50,6 +51,12 @@ import javax.swing.JTabbedPane; import javax.swing.SwingUtilities; import java.awt.Component; import java.awt.Container; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyVetoException; +import java.beans.VetoableChangeListener; +import java.util.Objects; + +import static io.ultreia.java4all.i18n.I18n.t; /** * Created on 8/27/14. @@ -62,6 +69,13 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto, Tr private static final Logger log = LogManager.getLogger(TripLonglineUIHandler.class); private boolean buildTripMap = true; + private final VetoableChangeListener logbooksAvailabilityListener; + private final VetoableChangeListener observationsAvailabilityListener; + + TripLonglineUIHandler() { + logbooksAvailabilityListener = this::onLogbooksAvailabilityChanged; + observationsAvailabilityListener = this::onObservationsAvailabilityChanged; + } @Override public TripLonglineUIModel getModel() { @@ -76,7 +90,7 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto, Tr referenceCache.addReferentialFilter(TripLonglineDto.PROPERTY_LOGBOOK_DATA_ENTRY_OPERATOR, (ReferentialReferencesFilter<PersonDto, PersonReference>) PersonHelper::filterDataEntryOperatorReferences); referenceCache.addReferentialFilter(TripLonglineDto.PROPERTY_VESSEL, (ReferentialReferencesFilter<VesselDto, VesselReference>) incomingReferences -> { ClientConfig config = ObserveSwingApplicationContext.get().getConfig(); - return VesselHelper.filterVesselReferencesByVesselTypeIds(incomingReferences, config.getLonglineVesselTypeIds()); + return VesselHelper.filterVesselReferencesByVesselTypeIds(incomingReferences, config.getLonglineVesselTypeIds()); }); referenceCache.addReferentialFilter(TripLonglineDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> { String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineTripId(); @@ -95,7 +109,7 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto, Tr tripMap.getHandler().init(ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)); tripMap.addPropertyChangeListener(TripMapUI.PROPERTY_SHOW_OBSERVATION, e -> updateMapModel()); tripMap.addPropertyChangeListener(TripMapUI.PROPERTY_SHOW_LOGBOOK, e -> updateMapModel()); - getUi().getMainTabbedPane().addChangeListener(e -> { + ui.getMainTabbedPane().addChangeListener(e -> { JTabbedPane tripLonglineTabPane = (JTabbedPane) e.getSource(); TripLonglineUI ui1 = getUi(); TripMapUI tripMap1 = ui1.getTripMap(); @@ -201,6 +215,43 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto, Tr buildTripMap = true; } + @Override + public void startEditUI() { + super.startEditUI(); + TripLonglineUIModel model = getModel(); + TripLonglineDto bean = model.getBean(); + ui.getOcean().setEnabled(bean.getActivityObsCount() == 0 && bean.getActivityLogbookCount() == 0); + if (model.isUpdatingMode()) { + model.removeVetoableChangeListener(TripLonglineDto.PROPERTY_LOGBOOK_AVAILABILITY, logbooksAvailabilityListener); + model.removeVetoableChangeListener(TripLonglineDto.PROPERTY_OBSERVATIONS_AVAILABILITY, observationsAvailabilityListener); + model.addVetoableChangeListener(TripLonglineDto.PROPERTY_LOGBOOK_AVAILABILITY, logbooksAvailabilityListener); + model.addVetoableChangeListener(TripLonglineDto.PROPERTY_OBSERVATIONS_AVAILABILITY, observationsAvailabilityListener); + } + } + + @Override + public void stopEditUI() { + getModel().removeVetoableChangeListener(TripLonglineDto.PROPERTY_LOGBOOK_AVAILABILITY, logbooksAvailabilityListener); + getModel().removeVetoableChangeListener(TripLonglineDto.PROPERTY_OBSERVATIONS_AVAILABILITY, observationsAvailabilityListener); + super.stopEditUI(); + } + + private void onLogbooksAvailabilityChanged(PropertyChangeEvent event) throws PropertyVetoException { + if (getModel().isUpdatingMode() && Objects.equals(Boolean.FALSE, event.getNewValue()) && getModel().getBean().getActivityLogbookCount() > 0) { + String message = t("observe.common.TripLonglineDto.with.logbooks.message"); + UIHelper.displayWarning(t("observe.common.TripLonglineDto.with.logbooks.title"), message); + throw new PropertyVetoException(message, event); + } + } + + private void onObservationsAvailabilityChanged(PropertyChangeEvent event) throws PropertyVetoException { + if (getModel().isUpdatingMode() && Objects.equals(Boolean.FALSE, event.getNewValue()) && getModel().getBean().getActivityObsCount() > 0) { + String message = t("observe.common.TripLonglineDto.with.observations.message"); + UIHelper.displayWarning(t("observe.common.TripLonglineDto.with.observations.title"), message); + throw new PropertyVetoException(message, event); + } + } + private void buildTripMap() { SwingUtilities.invokeLater(() -> { ObserveSwingApplicationContext.get().getMainUI().getModel().setBusy(true); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripLonglineUIModel.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.content.data.ll.common; * 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>. @@ -27,11 +27,16 @@ import fr.ird.observe.client.ui.content.api.data.open.ContentOpenableUIModel; import fr.ird.observe.dto.data.ll.common.TripLonglineDto; import fr.ird.observe.dto.data.ll.common.TripLonglineReference; import fr.ird.observe.dto.form.Form; +import io.ultreia.java4all.bean.JavaBean; +import io.ultreia.java4all.bean.definition.JavaBeanDefinition; +import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; +import io.ultreia.java4all.i18n.I18n; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import io.ultreia.java4all.i18n.I18n; import org.nuiton.util.DateUtil; +import java.beans.PropertyChangeListener; +import java.beans.PropertyVetoException; import java.util.Date; /** @@ -40,7 +45,9 @@ import java.util.Date; * @author Tony Chemit - dev(a)tchemit.fr * @since XXX */ -public class TripLonglineUIModel extends ContentOpenableUIModel<TripLonglineDto, TripLonglineReference> { +@SuppressWarnings("WeakerAccess") +@GenerateJavaBeanDefinition +public class TripLonglineUIModel extends ContentOpenableUIModel<TripLonglineDto, TripLonglineReference> implements JavaBean { private static final long serialVersionUID = 1L; private static final Logger log = LogManager.getLogger(TripLonglineUIModel.class); @@ -49,6 +56,34 @@ public class TripLonglineUIModel extends ContentOpenableUIModel<TripLonglineDto, super(TripLonglineDto.class, I18n.n("observe.common.TripLonglineDto.message.not.open")); } + public boolean isLogbookAvailability() { + return getBean().isLogbookAvailability(); + } + + public void setLogbookAvailability(boolean logbookAvailability) { + try { + boolean oldValue = isLogbookAvailability(); + fireVetoableChange(TripLonglineDto.PROPERTY_LOGBOOK_AVAILABILITY, oldValue, logbookAvailability); + getBean().setLogbookAvailability(logbookAvailability); + firePropertyChange(TripLonglineDto.PROPERTY_LOGBOOK_AVAILABILITY, oldValue, logbookAvailability); + } catch (PropertyVetoException ignored) { + } + } + + public boolean isObservationsAvailability() { + return getBean().isObservationsAvailability(); + } + + public void setObservationsAvailability(boolean observationsAvailability) { + try { + boolean oldValue = isObservationsAvailability(); + fireVetoableChange(TripLonglineDto.PROPERTY_OBSERVATIONS_AVAILABILITY, oldValue, observationsAvailability); + getBean().setObservationsAvailability(observationsAvailability); + firePropertyChange(TripLonglineDto.PROPERTY_OBSERVATIONS_AVAILABILITY, oldValue, observationsAvailability); + } catch (PropertyVetoException ignored) { + } + } + @Override public void openForm(Form<TripLonglineDto> form) { super.openForm(form); @@ -59,19 +94,22 @@ public class TripLonglineUIModel extends ContentOpenableUIModel<TripLonglineDto, getBean().setEndDate(date); log.debug(getPrefix() + "date fin " + date); } + firePropertyChange(TripLonglineDto.PROPERTY_LOGBOOK_AVAILABILITY, isLogbookAvailability()); + firePropertyChange(TripLonglineDto.PROPERTY_OBSERVATIONS_AVAILABILITY, isObservationsAvailability()); } @Override + public void init(ContentUI ui) { super.init(ui); - getBean().addPropertyChangeListener(TripLonglineDto.PROPERTY_START_DATE, e->{ - TripLonglineDto bean = (TripLonglineDto) e.getSource(); - bean.updateNoOfDays(); - }); - getBean().addPropertyChangeListener(TripLonglineDto.PROPERTY_END_DATE, e->{ - TripLonglineDto bean = (TripLonglineDto) e.getSource(); - bean.updateNoOfDays(); - }); + PropertyChangeListener propertyChangeListener = e -> ((TripLonglineDto) e.getSource()).updateNoOfDays(); + getBean().addPropertyChangeListener(TripLonglineDto.PROPERTY_START_DATE, propertyChangeListener); + getBean().addPropertyChangeListener(TripLonglineDto.PROPERTY_END_DATE, propertyChangeListener); + } + + @Override + public JavaBeanDefinition javaBeanDefinition() { + return new TripLonglineUIModelJavaBeanDefinition(); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUI.jaxx ===================================== @@ -106,26 +106,26 @@ </cell> </row> -  +  <row> <cell> - <JLabel id='vesselLabel'/> + <JLabel id='harbourLabel'/> </cell> <cell weightx='1' anchor='east'> - <BeanFilterableComboBox id='vessel' constructorParams='this' genericType='VesselReference'/> + <JPanel layout="{new BorderLayout()}"> + <BeanFilterableComboBox id='harbour' constructorParams='this' genericType='HarbourReference' constraints='BorderLayout.CENTER'/> + <JButton id='selectTransshipment' constraints='BorderLayout.EAST'/> + </JPanel> </cell> </row> -  +  <row> <cell> - <JLabel id='harbourLabel'/> + <JLabel id='vesselLabel'/> </cell> <cell weightx='1' anchor='east'> - <JPanel layout="{new BorderLayout()}"> - <BeanFilterableComboBox id='harbour' constructorParams='this' genericType='HarbourReference' constraints='BorderLayout.CENTER'/> - <JButton id='selectTransshipment' constraints='BorderLayout.EAST'/> - </JPanel> + <BeanFilterableComboBox id='vessel' constructorParams='this' genericType='VesselReference'/> </cell> </row> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/TripSeineUI.jaxx ===================================== @@ -76,15 +76,6 @@ <field name='route' component='{actionDown}'/> </BeanValidator> - <script><![CDATA[ - -protected boolean canEditOcean(java.util.LinkedHashSet<RouteStubDto> routes) { - return routes == null || routes.isEmpty(); -} - -]]> - </script> -  <JPanel id="body" layout='{new BorderLayout()}'> <JScrollPane id='bodyScrollPane' constraints='BorderLayout.CENTER'> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/TripSeineUI.jcss ===================================== @@ -20,18 +20,6 @@ * #L% */ -#ocean { - enabled:{canEditOcean(bean.getRoute())}; -} - -#formsUrl { - openLinkTip:"observe.common.TripSeineDto.action.openLinkFormsUrl.tip"; -} - -#reportsUrl { - openLinkTip:"observe.common.TripSeineDto.action.openLinkReportsUrl.tip"; -} - #reopen { _toolTipText:{t("observe.common.TripDto.action.reopen.tip")}; } @@ -57,6 +45,18 @@ _observeAction:{MoveSingleTripSeineUIAction.ACTION_NAME}; } +/* ***************************************************************************** */ +/* GENERAL TAB **************************************************************** */ +/* ***************************************************************************** */ + +#formsUrl { + openLinkTip:"observe.common.TripSeineDto.action.openLinkFormsUrl.tip"; +} + +#reportsUrl { + openLinkTip:"observe.common.TripSeineDto.action.openLinkReportsUrl.tip"; +} + /* ***************************************************************************** */ /* MAP TAB ******************************************************************** */ /* ***************************************************************************** */ ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/TripSeineUIHandler.java ===================================== @@ -164,5 +164,11 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto, TripSein getUi().getTripMap().getHandler().doCloseMap(); buildTripMap = true; } + + @Override + public void startEditUI() { + super.startEditUI(); + ui.getOcean().setEnabled(getModel().getBean().getRouteCount() == 0); + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeCellRenderer.java ===================================== @@ -31,6 +31,7 @@ import org.jdesktop.swingx.tree.DefaultXTreeCellRenderer; import javax.swing.Icon; import javax.swing.JLabel; import javax.swing.JTree; +import javax.swing.SwingUtilities; import javax.swing.tree.DefaultTreeCellRenderer; import java.awt.Color; import java.awt.Component; @@ -95,6 +96,13 @@ public class NavigationTreeCellRenderer extends DefaultXTreeCellRenderer impleme Dimension newSize = new Dimension((int) size.getWidth(), 32); comp.setSize(newSize); comp.setPreferredSize(newSize); + } else { + int stringWidth = SwingUtilities.computeStringWidth(comp.getFontMetrics(comp.getFont()), text); + if (size.getWidth()<stringWidth) { + log.error(String.format("Size is too low: %s for node: %s", size, text)); + Dimension newSize = new Dimension(stringWidth+5, (int)height); + comp.setPreferredSize(newSize); + } } return comp; } ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -2396,6 +2396,10 @@ observe.common.TripLonglineDto.tripType=Trip type observe.common.TripLonglineDto.type=Trip observe.common.TripLonglineDto.types=Trips observe.common.TripLonglineDto.vessel=Vessel +observe.common.TripLonglineDto.with.logbooks.message=There is some logbook in this trip, can't unselect logbook avaibility +observe.common.TripLonglineDto.with.logbooks.title=Can't remove logbook avaibility +observe.common.TripLonglineDto.with.observations.message=There is some observations in this trip, can't unselect observations avaibility +observe.common.TripLonglineDto.with.observations.title=Can't remove observation avaibility observe.common.TripLonglineGearUseDto.gearUseFeaturesLongline=Gear use features observe.common.TripLonglineLandingDto.action.close.tip=Close the opened landing observe.common.TripLonglineLandingDto.action.create=Next landing @@ -3374,6 +3378,7 @@ observe.validation.hooksComposition.desactivated.hookSize=Selected hook size is observe.validation.hooksComposition.desactivated.hookType=Selected hook type is disabled. observe.validation.hooksComposition.required.hookType=Hook type must be filled. observe.validation.hooksComposition.required.proportion=Proportion must be filled. +observe.validation.landing.endDate.after.startDate=End date must be after start date. observe.validation.landingPartLongline.bound.categoryWeight=Max category must be strictly greater than min category. observe.validation.landingPartLongline.required.weight=Weight must be filled. observe.validation.landingPartLongline.required.weightMeasureMethod=Weight measure method must be filled. ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -2396,6 +2396,10 @@ observe.common.TripLonglineDto.tripType=Tipo de marea observe.common.TripLonglineDto.type=Marea observe.common.TripLonglineDto.types=Mareas observe.common.TripLonglineDto.vessel=Buque +observe.common.TripLonglineDto.with.logbooks.message=There is some logbook in this trip, can't unselect logbook avaibility \#TODO +observe.common.TripLonglineDto.with.logbooks.title=Can't remove logbook avaibility \#TODO +observe.common.TripLonglineDto.with.observations.message=There is some observations in this trip, can't unselect observations avaibility \#TODO +observe.common.TripLonglineDto.with.observations.title=Can't remove observation avaibility \#TODO observe.common.TripLonglineGearUseDto.gearUseFeaturesLongline=Equipamiento observe.common.TripLonglineLandingDto.action.close.tip=Close the opened landing observe.common.TripLonglineLandingDto.action.create=Next landing @@ -3374,6 +3378,7 @@ observe.validation.hooksComposition.desactivated.hookSize=El tamaño de avanzuel observe.validation.hooksComposition.desactivated.hookType=El tipo de avanzuelo seleccionado está desactivado. observe.validation.hooksComposition.required.hookType=La selección de un tipo de avanzuelo es mandatoria. observe.validation.hooksComposition.required.proportion=La proporción está vacía. +observe.validation.landing.endDate.after.startDate=La fecha de fin debe ser supuerior a la fecha de inicio. observe.validation.landingPartLongline.bound.categoryWeight=Max category must be strictly greater than min category. observe.validation.landingPartLongline.required.weight=Weight must be filled. \#TODO observe.validation.landingPartLongline.required.weightMeasureMethod=Weight measure method must be filled. ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -2396,6 +2396,10 @@ observe.common.TripLonglineDto.tripType=Type de marée observe.common.TripLonglineDto.type=Marée observe.common.TripLonglineDto.types=Marées observe.common.TripLonglineDto.vessel=Navire +observe.common.TripLonglineDto.with.logbooks.message=Il existe des livres de bord sur cette marée, impossible de désactiver cette propriété +observe.common.TripLonglineDto.with.logbooks.title=Impossible de désactiver la présence des livres de bord +observe.common.TripLonglineDto.with.observations.message=Il existe des observations sur cette marée, impossible de désactiver cette propriété +observe.common.TripLonglineDto.with.observations.title=Impossible de désactiver la présence des observations observe.common.TripLonglineGearUseDto.gearUseFeaturesLongline=Équipements observe.common.TripLonglineLandingDto.action.close.tip=Clôturer le débarquement ouvert observe.common.TripLonglineLandingDto.action.create=Débarquement suivant @@ -3374,6 +3378,7 @@ observe.validation.hooksComposition.desactivated.hookSize=La taille d'hameçon s observe.validation.hooksComposition.desactivated.hookType=Le type d'hameçon sélectionné est désactivée. observe.validation.hooksComposition.required.hookType=La sélection d'un type d'hameçon est obligatoire. observe.validation.hooksComposition.required.proportion=Proportion non renseignée. +observe.validation.landing.endDate.after.startDate=La date de fin doit être supérieure à sa date de début. observe.validation.landingPartLongline.bound.categoryWeight=La catégorie de poids max doit être strictement supérieur à la catégorie min. observe.validation.landingPartLongline.required.weight=Le poids doit être renseigné. observe.validation.landingPartLongline.required.weightMeasureMethod=La méthode de mesure de poids est obligatoire. ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -12,6 +12,7 @@ observe.validation.floatingObject.invalid.parts observe.validation.floatingObject.required.comment.for.balise1 observe.validation.floatingObject.required.comment.for.balise2 observe.validation.floatingObject.size.supportVesselName +observe.validation.landing.endDate.after.startDate observe.validation.landingPartLongline.bound.categoryWeight observe.validation.landingPartLongline.required.weightMeasureMethod observe.validation.lengthFormula.endDate.before.startDate ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/landing/LandingLonglineDto-create-error-validation.xml ===================================== @@ -28,6 +28,15 @@ <message/> </field-validator> </field> + <field name="endDate"> +  + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ endDate == null || startDate == null || endDate.time >= startDate.time ]]> + </param> + <message>observe.validation.landing.endDate.after.startDate</message> + </field-validator> + </field> <field name="comment"> <field-validator type="commentLengthFieldDto"> <message/> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/landing/LandingLonglineDto-update-error-validation.xml ===================================== @@ -28,6 +28,15 @@ <message/> </field-validator> </field> + <field name="endDate"> +  + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ endDate == null || startDate == null || endDate.time >= startDate.time ]]> + </param> + <message>observe.validation.landing.endDate.after.startDate</message> + </field-validator> + </field> <field name="comment"> <field-validator type="commentLengthFieldDto"> <message/> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f1b3590097677016ac5caadaca… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f1b3590097677016ac5caadaca… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Improve Pairing screen
by Tony CHEMIT 28 May '19

28 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f1b35900 by tchemit at 2019-05-28T08:38:33Z Improve Pairing screen - - - - - 5 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/ActivityLonglinePairingUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/ActivityLonglinePairingTreeTable.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/ActivityLonglinePairingTreeTableModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/node/ActivityLonglinePairingActivityNode.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/node/ActivityLonglinePairingRootNode.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/ActivityLonglinePairingUIHandler.java ===================================== @@ -36,6 +36,7 @@ import fr.ird.observe.client.ui.util.ProgressModel; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.referential.common.ProgramReference; import fr.ird.observe.services.service.data.ll.pairing.ActivityLonglinePairingConfig; +import fr.ird.observe.services.service.data.ll.pairing.ActivityLonglinePairingResult; import fr.ird.observe.services.service.data.ll.pairing.ActivityLonglinePairingResultItem; import fr.ird.observe.services.service.data.ll.pairing.ActivityLonglinePairingService; import fr.ird.observe.services.service.data.ll.pairing.TripLonglinePairingResult; @@ -139,7 +140,9 @@ public class ActivityLonglinePairingUIHandler extends AdminTabUIHandler<Activity } ui.getTable().openTable(rootNode); - stepModel.setModified(false); + rootNode.setValueAt(true,2); + + stepModel.recomputeSelectedValues(); return WizardState.NEED_FIX; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/ActivityLonglinePairingTreeTable.java ===================================== @@ -261,19 +261,26 @@ public class ActivityLonglinePairingTreeTable extends JXTreeTable { TableCellRenderer renderer = objectRenderer; Object newValue = value; + boolean enabled = true; switch (column) { + case 0: + enabled = node.isSelected(); + break; case 1: if (node instanceof ActivityLonglinePairingActivityNode) { ActivityLonglinePairingResultItem selectedValue = ((ActivityLonglinePairingActivityNode) node).getSelectedValue(); newValue = selectedValue == null ? "" : decorator.toString(selectedValue); } + enabled = node.isSelected(); break; case 2: newValue = value == null ? null : Boolean.valueOf(String.valueOf(value)); renderer = booleanInclusiveRenderer; break; } - return renderer.getTableCellRendererComponent(table, newValue, isSelected, hasFocus, row, column); + Component component = renderer.getTableCellRendererComponent(table, newValue, isSelected, hasFocus, row, column); + component.setEnabled(enabled); + return component; } } @@ -294,7 +301,7 @@ public class ActivityLonglinePairingTreeTable extends JXTreeTable { this.programDecorator = decoratorService.getReferentialReferenceDecorator(ProgramReference.class); this.tripDecorator = decoratorService.getDataReferenceDecorator(TripLonglineReference.class); this.activityDecorator = decoratorService.getDataReferenceDecorator(ActivityLonglineLogbookReference.class); - this.programIcon = UIManager.getIcon("navigation.referential.Program"); + this.programIcon = UIManager.getIcon("navigation.referential.common.Program"); this.tripIcon = UIManager.getIcon("navigation.data.Trip"); this.activityIcon = UIManager.getIcon("navigation.data.Activity"); } @@ -304,6 +311,7 @@ public class ActivityLonglinePairingTreeTable extends JXTreeTable { ActivityLonglinePairingNodeSupport node = (ActivityLonglinePairingNodeSupport) value; DtoReference valueAt = (DtoReference) node.getValueAt(0); Icon icon = null; + boolean enabled=node.isSelected(); if (value instanceof ActivityLonglinePairingProgramNode) { value = programDecorator.toString(valueAt); icon = programIcon; @@ -316,6 +324,7 @@ public class ActivityLonglinePairingTreeTable extends JXTreeTable { } Component treeCellRendererComponent = super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); setIcon(icon); + treeCellRendererComponent.setEnabled(enabled); return treeCellRendererComponent; } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/ActivityLonglinePairingTreeTableModel.java ===================================== @@ -60,7 +60,7 @@ public class ActivityLonglinePairingTreeTableModel extends DefaultTreeTableModel @Override public boolean isCellEditable(Object node, int column) { - return column == 2 || (column == 1 && node instanceof ActivityLonglinePairingActivityNode); + return column == 2 || (column == 1 && node instanceof ActivityLonglinePairingActivityNode && (boolean) getValueAt(node, 2)); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/node/ActivityLonglinePairingActivityNode.java ===================================== @@ -37,9 +37,16 @@ public class ActivityLonglinePairingActivityNode extends ActivityLonglinePairing private ActivityLonglinePairingResultItem selectedValue; - public ActivityLonglinePairingActivityNode(ActivityLonglinePairingResult userObject) { + ActivityLonglinePairingActivityNode(ActivityLonglinePairingResult userObject) { super(Objects.requireNonNull(userObject), false); this.selectedValue = userObject.getRelatedObservedActivity(); + if (selectedValue == null || !userObject.getItems().isEmpty()) { + ActivityLonglinePairingResultItem activityLonglinePairingResultItem = userObject.getItems().get(0); +// setValueAt(activityLonglinePairingResultItem, 1); + if (activityLonglinePairingResultItem.isDistanceValid() || activityLonglinePairingResultItem.isTimeValid()) { + setValueAt(activityLonglinePairingResultItem, 1); + } + } } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/node/ActivityLonglinePairingRootNode.java ===================================== @@ -41,6 +41,13 @@ public class ActivityLonglinePairingRootNode extends ActivityLonglinePairingNode return null; } + @Override + public void setValueAt(Object aValue, int column) { + if (column == 2) { + applySelected((Boolean) aValue); + } + } + public List<ActivityLonglinePairingActivityNode> getSelectedNodes() { List<ActivityLonglinePairingActivityNode> result = new LinkedList<>(); collectSelectedNodes(result); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f1b3590097677016ac5caadaca5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f1b3590097677016ac5caadaca5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Pas d'alertes dans les onglets - Closes #1296
by Tony CHEMIT 27 May '19

27 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6c360637 by tchemit at 2019-05-27T11:33:56Z [LL] Pas d'alertes dans les onglets - Closes #1296 - - - - - 15 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/edit/ContentEditUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/LandingPartLonglineContentTableModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/LandingPartLonglineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/LonglineGlobalCompositionLogbookUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/TripLonglineSampleLogbookUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineGlobalCompositionObsUI.jcss - pom.xml Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIInitializer.java ===================================== @@ -225,6 +225,8 @@ public class ContentUIInitializer<UI extends ContentUI> { ui.getActionMap().setParent(actionMap); ui.setInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW, inputMap); + ImmutableMap.Builder<String, JAXXValidator> extraTabUIBuilder = ImmutableMap.builder(); + Set<Object> done = new LinkedHashSet<>(); for (String name : ui.get$objectMap().keySet()) { Object o = ui.getObjectById(name); @@ -305,11 +307,6 @@ public class ContentUIInitializer<UI extends ContentUI> { init(ui, (ObserveSwingValidator<?>) o); continue; } - - if (o instanceof JTabbedPane) { - init((JTabbedPane) o); - continue; - } if (o instanceof JLabel) { init((JLabel) o); continue; @@ -330,12 +327,26 @@ public class ContentUIInitializer<UI extends ContentUI> { init((NormalTextEditor) o); continue; } + if (o instanceof ContentUI) { + init((ContentUI) o, extraTabUIBuilder); + continue; + } if (o instanceof Table) { init((Table) o); } } + // second pass to init JTabbedPane + ImmutableMap<String, JAXXValidator> extraTabUis = extraTabUIBuilder.build(); + for (String name : ui.get$objectMap().keySet()) { + Object o = ui.getObjectById(name); + + if (o instanceof JTabbedPane) { + init((JTabbedPane) o,extraTabUis); + } + } + if (!doNotBlockComponentIds.isEmpty()) { String[] acceptedComponentNames = doNotBlockComponentIds.toArray(new String[0]); initBlockLayerUI(acceptedComponentNames); @@ -431,6 +442,16 @@ public class ContentUIInitializer<UI extends ContentUI> { } } + protected void init(ContentUI editor, ImmutableMap.Builder<String, JAXXValidator> extraTabUIBuilder) { + if (editor instanceof JAXXValidator) { + String tab = (String) editor.getClientProperty("tab"); + if (tab != null) { + extraTabUIBuilder.put(tab, (JAXXValidator) editor); + } + } + + } + protected void initBlockLayerUI(String... doNotBlockComponentIds) { ui.getBlockLayerUI().setAcceptedComponentTypes(ObserveMapPane.class, JScrollBar.class); ui.getBlockLayerUI().setAcceptedComponentNames(doNotBlockComponentIds); @@ -707,9 +728,9 @@ public class ContentUIInitializer<UI extends ContentUI> { addAutoSelectOnFocus(hourEditor.getTextField()); } - protected void init(JTabbedPane tabbedPane) { + protected void init(JTabbedPane tabbedPane, ImmutableMap<String, JAXXValidator> extraTabUis) { if (GoToTabUIActionSupport.MAIN_TABBED_PANE.equals(tabbedPane.getName())) { - initMainTabbedPane(tabbedPane); + initMainTabbedPane(tabbedPane,extraTabUis); return; } if (GoToTabUIActionSupport.SUB_TABBED_PANE.equals(tabbedPane.getName())) { @@ -717,7 +738,7 @@ public class ContentUIInitializer<UI extends ContentUI> { } } - protected void initMainTabbedPane(JTabbedPane tabbedPane) { + protected void initMainTabbedPane(JTabbedPane tabbedPane, ImmutableMap<String, JAXXValidator> extraTabUis) { int tabCount = tabbedPane.getTabCount(); InputMap inputMap = ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/edit/ContentEditUIInitializer.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.data.edit; * #L% */ +import com.google.common.collect.ImmutableMap; import fr.ird.observe.client.ui.actions.content.api.tab.GoToTabUIActionSupport; import fr.ird.observe.client.ui.content.api.ContentUIInitializer; import org.nuiton.jaxx.validator.JAXXValidator; @@ -45,15 +46,15 @@ public class ContentEditUIInitializer<UI extends ContentEditUI> extends ContentU } @Override - protected void initMainTabbedPane(JTabbedPane tabbedPane) { - super.initMainTabbedPane(tabbedPane); - tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); + protected void initMainTabbedPane(JTabbedPane tabbedPane, ImmutableMap<String, JAXXValidator> extraTabUis) { + super.initMainTabbedPane(tabbedPane, extraTabUis); + tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE).addScope( NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).addExtraTab(extraTabUis).build(); } @Override protected void initSubTabbedPane(JTabbedPane tabbedPane) { super.initSubTabbedPane(tabbedPane); - subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); + subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).build(); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUIInitializer.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.data.open; * #L% */ +import com.google.common.collect.ImmutableMap; import fr.ird.observe.client.ui.actions.content.api.tab.GoToTabUIActionSupport; import fr.ird.observe.client.ui.content.api.ContentUIInitializer; import org.nuiton.jaxx.validator.JAXXValidator; @@ -29,6 +30,7 @@ import org.nuiton.jaxx.validator.swing.tab.JTabbedPaneValidator; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JTabbedPane; +import java.util.Map; /** * To initialize ui. @@ -45,15 +47,15 @@ public class ContentOpenableUIInitializer<UI extends ContentOpenableUI> extends } @Override - protected void initMainTabbedPane(JTabbedPane tabbedPane) { - super.initMainTabbedPane(tabbedPane); - tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); + protected void initMainTabbedPane(JTabbedPane tabbedPane, ImmutableMap<String, JAXXValidator> extraTabUis) { + super.initMainTabbedPane(tabbedPane, extraTabUis); + tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).addExtraTab((Map)extraTabUis).build(); } @Override protected void initSubTabbedPane(JTabbedPane tabbedPane) { super.initSubTabbedPane(tabbedPane); - subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); + subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).build(); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIInitializer.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.data.simple; * #L% */ +import com.google.common.collect.ImmutableMap; import fr.ird.observe.client.ui.actions.content.api.tab.GoToTabUIActionSupport; import fr.ird.observe.client.ui.content.api.ContentUIInitializer; import org.nuiton.jaxx.validator.JAXXValidator; @@ -29,6 +30,7 @@ import org.nuiton.jaxx.validator.swing.tab.JTabbedPaneValidator; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JTabbedPane; +import java.util.Map; /** * To initialize ui. @@ -45,15 +47,15 @@ public class ContentSimpleUIInitializer<UI extends ContentSimpleUI> extends Cont } @Override - protected void initMainTabbedPane(JTabbedPane tabbedPane) { - super.initMainTabbedPane(tabbedPane); - tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); + protected void initMainTabbedPane(JTabbedPane tabbedPane, ImmutableMap<String, JAXXValidator> extraTabUis) { + super.initMainTabbedPane(tabbedPane, extraTabUis); + tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).addExtraTab((Map)extraTabUis).build(); } @Override protected void initSubTabbedPane(JTabbedPane tabbedPane) { super.initSubTabbedPane(tabbedPane); - subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); + subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).build(); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIInitializer.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.data.table; * #L% */ +import com.google.common.collect.ImmutableMap; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ui.ObserveKeyStrokes; import fr.ird.observe.client.ui.ObserveMainUI; @@ -41,6 +42,7 @@ import javax.swing.JComponent; import javax.swing.JTabbedPane; import javax.swing.table.DefaultTableCellRenderer; import java.awt.BorderLayout; +import java.util.Map; import static io.ultreia.java4all.i18n.I18n.n; @@ -69,15 +71,15 @@ public class ContentTableUIInitializer<D extends DataDto, C extends DataDto, U e } @Override - protected void initMainTabbedPane(JTabbedPane tabbedPane) { - super.initMainTabbedPane(tabbedPane); - tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); + protected void initMainTabbedPane(JTabbedPane tabbedPane, ImmutableMap<String, JAXXValidator> extraTabUis) { + super.initMainTabbedPane(tabbedPane, extraTabUis); + tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).addExtraTab((Map)extraTabUis).build(); } @Override protected void initSubTabbedPane(JTabbedPane tabbedPane) { super.initSubTabbedPane(tabbedPane); - subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); + subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).build(); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIInitializer.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.ref; * #L% */ +import com.google.common.collect.ImmutableMap; import fr.ird.observe.client.ui.actions.content.api.tab.GoToTabUIActionSupport; import fr.ird.observe.client.ui.content.api.ContentUIInitializer; import fr.ird.observe.dto.reference.ReferentialDtoReference; @@ -58,15 +59,15 @@ public class ContentReferenceUIInitializer<E extends ReferentialDto, R extends R } @Override - protected void initMainTabbedPane(JTabbedPane tabbedPane) { - super.initMainTabbedPane(tabbedPane); - tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); + protected void initMainTabbedPane(JTabbedPane tabbedPane, ImmutableMap<String, JAXXValidator> extraTabUis) { + super.initMainTabbedPane(tabbedPane, extraTabUis); + tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE).addScope( NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).build(); } @Override protected void initSubTabbedPane(JTabbedPane tabbedPane) { super.initSubTabbedPane(tabbedPane); - subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); + subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).build(); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/LandingPartLonglineContentTableModel.java ===================================== @@ -57,7 +57,6 @@ public class LandingPartLonglineContentTableModel extends ContentTableModel<Land parent.setLandingPart(childs); } - @Override protected SwingValidator<LandingLonglineDto> getParentValidator() { return parentUI.getValidator(); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/LandingPartLonglineUIHandler.java ===================================== @@ -23,7 +23,7 @@ package fr.ird.observe.client.ui.content.data.ll.landing; */ import fr.ird.observe.client.ObserveSwingApplicationContext; -import fr.ird.observe.client.ui.content.api.data.table.ContentTableUIHandler; +import fr.ird.observe.client.ui.content.api.data.table.NotStandaloneContentTableUIHandler; import fr.ird.observe.client.ui.content.api.spi.ContentUIReferenceCache; import fr.ird.observe.client.ui.content.api.ui.ObserveLayoutFocusTraversalPolicy; import fr.ird.observe.client.ui.util.UIHelper; @@ -47,7 +47,7 @@ import static io.ultreia.java4all.i18n.I18n.n; * @author Tony Chemit - dev(a)tchemit.fr * @since 3.7 */ -public class LandingPartLonglineUIHandler extends ContentTableUIHandler<LandingLonglineDto, LandingPartLonglineDto, LandingPartLonglineUI> implements UIHandler<LandingPartLonglineUI> { +public class LandingPartLonglineUIHandler extends NotStandaloneContentTableUIHandler<LandingLonglineDto, LandingPartLonglineDto, LandingPartLonglineUI> implements UIHandler<LandingPartLonglineUI> { private static final Logger log = LogManager.getLogger(LandingPartLonglineUIHandler.class); @@ -127,16 +127,6 @@ public class LandingPartLonglineUIHandler extends ContentTableUIHandler<LandingL UIHelper.askFocus(ui.getSpecies()); } - @Override - public void doPersist(LandingLonglineDto bean) { - // not a standalone ui - } - - @Override - protected void loadEditBean(String beanId) { - // not a standalone ui - } - @Override public void startEditUI() { ui.getValidatorTable().setParentValidator(ui.getValidator()); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUI.jaxx ===================================== @@ -159,7 +159,7 @@ <tab id='landingPartTab' i18nProperty=""> <JPanel id="landingPartPanel" layout='{new BorderLayout()}'> - <LandingPartLonglineUIImpl id="LandingPartLonglineUI" constructorParams="this"/> + <LandingPartLonglineUIImpl id="landingPartLonglineUI" constructorParams="this"/> </JPanel> </tab> </JTabbedPane> @@ -176,6 +176,6 @@ <JButton id='move'/> <Object id="delegateContentUI" initializer="mainTabbedPane"/> - <LandingPartLonglineUIModel id="landingPartModel" initializer="LandingPartLonglineUI.getModel()"/> + <LandingPartLonglineUIModel id="landingPartModel" initializer="landingPartLonglineUI.getModel()"/> </fr.ird.observe.client.ui.content.api.data.open.ContentOpenableUI> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUI.jcss ===================================== @@ -44,6 +44,10 @@ /* LANDING PART TAB *********************************************************** */ /* ***************************************************************************** */ +#landingPartLonglineUI { + _tab:{"landingPartTab"}; +} + #comment { title:"observe.common.TripLonglineLandingDto.comment"; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/LonglineGlobalCompositionLogbookUI.jcss ===================================== @@ -34,3 +34,19 @@ mitigationType { universeLabel:{t("observe.common.SetLonglineLogbookGlobalCompositionDto.availableMitigationType")}; selectedLabel:{t("observe.common.SetLonglineLogbookGlobalCompositionDto.selectedMitigationType")}; } + +#floatlinesCompositionUI { + _tab:{"floatlinesCompositionTab"}; +} + +#branchlinesCompositionUI { + _tab:{"branchlinesCompositionTab"}; +} + +#hooksCompositionUI { + _tab:{"hooksCompositionTab"}; +} + +#baitsCompositionUI { + _tab:{"baitsCompositionTab"}; +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/TripLonglineSampleLogbookUI.jcss ===================================== @@ -44,6 +44,10 @@ /* SAMPLE PART TAB ************************************************************ */ /* ***************************************************************************** */ +#samplePartLogbookUI { + _tab:{"samplePartLogbookTab"}; +} + #comment { title:"observe.common.TripLonglineSampleLogbookDto.comment"; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUI.jcss ===================================== @@ -191,3 +191,7 @@ #branchlineDetailTab { enabled: {compositionTab.isEnabled() && model.isCompositionTabValid() && !branchlinesTableModel.isSelectionEmpty()}; } + +#branchlineDetailUI { + _tab:{"branchlineDetailTab"}; +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineGlobalCompositionObsUI.jcss ===================================== @@ -34,3 +34,19 @@ universeLabel:{t("observe.common.SetLonglineObsGlobalCompositionDto.availableMitigationType")}; selectedLabel:{t("observe.common.SetLonglineObsGlobalCompositionDto.selectedMitigationType")}; } + +#floatlinesCompositionUI { + _tab:{"floatlinesCompositionTab"}; +} + +#branchlinesCompositionUI { + _tab:{"branchlinesCompositionTab"}; +} + +#hooksCompositionUI { + _tab:{"hooksCompositionTab"}; +} + +#baitsCompositionUI { + _tab:{"baitsCompositionTab"}; +} ===================================== pom.xml ===================================== @@ -163,7 +163,7 @@   - <lib.version.java4all.jaxx>3.0-alpha-51</lib.version.java4all.jaxx> + <lib.version.java4all.jaxx>3.0-alpha-52-SNAPSHOT</lib.version.java4all.jaxx>    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6c3606377109b352723b9217c27… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6c3606377109b352723b9217c27… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Add referentials fixture
by Tony CHEMIT 24 May '19

24 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1d55d2c7 by tchemit at 2019-05-24T13:30:13Z Add referentials fixture - - - - - 1 changed file: - + test/src/main/resources/fixtures/referentials.md Changes: ===================================== test/src/main/resources/fixtures/referentials.md ===================================== @@ -0,0 +1,165 @@ +# Référentiel commun + +## Armateurs + +## Bateaux + +## Caractéristiques d'un équipement + +## Catégories de bateau + +## Équipements + +## Espèce + +## Groupes espèce + +## Listes d'espèces + +## Méthodes d'estimation de poids + +## Méthodes d'estimation de taille + +## Modes de libération + +## Océans + +## Organismes + +## Pays + +## Personnes + +## Ports + +## Programmes + +## Qualités de donnée + +## Relations Taille-Poids + +## Relations Taille-Taille + +## Sexes + +## Types de caractéristique d'équipement + +## Types de mesure de poids + +## Types de mesure de taille + +## Types de pêcherie + +## Vents Beaufort + +## Zones FPA + + +# Référentiel Palangre - Commun + +## Activités bateau (Palangre) + +## Catégories de poids + +## Couleurs de cyalumes + +## Devenirs capture + +## États de santé + +## Formes au filage + +## Méthode d'observation + +## Méthodes d'estimation de poids + +## Statuts de l'appât au filage + +## Tailles + +## Traitements à bord + +## Types d'appât + +## Types d'hameçon + +## Types de cyalumes + +## Types de ligne + +## Types de marée + +## Types de mesure d'atténuation + + +# Référentiel Palangre - Débarquement + +## Compagnies + +## Conservations + +## Sources d'information + +# Référentiel Palangre - Observation + +## Formats de données de capteur + +## Localisations de l'élément sur l'avançon + +## Localisations de l'élément sur la ligne mère + +## Marques de capteur + +## Maturités + +## Niveaux de remplissage de l'estomac + +## Positions du hameçon + +## Statuts de l'appât au virage + +## Types de capteur + +## Types de rencontre + + +# Référentiel Senne - Commun + +## Activités bateau (Senne) + +## Devenirs espèce + +## Opérations balise + +## Types de balise + + +# Référentiel Senne - Observation + +## Activités environnantes + +## Catégories de poids + +## Causes coup nul + +## Conformités à la libération + +## États à la libération + +## Modes détection + +## Moments de la libération + +## Object flottant Matériaux + +## Opérations sur l'objet + +## Raisons de non coup de Senne + +## Raisons rejet + +## Statuts faune observée + +## Systèmes observés + +## Types d'objet flottant View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1d55d2c718127e035b6df8b66e7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1d55d2c718127e035b6df8b66e7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: pb traduction pop up activité observée associée - Closes #1289
by Tony CHEMIT 24 May '19

24 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 39d4aa48 by tchemit at 2019-05-24T11:29:54Z pb traduction pop up activité observée associée - Closes #1289 - - - - - b5b82405 by tchemit at 2019-05-24T11:29:56Z [PS] Opérations sur balises non traduites - Closes #1292 - - - - - c4db9541 by tchemit at 2019-05-24T11:29:56Z update version - - - - - 49e6603e by tchemit at 2019-05-24T11:29:56Z [PS] Pb traduction Echantillon nespece accessoire - Closes #1295 - - - - - 8ad8783b by tchemit at 2019-05-24T11:29:56Z Fix some bugs on backup - - - - - 17c51847 by tchemit at 2019-05-24T12:42:24Z fix some i18n properties building + improve BeanFilterableComboBox init - - - - - 30 changed files: - − .gitlab/issue_templates/Contrat-AZTI-2017-Anomalie.md - − .gitlab/issue_templates/Contrat-AZTI-2017-Evolution.md - .gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md - .gitlab/issue_templates/Contrat-SFA-2017-Evolution.md - − .mvn/gitlab-cache/milestones/674086-issues.json - − .mvn/gitlab-cache/milestones/674086.json - + .mvn/gitlab-cache/milestones/761666-artifacts.json - .mvn/gitlab-cache/milestones/761666-issues.json - .mvn/gitlab-cache/milestones/761666.json - CHANGELOG.md - client-configuration/pom.xml - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/pom.xml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/backup/BackupsManager.java - client-core/src/main/java/fr/ird/observe/client/db/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/MoveSingleDataUIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/ChooseRelatedObservedActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/ActivityLonglinePairingTreeTable.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/FloatingObjectTransmittingBuoyOperationUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetSampleUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetSampleUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java - client-core/src/main/java/fr/ird/observe/client/ui/util/treetable/BeanFilterableComboBoxCellEditor.java - client-runner/pom.xml - dto/pom.xml - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java - observe-i18n/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/28f5fc72590c2de0b869081706… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/28f5fc72590c2de0b869081706… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [PS] Pb traduction Echantillon nespece accessoire - Closes #1295
by Tony CHEMIT 22 May '19

22 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 28f5fc72 by tchemit at 2019-05-22T15:56:19Z [PS] Pb traduction Echantillon nespece accessoire - Closes #1295 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetSampleUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetSampleUI.jcss Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetSampleUI.jaxx ===================================== @@ -90,9 +90,6 @@ public String getLengthDataTip(boolean computed) { return computed ? t(NonTargetSampleUIHandler.LONGUEUR_COMPUTED_TIP) : t(NonTargetSampleUIHandler.LONGUEUR_OBSERVED_TIP); } -public String getSpeciesFauneTypeTaille(SpeciesReference species) { - return species == null ? t(NonTargetSampleUIHandler.NO_SPECIES_SELECTED) : species.getSizeMeasureTypeId(); -} ]]> </script> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetSampleUI.jcss ===================================== @@ -20,11 +20,6 @@ * #L% */ -#sizeMeasureTypeLabel { - font-weight:"bold"; - text:{getSpeciesFauneTypeTaille(tableEditBean.getSpecies())}; -} - #hideFormInformation { text:"observe.common.NonTargetSampleDto.message.cantAdd"; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/28f5fc72590c2de0b8690817062… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/28f5fc72590c2de0b8690817062… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update version
by Tony CHEMIT 22 May '19

22 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 590f128c by tchemit at 2019-05-22T15:18:24Z update version - - - - - 27 changed files: - − .gitlab/issue_templates/Contrat-AZTI-2017-Anomalie.md - − .gitlab/issue_templates/Contrat-AZTI-2017-Evolution.md - .gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md - .gitlab/issue_templates/Contrat-SFA-2017-Evolution.md - − .mvn/gitlab-cache/milestones/674086-issues.json - − .mvn/gitlab-cache/milestones/674086.json - + .mvn/gitlab-cache/milestones/761666-artifacts.json - .mvn/gitlab-cache/milestones/761666-issues.json - .mvn/gitlab-cache/milestones/761666.json - CHANGELOG.md - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services-validation/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== .gitlab/issue_templates/Contrat-AZTI-2017-Anomalie.md deleted ===================================== @@ -1,14 +0,0 @@ -## Quelle est la cause de bogue ? - -## Comment reproduire le bogue ? - -## Logs - -``` - -``` - -/label ~"Anomalie" -/label ~"Contrat AZTI-2017" -/milestone %"Contrat AZTI-2017" -/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-AZTI-2017-Evolution.md deleted ===================================== @@ -1,6 +0,0 @@ - - -/label ~"Evolution" -/label ~"Contrat AZTI-2017" -/milestone %"Contrat AZTI-2017" -/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md ===================================== @@ -10,5 +10,5 @@ /label ~"Anomalie" /label ~"IRD-2018-01-V8" -/milestone %"8.0-beta-1" +/milestone %"8.0-RC-1" /assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-SFA-2017-Evolution.md ===================================== @@ -1,5 +1,5 @@ /label ~"Evolution" /label ~"IRD-2018-01-V8" -/milestone %"Contrat SFA-2017" +/milestone %"8.0-RC-1" /assign @tchemit \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/674086-issues.json deleted ===================================== @@ -1,719 +0,0 @@ -[ - { - "id": 18573039, - "iid": 1239, - "projectId": 2722779, - "title": "Improve select tree", - "description": "Add an undeterminated state icon as shown in below screenshot:\n\n![image](/uploads/9f86d633161669b1a725500556f2c3a7/image.png)\n\nPlus be able to use **Space** accelerator to select items in tree (this is the default behaviour to select in a tree); the **Enter** accelerator is kept.", - "labels": [ - "Evolution", - "À facturer" - ], - "milestone": { - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" - }, - "assignees": [ - { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - } - ], - "assignee": { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - }, - "author": { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - }, - "userNotesCount": 0, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "closed", - "updatedAt": "Feb 25, 2019 2:08:33 PM", - "createdAt": "Feb 25, 2019 1:57:21 PM", - "closedAt": "Feb 25, 2019 2:08:33 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1239" - }, - { - "id": 17565900, - "iid": 1200, - "projectId": 2722779, - "title": "Use Ctrl-Tab instead of Tab to select in a ComboBox", - "description": "Usage of Tab to select a item in a combo box does not work very well.", - "labels": [ - "Anomalie", - "IRD-2018-01-V8" - ], - "milestone": { - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" - }, - "assignees": [ - { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - } - ], - "assignee": { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - }, - "author": { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - }, - "userNotesCount": 0, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "closed", - "updatedAt": "Jan 22, 2019 5:39:02 PM", - "createdAt": "Jan 22, 2019 3:08:53 PM", - "closedAt": "Jan 22, 2019 5:39:02 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1200" - }, - { - "id": 16573198, - "iid": 1185, - "projectId": 2722779, - "title": "[V8][DATA MODEL] Ajout de champs", - "description": "* Rajouter des homeid sur toutes les tables qui n\u0027en n\u0027ont pas. Cela facilitera le stockage des id des données historiques (dont nous traitons la migration) et les mises en correspondances.\n* Renommer observe_longline.activitylogbook.timestamp en starttimestamp et rajouter un endtimestamp (non obligatoire)", - "labels": [ - "Evolution", - "IRD-2018-01-V8", - "À facturer" - ], - "milestone": { - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" - }, - "assignees": [ - { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - } - ], - "assignee": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - }, - "author": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - }, - "userNotesCount": 7, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "closed", - "updatedAt": "Dec 30, 2018 11:35:50 AM", - "createdAt": "Dec 11, 2018 1:51:50 PM", - "closedAt": "Dec 30, 2018 11:35:50 AM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1185" - }, - { - "id": 16239318, - "iid": 1182, - "projectId": 2722779, - "title": "Corrections dans le référentiel (requises pour migration FINSS)", - "description": "Corriger code pays :\r\n * Mauritanie : MOZ en MRT\r\n * Porto Rico : PT/PRT en PR/PRI\r\n\r\n```\r\nUPDATE observe_common.country SET iso2code \u003d \u0027MR\u0027, iso3code \u003d \u0027MRT\u0027 WHERE topiaid \u003d \u0027fr.ird.observe.entities.referentiel.Country#1464000000000#0.00054\u0027;\r\nUPDATE observe_common.country SET iso2code \u003d \u0027PR\u0027, iso3code \u003d \u0027PRI\u0027 WHERE topiaid \u003d \u0027fr.ird.observe.entities.referentiel.Country#1464000000000#0.00076\u0027;\r\n```\r\n\r\nTypes d\u0027activité bateau longline :\r\n```\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.01\u0027, 0, \u00272018-12-12\u0027, \u0027WAITING\u0027, 1, null, \u0027Waiting\u0027, \u0027En attente\u0027, \u0027Waiting #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.02\u0027, 0, \u00272018-12-12\u0027, \u0027SEINE_BACKDOWN\u0027, 1, null, \u0027Seine overturn\u0027, \u0027Chavirage de poche\u0027, \u0027Seine overturn #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.03\u0027, 0, \u00272018-12-12\u0027, \u0027HOVE\u0027, 1, null, \u0027Hoving toe\u0027, \u0027A la cape\u0027, \u0027Hoving toe #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.04\u0027, 0, \u00272018-12-12\u0027, \u0027FO_NEGATIVE\u0027, 1, null, \u0027Null set\u0027, \u0027Calée -\u0027, \u0027Null set #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.05\u0027, 0, \u00272018-12-12\u0027, \u0027FO_POSITIVE\u0027, 1, null, \u0027Positive set\u0027, \u0027Calée +\u0027, \u0027Positive set #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.06\u0027, 0, \u00272018-12-12\u0027, \u0027FO_UNKNOWN\u0027, 1, null, \u0027Unknown set\u0027, \u0027Calée ?\u0027, \u0027Unknown #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.07\u0027, 0, \u00272018-12-12\u0027, \u0027FOB_REMOVAL\u0027, 1, null, \u0027FOB removal\u0027, \u0027Retrait FOB\u0027, \u0027FOB removal #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.08\u0027, 0, \u00272018-12-12\u0027, \u0027FOB_DEPLOYMENT\u0027, 1, null, \u0027FOB deployment\u0027, \u0027Déploiement FOB\u0027, \u0027FOB deployment #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.09\u0027, 0, \u00272018-12-12\u0027, \u0027INACTIVE\u0027, 1, null, \u0027Inactive\u0027, \u0027Inconnue\u0027, \u0027Inactive #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.10\u0027, 0, \u00272018-12-12\u0027, \u0027LANDING\u0027, 1, null, \u0027Landing\u0027, \u0027Débarquement\u0027, \u0027Landing #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.11\u0027, 0, \u00272018-12-12\u0027, \u0027FO_HAULING\u0027, 1, null, \u0027Set hauling\u0027, \u0027Filage\u0027, \u0027Set hauling #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.12\u0027, 0, \u00272018-12-12\u0027, \u0027ONEDAYTRIP\u0027, 1, null, \u0027One day day trip\u0027, \u0027Marée mono journée\u0027, \u0027One day day trip #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.13\u0027, 0, \u00272018-12-12\u0027, \u0027OUT\u0027, 1, null, \u0027Vessel out fishing\u0027, \u0027Bateau en pêche\u0027, \u0027Vessel out fishing #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.14\u0027, 0, \u00272018-12-12\u0027, \u0027SEARCH\u0027, 1, null, \u0027Search\u0027, \u0027Recherche\u0027, \u0027Search #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.15\u0027, 0, \u00272018-12-12\u0027, \u0027TRANSIT\u0027, 1, null, \u0027Transit\u0027, \u0027Transit\u0027, \u0027Transit #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\n\r\n```", - "labels": [ - "Evolution", - "IRD-2018-01-V8" - ], - "milestone": { - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" - }, - "assignees": [ - { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - } - ], - "assignee": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - }, - "author": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - }, - "userNotesCount": 4, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "closed", - "updatedAt": "Jan 15, 2019 2:50:45 PM", - "createdAt": "Nov 30, 2018 12:34:38 PM", - "closedAt": "Jan 15, 2019 11:29:41 AM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1182" - }, - { - "id": 15852715, - "iid": 1172, - "projectId": 2722779, - "title": "Ajouter un générateur d\u0027id sur LL-Trip", - "description": "* Id Métier : Selon faisabilité. Ce champ est et doit rester alphanumérique. On aimerait toutefois rajouter à l\u0027extrémité droite un bouton qui permettre d\u0027auto générer, au besoin, un identifiant \"unique\" facilement lisible. L\u0027utilisation de ce bouton sera optionnel et il resterait possible d\u0027attribuer un id manuellement, alphanumérique. On pense :\n * aux générateurs d\u0027identifiants courts du type de ceux utilisés pour générer les URL abrégées : https://hashids.org/\n * aux générateurs utilisant un dictionnaire de nom et d\u0027adjectifs : https://www.npmjs.com/package/human-readable-ids", - "labels": [ - "Evolution", - "IRD-2018-01-V8", - "À facturer" - ], - "milestone": { - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" - }, - "assignees": [ - { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - } - ], - "assignee": { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - }, - "author": { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - }, - "userNotesCount": 0, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "closed", - "updatedAt": "Dec 28, 2018 11:27:24 AM", - "createdAt": "Nov 14, 2018 6:20:47 PM", - "closedAt": "Dec 28, 2018 11:27:24 AM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1172" - }, - { - "id": 14727820, - "iid": 1130, - "projectId": 2722779, - "title": "[LL] Créer une liste d\u0027affichage d\u0027espèces propre aux captures, débarquements et échantillons LL Logbooks", - "description": "Créer une liste d\u0027affichage d\u0027espèces qui sera propre aux captures, débarquements et échantillons LL Logbooks (différente de la liste existante dédiée aux LL Observations).\n\nJuliette doit fournir la liste d\u0027espèces à y faire figurer.", - "labels": [ - "Evolution", - "IRD-2018-01-V8", - "À facturer" - ], - "milestone": { - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" - }, - "assignees": [ - { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - } - ], - "assignee": { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - }, - "author": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - }, - "userNotesCount": 10, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "closed", - "updatedAt": "Jan 15, 2019 11:29:41 AM", - "createdAt": "Oct 5, 2018 9:28:31 PM", - "closedAt": "Jan 15, 2019 11:29:41 AM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1130" - }, - { - "id": 14727558, - "iid": 1127, - "projectId": 2722779, - "title": "[LL] La position d\u0027activité devrait-elle est optionnelle ?", - "description": "Ce pourrait être nécessaires pour les activités hors ZEE, pour lesquelles les bateaux ne fournissent pas toujours les positions.\n\nCas en cours d\u0027investigation...", - "labels": [ - "IRD-2018-01-V8" - ], - "milestone": { - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" - }, - "assignees": [ - { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - } - ], - "assignee": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - }, - "author": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - }, - "userNotesCount": 2, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "closed", - "updatedAt": "Jan 22, 2019 3:24:53 PM", - "createdAt": "Oct 5, 2018 9:08:48 PM", - "closedAt": "Jan 22, 2019 3:24:53 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1127" - }, - { - "id": 14715026, - "iid": 1122, - "projectId": 2722779, - "title": "[LL] Fournir le contenu de la table LL Compagnies destinataires des débarquements", - "description": "", - "labels": [ - "Evolution", - "IRD-2018-01-V8" - ], - "milestone": { - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" - }, - "assignees": [ - { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - } - ], - "assignee": { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - }, - "author": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - }, - "userNotesCount": 11, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "closed", - "updatedAt": "Jan 16, 2019 4:24:42 PM", - "createdAt": "Oct 5, 2018 1:31:54 PM", - "closedAt": "Jan 16, 2019 4:24:42 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1122" - }, - { - "id": 14310661, - "iid": 1066, - "projectId": 2722779, - "title": "Improve usage guis", - "description": "The current implementation is quite naive and is poor in term of performance, since it computes all references of any usage of the given referential.\nIn some case, for example for ``DataQuality`` this will be a huge amount of data, for... nothing, or nearly.\n\nI propose a new implementation which first just count usages by type, then in gui, we just display those counts, and if user wants to see usages for a given type, let just ask him to click on a button or select the required type.\nIn that way data are computed only when wanted by user and make the api much more lighter.\n\nIn term on gui design, I propose to use horizontal tab panned (on left) to represent all types of usages found and a unique list of references (on right) which contains the very usages for the selected. In that way we control perfectly the size of this gui and offer a better experience (see #1059).\n\n@pcauquil WDYT ?", - "labels": [ - "Evolution", - "À facturer" - ], - "milestone": { - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" - }, - "assignees": [], - "author": { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - }, - "userNotesCount": 4, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "closed", - "updatedAt": "Feb 14, 2019 3:45:53 PM", - "createdAt": "Sep 19, 2018 10:29:02 PM", - "closedAt": "Feb 14, 2019 3:45:53 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1066" - }, - { - "id": 11953555, - "iid": 970, - "projectId": 2722779, - "title": "Mutualiser les topiaid t3 et ObServe", - "description": "On souhaiterait pouvoir ré utiliser des topiaid entre t3 et ObServe (notamment sur les références).\n\nActuellement c\u0027est impossible du fait du lien fort entre syntaxe du topiaid et classes des logiciels.\n\nJe vois deux options possibles :\n* permettre que le préfixe des topiaid soit indépendant des noms de classes de l\u0027application\n* utiliser un package Java commun pour les classes des deux logiciels", - "labels": [ - "Evolution", - "IRD-2018-01-V8", - "À facturer" - ], - "milestone": { - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" - }, - "assignees": [ - { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - } - ], - "assignee": { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - }, - "author": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - }, - "userNotesCount": 2, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "closed", - "updatedAt": "Dec 16, 2018 1:03:10 PM", - "createdAt": "Jun 12, 2018 1:55:13 PM", - "closedAt": "Dec 14, 2018 12:49:58 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/970" - }, - { - "id": 9963535, - "iid": 918, - "projectId": 2722779, - "title": "Déplacement de groupes de données", - "description": "Comme cela a été évoqué précédemment dans ce document, il faut permettre, par clic droit, de\ndéplacer les groupes « données d’observation », « logbooks », « échantillons » d’une marée à l’autre.\n\nExactement comme l’on peut, actuellement, déplacer une marée de programme par le menu contextuel. \n\nCeci entraînera nécessairement la perte des appariements entre activités d’observation et\nlogbooks s’il y en avait. Par contre on fera suivre si possible les champs de la table Activité relatifs à\nces groupes (données des onglets Caractéristiques d’observation et Caractéristiques logbooks).\n\nLes déplacements possibles seront :\n * Déplacer le logbook d’une marée vers une autre\n * Déplacer les débarquements d’une marée vers une autre\n * Déplacer les échantillons :\n * de la racine de la marée vers une opération de pêche (de la même marée ou d’une autre)\n * d’une opération de pêche vers la racine de la marée (ou d’une autre marée)\n * d’une opération de pêche vers une autre opération de pêche (de la même marée ou d’un autre)", - "labels": [ - "Evolution", - "IRD-2018-01-V8" - ], - "milestone": { - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" - }, - "assignees": [ - { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - } - ], - "assignee": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - }, - "author": { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - }, - "userNotesCount": 5, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "opened", - "updatedAt": "Apr 16, 2019 1:44:48 AM", - "createdAt": "Mar 27, 2018 3:49:17 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/918" - }, - { - "id": 9962937, - "iid": 915, - "projectId": 2722779, - "title": "Ajout de règles de validation de niveau 1", - "description": "On trouve des éléments de démarrage pour ce sujet dans :\n * Dans le manuel Industrial Fishery de FINNS version allégée SFA, p73+, la liste des contrôles\nactuellement assurés par FINNS et par les requêtes propres à la SFA sur les données LL\nindustrielles.\n * Dans le manuel Semi Industrial Fishery de FINNS version allégée SFA, p26+, la liste des\ncontrôles actuellement assurés par FINNS et par les requêtes propres à la SFA sur les données\nLL semi industrielles.\n\n# Liste des nouveaux contrôles à implanter :\n * *[Erreur]* Check that Departure Date is earlier than Arrival Date of the trip and that both dates are earlier than today.\n * *[Erreur]* Check that trip departure/arrival dates do not overlap with another trip for the same vessel (à implanter sur tous les types de marées).\n * *[Erreur]* Check that the Event Start Date is less than the Event End Date (A implanter sur le formulaire opération de pêche (qui recèle 4 dates/heures) : il faut date début filage \u003c fin filage \u003c début virage \u003c fin virage)\n * *[Erreur]* Check that dates for the event (activity) are inside the start/end date/ time of the trip\n * *[Warning]* Check for Null positions, for latitude that is exactly 0 or 90 and for longitude that is exactly 0 or 180\n * *[Erreur]* Si elles sont renseignées, position d’activité et première position de pêche (début du filage) doivent être identiques\n * *[Erreur]* Check for number of hooks \u003c500 and number of hooks\u003e 5500\n * *[Warning]* Check if the SST is \u003c15\n * *[Erreur]* Check if the SST is \u003e35\n * *[Erreur]* Check whereas the fish is either too big or too small for a given species (Utiliser les bornes définies dans le référentiel Species)\n\n# Liste des contrôles demandés mais déjà implantés :\n * *[Erreur]* Check that the trip type is valid for current gears of the vessel. That is the vessel to which a longline trip is being added has its gear type set to industrial longliners.\n\nLa liste des bateaux proposés sur les formulaires est filtrée selon leur type. Pas d’erreur possible\n\n * *[Erreur]* Check for negative values in catch, discard, lost or retained weights and pieces\n\nOn interdit déjà les valeurs négatives.\n\n * *[Erreur]* Check that new trip type selected is associated with longline data\n\nLe type de marée est piloté par le programme dans lequel elle est créée, de même que la nature des formulaires (PS ou LL). Pas d’erreur possible.\n\n * *[Erreur]* If species have been classified, check that selected species in trip catches is either a target or a bycatch class\n\nLa liste d’espèces proposée dans le formulaire capture est déjà filtrée et ne propose que les espèces pertinentes. Pas d’erreur possible.\n\n * *[Erreur]* If species have been classified, check that selected species is a bait class for species recorded as bait.\n\nLa liste d’espèces proposées comme appât provient de la table appâts et ne propose que les espèces pertinentes. Pas d’erreur possible.\n\n * *[Erreur]* Check that the event is valid for the trip type (only if the trip type has definition of allowed events\n\nLa liste des activités dans ObServe est propre à un type d’engin. Pas d’erreur possible.\n\n * *[Erreur]* If new event is not a fishing activity, then it makes sure that there are no catches associated to this record, e.g. in port event\n\nL’UI d’ObServe n’autorisera la saisie de captures que sur le type opération de pêche. Pas d’erreur possible.\n\n * *[Erreur]* Check for negative values in oceanography\n\nOn interdit déjà les valeurs négatives.\n\n * *[Erreur]* Check that the total percentage of the lost catch is not greater than 100.00\n\nContrôle déjà actif.", - "labels": [ - "Evolution", - "IRD-2018-01-V8" - ], - "milestone": { - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" - }, - "assignees": [ - { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - } - ], - "assignee": { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - }, - "author": { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - }, - "userNotesCount": 1, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "closed", - "updatedAt": "Jan 27, 2019 3:07:52 AM", - "createdAt": "Mar 27, 2018 3:13:54 PM", - "closedAt": "Jan 27, 2019 3:07:52 AM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/915" - } -] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/674086.json deleted ===================================== @@ -1,11 +0,0 @@ -{ - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" -} \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/761666-artifacts.json ===================================== @@ -0,0 +1,12 @@ +[ + { + "name": "Application", + "filename": "observe-8.0-RC-1-SNAPSHOT.zip", + "url": "https://ultreia.io/release/observe-8.0-RC-1-SNAPSHOT.zip" + }, + { + "name": "Serveur", + "filename": "observe-8.0-RC-1-SNAPSHOT.war", + "url": "https://ultreia.io/release/observe-8.0-RC-1-SNAPSHOT.war" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/761666-issues.json ===================================== The diff for this file was not included because it is too large. ===================================== .mvn/gitlab-cache/milestones/761666.json ===================================== @@ -3,9 +3,9 @@ "iid": 133, "projectId": 2722779, "groupId": 0, - "title": "8.0-beta-1", + "title": "8.0-RC-1", "description": "", - "dueDate": "Feb 3, 2019 1:00:00 AM", + "dueDate": "May 31, 2019 2:00:00 AM", "startDate": "Jan 21, 2019 1:00:00 AM", "state": "active" } \ No newline at end of file ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2019-05-14 00:13. + * Last generated at 2019-05-22 17:16. ## Version [8.0-alpha-4](https://gitlab.com/ultreiaio/ird-observe/milestones/115) Seconde partie du troisième lot du contrat IRD-2018-01-V8.
contient fonctionnalités avancées. ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services-validation/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/590f128cdbf128a2074b318319d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/590f128cdbf128a2074b318319d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [PS] Opérations sur balises non traduites - Closes #1292
by Tony CHEMIT 21 May '19

21 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4c829afd by tchemit at 2019-05-21T16:34:47Z [PS] Opérations sur balises non traduites - Closes #1292 - - - - - 2 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/FloatingObjectTransmittingBuoyOperationUI.jcss Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -782,6 +782,7 @@ observe.common.TdrObsDto.speciesTab observe.common.TdrObsDto.timestampTab observe.common.TdrObsDto.title observe.common.TransmittingBuoyDto.brand +observe.common.TransmittingBuoyDto.code observe.common.TransmittingBuoyDto.noBuoy observe.common.TransmittingBuoyDto.ownership observe.common.TransmittingBuoyDto.title ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/FloatingObjectTransmittingBuoyOperationUI.jcss ===================================== @@ -40,7 +40,7 @@ } #transmittingBuoyOperation1Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION}; + i18nProperty:transmittingBuoyOperation; } #transmittingBuoyOperation1 { @@ -50,7 +50,7 @@ } #transmittingBuoyType1Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_TYPE}; + i18nProperty:transmittingBuoyOperation; } #transmittingBuoyType1 { @@ -59,7 +59,7 @@ } #ownership1Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_OWNERSHIP}; + i18nProperty:ownership; } #ownership1 { @@ -67,8 +67,8 @@ enabled: {!getHandler().isBalisePose(transmittingBuoy1.getTransmittingBuoyOperation())} } -#country1Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_COUNTRY}; +#country1Label { + i18nProperty:country; } #country1 { @@ -77,7 +77,7 @@ } #code1Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_CODE}; + i18nProperty:code; } #code1 { @@ -86,7 +86,7 @@ } #brand1Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_BRAND}; + i18nProperty:brand; } #brand1 { @@ -95,7 +95,7 @@ } #transmittingBuoyOperation2Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION}; + i18nProperty:transmittingBuoyOperation; } #transmittingBuoyOperation2 { @@ -105,7 +105,7 @@ } #transmittingBuoyType2Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_TYPE}; + i18nProperty:transmittingBuoyType; } #transmittingBuoyType2 { @@ -114,7 +114,7 @@ } #ownership2Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_OWNERSHIP}; + i18nProperty:ownership; } #ownership2 { @@ -123,7 +123,7 @@ } #country2Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_COUNTRY}; + i18nProperty:country; } #country2 { @@ -132,7 +132,7 @@ } #code2Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_CODE}; + i18nProperty:code; } #code2 { @@ -141,7 +141,7 @@ } #brand2Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_BRAND}; + i18nProperty:brand; } #brand2 { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4c829afddd09026eb79bfa4219e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4c829afddd09026eb79bfa4219e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] pb traduction pop up activité observée associée - Closes #1289
by Tony CHEMIT 21 May '19

21 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: be2ea0d2 by tchemit at 2019-05-21T16:02:41Z pb traduction pop up activité observée associée - Closes #1289 - - - - - 9 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/ActivityLonglinePairingConfigUI.jcss - 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/src/main/i18n/getters/java.getter - services/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityLonglinePairingResultItem.java - services/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityLonglinePairingResultItemDecorator.java Changes: ===================================== client-core/src/main/i18n/getters/java.getter ===================================== @@ -999,6 +999,7 @@ observe.ui.tree.longline.encounter observe.ui.tree.longline.logbook.activity.list observe.ui.tree.longline.logbook.activity.unsaved observe.ui.tree.longline.logbook.landing.list +observe.ui.tree.longline.logbook.landing.unsaved observe.ui.tree.longline.logbook.sample.list observe.ui.tree.longline.logbook.sample.unsaved observe.ui.tree.longline.logbook.set.unsaved ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -100,10 +100,6 @@ observe.common.ActivityLonglineObsDto.timeStamp observe.common.ActivityLonglineObsDto.title observe.common.ActivityLonglineObsDto.titles observe.common.ActivityLonglineObsDto.vesselActivityLongline -observe.common.ActivityLonglinePairingResultItemDto.computedDistance -observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue -observe.common.ActivityLonglinePairingResultItemDto.computedTime -observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue observe.common.ActivitySeineDto.availableObservedSystem observe.common.ActivitySeineDto.comment observe.common.ActivitySeineDto.coordinate @@ -899,6 +895,10 @@ observe.common.WithFormula.coefficientsInformation observe.common.WithFormula.equation observe.common.WithFormula.source observe.common.acquisitionMode +observe.common.activityLonglinePairingResultItem.computedDistance +observe.common.activityLonglinePairingResultItem.computedDistanceValue +observe.common.activityLonglinePairingResultItem.computedTime +observe.common.activityLonglinePairingResultItem.computedTimeValue observe.common.description observe.common.directory observe.common.file ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/ActivityLonglinePairingConfigUI.jcss ===================================== @@ -25,7 +25,7 @@ } #longlineActivityPairingMaxTimeLabel { - text:"observe.common.ActivityLonglinePairingResultItemDto.computedTime"; + text:"observe.common.activityLonglinePairingResultItem.computedTime"; } #longlineActivityPairingMaxTime { @@ -35,7 +35,7 @@ } #longlineActivityPairingMaxDistanceLabel { - text:"observe.common.ActivityLonglinePairingResultItemDto.computedDistance"; + text:"observe.common.activityLonglinePairingResultItem.computedDistance"; } #longlineActivityPairingMaxDistance { ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -465,12 +465,6 @@ observe.common.ActivityLonglineObsDto.types=Activities observe.common.ActivityLonglineObsDto.vesselActivityLongline=Vessel activity observe.common.ActivityLonglineObsEncounterDto.comment=Comment observe.common.ActivityLonglineObsSensorUsedDto.comment=Comment -observe.common.ActivityLonglinePairingResultItemDto.computedDistance=Distance (km) -observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue=Distance (%s kms) -observe.common.ActivityLonglinePairingResultItemDto.computedTime=Time (minutes) -observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue=Time (%s minutes) -observe.common.ActivityLonglinePairingResultItemDto.observationActivity=Observed activity -observe.common.ActivityLonglinePairingResultItemDto.type=Observed activity observe.common.ActivityObsDto.action.goToOpen.short=Observations - Open activity observe.common.ActivityObsDto.action.goToOpen.tip=Go to open activity (Observations) observe.common.ActivitySeineDto.action.addFloatingObject=Add FAD @@ -2570,6 +2564,12 @@ observe.common.action.selectFirst.tip=Select first entry observe.common.action.selectLast.tip=Select last entry observe.common.action.selectNext.tip=Select next entry observe.common.action.selectPrevious.tip=Select previous entry +observe.common.activityLonglinePairingResultItem=Observed activity +observe.common.activityLonglinePairingResultItem.computedDistance=Distance (km) +observe.common.activityLonglinePairingResultItem.computedDistanceValue=Distance (%s kms) +observe.common.activityLonglinePairingResultItem.computedTime=Time (minutes) +observe.common.activityLonglinePairingResultItem.computedTimeValue=Time (%s minutes) +observe.common.activityLonglinePairingResultItem.observationActivity=Observed activity observe.common.boolean.false=No observe.common.boolean.null=Undefined observe.common.boolean.true=Yes ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -465,12 +465,6 @@ observe.common.ActivityLonglineObsDto.types=Actividades observe.common.ActivityLonglineObsDto.vesselActivityLongline=Actividad barco observe.common.ActivityLonglineObsEncounterDto.comment=Comentarios observe.common.ActivityLonglineObsSensorUsedDto.comment=Comentarios -observe.common.ActivityLonglinePairingResultItemDto.computedDistance=Distance (km) \#TODO -observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue=Distance (%s kms) \#TODO -observe.common.ActivityLonglinePairingResultItemDto.computedTime=Time (minutes) \#TODO -observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue=Time (%s minutes) \#TODO -observe.common.ActivityLonglinePairingResultItemDto.observationActivity=Observed activity \#TODO -observe.common.ActivityLonglinePairingResultItemDto.type=Observed activity \#TODO observe.common.ActivityObsDto.action.goToOpen.short=Observations - Open activity \#TODO observe.common.ActivityObsDto.action.goToOpen.tip=Go to open activity (Observations) \#TODO observe.common.ActivitySeineDto.action.addFloatingObject=Añadir un FOB @@ -2570,6 +2564,12 @@ observe.common.action.selectFirst.tip=Select first entry observe.common.action.selectLast.tip=Select last entry observe.common.action.selectNext.tip=Select next entry observe.common.action.selectPrevious.tip=Select previous entry +observe.common.activityLonglinePairingResultItem=Observed activity \#TODO +observe.common.activityLonglinePairingResultItem.computedDistance=Distance (km) \#TODO +observe.common.activityLonglinePairingResultItem.computedDistanceValue=Distance (%s kms) \#TODO +observe.common.activityLonglinePairingResultItem.computedTime=Time (minutes) \#TODO +observe.common.activityLonglinePairingResultItem.computedTimeValue=Time (%s minutes) \#TODO +observe.common.activityLonglinePairingResultItem.observationActivity=Observed activity \#TODO observe.common.boolean.false=No observe.common.boolean.null=Indeterminado observe.common.boolean.true=Si ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -465,12 +465,6 @@ observe.common.ActivityLonglineObsDto.types=Activités observe.common.ActivityLonglineObsDto.vesselActivityLongline=Activité bateau observe.common.ActivityLonglineObsEncounterDto.comment=Commentaire observe.common.ActivityLonglineObsSensorUsedDto.comment=Commentaire -observe.common.ActivityLonglinePairingResultItemDto.computedDistance=Distance (km) -observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue=Distance (%s kms) -observe.common.ActivityLonglinePairingResultItemDto.computedTime=Temps (minutes) -observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue=Temps (%s minutes) -observe.common.ActivityLonglinePairingResultItemDto.observationActivity=Activité observée -observe.common.ActivityLonglinePairingResultItemDto.type=Activité observée observe.common.ActivityObsDto.action.goToOpen.short=Observations - Activité ouverte observe.common.ActivityObsDto.action.goToOpen.tip=Accéder à l'activité ouverte (Observations) observe.common.ActivitySeineDto.action.addFloatingObject=Ajouter un DCP @@ -2570,6 +2564,12 @@ observe.common.action.selectFirst.tip=Sélectionner la première entrée observe.common.action.selectLast.tip=Sélectionner la dernière entrée observe.common.action.selectNext.tip=Sélectionner l'entrée suivante observe.common.action.selectPrevious.tip=Sélectionner l'entrée précédente +observe.common.activityLonglinePairingResultItem=Activité observée +observe.common.activityLonglinePairingResultItem.computedDistance=Distance (km) +observe.common.activityLonglinePairingResultItem.computedDistanceValue=Distance (%s kms) +observe.common.activityLonglinePairingResultItem.computedTime=Temps (minutes) +observe.common.activityLonglinePairingResultItem.computedTimeValue=Temps (%s minutes) +observe.common.activityLonglinePairingResultItem.observationActivity=Activité observée observe.common.boolean.false=Non observe.common.boolean.null=Indéterminé observe.common.boolean.true=Oui ===================================== services/src/main/i18n/getters/java.getter ===================================== @@ -1,6 +1,6 @@ -observe.common.ActivityLonglinePairingResultItemDto.computedDistance -observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue -observe.common.ActivityLonglinePairingResultItemDto.computedTime -observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue -observe.common.ActivityLonglinePairingResultItemDto.observationActivity -observe.common.ActivityLonglinePairingResultItemDto.type +observe.common.activityLonglinePairingResultItem +observe.common.activityLonglinePairingResultItem.computedDistance +observe.common.activityLonglinePairingResultItem.computedDistanceValue +observe.common.activityLonglinePairingResultItem.computedTime +observe.common.activityLonglinePairingResultItem.computedTimeValue +observe.common.activityLonglinePairingResultItem.observationActivity ===================================== services/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityLonglinePairingResultItem.java ===================================== @@ -28,6 +28,8 @@ import io.ultreia.java4all.lang.Numbers; import java.util.Objects; +import static io.ultreia.java4all.i18n.I18n.n; + /** * Created by tchemit on 15/10/2018. * @@ -35,6 +37,10 @@ import java.util.Objects; */ public class ActivityLonglinePairingResultItem implements ObserveDto { + static { + n("observe.common.activityLonglinePairingResultItem"); + + } private final ActivityLonglineObsReference observationActivity; private final long computedTime; private final double computedDistance; ===================================== services/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityLonglinePairingResultItemDecorator.java ===================================== @@ -41,10 +41,10 @@ import static io.ultreia.java4all.i18n.I18n.n; public class ActivityLonglinePairingResultItemDecorator extends ObserveDecorator<ActivityLonglinePairingResultItem> { static { - n("observe.common.ActivityLonglinePairingResultItemDto.type"); - n("observe.common.ActivityLonglinePairingResultItemDto.observationActivity"); - n("observe.common.ActivityLonglinePairingResultItemDto.computedTime"); - n("observe.common.ActivityLonglinePairingResultItemDto.computedDistance"); + n("observe.common.activityLonglinePairingResultItem"); + n("observe.common.activityLonglinePairingResultItem.observationActivity"); + n("observe.common.activityLonglinePairingResultItem.computedTime"); + n("observe.common.activityLonglinePairingResultItem.computedDistance"); } private final Locale locale; @@ -62,9 +62,9 @@ public class ActivityLonglinePairingResultItemDecorator extends ObserveDecorator Object value0 = jxcontext.getValue(token); switch (token) { case "computedTime": - return (Comparable) l(locale, "observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue", value0); + return (Comparable) l(locale, "observe.common.activityLonglinePairingResultItem.computedTimeValue", value0); case "computedDistance": - return (Comparable) l(locale, "observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue", value0); + return (Comparable) l(locale, "observe.common.activityLonglinePairingResultItem.computedDistanceValue", value0); case "observationActivity": return (Comparable) activityDecorator.toString(value0); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/be2ea0d2b81eee06774fc64a372… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/be2ea0d2b81eee06774fc64a372… You're receiving this email because of your account on gitlab.com.

1 0